Sanitized user-provided file names in HTTP multipart uploads

* Protect `readLine()` against DoS

* Sanitized user-provided file names in HTTP multipart uploads

---------

Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: 💬 Discord Server
-    url: https://discord.gg/HYmhKj45pU
+    url: https://discord.gg/Cn8pWhQRxZ
     about: You can join our Discord server for real time discussion and support

.github/workflows/build.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.7"
 
       - name: Pip requirements
         run: |

.github/workflows/multiOSReleases.yml

@@ -1,96 +0,0 @@
-name: Test Installers Build
-
-on:
-  workflow_dispatch:
-  release:
-    types: [created]
-permissions:
-  contents: write
-  packages: write
-jobs:
-  build-installers:
-    strategy:
-      matrix:
-        include:
-          - os: windows-latest
-            platform: win
-            ext: exe
-         #- os: macos-latest
-         #  platform: mac
-         # ext: dmg
-         #- os: ubuntu-latest
-         #  platform: linux
-         #  ext: deb
-    runs-on: ${{ matrix.os }}
-    
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: "21"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-version: 8.7
-
-      # Install Windows dependencies
-      - name: Install WiX Toolset
-        if: matrix.os == 'windows-latest'
-        run: |
-          curl -L -o wix.exe https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe
-          .\wix.exe /install /quiet
-          
-      # Install Linux dependencies
-      - name: Install Linux Dependencies
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y fakeroot rpm
-
-      # Get version number
-      - name: Get version number
-        id: versionNumber
-        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Get version number mac
-        id: versionNumberMac
-        run: echo "versionNumberMac=$(./gradlew printMacVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-        shell: bash
-
-      # Build installer
-      - name: Build Installer
-        run: ./gradlew build jpackage -x test --info
-        env:
-          DOCKER_ENABLE_SECURITY: false
-          STIRLING_PDF_DESKTOP_UI: true
-
-      # Rename and collect artifacts based on OS
-      - name: Prepare artifacts
-        id: prepare
-        shell: bash
-        run: |
-          if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            mv "build/jpackage/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.exe" "Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}"
-          elif [ "${{ matrix.os }}" = "macos-latest" ]; then
-            mv "build/jpackage/Stirling-PDF-${{ steps.versionNumberMac.outputs.versionNumberMac }}.dmg" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
-          else
-            mv "build/jpackage/stirling-pdf_${{ steps.versionNumber.outputs.versionNumber }}-1_amd64.deb" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
-          fi
-
-      # Upload installer as artifact for testing
-      - name: Upload Installer Artifact
-        uses: actions/upload-artifact@v4
-        with:    
-          name: Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
-          path: Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
-          retention-days: 1
-          if-no-files-found: error
-
-      - name: Upload binaries to release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ./Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}

.github/workflows/releaseArtifacts.yml

@@ -35,28 +35,27 @@ jobs:
         run: ./gradlew clean createExe
         env:
           DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
-          STIRLING_PDF_DESKTOP_UI: false
 
       - name: Get version number
         id: versionNumber
         run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
 
       - name: Rename binarie
-        run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
+        if: matrix.file_suffix != ''
+        run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
 
       - name: Upload Assets binarie
         uses: actions/upload-artifact@v4
         with:
-          path: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
+          path: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
-          name: Stirling-PDF-Server${{ matrix.file_suffix }}.exe
+          name: Stirling-PDF${{ matrix.file_suffix }}.exe
           overwrite: true
           retention-days: 1
           if-no-files-found: error
-          
       - name: Upload binaries to release
         uses: softprops/action-gh-release@v2
         with:
-          files: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
+          files: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
 
       - name: Rename jar binaries
         run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar

.gitignore

@@ -161,4 +161,3 @@ out/
 .pytest_cache
 .ipynb_checkpoints
 
-**/jcef-bundle/

.vscode/settings.json

@@ -49,7 +49,5 @@
   "editor.indentSize": "tabSize",
   "editor.stickyScroll.enabled": false,
   "editor.minimap.enabled": false,
-  "editor.formatOnSave": true,
+  "editor.formatOnSave": true
-  "java.format.settings.google.mode": "jar-file",
-  "java.format.settings.google.extra": "--aosp --skip-sorting-imports"
 }

DATABASE.md

@@ -1,5 +1,12 @@
 # New Database Backup and Import Functionality
 
+> [!IMPORTANT]
+> **Full activation will take place on approximately January 5th, 2025!**
+
+Why is the waiting time six months?
+
+There are users who only install updates sporadically; if they skip the preparation, it can/will lead to data loss in the database.
+
 ## Functionality Overview
 
 The newly introduced feature enhances the application with robust database backup and import capabilities. This feature is designed to ensure data integrity and provide a straightforward way to manage database backups. Here's how it works:

Dockerfile-ultra-lite

@@ -1,5 +1,5 @@
 # use alpine
-FROM alpine:3.21.0
+FROM alpine:3.20.3
 
 ARG VERSION_TAG
 

README.md

@@ -2,7 +2,7 @@
 <h1 align="center">Stirling-PDF</h1>
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/frooodle/s-pdf)](https://hub.docker.com/r/frooodle/s-pdf)
-[![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/HYmhKj45pU)
+[![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/Cn8pWhQRxZ)
 [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
 
@@ -187,48 +187,47 @@ Certain functionality like `Sign` supports pre-saved files stored at `/customFil
 
 ## Supported Languages
 
-Stirling-PDF currently supports 38 languages!
+Stirling-PDF currently supports 37 languages!
 
 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![94%](https://geps.dev/progress/94)   |
+| Arabic (العربية) (ar_AR)                        | ![99%](https://geps.dev/progress/99)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![92%](https://geps.dev/progress/92)   |
+| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![76%](https://geps.dev/progress/76)   |
-| Basque (Euskara) (eu_ES)                     | ![53%](https://geps.dev/progress/53)   |
+| Basque (Euskara) (eu_ES)                     | ![54%](https://geps.dev/progress/54)   |
-| Bulgarian (Български) (bg_BG)                | ![89%](https://geps.dev/progress/89)   |
+| Bulgarian (Български) (bg_BG)                | ![95%](https://geps.dev/progress/95)   |
-| Catalan (Català) (ca_CA)                     | ![84%](https://geps.dev/progress/84)   |
+| Catalan (Català) (ca_CA)                     | ![89%](https://geps.dev/progress/89)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![91%](https://geps.dev/progress/91)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![96%](https://geps.dev/progress/96)   |
-| Czech (Česky) (cs_CZ)                        | ![90%](https://geps.dev/progress/90)   |
+| Czech (Česky) (cs_CZ)                        | ![96%](https://geps.dev/progress/96)   |
-| Danish (Dansk) (da_DK)                       | ![89%](https://geps.dev/progress/89)   |
+| Danish (Dansk) (da_DK)                       | ![95%](https://geps.dev/progress/95)   |
-| Dutch (Nederlands) (nl_NL)                   | ![89%](https://geps.dev/progress/89)   |
+| Dutch (Nederlands) (nl_NL)                   | ![94%](https://geps.dev/progress/94)   |
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                    | ![92%](https://geps.dev/progress/92)   |
+| French (Français) (fr_FR)                    | ![98%](https://geps.dev/progress/98)   |
-| German (Deutsch) (de_DE)                     | ![100%](https://geps.dev/progress/100)   |
+| German (Deutsch) (de_DE)                     | ![98%](https://geps.dev/progress/98)   |
-| Greek (Ελληνικά) (el_GR)                     | ![90%](https://geps.dev/progress/90)   |
+| Greek (Ελληνικά) (el_GR)                     | ![96%](https://geps.dev/progress/96)   |
-| Hindi (हिंदी) (hi_IN)                          | ![88%](https://geps.dev/progress/88)   |
+| Hindi (हिंदी) (hi_IN)                          | ![93%](https://geps.dev/progress/93)   |
-| Hungarian (Magyar) (hu_HU)                   | ![91%](https://geps.dev/progress/91)   |
+| Hungarian (Magyar) (hu_HU)                   | ![96%](https://geps.dev/progress/96)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![90%](https://geps.dev/progress/90)   |
+| Indonesian (Bahasa Indonesia) (id_ID)        | ![96%](https://geps.dev/progress/96)   |
-| Irish (Gaeilge) (ga_IE)                      | ![82%](https://geps.dev/progress/82)   |
+| Irish (Gaeilge) (ga_IE)                      | ![86%](https://geps.dev/progress/86)   |
 | Italian (Italiano) (it_IT)                   | ![99%](https://geps.dev/progress/99)   |
-| Japanese (日本語) (ja_JP)                    | ![93%](https://geps.dev/progress/93)   |
+| Japanese (日本語) (ja_JP)                    | ![84%](https://geps.dev/progress/84)   |
-| Korean (한국어) (ko_KR)                      | ![89%](https://geps.dev/progress/89)   |
+| Korean (한국어) (ko_KR)                      | ![94%](https://geps.dev/progress/94)   |
-| Norwegian (Norsk) (no_NB)                    | ![82%](https://geps.dev/progress/82)   |
+| Norwegian (Norsk) (no_NB)                    | ![86%](https://geps.dev/progress/86)   |
-| Persian (فارسی) (fa_IR)                      | ![99%](https://geps.dev/progress/99)   |
+| Polish (Polski) (pl_PL)                      | ![95%](https://geps.dev/progress/95)   |
-| Polish (Polski) (pl_PL)                      | ![90%](https://geps.dev/progress/90)   |
+| Portuguese (Português) (pt_PT)               | ![96%](https://geps.dev/progress/96)   |
-| Portuguese (Português) (pt_PT)               | ![90%](https://geps.dev/progress/90)   |
+| Portuguese Brazilian (Português) (pt_BR)     | ![96%](https://geps.dev/progress/96)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![98%](https://geps.dev/progress/98)   |
+| Romanian (Română) (ro_RO)                    | ![89%](https://geps.dev/progress/89)   |
-| Romanian (Română) (ro_RO)                    | ![84%](https://geps.dev/progress/84)   |
+| Russian (Русский) (ru_RU)                    | ![95%](https://geps.dev/progress/95)   |
-| Russian (Русский) (ru_RU)                    | ![90%](https://geps.dev/progress/90)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![69%](https://geps.dev/progress/69)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![67%](https://geps.dev/progress/67)   |
+| Simplified Chinese (简体中文) (zh_CN)         | ![90%](https://geps.dev/progress/90)   |
-| Simplified Chinese (简体中文) (zh_CN)         | ![93%](https://geps.dev/progress/93)   |
+| Slovakian (Slovensky) (sk_SK)                | ![81%](https://geps.dev/progress/81)   |
-| Slovakian (Slovensky) (sk_SK)                | ![78%](https://geps.dev/progress/78)   |
+| Spanish (Español) (es_ES)                    | ![96%](https://geps.dev/progress/96)   |
-| Spanish (Español) (es_ES)                    | ![91%](https://geps.dev/progress/91)   |
+| Swedish (Svenska) (sv_SE)                    | ![95%](https://geps.dev/progress/95)   |
-| Swedish (Svenska) (sv_SE)                    | ![90%](https://geps.dev/progress/90)   |
+| Thai (ไทย) (th_TH)                           | ![94%](https://geps.dev/progress/94)   |
-| Thai (ไทย) (th_TH)                           | ![90%](https://geps.dev/progress/90)   |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![97%](https://geps.dev/progress/97)   |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![91%](https://geps.dev/progress/91)   |
+| Turkish (Türkçe) (tr_TR)                     | ![90%](https://geps.dev/progress/90)   |
-| Turkish (Türkçe) (tr_TR)                     | ![86%](https://geps.dev/progress/86)   |
+| Ukrainian (Українська) (uk_UA)               | ![79%](https://geps.dev/progress/79)   |
-| Ukrainian (Українська) (uk_UA)               | ![76%](https://geps.dev/progress/76)   |
+| Vietnamese (Tiếng Việt) (vi_VN)              | ![87%](https://geps.dev/progress/87)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![83%](https://geps.dev/progress/83)   |
 
 ## Contributing (Creating Issues, Translations, Fixing Bugs, etc.)
 
@@ -405,7 +404,7 @@ To access your account settings, go to Account Settings in the settings cog menu
 
 To add new users, go to the bottom of Account Settings and hit 'Admin Settings'. Here you can add new users. The different roles mentioned within this are for rate limiting. This is a work in progress and will be expanded on more in the future.
 
-For API usage, you must provide a header with `X-API-KEY` and the associated API key for that user.
+For API usage, you must provide a header with `X-API-Key` and the associated API key for that user.
 
 ## FAQ
 

build.gradle

@@ -8,7 +8,6 @@ plugins {
     id "com.diffplug.spotless" version "6.25.0"
     id "com.github.jk1.dependency-license-report" version "2.9"
 	//id "nebula.lint" version "19.0.3"
-	id("org.panteleyev.jpackageplugin") version "1.6.0"
 }
 
 
@@ -22,12 +21,10 @@ ext {
     imageioVersion = "3.12.0"
     lombokVersion = "1.18.36"
     bouncycastleVersion = "1.79"
-    springSecuritySamlVersion = "6.4.2"
-    openSamlVersion = "4.3.2"
 }
 
 group = "stirling.software"
-version = "0.36.5"
+version = "0.35.0"
 
 
 java {
@@ -42,9 +39,6 @@ repositories {
     maven {
         url 'https://build.shibboleth.net/maven/releases'
     }
-    maven { url "https://build.shibboleth.net/maven/releases" }
-    maven { url "https://maven.pkg.github.com/jcefmaven/jcefmaven" }
-
 }
 
 licenseReport {
@@ -68,12 +62,6 @@ sourceSets {
                 exclude "stirling/software/SPDF/model/User.java"
                 exclude "stirling/software/SPDF/repository/**"
             }
-
-            if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") {
-            	exclude "stirling/software/SPDF/UI/impl/**"
-            }
-
-
         }
     }
 }
@@ -84,153 +72,16 @@ openApi {
     outputFileName = "SwaggerDoc.json"
 }
 
-//0.11.5 to 2024.11.5
-def getMacVersion(String version) {
-    def currentYear = java.time.Year.now().getValue()
-    def versionParts = version.split("\\.", 2)
-    return "${currentYear}.${versionParts.length > 1 ? versionParts[1] : versionParts[0]}"
-}
-
-jpackage {
-    input = "build/libs"
-
-    appName = "Stirling-PDF"
-    appVersion = project.version
-    vendor = "Stirling-Software"
-	appDescription = "Stirling PDF - Your Local PDF Editor"
-
-    mainJar = "Stirling-PDF-${project.version}.jar"
-    mainClass = "org.springframework.boot.loader.launch.JarLauncher"
-
-    icon = "src/main/resources/static/favicon.ico"
-
-
-
-    // JVM Options
-    javaOptions = [
-        "-DBROWSER_OPEN=true",
-        "-DSTIRLING_PDF_DESKTOP_UI=true",
-        "-Djava.awt.headless=false",
-        "-Dapple.awt.UIElement=true",
-        "--add-opens", "java.base/java.lang=ALL-UNNAMED",
-        "--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED",
-        "--add-opens", "java.desktop/sun.awt=ALL-UNNAMED"
-
-    ]
-
-
-    verbose = true
-
-    destination = "${projectDir}/build/jpackage"
-
-    // Windows-specific configuration
-    windows {
-    	launcherAsService = false
-    	appVersion = project.version
-        winConsole = false
-        winDirChooser = true
-        winMenu = true
-        winShortcut = true
-        winPerUserInstall = true
-        winMenuGroup = "Stirling Software"
-        winUpgradeUuid = "2a43ed0c-b8c2-40cf-89e1-751129b87641" // Unique identifier for updates
-        winHelpUrl = "https://github.com/Stirling-Tools/Stirling-PDF"
-        winUpdateUrl = "https://github.com/Stirling-Tools/Stirling-PDF/releases"
-        type = "exe"
-        installDir = "C:/Program Files/Stirling-PDF"
-    }
-
-    // macOS-specific configuration
-    mac {
-    	appVersion = getMacVersion(project.version.toString())
-        icon = "src/main/resources/static/favicon.icns"
-        type = "dmg"
-        macPackageIdentifier = "com.stirling.software.pdf"
-        macPackageName = "Stirling-PDF"
-        macAppCategory = "public.app-category.productivity"
-        macSign = false // Enable signing
-        macAppStore = false // Not targeting App Store initially
-
-        //installDir = "Applications"
-
-        // Add license and other documentation to DMG
-        /*macDmgContent = [
-            "README.md",
-            "LICENSE",
-            "CHANGELOG.md"
-        ]*/
-
-        // Enable Mac-specific entitlements
-        //macEntitlements = "entitlements.plist" // You'll need to create this file
-    }
-
-    // Linux-specific configuration
-    linux {
-    	appVersion = project.version
-        icon = "src/main/resources/static/favicon.png"
-        type = "deb" // Can also use "rpm" for Red Hat-based systems
-
-        // Debian package configuration
-        //linuxPackageName = "stirlingpdf"
-        linuxDebMaintainer = "support@stirlingpdf.com"
-        linuxMenuGroup = "Office;PDF;Productivity"
-        linuxAppCategory = "Office"
-        linuxAppRelease = "1"
-        linuxPackageDeps = true
-
-        installDir = "/opt/Stirling-PDF"
-
-        // RPM-specific settings
-        //linuxRpmLicenseType = "MIT"
-    }
-
-    // Common additional options
-    //jLinkOptions = [
-    //    "--strip-debug",
-    //    "--compress=2",
-    //    "--no-header-files",
-    //    "--no-man-pages"
-    //]
-
-    // Add any additional modules required
-    /*addModules = [
-        "java.base",
-        "java.desktop",
-        "java.logging",
-        "java.sql",
-        "java.xml",
-        "jdk.crypto.ec"
-    ]*/
-
-    // Add copyright and license information
-    copyright = "Copyright © 2024 Stirling Software"
-    licenseFile = "LICENSE"
-}
-
-
 launch4j {
     icon = "${projectDir}/src/main/resources/static/favicon.ico"
 
     outfile="Stirling-PDF.exe"
-
+    headerType="console"
-    if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
-    	headerType = "gui"
-    } else {
-    	headerType = "console"
-    }
     jarTask = tasks.bootJar
 
     errTitle="Encountered error, Do you have Java 21?"
     downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
-
+    variables=["BROWSER_OPEN=true"]
-    if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
-    	variables=["BROWSER_OPEN=true", "STIRLING_PDF_DESKTOP_UI=true"]
-    } else {
-    	variables=["BROWSER_OPEN=true"]
-    }
-
-
-
     jreMinVersion="17"
 
     mutexName="Stirling-PDF"
@@ -247,7 +98,7 @@ spotless {
     java {
         target project.fileTree('src/main/java')
 
-        googleJavaFormat("1.25.2").aosp().reorderImports(false)
+        googleJavaFormat("1.22.0").aosp().reorderImports(false)
 
         importOrder("java", "javax", "org", "com", "net", "io")
         toggleOffOn()
@@ -270,17 +121,10 @@ configurations.all {
     exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
 }
 dependencies {
-
-	if (System.getenv("STIRLING_PDF_DESKTOP_UI") != "false") {
-		implementation "me.friwi:jcefmaven:127.3.1"
-	    implementation "org.openjfx:javafx-controls:21"
-	    implementation "org.openjfx:javafx-swing:21"
-    }
-
     //security updates
-    implementation "org.springframework:spring-webmvc:6.2.1"
+    implementation "org.springframework:spring-webmvc:6.2.0"
 
-    implementation("io.github.pixee:java-security-toolkit:1.2.1")
+    implementation("io.github.pixee:java-security-toolkit:1.2.0")
 
     // implementation "org.yaml:snakeyaml:2.2"
     implementation 'com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4'
@@ -296,22 +140,21 @@ dependencies {
 
     if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
         implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
-        implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE"
+        implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE"
         implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
         implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
 
-		implementation "org.springframework.session:spring-session-core:$springBootVersion"
+		implementation 'org.springframework.security:spring-security-saml2-service-provider:6.4.1'
-
 	    implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
         // Don't upgrade h2database
         runtimeOnly "com.h2database:h2:2.3.232"
         constraints {
-            implementation "org.opensaml:opensaml-core:$openSamlVersion"
+            implementation "org.opensaml:opensaml-core"
-            implementation "org.opensaml:opensaml-saml-api:$openSamlVersion"
+            implementation "org.opensaml:opensaml-saml-api"
-            implementation "org.opensaml:opensaml-saml-impl:$openSamlVersion"
+            implementation "org.opensaml:opensaml-saml-impl"
         }
-        implementation "org.springframework.security:spring-security-saml2-service-provider:$springSecuritySamlVersion"
+        implementation "org.springframework.security:spring-security-saml2-service-provider"
-//		implementation 'org.springframework.security:spring-security-core:$springSecuritySamlVersion'
+
         implementation 'com.coveo:saml-client:5.0.0'
 
 
@@ -343,7 +186,7 @@ dependencies {
     // Image metadata extractor
     implementation "com.drewnoakes:metadata-extractor:2.19.0"
 
-    implementation "commons-io:commons-io:2.18.0"
+    implementation "commons-io:commons-io:2.17.0"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"
     //general PDF
 
@@ -372,7 +215,7 @@ dependencies {
     implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
     implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
     implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    implementation "io.micrometer:micrometer-core:1.14.2"
+    implementation "io.micrometer:micrometer-core:1.14.1"
     implementation group: "com.google.zxing", name: "core", version: "3.5.3"
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation "org.commonmark:commonmark:0.24.0"
@@ -425,14 +268,7 @@ jar {
 tasks.named("test") {
     useJUnitPlatform()
 }
-task printVersion {
-    doLast {
-        println project.version
-    }
-}
 
-task printMacVersion {
+task printVersion {
-    doLast {
+    println project.version
-        println getMacVersion(project.version.toString())
-    }
 }

cucumber/features/external.feature

@@ -48,6 +48,24 @@ Feature: API Validation
 	And the response status code should be 200
 	
 	
+	
+  @ocr @negative
+  Scenario: Process PDF with text and OCR with type normal 
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
+    And the request data includes
+      | parameter        | value       |
+      | languages        | eng         |
+      | sidecar          | false        |
+      | deskew           | true        |
+      | clean            | true        |
+      | cleanFinal       | true        |
+      | ocrType          | Normal      |
+      | ocrRenderType    | hocr        |
+      | removeImagesAfter| false       |
+    When I send the API request to the endpoint "/api/v1/misc/ocr-pdf"
+	Then the response status code should be 500
+	
   @ocr @positive
   Scenario: Process PDF with OCR
     Given I generate a PDF file as "fileInput"
@@ -66,6 +84,26 @@ Feature: API Validation
     And the response file should have size greater than 0
 	And the response status code should be 200
 	
+  @ocr @positive
+  Scenario: Process PDF with OCR with sidecar
+    Given I generate a PDF file as "fileInput"
+    And the request data includes
+      | parameter        | value       |
+      | languages        | eng         |
+      | sidecar          | true        |
+      | deskew           | true        |
+      | clean            | true        |
+      | cleanFinal       | true        |
+      | ocrType          | Force      |
+      | ocrRenderType    | hocr        |
+      | removeImagesAfter| false       |
+    When I send the API request to the endpoint "/api/v1/misc/ocr-pdf"
+    Then the response content type should be "application/octet-stream"
+	And the response file should have extension ".zip"
+	And the response ZIP should contain 2 files
+    And the response file should have size greater than 0
+	And the response status code should be 200
+
 
   @libre @positive
   Scenario Outline: Convert PDF to various word formats

cucumber/features/steps/step_definitions.py

@@ -15,10 +15,6 @@ import shutil
 import re
 from PIL import Image, ImageDraw
 
-API_HEADERS = {
-    'X-API-KEY': '123456789'
-}
-
 #########
 # GIVEN #
 #########
@@ -231,7 +227,7 @@ def save_generated_pdf(context, filename):
 def step_send_get_request(context, endpoint):
     base_url = "http://localhost:8080"
     full_url = f"{base_url}{endpoint}"
-    response = requests.get(full_url, headers=API_HEADERS)
+    response = requests.get(full_url)
     context.response = response
 
 @when('I send a GET request to "{endpoint}" with parameters')
@@ -239,7 +235,7 @@ def step_send_get_request_with_params(context, endpoint):
     base_url = "http://localhost:8080"
     params = {row['parameter']: row['value'] for row in context.table}
     full_url = f"{base_url}{endpoint}"
-    response = requests.get(full_url, params=params, headers=API_HEADERS)
+    response = requests.get(full_url, params=params)
     context.response = response
 
 @when('I send the API request to the endpoint "{endpoint}"')
@@ -260,7 +256,7 @@ def step_send_api_request(context, endpoint):
         print(f"form_data {file.name} with {mime_type}")
         form_data.append((key, (file.name, file, mime_type)))
 
-    response = requests.post(url, files=form_data, headers=API_HEADERS)
+    response = requests.post(url, files=form_data)
     context.response = response
 
 ########

exampleYmlFiles/test_cicd.yml

@@ -1,34 +0,0 @@
-services:
-  stirling-pdf:
-    container_name: Stirling-PDF-Security-Fat
-    image: stirlingtools/stirling-pdf:latest-fat
-    deploy:
-      resources:
-        limits:
-          memory: 4G
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f -H 'X-API-KEY: 123456789' http://localhost:8080/api/v1/info/status | grep -q 'UP'"]
-      interval: 5s
-      timeout: 10s
-      retries: 16
-    ports:
-      - 8080:8080
-    volumes:
-      - /stirling/latest/data:/usr/share/tessdata:rw
-      - /stirling/latest/config:/configs:rw
-      - /stirling/latest/logs:/logs:rw
-    environment:
-      DOCKER_ENABLE_SECURITY: "true"
-      SECURITY_ENABLELOGIN: "true"
-      PUID: 1002
-      PGID: 1002
-      UMASK: "022"
-      SYSTEM_DEFAULTLOCALE: en-US
-      UI_APPNAME: Stirling-PDF
-      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest-fat with Security
-      UI_APPNAMENAVBAR: Stirling-PDF Latest-fat
-      SYSTEM_MAXFILESIZE: "100"
-      METRICS_ENABLED: "true"
-      SYSTEM_GOOGLEVISIBILITY: "true"
-      SECURITY_CUSTOMGLOBALAPIKEY: "123456789"
-    restart: on-failure:5

scripts/ignore_translation.toml

@@ -42,19 +42,14 @@ ignore = [
     'addPageNumbers.selectText.3',
     'alphabet',
     'certSign.name',
-    'fileChooser.dragAndDrop',
     'home.pipeline.title',
     'language.direction',
-    'legal.impressum',
     'licenses.version',
     'pipeline.title',
     'pipelineOptions.pipelineHeader',
     'pro',
     'sponsor',
     'text',
-    'validateSignature.cert.bits',
-    'validateSignature.cert.version',
-    'validateSignature.status',
     'watermark.type.1',
 ]
 
@@ -66,6 +61,7 @@ ignore = [
 [es_ES]
 ignore = [
     'adminUserSettings.roles',
+    'color',
     'error',
     'language.direction',
     'no',
@@ -77,11 +73,6 @@ ignore = [
     'language.direction',
 ]
 
-[fa_IR]
-ignore = [
-    'language.direction',
-]
-
 [fr_FR]
 ignore = [
     'AddStampRequest.alphabet',

scripts/init.sh

@@ -16,10 +16,10 @@ fi
 # Check if TESSERACT_LANGS environment variable is set and is not empty
 if [[ -n "$TESSERACT_LANGS" ]]; then
   # Convert comma-separated values to a space-separated list
-  SPACE_SEPARATED_LANGS=$(echo $TESSERACT_LANGS | tr ',' ' ')
+  LANGS=$(echo $TESSERACT_LANGS | tr ',' ' ')
   pattern='^[a-zA-Z]{2,4}(_[a-zA-Z]{2,4})?$'
   # Install each language pack
-  for LANG in $SPACE_SEPARATED_LANGS; do
+  for LANG in $LANGS; do
      if [[ $LANG =~ $pattern ]]; then
       apk add --no-cache "tesseract-ocr-data-$LANG"
      else

src/main/java/stirling/software/SPDF/EE/EEAppConfig.java

@@ -3,14 +3,13 @@ package stirling.software.SPDF.EE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
+import org.springframework.context.annotation.Lazy;
-import org.springframework.core.annotation.Order;
 
 import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
-@Order(Ordered.HIGHEST_PRECEDENCE)
+@Lazy
 @Slf4j
 public class EEAppConfig {
 

src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java

@@ -25,10 +25,9 @@ public class LicenseKeyChecker {
             KeygenLicenseVerifier licenseService, ApplicationProperties applicationProperties) {
         this.licenseService = licenseService;
         this.applicationProperties = applicationProperties;
-        this.checkLicense();
     }
 
-    @Scheduled(initialDelay = 604800000, fixedRate = 604800000) // 7 days in milliseconds
+    @Scheduled(fixedRate = 604800000, initialDelay = 1000) // 7 days in milliseconds
     public void checkLicensePeriodically() {
         checkLicense();
     }

src/main/java/stirling/software/SPDF/LibreOfficeListener.java

@@ -6,6 +6,9 @@ import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import io.github.pixee.security.SystemCommand;
 
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class LibreOfficeListener {
 
+    private static final Logger logger = LoggerFactory.getLogger(LibreOfficeListener.class);
     private static final long ACTIVITY_TIMEOUT = 20L * 60 * 1000; // 20 minutes
 
     private static final LibreOfficeListener INSTANCE = new LibreOfficeListener();
@@ -83,7 +87,7 @@ public class LibreOfficeListener {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
-                log.error("exception", e);
+                logger.error("exception", e);
             } // Check every 1 second
         }
     }

src/main/java/stirling/software/SPDF/SPdfApplication.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF;
 
-import java.awt.*;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.nio.file.Files;
@@ -9,10 +8,9 @@ import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
-
-import javax.swing.*;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
@@ -23,17 +21,15 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import io.github.pixee.security.SystemCommand;
 
 import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.UI.WebBrowser;
 import stirling.software.SPDF.config.ConfigInitializer;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @SpringBootApplication
 @EnableScheduling
-@Slf4j
 public class SPdfApplication {
 
+    private static final Logger logger = LoggerFactory.getLogger(SPdfApplication.class);
+
     @Autowired private Environment env;
     @Autowired ApplicationProperties applicationProperties;
 
@@ -71,19 +67,36 @@ public class SPdfApplication {
         }
     }
 
+    @PostConstruct
+    public void init() {
+        baseUrlStatic = this.baseUrl;
+        // Check if the BROWSER_OPEN environment variable is set to true
+        String browserOpenEnv = env.getProperty("BROWSER_OPEN");
+        boolean browserOpen = browserOpenEnv != null && "true".equalsIgnoreCase(browserOpenEnv);
+        if (browserOpen) {
+            try {
+                String url = baseUrl + ":" + getStaticPort();
+
+                String os = System.getProperty("os.name").toLowerCase();
+                Runtime rt = Runtime.getRuntime();
+                if (os.contains("win")) {
+                    // For Windows
+                    SystemCommand.runCommand(rt, "rundll32 url.dll,FileProtocolHandler " + url);
+                } else if (os.contains("mac")) {
+                    SystemCommand.runCommand(rt, "open " + url);
+                } else if (os.contains("nix") || os.contains("nux")) {
+                    SystemCommand.runCommand(rt, "xdg-open " + url);
+                }
+            } catch (Exception e) {
+                logger.error("Error opening browser: {}", e.getMessage());
+            }
+        }
+        logger.info("Running configs {}", applicationProperties.toString());
+    }
+
     public static void main(String[] args) throws IOException, InterruptedException {
 
         SpringApplication app = new SpringApplication(SPdfApplication.class);
-
-        Properties props = new Properties();
-
-        if (Boolean.parseBoolean(System.getProperty("STIRLING_PDF_DESKTOP_UI", "false"))) {
-            System.setProperty("java.awt.headless", "false");
-            app.setHeadless(false);
-            props.put("java.awt.headless", "false");
-            props.put("spring.main.web-application-type", "servlet");
-        }
-
         app.setAdditionalProfiles("default");
         app.addInitializers(new ConfigInitializer());
         Map<String, String> propertyFiles = new HashMap<>();
@@ -92,7 +105,7 @@ public class SPdfApplication {
         if (Files.exists(Paths.get("configs/settings.yml"))) {
             propertyFiles.put("spring.config.additional-location", "file:configs/settings.yml");
         } else {
-            log.warn("External configuration file 'configs/settings.yml' does not exist.");
+            logger.warn("External configuration file 'configs/settings.yml' does not exist.");
         }
 
         if (Files.exists(Paths.get("configs/custom_settings.yml"))) {
@@ -105,22 +118,16 @@ public class SPdfApplication {
                     "spring.config.additional-location",
                     existingLocation + "file:configs/custom_settings.yml");
         } else {
-            log.warn("Custom configuration file 'configs/custom_settings.yml' does not exist.");
+            logger.warn("Custom configuration file 'configs/custom_settings.yml' does not exist.");
         }
-        Properties finalProps = new Properties();
 
         if (!propertyFiles.isEmpty()) {
-            finalProps.putAll(
+            app.setDefaultProperties(
                     Collections.singletonMap(
                             "spring.config.additional-location",
                             propertyFiles.get("spring.config.additional-location")));
         }
 
-        if (!props.isEmpty()) {
-            finalProps.putAll(props);
-        }
-        app.setDefaultProperties(finalProps);
-
         app.run(args);
 
         // Ensure directories are created
@@ -128,56 +135,16 @@ public class SPdfApplication {
             Files.createDirectories(Path.of("customFiles/static/"));
             Files.createDirectories(Path.of("customFiles/templates/"));
         } catch (Exception e) {
-            log.error("Error creating directories: {}", e.getMessage());
+            logger.error("Error creating directories: {}", e.getMessage());
         }
 
         printStartupLogs();
     }
 
     private static void printStartupLogs() {
-        log.info("Stirling-PDF Started.");
+        logger.info("Stirling-PDF Started.");
         String url = baseUrlStatic + ":" + getStaticPort();
-        log.info("Navigate to {}", url);
+        logger.info("Navigate to {}", url);
-    }
-
-    @Autowired(required = false)
-    private WebBrowser webBrowser;
-
-    @PostConstruct
-    public void init() {
-        baseUrlStatic = this.baseUrl;
-        String url = baseUrl + ":" + getStaticPort();
-        if (webBrowser != null
-                && Boolean.parseBoolean(System.getProperty("STIRLING_PDF_DESKTOP_UI", "false"))) {
-            webBrowser.initWebUI(url);
-        } else {
-            String browserOpenEnv = env.getProperty("BROWSER_OPEN");
-            boolean browserOpen = browserOpenEnv != null && "true".equalsIgnoreCase(browserOpenEnv);
-            if (browserOpen) {
-                try {
-                    String os = System.getProperty("os.name").toLowerCase();
-                    Runtime rt = Runtime.getRuntime();
-                    if (os.contains("win")) {
-                        // For Windows
-                        SystemCommand.runCommand(rt, "rundll32 url.dll,FileProtocolHandler " + url);
-                    } else if (os.contains("mac")) {
-                        SystemCommand.runCommand(rt, "open " + url);
-                    } else if (os.contains("nix") || os.contains("nux")) {
-                        SystemCommand.runCommand(rt, "xdg-open " + url);
-                    }
-                } catch (Exception e) {
-                    log.error("Error opening browser: {}", e.getMessage());
-                }
-            }
-        }
-        log.info("Running configs {}", applicationProperties.toString());
-    }
-
-    @PreDestroy
-    public void cleanup() {
-        if (webBrowser != null) {
-            webBrowser.cleanup();
-        }
     }
 
     public static String getStaticBaseUrl() {

src/main/java/stirling/software/SPDF/UI/WebBrowser.java

@@ -1,7 +0,0 @@
-package stirling.software.SPDF.UI;
-
-public interface WebBrowser {
-    void initWebUI(String url);
-
-    void cleanup();
-}

src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java

@@ -1,354 +0,0 @@
-package stirling.software.SPDF.UI.impl;
-
-import java.awt.AWTException;
-import java.awt.BorderLayout;
-import java.awt.Frame;
-import java.awt.Image;
-import java.awt.MenuItem;
-import java.awt.PopupMenu;
-import java.awt.SystemTray;
-import java.awt.TrayIcon;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowStateListener;
-import java.io.File;
-import java.io.InputStream;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-
-import javax.imageio.ImageIO;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-
-import org.cef.CefApp;
-import org.cef.CefClient;
-import org.cef.CefSettings;
-import org.cef.browser.CefBrowser;
-import org.cef.callback.CefBeforeDownloadCallback;
-import org.cef.callback.CefDownloadItem;
-import org.cef.callback.CefDownloadItemCallback;
-import org.cef.handler.CefDownloadHandlerAdapter;
-import org.cef.handler.CefLoadHandlerAdapter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-import jakarta.annotation.PreDestroy;
-import lombok.extern.slf4j.Slf4j;
-import me.friwi.jcefmaven.CefAppBuilder;
-import me.friwi.jcefmaven.EnumProgress;
-import me.friwi.jcefmaven.MavenCefAppHandlerAdapter;
-import me.friwi.jcefmaven.impl.progress.ConsoleProgressHandler;
-import stirling.software.SPDF.UI.WebBrowser;
-
-@Component
-@Slf4j
-@ConditionalOnProperty(
-        name = "STIRLING_PDF_DESKTOP_UI",
-        havingValue = "true",
-        matchIfMissing = false)
-public class DesktopBrowser implements WebBrowser {
-    private static CefApp cefApp;
-    private static CefClient client;
-    private static CefBrowser browser;
-    private static JFrame frame;
-    private static LoadingWindow loadingWindow;
-    private static volatile boolean browserInitialized = false;
-    private static TrayIcon trayIcon;
-    private static SystemTray systemTray;
-
-    public DesktopBrowser() {
-        SwingUtilities.invokeLater(
-                () -> {
-                    loadingWindow = new LoadingWindow(null, "Initializing...");
-                    loadingWindow.setVisible(true);
-                });
-    }
-
-    public void initWebUI(String url) {
-        CompletableFuture.runAsync(
-                () -> {
-                    try {
-                        CefAppBuilder builder = new CefAppBuilder();
-                        configureCefSettings(builder);
-                        builder.setProgressHandler(createProgressHandler());
-
-                        // Build and initialize CEF
-                        cefApp = builder.build();
-                        client = cefApp.createClient();
-
-                        // Set up download handler
-                        setupDownloadHandler();
-
-                        // Create browser and frame on EDT
-                        SwingUtilities.invokeAndWait(
-                                () -> {
-                                    browser = client.createBrowser(url, false, false);
-                                    setupMainFrame();
-                                    setupLoadHandler();
-
-                                    // Show the frame immediately but transparent
-                                    frame.setVisible(true);
-                                });
-                    } catch (Exception e) {
-                        log.error("Error initializing JCEF browser: ", e);
-                        cleanup();
-                    }
-                });
-    }
-
-    private void configureCefSettings(CefAppBuilder builder) {
-        CefSettings settings = builder.getCefSettings();
-        settings.cache_path = new File("jcef-bundle").getAbsolutePath();
-        settings.root_cache_path = new File("jcef-bundle").getAbsolutePath();
-        settings.persist_session_cookies = true;
-        settings.windowless_rendering_enabled = false;
-        settings.log_severity = CefSettings.LogSeverity.LOGSEVERITY_INFO;
-
-        builder.setAppHandler(
-                new MavenCefAppHandlerAdapter() {
-                    @Override
-                    public void stateHasChanged(org.cef.CefApp.CefAppState state) {
-                        log.info("CEF state changed: " + state);
-                        if (state == CefApp.CefAppState.TERMINATED) {
-                            System.exit(0);
-                        }
-                    }
-                });
-    }
-
-    private void setupDownloadHandler() {
-        client.addDownloadHandler(
-                new CefDownloadHandlerAdapter() {
-                    @Override
-                    public boolean onBeforeDownload(
-                            CefBrowser browser,
-                            CefDownloadItem downloadItem,
-                            String suggestedName,
-                            CefBeforeDownloadCallback callback) {
-                        callback.Continue("", true);
-                        return true;
-                    }
-
-                    @Override
-                    public void onDownloadUpdated(
-                            CefBrowser browser,
-                            CefDownloadItem downloadItem,
-                            CefDownloadItemCallback callback) {
-                        if (downloadItem.isComplete()) {
-                            log.info("Download completed: " + downloadItem.getFullPath());
-                        } else if (downloadItem.isCanceled()) {
-                            log.info("Download canceled: " + downloadItem.getFullPath());
-                        }
-                    }
-                });
-    }
-
-    private ConsoleProgressHandler createProgressHandler() {
-        return new ConsoleProgressHandler() {
-            @Override
-            public void handleProgress(EnumProgress state, float percent) {
-                Objects.requireNonNull(state, "state cannot be null");
-                SwingUtilities.invokeLater(
-                        () -> {
-                            if (loadingWindow != null) {
-                                switch (state) {
-                                    case LOCATING:
-                                        loadingWindow.setStatus("Locating Files...");
-                                        loadingWindow.setProgress(0);
-                                        break;
-                                    case DOWNLOADING:
-                                        if (percent >= 0) {
-                                            loadingWindow.setStatus(
-                                                    String.format(
-                                                            "Downloading additional files: %.0f%%",
-                                                            percent));
-                                            loadingWindow.setProgress((int) percent);
-                                        }
-                                        break;
-                                    case EXTRACTING:
-                                        loadingWindow.setStatus("Extracting files...");
-                                        loadingWindow.setProgress(60);
-                                        break;
-                                    case INITIALIZING:
-                                        loadingWindow.setStatus("Initializing UI...");
-                                        loadingWindow.setProgress(80);
-                                        break;
-                                    case INITIALIZED:
-                                        loadingWindow.setStatus("Finalising startup...");
-                                        loadingWindow.setProgress(90);
-                                        break;
-                                }
-                            }
-                        });
-            }
-        };
-    }
-
-    private void setupMainFrame() {
-        frame = new JFrame("Stirling-PDF");
-        frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-        frame.setUndecorated(true);
-        frame.setOpacity(0.0f);
-
-        JPanel contentPane = new JPanel(new BorderLayout());
-        contentPane.setDoubleBuffered(true);
-        contentPane.add(browser.getUIComponent(), BorderLayout.CENTER);
-        frame.setContentPane(contentPane);
-
-        frame.addWindowListener(
-                new java.awt.event.WindowAdapter() {
-                    @Override
-                    public void windowClosing(java.awt.event.WindowEvent windowEvent) {
-                        cleanup();
-                        System.exit(0);
-                    }
-                });
-
-        frame.setSize(1280, 768);
-        frame.setLocationRelativeTo(null);
-
-        loadIcon();
-    }
-
-    private void setupLoadHandler() {
-        client.addLoadHandler(
-                new CefLoadHandlerAdapter() {
-                    @Override
-                    public void onLoadingStateChange(
-                            CefBrowser browser,
-                            boolean isLoading,
-                            boolean canGoBack,
-                            boolean canGoForward) {
-                        if (!isLoading && !browserInitialized) {
-                            browserInitialized = true;
-                            SwingUtilities.invokeLater(
-                                    () -> {
-                                        if (loadingWindow != null) {
-                                            Timer timer =
-                                                    new Timer(
-                                                            500,
-                                                            e -> {
-                                                                loadingWindow.dispose();
-                                                                loadingWindow = null;
-
-                                                                frame.dispose();
-                                                                frame.setOpacity(1.0f);
-                                                                frame.setUndecorated(false);
-                                                                frame.pack();
-                                                                frame.setSize(1280, 800);
-                                                                frame.setLocationRelativeTo(null);
-                                                                frame.setVisible(true);
-                                                                frame.requestFocus();
-                                                                frame.toFront();
-                                                                browser.getUIComponent()
-                                                                        .requestFocus();
-                                                            });
-                                            timer.setRepeats(false);
-                                            timer.start();
-                                        }
-                                    });
-                        }
-                    }
-                });
-    }
-
-    private void setupTrayIcon(Image icon) {
-        if (!SystemTray.isSupported()) {
-            log.warn("System tray is not supported");
-            return;
-        }
-
-        try {
-            systemTray = SystemTray.getSystemTray();
-
-            // Create popup menu
-            PopupMenu popup = new PopupMenu();
-
-            // Create menu items
-            MenuItem showItem = new MenuItem("Show");
-            showItem.addActionListener(
-                    e -> {
-                        frame.setVisible(true);
-                        frame.setState(Frame.NORMAL);
-                    });
-
-            MenuItem exitItem = new MenuItem("Exit");
-            exitItem.addActionListener(
-                    e -> {
-                        cleanup();
-                        System.exit(0);
-                    });
-
-            // Add menu items to popup menu
-            popup.add(showItem);
-            popup.addSeparator();
-            popup.add(exitItem);
-
-            // Create tray icon
-            trayIcon = new TrayIcon(icon, "Stirling-PDF", popup);
-            trayIcon.setImageAutoSize(true);
-
-            // Add double-click behavior
-            trayIcon.addActionListener(
-                    e -> {
-                        frame.setVisible(true);
-                        frame.setState(Frame.NORMAL);
-                    });
-
-            // Add tray icon to system tray
-            systemTray.add(trayIcon);
-
-            // Modify frame behavior to minimize to tray
-            frame.addWindowStateListener(
-                    new WindowStateListener() {
-                        public void windowStateChanged(WindowEvent e) {
-                            if (e.getNewState() == Frame.ICONIFIED) {
-                                frame.setVisible(false);
-                            }
-                        }
-                    });
-
-        } catch (AWTException e) {
-            log.error("Error setting up system tray icon", e);
-        }
-    }
-
-    private void loadIcon() {
-        try {
-            Image icon = null;
-            String[] iconPaths = {"/static/favicon.ico"};
-
-            for (String path : iconPaths) {
-                if (icon != null) break;
-                try {
-                    try (InputStream is = getClass().getResourceAsStream(path)) {
-                        if (is != null) {
-                            icon = ImageIO.read(is);
-                            break;
-                        }
-                    }
-                } catch (Exception e) {
-                    log.debug("Could not load icon from " + path, e);
-                }
-            }
-
-            if (icon != null) {
-                frame.setIconImage(icon);
-                setupTrayIcon(icon);
-            } else {
-                log.warn("Could not load icon from any source");
-            }
-        } catch (Exception e) {
-            log.error("Error loading icon", e);
-        }
-    }
-
-    @PreDestroy
-    public void cleanup() {
-        if (browser != null) browser.close(true);
-        if (client != null) client.dispose();
-        if (cefApp != null) cefApp.dispose();
-        if (loadingWindow != null) loadingWindow.dispose();
-    }
-}

src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java

@@ -1,114 +0,0 @@
-package stirling.software.SPDF.UI.impl;
-
-import java.awt.*;
-import java.io.InputStream;
-
-import javax.imageio.ImageIO;
-import javax.swing.*;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class LoadingWindow extends JDialog {
-    private final JProgressBar progressBar;
-    private final JLabel statusLabel;
-    private final JPanel mainPanel;
-    private final JLabel brandLabel;
-
-    public LoadingWindow(Frame parent, String initialUrl) {
-        super(parent, "Initializing Stirling-PDF", true);
-
-        // Initialize components
-        mainPanel = new JPanel();
-        mainPanel.setBackground(Color.WHITE);
-        mainPanel.setBorder(BorderFactory.createEmptyBorder(20, 30, 20, 30));
-        mainPanel.setLayout(new GridBagLayout());
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        // Configure GridBagConstraints
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.fill = GridBagConstraints.HORIZONTAL;
-        gbc.insets = new Insets(5, 5, 5, 5);
-        gbc.weightx = 1.0; // Add horizontal weight
-        gbc.weighty = 0.0; // Add vertical weight
-
-        // Add icon
-        try {
-            try (InputStream is = getClass().getResourceAsStream("/static/favicon.ico")) {
-                if (is != null) {
-                    Image img = ImageIO.read(is);
-                    if (img != null) {
-                        Image scaledImg = img.getScaledInstance(48, 48, Image.SCALE_SMOOTH);
-                        JLabel iconLabel = new JLabel(new ImageIcon(scaledImg));
-                        iconLabel.setHorizontalAlignment(SwingConstants.CENTER);
-                        gbc.gridy = 0;
-                        mainPanel.add(iconLabel, gbc);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error("Failed to load icon", e);
-        }
-        // URL Label with explicit size
-        brandLabel = new JLabel(initialUrl);
-        brandLabel.setHorizontalAlignment(SwingConstants.CENTER);
-        brandLabel.setPreferredSize(new Dimension(300, 25));
-        brandLabel.setText("Stirling-PDF");
-        gbc.gridy = 1;
-        mainPanel.add(brandLabel, gbc);
-
-        // Status label with explicit size
-        statusLabel = new JLabel("Initializing...");
-        statusLabel.setHorizontalAlignment(SwingConstants.CENTER);
-        statusLabel.setPreferredSize(new Dimension(300, 25));
-        gbc.gridy = 2;
-        mainPanel.add(statusLabel, gbc);
-        // Progress bar with explicit size
-        progressBar = new JProgressBar(0, 100);
-        progressBar.setStringPainted(true);
-        progressBar.setPreferredSize(new Dimension(300, 25));
-        gbc.gridy = 3;
-        mainPanel.add(progressBar, gbc);
-
-        // Set dialog properties
-        setContentPane(mainPanel);
-        setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
-        setResizable(false);
-        setUndecorated(false);
-
-        // Set size and position
-        setSize(400, 200);
-        setLocationRelativeTo(parent);
-        setAlwaysOnTop(true);
-        setProgress(0);
-        setStatus("Starting...");
-    }
-
-    public void setProgress(final int progress) {
-        SwingUtilities.invokeLater(
-                () -> {
-                    try {
-                        progressBar.setValue(Math.min(Math.max(progress, 0), 100));
-                        progressBar.setString(progress + "%");
-                        mainPanel.revalidate();
-                        mainPanel.repaint();
-                    } catch (Exception e) {
-                        log.error("Error updating progress", e);
-                    }
-                });
-    }
-
-    public void setStatus(final String status) {
-        log.info(status);
-        SwingUtilities.invokeLater(
-                () -> {
-                    try {
-                        statusLabel.setText(status != null ? status : "");
-                        mainPanel.revalidate();
-                        mainPanel.repaint();
-                    } catch (Exception e) {
-                        log.error("Error updating status", e);
-                    }
-                });
-    }
-}

src/main/java/stirling/software/SPDF/config/AppConfig.java

@@ -7,6 +7,8 @@ import java.nio.file.Paths;
 import java.util.Properties;
 import java.util.function.Predicate;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -19,14 +21,14 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.spring6.SpringTemplateEngine;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
 @Lazy
-@Slf4j
 public class AppConfig {
 
+    private static final Logger logger = LoggerFactory.getLogger(AppConfig.class);
+
     @Autowired ApplicationProperties applicationProperties;
 
     @Bean
@@ -59,7 +61,7 @@ public class AppConfig {
             props.load(resource.getInputStream());
             return props.getProperty("version");
         } catch (IOException e) {
-            log.error("exception", e);
+            logger.error("exception", e);
         }
         return "0.0.0";
     }
@@ -99,27 +101,6 @@ public class AppConfig {
         return Files.exists(Paths.get("/.dockerenv"));
     }
 
-    @Bean(name = "configDirMounted")
-    public boolean isRunningInDockerWithConfig() {
-        Path dockerEnv = Paths.get("/.dockerenv");
-        // default to true if not docker
-        if (!Files.exists(dockerEnv)) {
-            return true;
-        }
-
-        Path mountInfo = Paths.get("/proc/1/mountinfo");
-        // this should always exist, if not some unknown usecase
-        if (!Files.exists(mountInfo)) {
-            return true;
-        }
-
-        try {
-            return Files.lines(mountInfo).anyMatch(line -> line.contains(" /configs "));
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
     @Bean(name = "bookAndHtmlFormatsInstalled")
     public boolean bookAndHtmlFormatsInstalled() {
         String installOps = System.getProperty("INSTALL_BOOK_AND_ADVANCED_HTML_OPS");

src/main/java/stirling/software/SPDF/config/ConfigInitializer.java

@@ -16,15 +16,16 @@ import org.simpleyaml.configuration.comments.CommentType;
 import org.simpleyaml.configuration.file.YamlFile;
 import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
 import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 public class ConfigInitializer
         implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
+    private static final Logger logger = LoggerFactory.getLogger(ConfigInitializer.class);
+
     @Override
     public void initialize(ConfigurableApplicationContext applicationContext) {
         try {
@@ -148,7 +149,7 @@ public class ConfigInitializer
                     .commentSide(settingsTemplateFile.getComment(path, CommentType.SIDE));
         } else {
             // Log if the key is not found in both YAML files
-            log.info("Key not found in both YAML files: " + path);
+            logger.info("Key not found in both YAML files: " + path);
         }
     }
 }

src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -7,19 +7,19 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Service;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Service
-@Slf4j
 @DependsOn({"bookAndHtmlFormatsInstalled"})
 public class EndpointConfiguration {
-
+    private static final Logger logger = LoggerFactory.getLogger(EndpointConfiguration.class);
     private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
     private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
 
@@ -43,7 +43,7 @@ public class EndpointConfiguration {
 
     public void disableEndpoint(String endpoint) {
         if (!endpointStatuses.containsKey(endpoint) || endpointStatuses.get(endpoint) != false) {
-            log.debug("Disabling {}", endpoint);
+            logger.debug("Disabling {}", endpoint);
             endpointStatuses.put(endpoint, false);
         }
     }
@@ -87,7 +87,7 @@ public class EndpointConfiguration {
                         .collect(Collectors.toList());
 
         if (!disabledList.isEmpty()) {
-            log.info(
+            logger.info(
                     "Total disabled endpoints: {}. Disabled endpoints: {}",
                     disabledList.size(),
                     String.join(", ", disabledList));
@@ -260,9 +260,6 @@ public class EndpointConfiguration {
 
         // Pdftohtml dependent endpoints
         addEndpointToGroup("Pdftohtml", "pdf-to-html");
-
-        // disabled for now while we resolve issues
-        disableEndpoint("pdf-to-pdfa");
     }
 
     private void processEnvironmentConfigs() {

src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java

@@ -43,6 +43,7 @@ public class ExternalAppDepConfig {
                     put("unoconv", List.of("Unoconv"));
                     put("qpdf", List.of("qpdf"));
                     put("tesseract", List.of("tesseract"));
+                    
                 }
             };
 
@@ -97,7 +98,7 @@ public class ExternalAppDepConfig {
     public void checkDependencies() {
 
         // Check core dependencies
-        checkDependencyAndDisableGroup("tesseract");
+    	checkDependencyAndDisableGroup("tesseract");
         checkDependencyAndDisableGroup("soffice");
         checkDependencyAndDisableGroup("qpdf");
         checkDependencyAndDisableGroup("weasyprint");

src/main/java/stirling/software/SPDF/config/InitialSetup.java

@@ -1,14 +1,11 @@
 package stirling.software.SPDF.config;
 
 import java.io.IOException;
-import java.util.Properties;
 import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 
 import io.micrometer.common.util.StringUtils;
@@ -26,18 +23,6 @@ public class InitialSetup {
     @Autowired private ApplicationProperties applicationProperties;
 
     @PostConstruct
-    public void init() throws IOException {
-        initUUIDKey();
-
-        initSecretKey();
-
-        initEnableCSRFSecurity();
-
-        initLegalUrls();
-
-        initSetAppVersion();
-    }
-
     public void initUUIDKey() throws IOException {
         String uuid = applicationProperties.getAutomaticallyGenerated().getUUID();
         if (!GeneralUtils.isValidUUID(uuid)) {
@@ -47,6 +32,7 @@ public class InitialSetup {
         }
     }
 
+    @PostConstruct
     public void initSecretKey() throws IOException {
         String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
         if (!GeneralUtils.isValidUUID(secretKey)) {
@@ -56,24 +42,13 @@ public class InitialSetup {
         }
     }
 
-    public void initEnableCSRFSecurity() throws IOException {
+    @PostConstruct
-        if (GeneralUtils.isVersionHigher(
-                "0.36.0", applicationProperties.getAutomaticallyGenerated().getAppVersion())) {
-            Boolean csrf = applicationProperties.getSecurity().getCsrfDisabled();
-            if (!csrf) {
-                GeneralUtils.saveKeyToConfig("security.csrfDisabled", false, false);
-                GeneralUtils.saveKeyToConfig("system.enableAnalytics", "true", false);
-                applicationProperties.getSecurity().setCsrfDisabled(false);
-            }
-        }
-    }
-
     public void initLegalUrls() throws IOException {
         // Initialize Terms and Conditions
         String termsUrl = applicationProperties.getLegal().getTermsAndConditions();
         if (StringUtils.isEmpty(termsUrl)) {
             String defaultTermsUrl = "https://www.stirlingpdf.com/terms-and-conditions";
-            GeneralUtils.saveKeyToConfig("legal.termsAndConditions", defaultTermsUrl, false);
+            GeneralUtils.saveKeyToConfig("legal.termsAndConditions", defaultTermsUrl);
             applicationProperties.getLegal().setTermsAndConditions(defaultTermsUrl);
         }
 
@@ -81,23 +56,8 @@ public class InitialSetup {
         String privacyUrl = applicationProperties.getLegal().getPrivacyPolicy();
         if (StringUtils.isEmpty(privacyUrl)) {
             String defaultPrivacyUrl = "https://www.stirlingpdf.com/privacy-policy";
-            GeneralUtils.saveKeyToConfig("legal.privacyPolicy", defaultPrivacyUrl, false);
+            GeneralUtils.saveKeyToConfig("legal.privacyPolicy", defaultPrivacyUrl);
             applicationProperties.getLegal().setPrivacyPolicy(defaultPrivacyUrl);
         }
     }
-
-    public void initSetAppVersion() throws IOException {
-
-        String appVersion = "0.0.0";
-        Resource resource = new ClassPathResource("version.properties");
-        Properties props = new Properties();
-        try {
-            props.load(resource.getInputStream());
-            appVersion = props.getProperty("version");
-        } catch (Exception e) {
-
-        }
-        applicationProperties.getAutomaticallyGenerated().setAppVersion(appVersion);
-        GeneralUtils.saveKeyToConfig("AutomaticallyGenerated.appVersion", appVersion, false);
-    }
 }

src/main/java/stirling/software/SPDF/config/interfaces/DatabaseBackupInterface.java

@@ -6,7 +6,6 @@ import java.util.List;
 import stirling.software.SPDF.utils.FileInfo;
 
 public interface DatabaseBackupInterface {
-
     void exportDatabase() throws IOException;
 
     boolean importDatabase();

src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java

@@ -30,7 +30,6 @@ public class InitialSecuritySetup {
             initializeAdminUser();
         } else {
             databaseBackupHelper.exportDatabase();
-            userService.migrateOauth2ToSSO();
         }
         initializeInternalApiUser();
     }
@@ -75,6 +74,5 @@ public class InitialSecuritySetup {
             userService.addApiKeyToUser(Role.INTERNAL_API_USER.getRoleId());
             log.info("Internal API user created: " + Role.INTERNAL_API_USER.getRoleId());
         }
-        userService.syncCustomApiUser(applicationProperties.getSecurity().getCustomGlobalAPIKey());
     }
 }

src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java

@@ -3,16 +3,14 @@ package stirling.software.SPDF.config.security;
 import java.security.cert.X509Certificate;
 import java.util.*;
 
-import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.Resource;
-import org.springframework.security.authentication.ProviderManager;
+import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -34,8 +32,7 @@ import org.springframework.security.saml2.provider.service.authentication.OpenSa
 import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
-import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
+import org.springframework.security.saml2.provider.service.web.authentication.Saml2WebSsoAuthenticationFilter;
-import org.springframework.security.saml2.provider.service.web.authentication.OpenSaml4AuthenticationRequestResolver;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
@@ -44,7 +41,6 @@ import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationFailureHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
@@ -68,7 +64,6 @@ import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 @EnableWebSecurity
 @EnableMethodSecurity
 @Slf4j
-@DependsOn("runningEE")
 public class SecurityConfiguration {
 
     @Autowired private CustomUserDetailsService userDetailsService;
@@ -84,10 +79,6 @@ public class SecurityConfiguration {
     @Qualifier("loginEnabled")
     public boolean loginEnabledValue;
 
-    @Autowired
-    @Qualifier("runningEE")
-    public boolean runningEE;
-
     @Autowired ApplicationProperties applicationProperties;
 
     @Autowired private UserAuthenticationFilter userAuthenticationFilter;
@@ -99,14 +90,13 @@ public class SecurityConfiguration {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        if (applicationProperties.getSecurity().getCsrfDisabled() || !loginEnabledValue) {
-            http.csrf(csrf -> csrf.disable());
-        }
 
         if (loginEnabledValue) {
             http.addFilterBefore(
                     userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
-            if (!applicationProperties.getSecurity().getCsrfDisabled()) {
+            if (applicationProperties.getSecurity().getCsrfDisabled()) {
+                http.csrf(csrf -> csrf.disable());
+            } else {
                 CookieCsrfTokenRepository cookieRepo =
                         CookieCsrfTokenRepository.withHttpOnlyFalse();
                 CsrfTokenRequestAttributeHandler requestHandler =
@@ -116,7 +106,7 @@ public class SecurityConfiguration {
                         csrf ->
                                 csrf.ignoringRequestMatchers(
                                                 request -> {
-                                                    String apiKey = request.getHeader("X-API-KEY");
+                                                    String apiKey = request.getHeader("X-API-Key");
 
                                                     // If there's no API key, don't ignore CSRF
                                                     // (return false)
@@ -255,22 +245,12 @@ public class SecurityConfiguration {
             }
 
             // Handle SAML
-            if (applicationProperties.getSecurity().isSaml2Activ()) { // && runningEE
+            if (applicationProperties.getSecurity().isSaml2Activ()
-                // Configure the authentication provider
+                    && applicationProperties.getSystem().getEnableAlphaFunctionality()) {
-                OpenSaml4AuthenticationProvider authenticationProvider =
+                http.authenticationProvider(samlAuthenticationProvider());
-                        new OpenSaml4AuthenticationProvider();
+                http.saml2Login(
-                authenticationProvider.setResponseAuthenticationConverter(
+                                saml2 ->
-                        new CustomSaml2ResponseAuthenticationConverter(userService));
-
-                http.authenticationProvider(authenticationProvider)
-                        .saml2Login(
-                                saml2 -> {
-                                    try {
                                         saml2.loginPage("/saml2")
-                                                .relyingPartyRegistrationRepository(
-                                                        relyingPartyRegistrations())
-                                                .authenticationManager(
-                                                        new ProviderManager(authenticationProvider))
                                                 .successHandler(
                                                         new CustomSaml2AuthenticationSuccessHandler(
                                                                 loginAttemptService,
@@ -278,34 +258,44 @@ public class SecurityConfiguration {
                                                                 userService))
                                                 .failureHandler(
                                                         new CustomSaml2AuthenticationFailureHandler())
-                                                .authenticationRequestResolver(
+                                                .permitAll())
-                                                        authenticationRequestResolver(
+                        .addFilterBefore(
-                                                                relyingPartyRegistrations()));
+                                userAuthenticationFilter, Saml2WebSsoAuthenticationFilter.class);
-                                    } catch (Exception e) {
-                                        log.error("Error configuring SAML2 login", e);
-                                        throw new RuntimeException(e);
-                                    }
-                                });
             }
-
         } else {
-            //            if (!applicationProperties.getSecurity().getCsrfDisabled()) {
+            if (applicationProperties.getSecurity().getCsrfDisabled()) {
-            //                CookieCsrfTokenRepository cookieRepo =
+                http.csrf(csrf -> csrf.disable());
-            //                        CookieCsrfTokenRepository.withHttpOnlyFalse();
+            } else {
-            //                CsrfTokenRequestAttributeHandler requestHandler =
+                CookieCsrfTokenRepository cookieRepo =
-            //                        new CsrfTokenRequestAttributeHandler();
+                        CookieCsrfTokenRepository.withHttpOnlyFalse();
-            //                requestHandler.setCsrfRequestAttributeName(null);
+                CsrfTokenRequestAttributeHandler requestHandler =
-            //                http.csrf(
+                        new CsrfTokenRequestAttributeHandler();
-            //                        csrf ->
+                requestHandler.setCsrfRequestAttributeName(null);
-            //                                csrf.csrfTokenRepository(cookieRepo)
+                http.csrf(
-            //                                        .csrfTokenRequestHandler(requestHandler));
+                        csrf ->
-            //            }
+                                csrf.csrfTokenRepository(cookieRepo)
+                                        .csrfTokenRequestHandler(requestHandler));
+            }
             http.authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
         }
 
         return http.build();
     }
 
+    @Bean
+    @ConditionalOnProperty(
+            name = "security.saml2.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    public AuthenticationProvider samlAuthenticationProvider() {
+        OpenSaml4AuthenticationProvider authenticationProvider =
+                new OpenSaml4AuthenticationProvider();
+        authenticationProvider.setResponseAuthenticationConverter(
+                new CustomSaml2ResponseAuthenticationConverter(userService));
+        return authenticationProvider;
+    }
+
+    // Client Registration Repository for OAUTH2 OIDC Login
     @Bean
     @ConditionalOnProperty(
             value = "security.oauth2.enabled",
@@ -442,12 +432,11 @@ public class SecurityConfiguration {
             havingValue = "true",
             matchIfMissing = false)
     public RelyingPartyRegistrationRepository relyingPartyRegistrations() throws Exception {
+
         SAML2 samlConf = applicationProperties.getSecurity().getSaml2();
 
-        X509Certificate idpCert = CertificateUtils.readCertificate(samlConf.getidpCert());
-        Saml2X509Credential verificationCredential = Saml2X509Credential.verification(idpCert);
-
         Resource privateKeyResource = samlConf.getPrivateKey();
+
         Resource certificateResource = samlConf.getSpCert();
 
         Saml2X509Credential signingCredential =
@@ -456,97 +445,26 @@ public class SecurityConfiguration {
                         CertificateUtils.readCertificate(certificateResource),
                         Saml2X509CredentialType.SIGNING);
 
+        X509Certificate idpCert = CertificateUtils.readCertificate(samlConf.getidpCert());
+
+        Saml2X509Credential verificationCredential = Saml2X509Credential.verification(idpCert);
+
         RelyingPartyRegistration rp =
                 RelyingPartyRegistration.withRegistrationId(samlConf.getRegistrationId())
-                        .signingX509Credentials(c -> c.add(signingCredential))
+                        .signingX509Credentials((c) -> c.add(signingCredential))
                         .assertingPartyMetadata(
-                                metadata ->
+                                (details) ->
-                                        metadata.entityId(samlConf.getIdpIssuer())
+                                        details.entityId(samlConf.getIdpIssuer())
                                                 .singleSignOnServiceLocation(
                                                         samlConf.getIdpSingleLoginUrl())
                                                 .verificationX509Credentials(
-                                                        c -> c.add(verificationCredential))
+                                                        (c) -> c.add(verificationCredential))
-                                                .singleSignOnServiceBinding(
-                                                        Saml2MessageBinding.POST)
                                                 .wantAuthnRequestsSigned(true))
                         .build();
-
         return new InMemoryRelyingPartyRegistrationRepository(rp);
     }
 
     @Bean
-    @ConditionalOnProperty(
-            name = "security.saml2.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    public OpenSaml4AuthenticationRequestResolver authenticationRequestResolver(
-            RelyingPartyRegistrationRepository relyingPartyRegistrationRepository) {
-        OpenSaml4AuthenticationRequestResolver resolver =
-                new OpenSaml4AuthenticationRequestResolver(relyingPartyRegistrationRepository);
-        resolver.setAuthnRequestCustomizer(
-                customizer -> {
-                    log.debug("Customizing SAML Authentication request");
-
-                    AuthnRequest authnRequest = customizer.getAuthnRequest();
-                    log.debug("AuthnRequest ID: {}", authnRequest.getID());
-
-                    if (authnRequest.getID() == null) {
-                        authnRequest.setID("ARQ" + UUID.randomUUID().toString());
-                    }
-                    log.debug("AuthnRequest new ID after set: {}", authnRequest.getID());
-                    log.debug("AuthnRequest IssueInstant: {}", authnRequest.getIssueInstant());
-                    log.debug(
-                            "AuthnRequest Issuer: {}",
-                            authnRequest.getIssuer() != null
-                                    ? authnRequest.getIssuer().getValue()
-                                    : "null");
-
-                    HttpServletRequest request = customizer.getRequest();
-
-                    // Log HTTP request details
-                    log.debug("HTTP Request Method: {}", request.getMethod());
-                    log.debug("Request URI: {}", request.getRequestURI());
-                    log.debug("Request URL: {}", request.getRequestURL().toString());
-                    log.debug("Query String: {}", request.getQueryString());
-                    log.debug("Remote Address: {}", request.getRemoteAddr());
-
-                    // Log headers
-                    Collections.list(request.getHeaderNames())
-                            .forEach(
-                                    headerName -> {
-                                        log.debug(
-                                                "Header - {}: {}",
-                                                headerName,
-                                                request.getHeader(headerName));
-                                    });
-
-                    // Log SAML specific parameters
-                    log.debug("SAML Request Parameters:");
-                    log.debug("SAMLRequest: {}", request.getParameter("SAMLRequest"));
-                    log.debug("RelayState: {}", request.getParameter("RelayState"));
-
-                    // Log session debugrmation if exists
-                    if (request.getSession(false) != null) {
-                        log.debug("Session ID: {}", request.getSession().getId());
-                    }
-
-                    // Log any assertions consumer service details if present
-                    if (authnRequest.getAssertionConsumerServiceURL() != null) {
-                        log.debug(
-                                "AssertionConsumerServiceURL: {}",
-                                authnRequest.getAssertionConsumerServiceURL());
-                    }
-
-                    // Log NameID policy if present
-                    if (authnRequest.getNameIDPolicy() != null) {
-                        log.debug(
-                                "NameIDPolicy Format: {}",
-                                authnRequest.getNameIDPolicy().getFormat());
-                    }
-                });
-        return resolver;
-    }
-
     public DaoAuthenticationProvider daoAuthenticationProvider() {
         DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
         provider.setUserDetailsService(userDetailsService);

src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java

@@ -71,7 +71,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
 
         // Check for API key in the request headers if no authentication exists
         if (authentication == null || !authentication.isAuthenticated()) {
-            String apiKey = request.getHeader("X-API-KEY");
+            String apiKey = request.getHeader("X-API-Key");
             if (apiKey != null && !apiKey.trim().isEmpty()) {
                 try {
                     // Use API key to authenticate. This requires you to have an authentication

src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java

@@ -59,7 +59,7 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
         String identifier = null;
 
         // Check for API key in the request headers
-        String apiKey = request.getHeader("X-API-KEY");
+        String apiKey = request.getHeader("X-API-Key");
         if (apiKey != null && !apiKey.trim().isEmpty()) {
             identifier =
                     "API_KEY_" + apiKey; // Prefix to distinguish between API keys and usernames
@@ -79,7 +79,7 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
         Role userRole =
                 getRoleFromAuthentication(SecurityContextHolder.getContext().getAuthentication());
 
-        if (request.getHeader("X-API-KEY") != null) {
+        if (request.getHeader("X-API-Key") != null) {
             // It's an API call
             processRequest(
                     userRole.getApiCallsPerDay(),

src/main/java/stirling/software/SPDF/config/security/UserService.java

@@ -18,7 +18,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.interfaces.DatabaseBackupInterface;
@@ -51,19 +50,8 @@ public class UserService implements UserServiceInterface {
 
     @Autowired ApplicationProperties applicationProperties;
 
-    @Transactional
-    public void migrateOauth2ToSSO() {
-        userRepository
-                .findByAuthenticationTypeIgnoreCase("OAUTH2")
-                .forEach(
-                        user -> {
-                            user.setAuthenticationType(AuthenticationType.SSO);
-                            userRepository.save(user);
-                        });
-    }
-
     // Handle OAUTH2 login and user auto creation.
-    public boolean processSSOPostLogin(String username, boolean autoCreateUser)
+    public boolean processOAuth2PostLogin(String username, boolean autoCreateUser)
             throws IllegalArgumentException, IOException {
         if (!isUsernameValid(username)) {
             return false;
@@ -73,7 +61,7 @@ public class UserService implements UserServiceInterface {
             return true;
         }
         if (autoCreateUser) {
-            saveUser(username, AuthenticationType.SSO);
+            saveUser(username, AuthenticationType.OAUTH2);
             return true;
         }
         return false;
@@ -390,37 +378,6 @@ public class UserService implements UserServiceInterface {
         }
     }
 
-    @Transactional
-    public void syncCustomApiUser(String customApiKey) throws IOException {
-        if (customApiKey == null || customApiKey.trim().length() == 0) {
-            return;
-        }
-        String username = "CUSTOM_API_USER";
-        Optional<User> existingUser = findByUsernameIgnoreCase(username);
-
-        if (!existingUser.isPresent()) {
-            // Create new user with API role
-            User user = new User();
-            user.setUsername(username);
-            user.setPassword(UUID.randomUUID().toString());
-            user.setEnabled(true);
-            user.setFirstLogin(false);
-            user.setAuthenticationType(AuthenticationType.WEB);
-            user.setApiKey(customApiKey);
-            user.addAuthority(new Authority(Role.INTERNAL_API_USER.getRoleId(), user));
-            userRepository.save(user);
-            databaseBackupHelper.exportDatabase();
-        } else {
-            // Update API key if it has changed
-            User user = existingUser.get();
-            if (!customApiKey.equals(user.getApiKey())) {
-                user.setApiKey(customApiKey);
-                userRepository.save(user);
-                databaseBackupHelper.exportDatabase();
-            }
-        }
-    }
-
     @Override
     public long getTotalUsersCount() {
         return userRepository.count();

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java

@@ -82,7 +82,8 @@ public class CustomOAuth2AuthenticationSuccessHandler
             }
             if (userService.usernameExistsIgnoreCase(username)
                     && userService.hasPassword(username)
-                    && !userService.isAuthenticationTypeByUsername(username, AuthenticationType.SSO)
+                    && !userService.isAuthenticationTypeByUsername(
+                            username, AuthenticationType.OAUTH2)
                     && oAuth.getAutoCreateUser()) {
                 response.sendRedirect(contextPath + "/logout?oauth2AuthenticationErrorWeb=true");
                 return;
@@ -94,7 +95,7 @@ public class CustomOAuth2AuthenticationSuccessHandler
                     return;
                 }
                 if (principal instanceof OAuth2User) {
-                    userService.processSSOPostLogin(username, oAuth.getAutoCreateUser());
+                    userService.processOAuth2PostLogin(username, oAuth.getAutoCreateUser());
                 }
                 response.sendRedirect(contextPath + "/");
                 return;

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2UserService.java

@@ -2,6 +2,8 @@ package stirling.software.SPDF.config.security.oauth2;
 
 import java.util.Optional;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
@@ -11,7 +13,6 @@ import org.springframework.security.oauth2.core.OAuth2Error;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.LoginAttemptService;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -19,7 +20,6 @@ import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
 import stirling.software.SPDF.model.User;
 
-@Slf4j
 public class CustomOAuth2UserService implements OAuth2UserService<OidcUserRequest, OidcUser> {
 
     private final OidcUserService delegate = new OidcUserService();
@@ -30,6 +30,8 @@ public class CustomOAuth2UserService implements OAuth2UserService<OidcUserReques
 
     private ApplicationProperties applicationProperties;
 
+    private static final Logger logger = LoggerFactory.getLogger(CustomOAuth2UserService.class);
+
     public CustomOAuth2UserService(
             ApplicationProperties applicationProperties,
             UserService userService,
@@ -80,10 +82,10 @@ public class CustomOAuth2UserService implements OAuth2UserService<OidcUserReques
                     user.getUserInfo(),
                     usernameAttribute);
         } catch (IllegalArgumentException e) {
-            log.error("Error loading OIDC user: {}", e.getMessage());
+            logger.error("Error loading OIDC user: {}", e.getMessage());
             throw new OAuth2AuthenticationException(new OAuth2Error(e.getMessage()), e);
         } catch (Exception e) {
-            log.error("Unexpected error loading OIDC user", e);
+            logger.error("Unexpected error loading OIDC user", e);
             throw new OAuth2AuthenticationException("Unexpected error during authentication");
         }
     }

src/main/java/stirling/software/SPDF/config/security/saml2/CertificateUtils.java

@@ -3,14 +3,12 @@ package stirling.software.SPDF.config.security.saml2;
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.security.KeyFactory;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
+import java.security.spec.PKCS8EncodedKeySpec;
 
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemReader;
 import org.springframework.core.io.Resource;
@@ -30,26 +28,15 @@ public class CertificateUtils {
     }
 
     public static RSAPrivateKey readPrivateKey(Resource privateKeyResource) throws Exception {
-        try (PEMParser pemParser =
+        try (PemReader pemReader =
-                new PEMParser(
+                new PemReader(
                         new InputStreamReader(
                                 privateKeyResource.getInputStream(), StandardCharsets.UTF_8))) {
-
+            PemObject pemObject = pemReader.readPemObject();
-            Object object = pemParser.readObject();
+            byte[] decodedKey = pemObject.getContent();
-            JcaPEMKeyConverter converter = new JcaPEMKeyConverter();
+            return (RSAPrivateKey)
-
+                    KeyFactory.getInstance("RSA")
-            if (object instanceof PEMKeyPair) {
+                            .generatePrivate(new PKCS8EncodedKeySpec(decodedKey));
-                // Handle traditional RSA private key format
-                PEMKeyPair keypair = (PEMKeyPair) object;
-                return (RSAPrivateKey) converter.getPrivateKey(keypair.getPrivateKeyInfo());
-            } else if (object instanceof PrivateKeyInfo) {
-                // Handle PKCS#8 format
-                return (RSAPrivateKey) converter.getPrivateKey((PrivateKeyInfo) object);
-            } else {
-                throw new IllegalArgumentException(
-                        "Unsupported key format: "
-                                + (object != null ? object.getClass().getName() : "null"));
-            }
         }
     }
 }

src/main/java/stirling/software/SPDF/config/security/saml2/CustomSaml2AuthenticationSuccessHandler.java

@@ -12,7 +12,6 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.LoginAttemptService;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -21,11 +20,11 @@ import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
 @AllArgsConstructor
-@Slf4j
 public class CustomSaml2AuthenticationSuccessHandler
         extends SavedRequestAwareAuthenticationSuccessHandler {
 
     private LoginAttemptService loginAttemptService;
+
     private ApplicationProperties applicationProperties;
     private UserService userService;
 
@@ -35,12 +34,10 @@ public class CustomSaml2AuthenticationSuccessHandler
             throws ServletException, IOException {
 
         Object principal = authentication.getPrincipal();
-        log.debug("Starting SAML2 authentication success handling");
 
         if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
             String username = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
-            log.debug("Authenticated principal found for user: {}", username);
+            // Get the saved request
-
             HttpSession session = request.getSession(false);
             String contextPath = request.getContextPath();
             SavedRequest savedRequest =
@@ -48,77 +45,46 @@ public class CustomSaml2AuthenticationSuccessHandler
                             ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
                             : null;
 
-            log.debug(
-                    "Session exists: {}, Saved request exists: {}",
-                    session != null,
-                    savedRequest != null);
-
             if (savedRequest != null
                     && !RequestUriUtils.isStaticResource(
                             contextPath, savedRequest.getRedirectUrl())) {
-                log.debug(
+                // Redirect to the original destination
-                        "Valid saved request found, redirecting to original destination: {}",
-                        savedRequest.getRedirectUrl());
                 super.onAuthenticationSuccess(request, response, authentication);
             } else {
                 SAML2 saml2 = applicationProperties.getSecurity().getSaml2();
-                log.debug(
-                        "Processing SAML2 authentication with autoCreateUser: {}",
-                        saml2.getAutoCreateUser());
 
                 if (loginAttemptService.isBlocked(username)) {
-                    log.debug("User {} is blocked due to too many login attempts", username);
                     if (session != null) {
                         session.removeAttribute("SPRING_SECURITY_SAVED_REQUEST");
                     }
                     throw new LockedException(
                             "Your account has been locked due to too many failed login attempts.");
                 }
-
+                if (userService.usernameExistsIgnoreCase(username)
-                boolean userExists = userService.usernameExistsIgnoreCase(username);
+                        && userService.hasPassword(username)
-                boolean hasPassword = userExists && userService.hasPassword(username);
+                        && !userService.isAuthenticationTypeByUsername(
-                boolean isSSOUser =
+                                username, AuthenticationType.OAUTH2)
-                        userExists
+                        && saml2.getAutoCreateUser()) {
-                                && userService.isAuthenticationTypeByUsername(
-                                        username, AuthenticationType.SSO);
-
-                log.debug(
-                        "User status - Exists: {}, Has password: {}, Is SSO user: {}",
-                        userExists,
-                        hasPassword,
-                        isSSOUser);
-
-                if (userExists && hasPassword && !isSSOUser && saml2.getAutoCreateUser()) {
-                    log.debug(
-                            "User {} exists with password but is not SSO user, redirecting to logout",
-                            username);
                     response.sendRedirect(
                             contextPath + "/logout?oauth2AuthenticationErrorWeb=true");
                     return;
                 }
-
                 try {
-                    if (saml2.getBlockRegistration() && !userExists) {
+                    if (saml2.getBlockRegistration()
-                        log.debug("Registration blocked for new user: {}", username);
+                            && !userService.usernameExistsIgnoreCase(username)) {
                         response.sendRedirect(
                                 contextPath + "/login?erroroauth=oauth2_admin_blocked_user");
                         return;
                     }
-                    log.debug("Processing SSO post-login for user: {}", username);
+                    userService.processOAuth2PostLogin(username, saml2.getAutoCreateUser());
-                    userService.processSSOPostLogin(username, saml2.getAutoCreateUser());
-                    log.debug("Successfully processed authentication for user: {}", username);
                     response.sendRedirect(contextPath + "/");
                     return;
                 } catch (IllegalArgumentException e) {
-                    log.debug(
-                            "Invalid username detected for user: {}, redirecting to logout",
-                            username);
                     response.sendRedirect(contextPath + "/logout?invalidUsername=true");
                     return;
                 }
             }
         } else {
-            log.debug("Non-SAML2 principal detected, delegating to parent handler");
             super.onAuthenticationSuccess(request, response, authentication);
         }
     }

src/main/java/stirling/software/SPDF/config/security/saml2/CustomSaml2ResponseAuthenticationConverter.java

@@ -3,6 +3,8 @@ package stirling.software.SPDF.config.security.saml2;
 import java.util.*;
 
 import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.schema.XSBoolean;
+import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.saml.saml2.core.Assertion;
 import org.opensaml.saml.saml2.core.Attribute;
 import org.opensaml.saml.saml2.core.AttributeStatement;
@@ -28,60 +30,15 @@ public class CustomSaml2ResponseAuthenticationConverter
         this.userService = userService;
     }
 
-    private Map<String, List<Object>> extractAttributes(Assertion assertion) {
-        Map<String, List<Object>> attributes = new HashMap<>();
-
-        for (AttributeStatement attributeStatement : assertion.getAttributeStatements()) {
-            for (Attribute attribute : attributeStatement.getAttributes()) {
-                String attributeName = attribute.getName();
-                List<Object> values = new ArrayList<>();
-
-                for (XMLObject xmlObject : attribute.getAttributeValues()) {
-                    // Get the text content directly
-                    String value = xmlObject.getDOM().getTextContent();
-                    if (value != null && !value.trim().isEmpty()) {
-                        values.add(value);
-                    }
-                }
-
-                if (!values.isEmpty()) {
-                    // Store with both full URI and last part of the URI
-                    attributes.put(attributeName, values);
-                    String shortName = attributeName.substring(attributeName.lastIndexOf('/') + 1);
-                    attributes.put(shortName, values);
-                }
-            }
-        }
-
-        return attributes;
-    }
-
     @Override
     public Saml2Authentication convert(ResponseToken responseToken) {
+        // Extract the assertion from the response
         Assertion assertion = responseToken.getResponse().getAssertions().get(0);
-        Map<String, List<Object>> attributes = extractAttributes(assertion);
 
-        // Debug log with actual values
+        // Extract the NameID
-        log.debug("Extracted SAML Attributes: " + attributes);
+        String nameId = assertion.getSubject().getNameID().getValue();
 
-        // Try to get username/identifier in order of preference
+        Optional<User> userOpt = userService.findByUsernameIgnoreCase(nameId);
-        String userIdentifier = null;
-        if (hasAttribute(attributes, "username")) {
-            userIdentifier = getFirstAttributeValue(attributes, "username");
-        } else if (hasAttribute(attributes, "emailaddress")) {
-            userIdentifier = getFirstAttributeValue(attributes, "emailaddress");
-        } else if (hasAttribute(attributes, "name")) {
-            userIdentifier = getFirstAttributeValue(attributes, "name");
-        } else if (hasAttribute(attributes, "upn")) {
-            userIdentifier = getFirstAttributeValue(attributes, "upn");
-        } else if (hasAttribute(attributes, "uid")) {
-            userIdentifier = getFirstAttributeValue(attributes, "uid");
-        } else {
-            userIdentifier = assertion.getSubject().getNameID().getValue();
-        }
-
-        // Rest of your existing code...
-        Optional<User> userOpt = userService.findByUsernameIgnoreCase(userIdentifier);
         SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority("ROLE_USER");
         if (userOpt.isPresent()) {
             User user = userOpt.get();
@@ -91,27 +48,39 @@ public class CustomSaml2ResponseAuthenticationConverter
             }
         }
 
+        // Extract the SessionIndexes
         List<String> sessionIndexes = new ArrayList<>();
         for (AuthnStatement authnStatement : assertion.getAuthnStatements()) {
             sessionIndexes.add(authnStatement.getSessionIndex());
         }
 
-        CustomSaml2AuthenticatedPrincipal principal =
+        // Extract the Attributes
-                new CustomSaml2AuthenticatedPrincipal(
+        Map<String, List<Object>> attributes = extractAttributes(assertion);
-                        userIdentifier, attributes, userIdentifier, sessionIndexes);
 
+        // Create the custom principal
+        CustomSaml2AuthenticatedPrincipal principal =
+                new CustomSaml2AuthenticatedPrincipal(nameId, attributes, nameId, sessionIndexes);
+
+        // Create the Saml2Authentication
         return new Saml2Authentication(
                 principal,
                 responseToken.getToken().getSaml2Response(),
                 Collections.singletonList(simpleGrantedAuthority));
     }
 
-    private boolean hasAttribute(Map<String, List<Object>> attributes, String name) {
+    private Map<String, List<Object>> extractAttributes(Assertion assertion) {
-        return attributes.containsKey(name) && !attributes.get(name).isEmpty();
+        Map<String, List<Object>> attributes = new HashMap<>();
-    }
+        for (AttributeStatement attributeStatement : assertion.getAttributeStatements()) {
-
+            for (Attribute attribute : attributeStatement.getAttributes()) {
-    private String getFirstAttributeValue(Map<String, List<Object>> attributes, String name) {
+                String attributeName = attribute.getName();
-        List<Object> values = attributes.get(name);
+                List<Object> values = new ArrayList<>();
-        return values != null && !values.isEmpty() ? values.get(0).toString() : null;
+                for (XMLObject xmlObject : attribute.getAttributeValues()) {
+                    log.info("BOOL: " + ((XSBoolean) xmlObject).getValue());
+                    values.add(((XSString) xmlObject).getValue());
+                }
+                attributes.put(attributeName, values);
+            }
+        }
+        return attributes;
     }
 }

src/main/java/stirling/software/SPDF/controller/api/CropController.java

@@ -11,6 +11,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -31,6 +33,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class CropController {
 
+    private static final Logger logger = LoggerFactory.getLogger(CropController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     private final PostHogService postHogService;

src/main/java/stirling/software/SPDF/controller/api/DatabaseController.java

@@ -25,7 +25,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.extern.slf4j.Slf4j;
@@ -35,28 +34,24 @@ import stirling.software.SPDF.config.security.database.DatabaseBackupHelper;
 @Controller
 @RequestMapping("/api/v1/database")
 @PreAuthorize("hasRole('ROLE_ADMIN')")
-@Tag(name = "Database", description = "Database APIs for backup, import, and management")
+@Tag(name = "Database", description = "Database APIs")
 public class DatabaseController {
 
     @Autowired DatabaseBackupHelper databaseBackupHelper;
 
-    @Operation(
+    @Hidden
-            summary = "Import a database backup file",
-            description = "Uploads and imports a database backup SQL file.")
     @PostMapping(consumes = "multipart/form-data", value = "import-database")
+    @Operation(
+            summary = "Import database backup",
+            description = "This endpoint imports a database backup from a SQL file.")
     public String importDatabase(
-            @Parameter(description = "SQL file to import", required = true)
+            @RequestParam("fileInput") MultipartFile file, RedirectAttributes redirectAttributes)
-                    @RequestParam("fileInput")
+            throws IllegalArgumentException, IOException {
-                    MultipartFile file,
-            RedirectAttributes redirectAttributes)
-            throws IOException {
-
         if (file == null || file.isEmpty()) {
             redirectAttributes.addAttribute("error", "fileNullOrEmpty");
             return "redirect:/database";
         }
         log.info("Received file: {}", file.getOriginalFilename());
-
         Path tempTemplatePath = Files.createTempFile("backup_", ".sql");
         try (InputStream in = file.getInputStream()) {
             Files.copy(in, tempTemplatePath, StandardCopyOption.REPLACE_EXISTING);
@@ -74,15 +69,9 @@ public class DatabaseController {
     }
 
     @Hidden
-    @Operation(
-            summary = "Import database backup by filename",
-            description = "Imports a database backup file from the server using its file name.")
     @GetMapping("/import-database-file/{fileName}")
-    public String importDatabaseFromBackupUI(
+    public String importDatabaseFromBackupUI(@PathVariable String fileName)
-            @Parameter(description = "Name of the file to import", required = true) @PathVariable
+            throws IllegalArgumentException, IOException {
-                    String fileName)
-            throws IOException {
-
         if (fileName == null || fileName.isEmpty()) {
             return "redirect:/database?error=fileNullOrEmpty";
         }
@@ -96,7 +85,6 @@ public class DatabaseController {
             return "redirect:/database?error=fileNotFound";
         }
         log.info("Received file: {}", fileName);
-
         if (databaseBackupHelper.importDatabaseFromUI(fileName)) {
             log.info("File {} imported to database", fileName);
             return "redirect:/database?infoMessage=importIntoDatabaseSuccessed";
@@ -105,14 +93,12 @@ public class DatabaseController {
     }
 
     @Hidden
+    @GetMapping("/delete/{fileName}")
     @Operation(
             summary = "Delete a database backup file",
-            description = "Deletes a specified database backup file from the server.")
+            description =
-    @GetMapping("/delete/{fileName}")
+                    "This endpoint deletes a database backup file with the specified file name.")
-    public String deleteFile(
+    public String deleteFile(@PathVariable String fileName) {
-            @Parameter(description = "Name of the file to delete", required = true) @PathVariable
-                    String fileName) {
-
         if (fileName == null || fileName.isEmpty()) {
             throw new IllegalArgumentException("File must not be null or empty");
         }
@@ -131,13 +117,12 @@ public class DatabaseController {
     }
 
     @Hidden
+    @GetMapping("/download/{fileName}")
     @Operation(
             summary = "Download a database backup file",
-            description = "Downloads the specified database backup file from the server.")
+            description =
-    @GetMapping("/download/{fileName}")
+                    "This endpoint downloads a database backup file with the specified file name.")
-    public ResponseEntity<?> downloadFile(
+    public ResponseEntity<?> downloadFile(@PathVariable String fileName) {
-            @Parameter(description = "Name of the file to download", required = true) @PathVariable
-                    String fileName) {
         if (fileName == null || fileName.isEmpty()) {
             throw new IllegalArgumentException("File must not be null or empty");
         }
@@ -156,22 +141,4 @@ public class DatabaseController {
                     .build();
         }
     }
-
-    @Operation(
-            summary = "Create a database backup",
-            description =
-                    "This endpoint triggers the creation of a database backup and redirects to the"
-                            + " database management page.")
-    @GetMapping("/createDatabaseBackup")
-    public String createDatabaseBackup() {
-        try {
-            log.info("Starting database backup creation...");
-            databaseBackupHelper.exportDatabase();
-            log.info("Database backup successfully created.");
-        } catch (IOException e) {
-            log.error("Error creating database backup: {}", e.getMessage(), e);
-            return "redirect:/database?error=" + e.getMessage();
-        }
-        return "redirect:/database?infoMessage=backupCreated";
-    }
 }

src/main/java/stirling/software/SPDF/controller/api/MergeController.java

@@ -20,6 +20,8 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -31,18 +33,18 @@ import org.springframework.web.multipart.MultipartFile;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.general.MergePdfsRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
-@Slf4j
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
 public class MergeController {
 
+    private static final Logger logger = LoggerFactory.getLogger(MergeController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -182,7 +184,7 @@ public class MergeController {
                     baos.toByteArray(), mergedFileName); // Return the modified PDF
 
         } catch (Exception ex) {
-            log.error("Error in merge pdf process", ex);
+            logger.error("Error in merge pdf process", ex);
             throw ex;
         } finally {
             for (File file : filesToDelete) {

src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java

@@ -12,6 +12,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -33,6 +35,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class MultiPageLayoutController {
 
+    private static final Logger logger = LoggerFactory.getLogger(MultiPageLayoutController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired

src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java

@@ -8,6 +8,8 @@ import java.util.List;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,7 +22,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.SortTypes;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
@@ -30,10 +31,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")
-@Slf4j
 @Tag(name = "General", description = "General APIs")
 public class RearrangePagesPDFController {
 
+    private static final Logger logger = LoggerFactory.getLogger(RearrangePagesPDFController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -200,7 +202,7 @@ public class RearrangePagesPDFController {
                     throw new IllegalArgumentException("Unsupported custom mode");
             }
         } catch (IllegalArgumentException e) {
-            log.error("Unsupported custom mode", e);
+            logger.error("Unsupported custom mode", e);
             return null;
         }
     }
@@ -228,8 +230,8 @@ public class RearrangePagesPDFController {
             } else {
                 newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages, false);
             }
-            log.info("newPageOrder = " + newPageOrder);
+            logger.info("newPageOrder = " + newPageOrder);
-            log.info("totalPages = " + totalPages);
+            logger.info("totalPages = " + totalPages);
             // Create a new list to hold the pages in the new order
             List<PDPage> newPages = new ArrayList<>();
             for (int i = 0; i < newPageOrder.size(); i++) {
@@ -252,7 +254,7 @@ public class RearrangePagesPDFController {
                                     .replaceFirst("[.][^.]+$", "")
                             + "_rearranged.pdf");
         } catch (IOException e) {
-            log.error("Failed rearranging documents", e);
+            logger.error("Failed rearranging documents", e);
             return null;
         }
     }

src/main/java/stirling/software/SPDF/controller/api/RotationController.java

@@ -5,6 +5,8 @@ import java.io.IOException;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -26,6 +28,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class RotationController {
 
+    private static final Logger logger = LoggerFactory.getLogger(RotationController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired

src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java

@@ -13,6 +13,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -34,6 +36,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class ScalePagesController {
 
+    private static final Logger logger = LoggerFactory.getLogger(ScalePagesController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired

src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java

@@ -13,6 +13,8 @@ import java.util.zip.ZipOutputStream;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -26,17 +28,16 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")
-@Slf4j
 @Tag(name = "General", description = "General APIs")
 public class SplitPDFController {
 
+    private static final Logger logger = LoggerFactory.getLogger(SplitPDFController.class);
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -51,114 +52,84 @@ public class SplitPDFController {
                     "This endpoint splits a given PDF file into separate documents based on the specified page numbers or ranges. Users can specify pages using individual numbers, ranges, or 'all' for every page. Input:PDF Output:PDF Type:SIMO")
     public ResponseEntity<byte[]> splitPdf(@ModelAttribute PDFWithPageNums request)
             throws IOException {
+        MultipartFile file = request.getFileInput();
+        String pages = request.getPageNumbers();
+        // open the pdf document
 
-        PDDocument document = null;
+        PDDocument document = Loader.loadPDF(file.getBytes());
-        Path zipFile = null;
+        // PdfMetadata metadata = PdfMetadataService.extractMetadataFromPdf(document);
+        int totalPages = document.getNumberOfPages();
+        List<Integer> pageNumbers = request.getPageNumbersList(document, false);
+        if (!pageNumbers.contains(totalPages - 1)) {
+            // Create a mutable ArrayList so we can add to it
+            pageNumbers = new ArrayList<>(pageNumbers);
+            pageNumbers.add(totalPages - 1);
+        }
+
+        logger.info(
+                "Splitting PDF into pages: {}",
+                pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
+
+        // split the document
         List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
-
+        int previousPageNumber = 0;
-        try {
+        for (int splitPoint : pageNumbers) {
-
+            try (PDDocument splitDocument =
-            MultipartFile file = request.getFileInput();
+                    pdfDocumentFactory.createNewDocumentBasedOnOldDocument(document)) {
-            String pages = request.getPageNumbers();
+                for (int i = previousPageNumber; i <= splitPoint; i++) {
-            // open the pdf document
+                    PDPage page = document.getPage(i);
-
+                    splitDocument.addPage(page);
-            document = Loader.loadPDF(file.getBytes());
+                    logger.info("Adding page {} to split document", i);
-            // PdfMetadata metadata = PdfMetadataService.extractMetadataFromPdf(document);
-            int totalPages = document.getNumberOfPages();
-            List<Integer> pageNumbers = request.getPageNumbersList(document, false);
-            if (!pageNumbers.contains(totalPages - 1)) {
-                // Create a mutable ArrayList so we can add to it
-                pageNumbers = new ArrayList<>(pageNumbers);
-                pageNumbers.add(totalPages - 1);
-            }
-
-            log.info(
-                    "Splitting PDF into pages: {}",
-                    pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
-
-            // split the document
-            splitDocumentsBoas = new ArrayList<>();
-            int previousPageNumber = 0;
-            for (int splitPoint : pageNumbers) {
-                try (PDDocument splitDocument =
-                        pdfDocumentFactory.createNewDocumentBasedOnOldDocument(document)) {
-                    for (int i = previousPageNumber; i <= splitPoint; i++) {
-                        PDPage page = document.getPage(i);
-                        splitDocument.addPage(page);
-                        log.info("Adding page {} to split document", i);
-                    }
-                    previousPageNumber = splitPoint + 1;
-
-                    // Transfer metadata to split pdf
-                    // PdfMetadataService.setMetadataToPdf(splitDocument, metadata);
-
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    splitDocument.save(baos);
-
-                    splitDocumentsBoas.add(baos);
-                } catch (Exception e) {
-                    log.error("Failed splitting documents and saving them", e);
-                    throw e;
                 }
-            }
+                previousPageNumber = splitPoint + 1;
 
-            // closing the original document
+                // Transfer metadata to split pdf
-            document.close();
+                // PdfMetadataService.setMetadataToPdf(splitDocument, metadata);
 
-            zipFile = Files.createTempFile("split_documents", ".zip");
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                splitDocument.save(baos);
 
-            String filename =
+                splitDocumentsBoas.add(baos);
-                    Filenames.toSimpleFileName(file.getOriginalFilename())
-                            .replaceFirst("[.][^.]+$", "");
-            try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
-                // loop through the split documents and write them to the zip file
-                for (int i = 0; i < splitDocumentsBoas.size(); i++) {
-                    String fileName = filename + "_" + (i + 1) + ".pdf";
-                    ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
-                    byte[] pdf = baos.toByteArray();
-
-                    // Add PDF file to the zip
-                    ZipEntry pdfEntry = new ZipEntry(fileName);
-                    zipOut.putNextEntry(pdfEntry);
-                    zipOut.write(pdf);
-                    zipOut.closeEntry();
-
-                    log.info("Wrote split document {} to zip file", fileName);
-                }
             } catch (Exception e) {
-                log.error("Failed writing to zip", e);
+                logger.error("Failed splitting documents and saving them", e);
                 throw e;
             }
-
-            log.info("Successfully created zip file with split documents: {}", zipFile.toString());
-            byte[] data = Files.readAllBytes(zipFile);
-            Files.deleteIfExists(zipFile);
-
-            // return the Resource in the response
-            return WebResponseUtils.bytesToWebResponse(
-                    data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
-
-        } finally {
-            try {
-                // Close the main document
-                if (document != null) {
-                    document.close();
-                }
-
-                // Close all ByteArrayOutputStreams
-                for (ByteArrayOutputStream baos : splitDocumentsBoas) {
-                    if (baos != null) {
-                        baos.close();
-                    }
-                }
-
-                // Delete temporary zip file
-                if (zipFile != null) {
-                    Files.deleteIfExists(zipFile);
-                }
-            } catch (Exception e) {
-                log.error("Error while cleaning up resources", e);
-            }
         }
+
+        // closing the original document
+        document.close();
+
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            // loop through the split documents and write them to the zip file
+            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+                String fileName = filename + "_" + (i + 1) + ".pdf";
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                byte[] pdf = baos.toByteArray();
+
+                // Add PDF file to the zip
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+
+                logger.info("Wrote split document {} to zip file", fileName);
+            }
+        } catch (Exception e) {
+            logger.error("Failed writing to zip", e);
+            throw e;
+        }
+
+        logger.info("Successfully created zip file with split documents: {}", zipFile.toString());
+        byte[] data = Files.readAllBytes(zipFile);
+        Files.deleteIfExists(zipFile);
+
+        // return the Resource in the response
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
     }
 }

src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java

@@ -13,6 +13,8 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -30,7 +32,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.PdfMetadata;
 import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
 import stirling.software.SPDF.service.PdfMetadataService;
@@ -38,10 +39,12 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")
-@Slf4j
 @Tag(name = "General", description = "General APIs")
 public class SplitPdfByChaptersController {
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(SplitPdfByChaptersController.class);
+
     private final PdfMetadataService pdfMetadataService;
 
     @Autowired
@@ -56,86 +59,70 @@ public class SplitPdfByChaptersController {
     public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfByChaptersRequest request)
             throws Exception {
         MultipartFile file = request.getFileInput();
-        PDDocument sourceDocument = null;
+        boolean includeMetadata = request.getIncludeMetadata();
-        Path zipFile = null;
+        Integer bookmarkLevel =
-
+                request.getBookmarkLevel(); // levels start from 0 (top most bookmarks)
-        try {
+        if (bookmarkLevel < 0) {
-            boolean includeMetadata = request.getIncludeMetadata();
+            return ResponseEntity.badRequest().body("Invalid bookmark level".getBytes());
-            Integer bookmarkLevel =
-                    request.getBookmarkLevel(); // levels start from 0 (top most bookmarks)
-            if (bookmarkLevel < 0) {
-                return ResponseEntity.badRequest().body("Invalid bookmark level".getBytes());
-            }
-            sourceDocument = Loader.loadPDF(file.getBytes());
-
-            PDDocumentOutline outline = sourceDocument.getDocumentCatalog().getDocumentOutline();
-
-            if (outline == null) {
-                log.warn("No outline found for {}", file.getOriginalFilename());
-                return ResponseEntity.badRequest().body("No outline found".getBytes());
-            }
-            List<Bookmark> bookmarks = new ArrayList<>();
-            try {
-                bookmarks =
-                        extractOutlineItems(
-                                sourceDocument,
-                                outline.getFirstChild(),
-                                bookmarks,
-                                outline.getFirstChild().getNextSibling(),
-                                0,
-                                bookmarkLevel);
-                // to handle last page edge case
-                bookmarks.get(bookmarks.size() - 1).setEndPage(sourceDocument.getNumberOfPages());
-                Bookmark lastBookmark = bookmarks.get(bookmarks.size() - 1);
-
-            } catch (Exception e) {
-                log.error("Unable to extract outline items", e);
-                return ResponseEntity.internalServerError()
-                        .body("Unable to extract outline items".getBytes());
-            }
-
-            boolean allowDuplicates = request.getAllowDuplicates();
-            if (!allowDuplicates) {
-                /*
-                duplicates are generated when multiple bookmarks correspond to the same page,
-                if the user doesn't want duplicates mergeBookmarksThatCorrespondToSamePage() method will merge the titles of all
-                the bookmarks that correspond to the same page, and treat them as a single bookmark
-                */
-                bookmarks = mergeBookmarksThatCorrespondToSamePage(bookmarks);
-            }
-            for (Bookmark bookmark : bookmarks) {
-                log.info(
-                        "{}::::{} to {}",
-                        bookmark.getTitle(),
-                        bookmark.getStartPage(),
-                        bookmark.getEndPage());
-            }
-            List<ByteArrayOutputStream> splitDocumentsBoas =
-                    getSplitDocumentsBoas(sourceDocument, bookmarks, includeMetadata);
-
-            zipFile = createZipFile(bookmarks, splitDocumentsBoas);
-
-            byte[] data = Files.readAllBytes(zipFile);
-            Files.deleteIfExists(zipFile);
-
-            String filename =
-                    Filenames.toSimpleFileName(file.getOriginalFilename())
-                            .replaceFirst("[.][^.]+$", "");
-            sourceDocument.close();
-            return WebResponseUtils.bytesToWebResponse(
-                    data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
-        } finally {
-            try {
-                if (sourceDocument != null) {
-                    sourceDocument.close();
-                }
-                if (zipFile != null) {
-                    Files.deleteIfExists(zipFile);
-                }
-            } catch (Exception e) {
-                log.error("Error while cleaning up resources", e);
-            }
         }
+        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
+
+        PDDocumentOutline outline = sourceDocument.getDocumentCatalog().getDocumentOutline();
+
+        if (outline == null) {
+            logger.warn("No outline found for {}", file.getOriginalFilename());
+            return ResponseEntity.badRequest().body("No outline found".getBytes());
+        }
+        List<Bookmark> bookmarks = new ArrayList<>();
+        try {
+            bookmarks =
+                    extractOutlineItems(
+                            sourceDocument,
+                            outline.getFirstChild(),
+                            bookmarks,
+                            outline.getFirstChild().getNextSibling(),
+                            0,
+                            bookmarkLevel);
+            // to handle last page edge case
+            bookmarks.get(bookmarks.size() - 1).setEndPage(sourceDocument.getNumberOfPages());
+            Bookmark lastBookmark = bookmarks.get(bookmarks.size() - 1);
+
+        } catch (Exception e) {
+            logger.error("Unable to extract outline items", e);
+            return ResponseEntity.internalServerError()
+                    .body("Unable to extract outline items".getBytes());
+        }
+
+        boolean allowDuplicates = request.getAllowDuplicates();
+        if (!allowDuplicates) {
+            /*
+            duplicates are generated when multiple bookmarks correspond to the same page,
+            if the user doesn't want duplicates mergeBookmarksThatCorrespondToSamePage() method will merge the titles of all
+            the bookmarks that correspond to the same page, and treat them as a single bookmark
+            */
+            bookmarks = mergeBookmarksThatCorrespondToSamePage(bookmarks);
+        }
+        for (Bookmark bookmark : bookmarks) {
+            logger.info(
+                    "{}::::{} to {}",
+                    bookmark.getTitle(),
+                    bookmark.getStartPage(),
+                    bookmark.getEndPage());
+        }
+        List<ByteArrayOutputStream> splitDocumentsBoas =
+                getSplitDocumentsBoas(sourceDocument, bookmarks, includeMetadata);
+
+        Path zipFile = createZipFile(bookmarks, splitDocumentsBoas);
+
+        byte[] data = Files.readAllBytes(zipFile);
+        Files.deleteIfExists(zipFile);
+
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
+        sourceDocument.close();
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
     }
 
     private List<Bookmark> mergeBookmarksThatCorrespondToSamePage(List<Bookmark> bookmarks) {
@@ -253,14 +240,14 @@ public class SplitPdfByChaptersController {
                 zipOut.write(pdf);
                 zipOut.closeEntry();
 
-                log.info("Wrote split document {} to zip file", fileName);
+                logger.info("Wrote split document {} to zip file", fileName);
             }
         } catch (Exception e) {
-            log.error("Failed writing to zip", e);
+            logger.error("Failed writing to zip", e);
             throw e;
         }
 
-        log.info("Successfully created zip file with split documents: {}", zipFile);
+        logger.info("Successfully created zip file with split documents: {}", zipFile);
         return zipFile;
     }
 
@@ -281,7 +268,7 @@ public class SplitPdfByChaptersController {
                         i++) {
                     PDPage page = sourceDocument.getPage(i);
                     splitDocument.addPage(page);
-                    log.info("Adding page {} to split document", i);
+                    logger.info("Adding page {} to split document", i);
                 }
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 if (includeMetadata) {
@@ -292,7 +279,7 @@ public class SplitPdfByChaptersController {
 
                 splitDocumentsBoas.add(baos);
             } catch (Exception e) {
-                log.error("Failed splitting documents and saving them", e);
+                logger.error("Failed splitting documents and saving them", e);
                 throw e;
             }
         }

src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java

@@ -18,6 +18,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -40,6 +42,9 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class SplitPdfBySectionsController {
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(SplitPdfBySectionsController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -100,13 +105,15 @@ public class SplitPdfBySectionsController {
 
                 if (sectionNum == horiz * verti) pageNum++;
             }
-            data = Files.readAllBytes(zipFile);
+        } catch (Exception e) {
-            return WebResponseUtils.bytesToWebResponse(
+            logger.error("exception", e);
-                    data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);
-
         } finally {
+            data = Files.readAllBytes(zipFile);
             Files.deleteIfExists(zipFile);
         }
+
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);
     }
 
     public List<PDDocument> splitPdfPages(

src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java

@@ -10,6 +10,8 @@ import java.util.zip.ZipOutputStream;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -23,7 +25,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
@@ -31,10 +32,10 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")
-@Slf4j
 @Tag(name = "General", description = "General APIs")
 public class SplitPdfBySizeController {
 
+    private static final Logger logger = LoggerFactory.getLogger(SplitPdfBySizeController.class);
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -77,7 +78,7 @@ public class SplitPdfBySizeController {
             }
 
         } catch (Exception e) {
-            log.error("exception", e);
+            logger.error("exception", e);
         } finally {
             data = Files.readAllBytes(zipFile);
             Files.deleteIfExists(zipFile);

src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java

@@ -11,6 +11,8 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -30,6 +32,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class ToSinglePageController {
 
+    private static final Logger logger = LoggerFactory.getLogger(ToSinglePageController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired

src/main/java/stirling/software/SPDF/controller/api/UserController.java

@@ -244,8 +244,8 @@ public class UserController {
             return new RedirectView("/addUsers?messageType=invalidRole", true);
         }
 
-        if (authType.equalsIgnoreCase(AuthenticationType.SSO.toString())) {
+        if (authType.equalsIgnoreCase(AuthenticationType.OAUTH2.toString())) {
-            userService.saveUser(username, AuthenticationType.SSO, role);
+            userService.saveUser(username, AuthenticationType.OAUTH2, role);
         } else {
             if (password.isBlank()) {
                 return new RedirectView("/addUsers?messageType=invalidPassword", true);

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java

@@ -14,6 +14,8 @@ import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.rendering.ImageType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -27,7 +29,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
@@ -39,10 +40,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/convert")
-@Slf4j
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConvertImgPDFController {
 
+    private static final Logger logger = LoggerFactory.getLogger(ConvertImgPDFController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -63,137 +65,112 @@ public class ConvertImgPDFController {
         String colorType = request.getColorType();
         String dpi = request.getDpi();
 
-        Path tempFile = null;
+        byte[] pdfBytes = file.getBytes();
-        Path tempOutputDir = null;
+        ImageType colorTypeResult = ImageType.RGB;
-        Path tempPdfPath = null;
+        if ("greyscale".equals(colorType)) {
+            colorTypeResult = ImageType.GRAY;
+        } else if ("blackwhite".equals(colorType)) {
+            colorTypeResult = ImageType.BINARY;
+        }
+        // returns bytes for image
+        boolean singleImage = "single".equals(singleOrMultiple);
         byte[] result = null;
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
 
-        try {
+        result =
-            byte[] pdfBytes = file.getBytes();
+                PdfUtils.convertFromPdf(
-            ImageType colorTypeResult = ImageType.RGB;
+                        pdfBytes,
-            if ("greyscale".equals(colorType)) {
+                        "webp".equalsIgnoreCase(imageFormat) ? "png" : imageFormat.toUpperCase(),
-                colorTypeResult = ImageType.GRAY;
+                        colorTypeResult,
-            } else if ("blackwhite".equals(colorType)) {
+                        singleImage,
-                colorTypeResult = ImageType.BINARY;
+                        Integer.valueOf(dpi),
-            }
+                        filename);
-            // returns bytes for image
+        if (result == null || result.length == 0) {
-            boolean singleImage = "single".equals(singleOrMultiple);
+            logger.error("resultant bytes for {} is null, error converting ", filename);
-            String filename =
+        }
-                    Filenames.toSimpleFileName(file.getOriginalFilename())
+        if ("webp".equalsIgnoreCase(imageFormat) && !CheckProgramInstall.isPythonAvailable()) {
-                            .replaceFirst("[.][^.]+$", "");
+            throw new IOException("Python is not installed. Required for WebP conversion.");
-
+        } else if ("webp".equalsIgnoreCase(imageFormat)
-            result =
+                && CheckProgramInstall.isPythonAvailable()) {
-                    PdfUtils.convertFromPdf(
+            // Write the output stream to a temp file
-                            pdfBytes,
+            Path tempFile = Files.createTempFile("temp_png", ".png");
-                            "webp".equalsIgnoreCase(imageFormat)
+            try (FileOutputStream fos = new FileOutputStream(tempFile.toFile())) {
-                                    ? "png"
+                fos.write(result);
-                                    : imageFormat.toUpperCase(),
+                fos.flush();
-                            colorTypeResult,
-                            singleImage,
-                            Integer.valueOf(dpi),
-                            filename);
-            if (result == null || result.length == 0) {
-                log.error("resultant bytes for {} is null, error converting ", filename);
-            }
-            if ("webp".equalsIgnoreCase(imageFormat) && !CheckProgramInstall.isPythonAvailable()) {
-                throw new IOException("Python is not installed. Required for WebP conversion.");
-            } else if ("webp".equalsIgnoreCase(imageFormat)
-                    && CheckProgramInstall.isPythonAvailable()) {
-                // Write the output stream to a temp file
-                tempFile = Files.createTempFile("temp_png", ".png");
-                try (FileOutputStream fos = new FileOutputStream(tempFile.toFile())) {
-                    fos.write(result);
-                    fos.flush();
-                }
-
-                String pythonVersion = CheckProgramInstall.getAvailablePythonCommand();
-
-                List<String> command = new ArrayList<>();
-                command.add(pythonVersion);
-                command.add("./scripts/png_to_webp.py"); // Python script to handle the conversion
-
-                // Create a temporary directory for the output WebP files
-                tempOutputDir = Files.createTempDirectory("webp_output");
-                if (singleImage) {
-                    // Run the Python script to convert PNG to WebP
-                    command.add(tempFile.toString());
-                    command.add(tempOutputDir.toString());
-                    command.add("--single");
-                } else {
-                    // Save the uploaded PDF to a temporary file
-                    tempPdfPath = Files.createTempFile("temp_pdf", ".pdf");
-                    file.transferTo(tempPdfPath.toFile());
-                    // Run the Python script to convert PDF to WebP
-                    command.add(tempPdfPath.toString());
-                    command.add(tempOutputDir.toString());
-                }
-                command.add("--dpi");
-                command.add(dpi);
-                ProcessExecutorResult resultProcess =
-                        ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
-                                .runCommandWithOutputHandling(command);
-
-                // Find all WebP files in the output directory
-                List<Path> webpFiles =
-                        Files.walk(tempOutputDir)
-                                .filter(path -> path.toString().endsWith(".webp"))
-                                .collect(Collectors.toList());
-
-                if (webpFiles.isEmpty()) {
-                    log.error("No WebP files were created in: {}", tempOutputDir.toString());
-                    throw new IOException(
-                            "No WebP files were created. " + resultProcess.getMessages());
-                }
-
-                byte[] bodyBytes = new byte[0];
-
-                if (webpFiles.size() == 1) {
-                    // Return the single WebP file directly
-                    Path webpFilePath = webpFiles.get(0);
-                    bodyBytes = Files.readAllBytes(webpFilePath);
-                } else {
-                    // Create a ZIP file containing all WebP images
-                    ByteArrayOutputStream zipOutputStream = new ByteArrayOutputStream();
-                    try (ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) {
-                        for (Path webpFile : webpFiles) {
-                            zos.putNextEntry(new ZipEntry(webpFile.getFileName().toString()));
-                            Files.copy(webpFile, zos);
-                            zos.closeEntry();
-                        }
-                    }
-                    bodyBytes = zipOutputStream.toByteArray();
-                }
-                // Clean up the temporary files
-                Files.deleteIfExists(tempFile);
-                if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
-                result = bodyBytes;
             }
 
+            String pythonVersion = CheckProgramInstall.getAvailablePythonCommand();
+
+            List<String> command = new ArrayList<>();
+            command.add(pythonVersion);
+            command.add("./scripts/png_to_webp.py"); // Python script to handle the conversion
+
+            // Create a temporary directory for the output WebP files
+            Path tempOutputDir = Files.createTempDirectory("webp_output");
             if (singleImage) {
-                String docName = filename + "." + imageFormat;
+                // Run the Python script to convert PNG to WebP
-                MediaType mediaType = MediaType.parseMediaType(getMediaType(imageFormat));
+                command.add(tempFile.toString());
-                return WebResponseUtils.bytesToWebResponse(result, docName, mediaType);
+                command.add(tempOutputDir.toString());
+                command.add("--single");
             } else {
-                String zipFilename = filename + "_convertedToImages.zip";
+                // Save the uploaded PDF to a temporary file
-                return WebResponseUtils.bytesToWebResponse(
+                Path tempPdfPath = Files.createTempFile("temp_pdf", ".pdf");
-                        result, zipFilename, MediaType.APPLICATION_OCTET_STREAM);
+                file.transferTo(tempPdfPath.toFile());
+                // Run the Python script to convert PDF to WebP
+                command.add(tempPdfPath.toString());
+                command.add(tempOutputDir.toString());
+            }
+            command.add("--dpi");
+            command.add(dpi);
+            ProcessExecutorResult resultProcess =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
+                            .runCommandWithOutputHandling(command);
+
+            // Find all WebP files in the output directory
+            List<Path> webpFiles =
+                    Files.walk(tempOutputDir)
+                            .filter(path -> path.toString().endsWith(".webp"))
+                            .collect(Collectors.toList());
+
+            if (webpFiles.isEmpty()) {
+                logger.error("No WebP files were created in: {}", tempOutputDir.toString());
+                throw new IOException("No WebP files were created. " + resultProcess.getMessages());
             }
 
-        } finally {
+            byte[] bodyBytes = new byte[0];
-            try {
+
-                // Clean up temporary files
+            if (webpFiles.size() == 1) {
-                if (tempFile != null) {
+                // Return the single WebP file directly
-                    Files.deleteIfExists(tempFile);
+                Path webpFilePath = webpFiles.get(0);
+                bodyBytes = Files.readAllBytes(webpFilePath);
+            } else {
+                // Create a ZIP file containing all WebP images
+                ByteArrayOutputStream zipOutputStream = new ByteArrayOutputStream();
+                try (ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) {
+                    for (Path webpFile : webpFiles) {
+                        zos.putNextEntry(new ZipEntry(webpFile.getFileName().toString()));
+                        Files.copy(webpFile, zos);
+                        zos.closeEntry();
+                    }
                 }
-                if (tempPdfPath != null) {
+                bodyBytes = zipOutputStream.toByteArray();
-                    Files.deleteIfExists(tempPdfPath);
-                }
-                if (tempOutputDir != null) {
-                    FileUtils.deleteDirectory(tempOutputDir.toFile());
-                }
-            } catch (Exception e) {
-                log.error("Error cleaning up temporary files", e);
             }
+            // Clean up the temporary files
+            Files.deleteIfExists(tempFile);
+            if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
+            result = bodyBytes;
+        }
+
+        if (singleImage) {
+            String docName = filename + "." + imageFormat;
+            MediaType mediaType = MediaType.parseMediaType(getMediaType(imageFormat));
+            return WebResponseUtils.bytesToWebResponse(result, docName, mediaType);
+        } else {
+            String zipFilename = filename + "_convertedToImages.zip";
+            return WebResponseUtils.bytesToWebResponse(
+                    result, zipFilename, MediaType.APPLICATION_OCTET_STREAM);
         }
     }
 
@@ -208,13 +185,7 @@ public class ConvertImgPDFController {
         String fitOption = request.getFitOption();
         String colorType = request.getColorType();
         boolean autoRotate = request.isAutoRotate();
-        // Handle Null entries for formdata
+
-        if (colorType == null || colorType.isBlank()) {
-            colorType = "color";
-        }
-        if (fitOption == null || fitOption.isEmpty()) {
-            fitOption = "fillPage";
-        }
         // Convert the file to PDF and get the resulting bytes
         byte[] bytes =
                 PdfUtils.imageToPdf(file, fitOption, autoRotate, colorType, pdfDocumentFactory);

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java

@@ -8,6 +8,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,7 +22,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.converters.PdfToPdfARequest;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
@@ -28,10 +29,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/convert")
-@Slf4j
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConvertPDFToPDFA {
 
+    private static final Logger logger = LoggerFactory.getLogger(ConvertPDFToPDFA.class);
+
     @PostMapping(consumes = "multipart/form-data", value = "/pdf/pdfa")
     @Operation(
             summary = "Convert a PDF to a PDF/A",
@@ -44,7 +46,7 @@ public class ConvertPDFToPDFA {
 
         // Validate input file type
         if (!"application/pdf".equals(inputFile.getContentType())) {
-            log.error("Invalid input file type: {}", inputFile.getContentType());
+            logger.error("Invalid input file type: {}", inputFile.getContentType());
             throw new IllegalArgumentException("Input file must be a PDF");
         }
 
@@ -94,7 +96,7 @@ public class ConvertPDFToPDFA {
                             .runCommandWithOutputHandling(command);
 
             if (returnCode.getRc() != 0) {
-                log.error("PDF/A conversion failed with return code: {}", returnCode.getRc());
+                logger.error("PDF/A conversion failed with return code: {}", returnCode.getRc());
                 throw new RuntimeException("PDF/A conversion failed");
             }
 

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java

@@ -7,6 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -17,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
@@ -27,10 +28,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @Tag(name = "Convert", description = "Convert APIs")
-@Slf4j
 @RequestMapping("/api/v1/convert")
 public class ConvertWebsiteToPDF {
 
+    private static final Logger logger = LoggerFactory.getLogger(ConvertWebsiteToPDF.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -86,7 +88,7 @@ public class ConvertWebsiteToPDF {
                 try {
                     Files.deleteIfExists(tempOutputFile);
                 } catch (IOException e) {
-                    log.error("Error deleting temporary output file", e);
+                    logger.error("Error deleting temporary output file", e);
                 }
             }
         }

src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java

@@ -7,6 +7,8 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.QuoteMode;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ContentDisposition;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -32,6 +34,8 @@ import technology.tabula.writers.Writer;
 @Tag(name = "Convert", description = "Convert APIs")
 public class ExtractCSVController {
 
+    private static final Logger logger = LoggerFactory.getLogger(ExtractCSVController.class);
+
     @PostMapping(value = "/pdf/csv", consumes = "multipart/form-data")
     @Operation(
             summary = "Extracts a CSV document from a PDF",

src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java

@@ -9,6 +9,8 @@ import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,16 +22,16 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.ExtractHeaderRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")
-@Slf4j
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoRenameController {
 
+    private static final Logger logger = LoggerFactory.getLogger(AutoRenameController.class);
+
     private static final float TITLE_FONT_SIZE_THRESHOLD = 20.0f;
     private static final int LINE_LIMIT = 200;
 
@@ -131,7 +133,7 @@ public class AutoRenameController {
             header = header.replaceAll("[/\\\\?%*:|\"<>]", "").trim();
             return WebResponseUtils.pdfDocToWebResponse(document, header + ".pdf");
         } else {
-            log.info("File has no good title to be found");
+            logger.info("File has no good title to be found");
             return WebResponseUtils.pdfDocToWebResponse(
                     document, Filenames.toSimpleFileName(file.getOriginalFilename()));
         }

src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java

@@ -14,6 +14,8 @@ import java.util.zip.ZipOutputStream;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -35,17 +37,16 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.AutoSplitPdfRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")
-@Slf4j
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoSplitPdfController {
 
+    private static final Logger logger = LoggerFactory.getLogger(AutoSplitPdfController.class);
     private static final String QR_CONTENT = "https://github.com/Stirling-Tools/Stirling-PDF";
     private static final String QR_CONTENT_OLD = "https://github.com/Frooodle/Stirling-PDF";
 
@@ -133,7 +134,7 @@ public class AutoSplitPdfController {
                 try {
                     document.close();
                 } catch (IOException e) {
-                    log.error("Error closing main PDDocument", e);
+                    logger.error("Error closing main PDDocument", e);
                 }
             }
 
@@ -141,7 +142,7 @@ public class AutoSplitPdfController {
                 try {
                     splitDoc.close();
                 } catch (IOException e) {
-                    log.error("Error closing split PDDocument", e);
+                    logger.error("Error closing split PDDocument", e);
                 }
             }
 
@@ -149,7 +150,7 @@ public class AutoSplitPdfController {
                 try {
                     Files.deleteIfExists(zipFile);
                 } catch (IOException e) {
-                    log.error("Error deleting temporary zip file", e);
+                    logger.error("Error deleting temporary zip file", e);
                 }
             }
         }

src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java

@@ -14,6 +14,8 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.text.PDFTextStripper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -28,7 +30,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.RemoveBlankPagesRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.PdfUtils;
@@ -36,10 +37,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")
-@Slf4j
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class BlankPageController {
 
+    private static final Logger logger = LoggerFactory.getLogger(BlankPageController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -69,7 +71,7 @@ public class BlankPageController {
             PDFRenderer pdfRenderer = new PDFRenderer(document);
             pdfRenderer.setSubsamplingAllowed(true);
             for (PDPage page : pages) {
-                log.info("checking page {}", pageIndex);
+                logger.info("checking page {}", pageIndex);
                 textStripper.setStartPage(pageIndex + 1);
                 textStripper.setEndPage(pageIndex + 1);
                 String pageText = textStripper.getText(document);
@@ -77,12 +79,12 @@ public class BlankPageController {
 
                 boolean blank = true;
                 if (hasText) {
-                    log.info("page {} has text, not blank", pageIndex);
+                    logger.info("page {} has text, not blank", pageIndex);
                     blank = false;
                 } else {
                     boolean hasImages = PdfUtils.hasImagesOnPage(page);
                     if (hasImages) {
-                        log.info("page {} has image, running blank detection", pageIndex);
+                        logger.info("page {} has image, running blank detection", pageIndex);
                         // Render image and save as temp file
                         BufferedImage image = pdfRenderer.renderImageWithDPI(pageIndex, 30);
                         blank = isBlankImage(image, threshold, whitePercent, threshold);
@@ -90,10 +92,10 @@ public class BlankPageController {
                 }
 
                 if (blank) {
-                    log.info("Skipping, Image was  blank for page #{}", pageIndex);
+                    logger.info("Skipping, Image was  blank for page #{}", pageIndex);
                     blankPages.add(page);
                 } else {
-                    log.info("page {} has image which is not blank", pageIndex);
+                    logger.info("page {} has image which is not blank", pageIndex);
                     nonBlankPages.add(page);
                 }
 
@@ -119,12 +121,12 @@ public class BlankPageController {
 
             zos.close();
 
-            log.info("Returning ZIP file: {}", filename + "_processed.zip");
+            logger.info("Returning ZIP file: {}", filename + "_processed.zip");
             return WebResponseUtils.boasToWebResponse(
                     baos, filename + "_processed.zip", MediaType.APPLICATION_OCTET_STREAM);
 
         } catch (IOException e) {
-            log.error("exception", e);
+            logger.error("exception", e);
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
@@ -147,7 +149,7 @@ public class BlankPageController {
     public static boolean isBlankImage(
             BufferedImage image, int threshold, double whitePercent, int blurSize) {
         if (image == null) {
-            log.info("Error: Image is null");
+            logger.info("Error: Image is null");
             return false;
         }
 
@@ -165,7 +167,7 @@ public class BlankPageController {
         }
 
         double whitePixelPercentage = (whitePixels / (double) totalPixels) * 100;
-        log.info(String.format("Page has white pixel percent of %.2f%%", whitePixelPercentage));
+        logger.info(String.format("Page has white pixel percent of %.2f%%", whitePixelPercentage));
 
         return whitePixelPercentage >= whitePercent;
     }

src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java

@@ -17,6 +17,8 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -29,7 +31,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
@@ -39,10 +40,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")
-@Slf4j
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class CompressController {
 
+    private static final Logger logger = LoggerFactory.getLogger(CompressController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -189,7 +191,7 @@ public class CompressController {
                             incrementOptimizeLevel(
                                     optimizeLevel, outputFileSize, expectedOutputSize);
                     if (autoMode && optimizeLevel > 9) {
-                        log.info("Maximum compression level reached in auto mode");
+                        logger.info("Maximum compression level reached in auto mode");
                         sizeMet = true;
                     }
                 }
@@ -201,7 +203,7 @@ public class CompressController {
 
             // Check if optimized file is larger than the original
             if (pdfBytes.length > inputFileSize) {
-                log.warn(
+                logger.warn(
                         "Optimized file is larger than the original. Returning the original file instead.");
                 finalFile = tempInputFile;
             }
@@ -232,7 +234,7 @@ public class CompressController {
 
     private int incrementOptimizeLevel(int currentLevel, long currentSize, long targetSize) {
         double currentRatio = currentSize / (double) targetSize;
-        log.info("Current compression ratio: {}", String.format("%.2f", currentRatio));
+        logger.info("Current compression ratio: {}", String.format("%.2f", currentRatio));
 
         if (currentRatio > 2.0) {
             return Math.min(9, currentLevel + 3);

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java

@@ -17,6 +17,8 @@ import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +31,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.ExtractImageScansRequest;
 import stirling.software.SPDF.utils.CheckProgramInstall;
 import stirling.software.SPDF.utils.ProcessExecutor;
@@ -38,10 +39,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")
-@Slf4j
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class ExtractImageScansController {
 
+    private static final Logger logger = LoggerFactory.getLogger(ExtractImageScansController.class);
+
     @PostMapping(consumes = "multipart/form-data", value = "/extract-image-scans")
     @Operation(
             summary = "Extract image scans from an input file",
@@ -199,7 +201,7 @@ public class ExtractImageScansController {
                         try {
                             Files.deleteIfExists(path);
                         } catch (IOException e) {
-                            log.error("Failed to delete temporary image file: " + path, e);
+                            logger.error("Failed to delete temporary image file: " + path, e);
                         }
                     });
 
@@ -207,7 +209,7 @@ public class ExtractImageScansController {
                 try {
                     Files.deleteIfExists(tempZipFile);
                 } catch (IOException e) {
-                    log.error("Failed to delete temporary zip file: " + tempZipFile, e);
+                    logger.error("Failed to delete temporary zip file: " + tempZipFile, e);
                 }
             }
 
@@ -216,7 +218,7 @@ public class ExtractImageScansController {
                         try {
                             FileUtils.deleteDirectory(dir.toFile());
                         } catch (IOException e) {
-                            log.error("Failed to delete temporary directory: " + dir, e);
+                            logger.error("Failed to delete temporary directory: " + dir, e);
                         }
                     });
         }

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java

@@ -25,6 +25,8 @@ import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -37,17 +39,17 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.PDFExtractImagesRequest;
 import stirling.software.SPDF.utils.ImageProcessingUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")
-@Slf4j
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class ExtractImagesController {
 
+    private static final Logger logger = LoggerFactory.getLogger(ExtractImagesController.class);
+
     @PostMapping(consumes = "multipart/form-data", value = "/extract-images")
     @Operation(
             summary = "Extract images from a PDF file",
@@ -105,7 +107,7 @@ public class ExtractImagesController {
                                                 allowDuplicates);
                                     } catch (IOException e) {
                                         // Log the error and continue processing other pages
-                                        log.error(
+                                        logger.error(
                                                 "Error extracting images from page {}: {}",
                                                 pageNum,
                                                 e.getMessage());
@@ -165,7 +167,7 @@ public class ExtractImagesController {
         try {
             md = MessageDigest.getInstance("MD5");
         } catch (NoSuchAlgorithmException e) {
-            log.error("MD5 algorithm not available for extractImages hash.", e);
+            logger.error("MD5 algorithm not available for extractImages hash.", e);
             return;
         }
         if (page.getResources() == null || page.getResources().getXObjectNames() == null) {

src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java

@@ -27,6 +27,8 @@ import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,6 +50,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class FakeScanControllerWIP {
 
+    private static final Logger logger = LoggerFactory.getLogger(FakeScanControllerWIP.class);
+
     // TODO finish
     @PostMapping(consumes = "multipart/form-data", value = "/fake-scan")
     @Hidden

src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java

@@ -12,6 +12,8 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -24,17 +26,17 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.FlattenRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")
-@Slf4j
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class FlattenController {
 
+    private static final Logger logger = LoggerFactory.getLogger(FlattenController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -82,7 +84,7 @@ public class FlattenController {
                         contentStream.drawImage(pdImage, 0, 0, pageWidth, pageHeight);
                     }
                 } catch (IOException e) {
-                    log.error("exception", e);
+                    logger.error("exception", e);
                 }
             }
             return WebResponseUtils.pdfDocToWebResponse(

src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java

@@ -11,9 +11,9 @@ import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,17 +24,16 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.MetadataRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
-import stirling.software.SPDF.utils.propertyeditor.StringToMapPropertyEditor;
 
 @RestController
 @RequestMapping("/api/v1/misc")
-@Slf4j
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class MetadataController {
 
+    private static final Logger logger = LoggerFactory.getLogger(MetadataController.class);
+
     private String checkUndefined(String entry) {
         // Check if the string is "undefined"
         if ("undefined".equals(entry)) {
@@ -45,11 +44,6 @@ public class MetadataController {
         return entry;
     }
 
-    @InitBinder
-    public void initBinder(WebDataBinder binder) {
-        binder.registerCustomEditor(Map.class, "allRequestParams", new StringToMapPropertyEditor());
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/update-metadata")
     @Operation(
             summary = "Update metadata of a PDF file",
@@ -146,7 +140,7 @@ public class MetadataController {
                 creationDateCal.setTime(
                         new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(creationDate));
             } catch (ParseException e) {
-                log.error("exception", e);
+                logger.error("exception", e);
             }
             info.setCreationDate(creationDateCal);
         } else {
@@ -158,7 +152,7 @@ public class MetadataController {
                 modificationDateCal.setTime(
                         new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(modificationDate));
             } catch (ParseException e) {
-                log.error("exception", e);
+                logger.error("exception", e);
             }
             info.setModificationDate(modificationDateCal);
         } else {

src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java

@@ -1,5 +1,7 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.BoundedLineReader;
+import io.github.pixee.security.Filenames;
 import java.awt.image.BufferedImage;
 import java.io.BufferedReader;
 import java.io.File;
@@ -33,8 +35,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import io.github.pixee.security.BoundedLineReader;
-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.extern.slf4j.Slf4j;
@@ -87,7 +87,7 @@ public class OCRController {
 
         Files.createDirectories(tempOutputDir);
         Files.createDirectories(tempImagesDir);
-        Process process = null;
+
         try {
             // Save input file
             inputFile.transferTo(tempInputFile.toFile());
@@ -139,7 +139,7 @@ public class OCRController {
                         command.add("pdf"); // Always output PDF
 
                         ProcessBuilder pb = new ProcessBuilder(command);
-                        process = pb.start();
+                        Process process = pb.start();
 
                         // Capture any error output
                         try (BufferedReader reader =
@@ -176,9 +176,7 @@ public class OCRController {
             // Read the final PDF file
             byte[] pdfContent = Files.readAllBytes(finalOutputFile);
             String outputFilename =
-                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
+                    Filenames.toSimpleFileName(inputFile.getOriginalFilename()).replaceFirst("[.][^.]+$", "") + "_OCR.pdf";
-                                    .replaceFirst("[.][^.]+$", "")
-                            + "_OCR.pdf";
 
             return ResponseEntity.ok()
                     .header(
@@ -188,10 +186,6 @@ public class OCRController {
                     .body(pdfContent);
 
         } finally {
-            if (process != null) {
-                process.destroy();
-            }
-
             // Clean up temporary files
             deleteDirectory(tempDir);
         }

src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java

@@ -2,6 +2,8 @@ package stirling.software.SPDF.controller.api.misc;
 
 import java.io.IOException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -15,7 +17,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.OverlayImageRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.PdfUtils;
@@ -23,10 +24,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")
-@Slf4j
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class OverlayImageController {
 
+    private static final Logger logger = LoggerFactory.getLogger(OverlayImageController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -58,7 +60,7 @@ public class OverlayImageController {
                                     .replaceFirst("[.][^.]+$", "")
                             + "_overlayed.pdf");
         } catch (IOException e) {
-            log.error("Failed to add image to PDF", e);
+            logger.error("Failed to add image to PDF", e);
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }

src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java

@@ -10,6 +10,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
 import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -33,6 +35,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class PageNumbersController {
 
+    private static final Logger logger = LoggerFactory.getLogger(PageNumbersController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired

src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java

@@ -6,6 +6,8 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -29,6 +31,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class RepairController {
 
+    private static final Logger logger = LoggerFactory.getLogger(RepairController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -46,6 +50,7 @@ public class RepairController {
         MultipartFile inputFile = request.getFileInput();
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
+        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
         byte[] pdfBytes = null;
         inputFile.transferTo(tempInputFile.toFile());
         try {
@@ -56,13 +61,14 @@ public class RepairController {
             command.add("--qdf"); // Linearizes and normalizes PDF structure
             command.add("--object-streams=disable"); // Can help with some corruptions
             command.add(tempInputFile.toString());
+            command.add(tempOutputFile.toString());
 
             ProcessExecutorResult returnCode =
                     ProcessExecutor.getInstance(ProcessExecutor.Processes.QPDF)
                             .runCommandWithOutputHandling(command);
 
             // Read the optimized PDF file
-            pdfBytes = pdfDocumentFactory.loadToBytes(tempInputFile.toFile());
+            pdfBytes = pdfDocumentFactory.loadToBytes(tempOutputFile.toFile());
 
             // Return the optimized PDF as a response
             String outputFilename =
@@ -73,6 +79,7 @@ public class RepairController {
         } finally {
             // Clean up the temporary files
             Files.deleteIfExists(tempInputFile);
+            Files.deleteIfExists(tempOutputFile);
         }
     }
 }

src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java

@@ -7,6 +7,8 @@ import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.common.PDNameTreeNode;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -27,6 +29,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class ShowJavascript {
 
+    private static final Logger logger = LoggerFactory.getLogger(ShowJavascript.class);
+
     @PostMapping(consumes = "multipart/form-data", value = "/show-javascript")
     @Operation(
             summary = "Grabs all JS from a PDF and returns a single JS file with all code",

src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java

@@ -229,22 +229,10 @@ public class StampController {
                     calculatePositionY(
                             pageSize, position, calculateTextCapHeight(font, fontSize), margin);
         }
-        // Split the stampText into multiple lines
-        String[] lines = stampText.split("\\\\n");
-
-        // Calculate dynamic line height based on font ascent and descent
-        float ascent = font.getFontDescriptor().getAscent();
-        float descent = font.getFontDescriptor().getDescent();
-        float lineHeight = ((ascent - descent) / 1000) * fontSize;
 
         contentStream.beginText();
-        for (int i = 0; i < lines.length; i++) {
+        contentStream.setTextMatrix(Matrix.getRotateInstance(Math.toRadians(rotation), x, y));
-            String line = lines[i];
+        contentStream.showText(stampText);
-            // Set the text matrix for each line with rotation
-            contentStream.setTextMatrix(
-                    Matrix.getRotateInstance(Math.toRadians(rotation), x, y - (i * lineHeight)));
-            contentStream.showText(line);
-        }
         contentStream.endText();
     }
 

src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java

@@ -7,6 +7,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -19,17 +21,17 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import jakarta.servlet.ServletContext;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.ApiEndpoint;
 import stirling.software.SPDF.model.Role;
 
 @Service
-@Slf4j
 public class ApiDocService {
 
     private final Map<String, ApiEndpoint> apiDocumentation = new HashMap<>();
 
+    private static final Logger logger = LoggerFactory.getLogger(ApiDocService.class);
+
     @Autowired private ServletContext servletContext;
 
     private String getApiDocsUrl() {
@@ -133,7 +135,7 @@ public class ApiDocService {
                             });
         } catch (Exception e) {
             // Handle exceptions
-            log.error("Error grabbing swagger doc, body result {}", apiDocsJson);
+            logger.error("Error grabbing swagger doc, body result {}", apiDocsJson);
         }
     }
 

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java

@@ -8,6 +8,8 @@ import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
@@ -24,7 +26,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.api.HandleDataRequest;
@@ -32,10 +33,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/pipeline")
-@Slf4j
 @Tag(name = "Pipeline", description = "Pipeline APIs")
 public class PipelineController {
 
+    private static final Logger logger = LoggerFactory.getLogger(PipelineController.class);
+
     final String watchedFoldersDir = "./pipeline/watchedFolders/";
     final String finishedFoldersDir = "./pipeline/finishedFolders/";
     @Autowired PipelineProcessor processor;
@@ -54,7 +56,7 @@ public class PipelineController {
             return null;
         }
         PipelineConfig config = objectMapper.readValue(jsonString, PipelineConfig.class);
-        log.info("Received POST request to /handleData with {} files", files.length);
+        logger.info("Received POST request to /handleData with {} files", files.length);
         try {
             List<Resource> inputFiles = processor.generateInputFiles(files);
             if (inputFiles == null || inputFiles.size() == 0) {
@@ -69,7 +71,7 @@ public class PipelineController {
                 is.read(bytes);
                 is.close();
 
-                log.info("Returning single file response...");
+                logger.info("Returning single file response...");
                 return WebResponseUtils.bytesToWebResponse(
                         bytes, singleFile.getFilename(), MediaType.APPLICATION_OCTET_STREAM);
             } else if (outputFiles == null) {
@@ -116,11 +118,11 @@ public class PipelineController {
 
             zipOut.close();
 
-            log.info("Returning zipped file response...");
+            logger.info("Returning zipped file response...");
             return WebResponseUtils.boasToWebResponse(
                     baos, "output.zip", MediaType.APPLICATION_OCTET_STREAM);
         } catch (Exception e) {
-            log.error("Error handling data: ", e);
+            logger.error("Error handling data: ", e);
             return null;
         }
     }

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java

@@ -16,6 +16,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.io.ByteArrayResource;
@@ -25,15 +27,14 @@ import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.utils.FileMonitor;
 
 @Service
-@Slf4j
 public class PipelineDirectoryProcessor {
 
+    private static final Logger logger = LoggerFactory.getLogger(PipelineDirectoryProcessor.class);
     @Autowired private ObjectMapper objectMapper;
     @Autowired private ApiDocService apiDocService;
     @Autowired PipelineProcessor processor;
@@ -55,9 +56,9 @@ public class PipelineDirectoryProcessor {
         if (!Files.exists(watchedFolderPath)) {
             try {
                 Files.createDirectories(watchedFolderPath);
-                log.info("Created directory: {}", watchedFolderPath);
+                logger.info("Created directory: {}", watchedFolderPath);
             } catch (IOException e) {
-                log.error("Error creating directory: {}", watchedFolderPath, e);
+                logger.error("Error creating directory: {}", watchedFolderPath, e);
                 return;
             }
         }
@@ -70,21 +71,21 @@ public class PipelineDirectoryProcessor {
                                         handleDirectory(t);
                                     }
                                 } catch (Exception e) {
-                                    log.error("Error handling directory: {}", t, e);
+                                    logger.error("Error handling directory: {}", t, e);
                                 }
                             });
         } catch (Exception e) {
-            log.error("Error walking through directory: {}", watchedFolderPath, e);
+            logger.error("Error walking through directory: {}", watchedFolderPath, e);
         }
     }
 
     public void handleDirectory(Path dir) throws IOException {
-        log.info("Handling directory: {}", dir);
+        logger.info("Handling directory: {}", dir);
         Path processingDir = createProcessingDirectory(dir);
 
         Optional<Path> jsonFileOptional = findJsonFile(dir);
         if (!jsonFileOptional.isPresent()) {
-            log.warn("No .JSON settings file found. No processing will happen for dir {}.", dir);
+            logger.warn("No .JSON settings file found. No processing will happen for dir {}.", dir);
             return;
         }
 
@@ -97,7 +98,7 @@ public class PipelineDirectoryProcessor {
         Path processingDir = dir.resolve("processing");
         if (!Files.exists(processingDir)) {
             Files.createDirectory(processingDir);
-            log.info("Created processing directory: {}", processingDir);
+            logger.info("Created processing directory: {}", processingDir);
         }
         return processingDir;
     }
@@ -110,7 +111,7 @@ public class PipelineDirectoryProcessor {
 
     private PipelineConfig readAndParseJson(Path jsonFile) throws IOException {
         String jsonString = new String(Files.readAllBytes(jsonFile), StandardCharsets.UTF_8);
-        log.debug("Reading JSON file: {}", jsonFile);
+        logger.debug("Reading JSON file: {}", jsonFile);
         return objectMapper.readValue(jsonString, PipelineConfig.class);
     }
 
@@ -120,7 +121,7 @@ public class PipelineDirectoryProcessor {
             validateOperation(operation);
             File[] files = collectFilesForProcessing(dir, jsonFile, operation);
             if (files == null || files.length == 0) {
-                log.debug("No files detected for {} ", dir);
+                logger.debug("No files detected for {} ", dir);
                 return;
             }
             List<File> filesToProcess = prepareFilesForProcessing(files, processingDir);
@@ -201,7 +202,7 @@ public class PipelineDirectoryProcessor {
             moveAndRenameFiles(outputFiles, config, dir);
             deleteOriginalFiles(filesToProcess, processingDir);
         } catch (Exception e) {
-            log.error("error during processing", e);
+            logger.error("error during processing", e);
             moveFilesBack(filesToProcess, processingDir);
         }
     }
@@ -214,7 +215,7 @@ public class PipelineDirectoryProcessor {
 
             if (!Files.exists(outputPath)) {
                 Files.createDirectories(outputPath);
-                log.info("Created directory: {}", outputPath);
+                logger.info("Created directory: {}", outputPath);
             }
 
             Path outputFile = outputPath.resolve(outputFileName);
@@ -222,7 +223,7 @@ public class PipelineDirectoryProcessor {
                 os.write(((ByteArrayResource) resource).getByteArray());
             }
 
-            log.info("File moved and renamed to {}", outputFile);
+            logger.info("File moved and renamed to {}", outputFile);
         }
     }
 
@@ -263,7 +264,7 @@ public class PipelineDirectoryProcessor {
             throws IOException {
         for (File file : filesToProcess) {
             Files.deleteIfExists(processingDir.resolve(file.getName()));
-            log.info("Deleted original file: {}", file.getName());
+            logger.info("Deleted original file: {}", file.getName());
         }
     }
 
@@ -271,12 +272,12 @@ public class PipelineDirectoryProcessor {
         for (File file : filesToProcess) {
             try {
                 Files.move(processingDir.resolve(file.getName()), file.toPath());
-                log.info(
+                logger.info(
                         "Moved file back to original location: {} , {}",
                         file.toPath(),
                         file.getName());
             } catch (IOException e) {
-                log.error("Error moving file back to original location: {}", file.getName(), e);
+                logger.error("Error moving file back to original location: {}", file.getName(), e);
             }
         }
     }

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java

@@ -19,6 +19,8 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
@@ -38,16 +40,16 @@ import io.github.pixee.security.Filenames;
 import io.github.pixee.security.ZipSecurity;
 
 import jakarta.servlet.ServletContext;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.Role;
 
 @Service
-@Slf4j
 public class PipelineProcessor {
 
+    private static final Logger logger = LoggerFactory.getLogger(PipelineProcessor.class);
+
     @Autowired private ApiDocService apiDocService;
 
     @Autowired(required = false)
@@ -79,7 +81,7 @@ public class PipelineProcessor {
             String operation = pipelineOperation.getOperation();
             boolean isMultiInputOperation = apiDocService.isMultiInput(operation);
 
-            log.info(
+            logger.info(
                     "Running operation: {} isMultiInputOperation {}",
                     operation,
                     isMultiInputOperation);
@@ -122,7 +124,7 @@ public class PipelineProcessor {
                             if (operation.startsWith("filter-")
                                     && (response.getBody() == null
                                             || response.getBody().length == 0)) {
-                                log.info("Skipping file due to failing {}", operation);
+                                logger.info("Skipping file due to failing {}", operation);
                                 continue;
                             }
 
@@ -206,7 +208,7 @@ public class PipelineProcessor {
             outputFiles = newOutputFiles;
         }
         if (hasErrors) {
-            log.error("Errors occurred during processing. Log: {}", logStream.toString());
+            logger.error("Errors occurred during processing. Log: {}", logStream.toString());
         }
 
         return outputFiles;
@@ -219,7 +221,7 @@ public class PipelineProcessor {
 
         HttpHeaders headers = new HttpHeaders();
         String apiKey = getApiKeyForUser();
-        headers.add("X-API-KEY", apiKey);
+        headers.add("X-API-Key", apiKey);
         headers.setContentType(MediaType.MULTIPART_FORM_DATA);
 
         // Create HttpEntity with the body and headers
@@ -308,7 +310,7 @@ public class PipelineProcessor {
 
     List<Resource> generateInputFiles(File[] files) throws Exception {
         if (files == null || files.length == 0) {
-            log.info("No files");
+            logger.info("No files");
             return null;
         }
 
@@ -316,7 +318,7 @@ public class PipelineProcessor {
 
         for (File file : files) {
             Path path = Paths.get(file.getAbsolutePath());
-            log.info("Reading file: " + path); // debug statement
+            logger.info("Reading file: " + path); // debug statement
 
             if (Files.exists(path)) {
                 Resource fileResource =
@@ -328,16 +330,16 @@ public class PipelineProcessor {
                         };
                 outputFiles.add(fileResource);
             } else {
-                log.info("File not found: " + path);
+                logger.info("File not found: " + path);
             }
         }
-        log.info("Files successfully loaded. Starting processing...");
+        logger.info("Files successfully loaded. Starting processing...");
         return outputFiles;
     }
 
     List<Resource> generateInputFiles(MultipartFile[] files) throws Exception {
         if (files == null || files.length == 0) {
-            log.info("No files");
+            logger.info("No files");
             return null;
         }
 
@@ -353,7 +355,7 @@ public class PipelineProcessor {
                     };
             outputFiles.add(fileResource);
         }
-        log.info("Files successfully loaded. Starting processing...");
+        logger.info("Files successfully loaded. Starting processing...");
         return outputFiles;
     }
 
@@ -367,7 +369,7 @@ public class PipelineProcessor {
     }
 
     private List<Resource> unzip(byte[] data) throws IOException {
-        log.info("Unzipping data of length: {}", data.length);
+        logger.info("Unzipping data of length: {}", data.length);
         List<Resource> unzippedFiles = new ArrayList<>();
 
         try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
@@ -394,7 +396,7 @@ public class PipelineProcessor {
 
                 // If the unzipped file is a zip file, unzip it
                 if (isZip(baos.toByteArray())) {
-                    log.info("File {} is a zip file. Unzipping...", filename);
+                    logger.info("File {} is a zip file. Unzipping...", filename);
                     unzippedFiles.addAll(unzip(baos.toByteArray()));
                 } else {
                     unzippedFiles.add(fileResource);
@@ -402,7 +404,7 @@ public class PipelineProcessor {
             }
         }
 
-        log.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
+        logger.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
         return unzippedFiles;
     }
 }

src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java

@@ -63,6 +63,8 @@ import org.bouncycastle.operator.InputDecryptorProvider;
 import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
 import org.bouncycastle.pkcs.PKCSException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.ResponseEntity;
@@ -76,17 +78,17 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.security.SignPDFWithCertRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/security")
-@Slf4j
 @Tag(name = "Security", description = "Security APIs")
 public class CertSignController {
 
+    private static final Logger logger = LoggerFactory.getLogger(CertSignController.class);
+
     static {
         Security.addProvider(new BouncyCastleProvider());
     }
@@ -106,7 +108,7 @@ public class CertSignController {
                 logoFile = Files.createTempFile("signature", ".png").toFile();
                 FileUtils.copyInputStreamToFile(is, logoFile);
             } catch (IOException e) {
-                log.error("Failed to load image signature file");
+                logger.error("Failed to load image signature file");
                 throw e;
             }
         }
@@ -210,9 +212,7 @@ public class CertSignController {
     @Operation(
             summary = "Sign PDF with a Digital Certificate",
             description =
-                    "This endpoint accepts a PDF file, a digital certificate and related information to sign"
+                    "This endpoint accepts a PDF file, a digital certificate and related information to sign the PDF. It then returns the digitally signed PDF file. Input:PDF Output:PDF Type:SISO")
-                            + " the PDF. It then returns the digitally signed PDF file. Input:PDF Output:PDF"
-                            + " Type:SISO")
     public ResponseEntity<byte[]> signPDFWithCert(@ModelAttribute SignPDFWithCertRequest request)
             throws Exception {
         MultipartFile pdf = request.getFileInput();
@@ -308,7 +308,7 @@ public class CertSignController {
             }
             doc.saveIncremental(output);
         } catch (Exception e) {
-            log.error("exception", e);
+            logger.error("exception", e);
         }
     }
 

src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java

@@ -56,6 +56,8 @@ import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.xml.DomXmpParser;
 import org.apache.xmpbox.xml.XmpParsingException;
 import org.apache.xmpbox.xml.XmpSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -71,16 +73,16 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/security")
-@Slf4j
 @Tag(name = "Security", description = "Security APIs")
 public class GetInfoOnPDF {
 
+    private static final Logger logger = LoggerFactory.getLogger(GetInfoOnPDF.class);
+
     static ObjectMapper objectMapper = new ObjectMapper();
 
     @PostMapping(consumes = "multipart/form-data", value = "/get-info-on-pdf")
@@ -222,7 +224,7 @@ public class GetInfoOnPDF {
                             javascriptArray.add(jsNode);
                         }
                     } catch (IOException e) {
-                        log.error("exception", e);
+                        logger.error("exception", e);
                     }
                 }
             }
@@ -255,7 +257,7 @@ public class GetInfoOnPDF {
                 }
             } catch (Exception e) {
                 // TODO Auto-generated catch block
-                log.error("exception", e);
+                logger.error("exception", e);
             }
 
             boolean isPdfACompliant = checkForStandard(pdfBoxDoc, "PDF/A");
@@ -307,7 +309,7 @@ public class GetInfoOnPDF {
                     new XmpSerializer().serialize(xmpMeta, os, true);
                     xmpString = new String(os.toByteArray(), StandardCharsets.UTF_8);
                 } catch (XmpParsingException | IOException e) {
-                    log.error("exception", e);
+                    logger.error("exception", e);
                 }
             }
 
@@ -320,14 +322,27 @@ public class GetInfoOnPDF {
                 PDEncryption pdfEncryption = pdfBoxDoc.getEncryption();
                 encryption.put("EncryptionAlgorithm", pdfEncryption.getFilter());
                 encryption.put("KeyLength", pdfEncryption.getLength());
+                AccessPermission ap = pdfBoxDoc.getCurrentAccessPermission();
+                if (ap != null) {
+                    ObjectNode permissionsNode = objectMapper.createObjectNode();
+
+                    permissionsNode.put("CanAssembleDocument", ap.canAssembleDocument());
+                    permissionsNode.put("CanExtractContent", ap.canExtractContent());
+                    permissionsNode.put(
+                            "CanExtractForAccessibility", ap.canExtractForAccessibility());
+                    permissionsNode.put("CanFillInForm", ap.canFillInForm());
+                    permissionsNode.put("CanModify", ap.canModify());
+                    permissionsNode.put("CanModifyAnnotations", ap.canModifyAnnotations());
+                    permissionsNode.put("CanPrint", ap.canPrint());
+
+                    encryption.set(
+                            "Permissions", permissionsNode); // set the node under "Permissions"
+                }
                 // Add other encryption-related properties as needed
             } else {
                 encryption.put("IsEncrypted", false);
             }
 
-            ObjectNode permissionsNode = objectMapper.createObjectNode();
-            setNodePermissions(pdfBoxDoc, permissionsNode);
-
             ObjectNode pageInfoParent = objectMapper.createObjectNode();
             for (int pageNum = 0; pageNum < pdfBoxDoc.getNumberOfPages(); pageNum++) {
                 ObjectNode pageInfo = objectMapper.createObjectNode();
@@ -569,7 +584,6 @@ public class GetInfoOnPDF {
             jsonOutput.set("DocumentInfo", docInfoNode);
             jsonOutput.set("Compliancy", compliancy);
             jsonOutput.set("Encryption", encryption);
-            jsonOutput.set("Permissions", permissionsNode); // set the node under "Permissions"
             jsonOutput.set("Other", other);
             jsonOutput.set("PerPageInfo", pageInfoParent);
 
@@ -583,29 +597,11 @@ public class GetInfoOnPDF {
                     MediaType.APPLICATION_JSON);
 
         } catch (Exception e) {
-            log.error("exception", e);
+            logger.error("exception", e);
         }
         return null;
     }
 
-    private void setNodePermissions(PDDocument pdfBoxDoc, ObjectNode permissionsNode) {
-        AccessPermission ap = pdfBoxDoc.getCurrentAccessPermission();
-
-        permissionsNode.put("Document Assembly", getPermissionState(ap.canAssembleDocument()));
-        permissionsNode.put("Extracting Content", getPermissionState(ap.canExtractContent()));
-        permissionsNode.put(
-                "Extracting for accessibility",
-                getPermissionState(ap.canExtractForAccessibility()));
-        permissionsNode.put("Form Filling", getPermissionState(ap.canFillInForm()));
-        permissionsNode.put("Modifying", getPermissionState(ap.canModify()));
-        permissionsNode.put("Modifying annotations", getPermissionState(ap.canModifyAnnotations()));
-        permissionsNode.put("Printing", getPermissionState(ap.canPrint()));
-    }
-
-    private String getPermissionState(boolean state) {
-        return state ? "Allowed" : "Not Allowed";
-    }
-
     private static void addOutlinesToArray(PDOutlineItem outline, ArrayNode arrayNode) {
         if (outline == null) return;
 
@@ -699,7 +695,7 @@ public class GetInfoOnPDF {
                 Exception
                         e) { // Catching general exception for brevity, ideally you'd catch specific
             // exceptions.
-            log.error("exception", e);
+            logger.error("exception", e);
         }
 
         return false;

src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java

@@ -5,6 +5,8 @@ import java.io.IOException;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
 import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -27,6 +29,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Security", description = "Security APIs")
 public class PasswordController {
 
+    private static final Logger logger = LoggerFactory.getLogger(PasswordController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -38,8 +42,7 @@ public class PasswordController {
     @Operation(
             summary = "Remove password from a PDF file",
             description =
-                    "This endpoint removes the password from a protected PDF file. Users need to provide the"
+                    "This endpoint removes the password from a protected PDF file. Users need to provide the existing password. Input:PDF Output:PDF Type:SISO")
-                            + " existing password. Input:PDF Output:PDF Type:SISO")
     public ResponseEntity<byte[]> removePassword(@ModelAttribute PDFPasswordRequest request)
             throws IOException {
         MultipartFile fileInput = request.getFileInput();
@@ -57,8 +60,7 @@ public class PasswordController {
     @Operation(
             summary = "Add password to a PDF file",
             description =
-                    "This endpoint adds password protection to a PDF file. Users can specify a set of"
+                    "This endpoint adds password protection to a PDF file. Users can specify a set of permissions that should be applied to the file. Input:PDF Output:PDF")
-                            + " permissions that should be applied to the file. Input:PDF Output:PDF")
     public ResponseEntity<byte[]> addPassword(@ModelAttribute AddPasswordRequest request)
             throws IOException {
         MultipartFile fileInput = request.getFileInput();

src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java

@@ -8,6 +8,8 @@ import java.util.List;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,7 +22,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.PDFText;
 import stirling.software.SPDF.model.api.security.RedactPdfRequest;
 import stirling.software.SPDF.pdf.TextFinder;
@@ -30,10 +31,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/security")
-@Slf4j
 @Tag(name = "Security", description = "Security APIs")
 public class RedactController {
 
+    private static final Logger logger = LoggerFactory.getLogger(RedactController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -45,8 +47,7 @@ public class RedactController {
     @Operation(
             summary = "Redacts listOfText in a PDF document",
             description =
-                    "This operation takes an input PDF file and redacts the provided listOfText. Input:PDF,"
+                    "This operation takes an input PDF file and redacts the provided listOfText. Input:PDF, Output:PDF, Type:SISO")
-                            + " Output:PDF, Type:SISO")
     public ResponseEntity<byte[]> redactPdf(@ModelAttribute RedactPdfRequest request)
             throws Exception {
         MultipartFile file = request.getFileInput();
@@ -67,7 +68,7 @@ public class RedactController {
             }
             redactColor = Color.decode(colorString);
         } catch (NumberFormatException e) {
-            log.warn("Invalid color string provided. Using default color BLACK for redaction.");
+            logger.warn("Invalid color string provided. Using default color BLACK for redaction.");
             redactColor = Color.BLACK;
         }
 

src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java

@@ -8,6 +8,8 @@ import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -29,6 +31,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Security", description = "Security APIs")
 public class RemoveCertSignController {
 
+    private static final Logger logger = LoggerFactory.getLogger(RemoveCertSignController.class);
+
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
     @Autowired
@@ -40,8 +44,7 @@ public class RemoveCertSignController {
     @Operation(
             summary = "Remove digital signature from PDF",
             description =
-                    "This endpoint accepts a PDF file and returns the PDF file without the digital signature."
+                    "This endpoint accepts a PDF file and returns the PDF file without the digital signature. Input: PDF, Output: PDF")
-                            + " Input: PDF, Output: PDF")
     public ResponseEntity<byte[]> removeCertSignPDF(@ModelAttribute PDFFile request)
             throws Exception {
         MultipartFile pdf = request.getFileInput();

src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java

@@ -1,180 +0,0 @@
-package stirling.software.SPDF.controller.api.security;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cms.CMSProcessable;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationStore;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.util.Store;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import stirling.software.SPDF.model.api.security.SignatureValidationRequest;
-import stirling.software.SPDF.model.api.security.SignatureValidationResult;
-import stirling.software.SPDF.service.CertificateValidationService;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
-
-@RestController
-@RequestMapping("/api/v1/security")
-@Tag(name = "Security", description = "Security APIs")
-public class ValidateSignatureController {
-
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-    private final CertificateValidationService certValidationService;
-
-    @Autowired
-    public ValidateSignatureController(
-            CustomPDDocumentFactory pdfDocumentFactory,
-            CertificateValidationService certValidationService) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-        this.certValidationService = certValidationService;
-    }
-
-    @Operation(
-            summary = "Validate PDF Digital Signature",
-            description =
-                    "Validates the digital signatures in a PDF file against default or custom certificates. Input:PDF Output:JSON Type:SISO")
-    @PostMapping(value = "/validate-signature")
-    public ResponseEntity<List<SignatureValidationResult>> validateSignature(
-            @ModelAttribute SignatureValidationRequest request) throws IOException {
-        List<SignatureValidationResult> results = new ArrayList<>();
-        MultipartFile file = request.getFileInput();
-
-        // Load custom certificate if provided
-        X509Certificate customCert = null;
-        if (request.getCertFile() != null && !request.getCertFile().isEmpty()) {
-            try (ByteArrayInputStream certStream =
-                    new ByteArrayInputStream(request.getCertFile().getBytes())) {
-                CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                customCert = (X509Certificate) cf.generateCertificate(certStream);
-            } catch (CertificateException e) {
-                throw new RuntimeException("Invalid certificate file: " + e.getMessage());
-            }
-        }
-
-        try (PDDocument document = pdfDocumentFactory.load(file.getInputStream())) {
-            List<PDSignature> signatures = document.getSignatureDictionaries();
-
-            for (PDSignature sig : signatures) {
-                SignatureValidationResult result = new SignatureValidationResult();
-
-                try {
-                    byte[] signedContent = sig.getSignedContent(file.getInputStream());
-                    byte[] signatureBytes = sig.getContents(file.getInputStream());
-
-                    CMSProcessable content = new CMSProcessableByteArray(signedContent);
-                    CMSSignedData signedData = new CMSSignedData(content, signatureBytes);
-
-                    Store<X509CertificateHolder> certStore = signedData.getCertificates();
-                    SignerInformationStore signerStore = signedData.getSignerInfos();
-
-                    for (SignerInformation signer : signerStore.getSigners()) {
-                        X509CertificateHolder certHolder =
-                                (X509CertificateHolder)
-                                        certStore.getMatches(signer.getSID()).iterator().next();
-                        X509Certificate cert =
-                                new JcaX509CertificateConverter().getCertificate(certHolder);
-
-                        boolean isValid =
-                                signer.verify(new JcaSimpleSignerInfoVerifierBuilder().build(cert));
-                        result.setValid(isValid);
-
-                        // Additional validations
-                        result.setChainValid(
-                                customCert != null
-                                        ? certValidationService
-                                                .validateCertificateChainWithCustomCert(
-                                                        cert, customCert)
-                                        : certValidationService.validateCertificateChain(cert));
-
-                        result.setTrustValid(
-                                customCert != null
-                                        ? certValidationService.validateTrustWithCustomCert(
-                                                cert, customCert)
-                                        : certValidationService.validateTrustStore(cert));
-
-                        result.setNotRevoked(!certValidationService.isRevoked(cert));
-                        result.setNotExpired(!cert.getNotAfter().before(new Date()));
-
-                        // Set basic signature info
-                        result.setSignerName(sig.getName());
-                        result.setSignatureDate(sig.getSignDate().getTime().toString());
-                        result.setReason(sig.getReason());
-                        result.setLocation(sig.getLocation());
-
-                        // Set new certificate details
-                        result.setIssuerDN(cert.getIssuerX500Principal().getName());
-                        result.setSubjectDN(cert.getSubjectX500Principal().getName());
-                        result.setSerialNumber(cert.getSerialNumber().toString(16)); // Hex format
-                        result.setValidFrom(cert.getNotBefore().toString());
-                        result.setValidUntil(cert.getNotAfter().toString());
-                        result.setSignatureAlgorithm(cert.getSigAlgName());
-
-                        // Get key size (if possible)
-                        try {
-                            result.setKeySize(
-                                    ((RSAPublicKey) cert.getPublicKey()).getModulus().bitLength());
-                        } catch (Exception e) {
-                            // If not RSA or error, set to 0
-                            result.setKeySize(0);
-                        }
-
-                        result.setVersion(String.valueOf(cert.getVersion()));
-
-                        // Set key usage
-                        List<String> keyUsages = new ArrayList<>();
-                        boolean[] keyUsageFlags = cert.getKeyUsage();
-                        if (keyUsageFlags != null) {
-                            String[] keyUsageLabels = {
-                                "Digital Signature", "Non-Repudiation", "Key Encipherment",
-                                "Data Encipherment", "Key Agreement", "Certificate Signing",
-                                "CRL Signing", "Encipher Only", "Decipher Only"
-                            };
-                            for (int i = 0; i < keyUsageFlags.length; i++) {
-                                if (keyUsageFlags[i]) {
-                                    keyUsages.add(keyUsageLabels[i]);
-                                }
-                            }
-                        }
-                        result.setKeyUsages(keyUsages);
-
-                        // Check if self-signed
-                        result.setSelfSigned(
-                                cert.getSubjectX500Principal()
-                                        .equals(cert.getIssuerX500Principal()));
-                    }
-                } catch (Exception e) {
-                    result.setValid(false);
-                    result.setErrorMessage("Signature validation failed: " + e.getMessage());
-                }
-
-                results.add(result);
-            }
-        }
-
-        return ResponseEntity.ok(results);
-    }
-}

src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java

@@ -69,7 +69,6 @@ public class WatermarkController {
         float opacity = request.getOpacity();
         int widthSpacer = request.getWidthSpacer();
         int heightSpacer = request.getHeightSpacer();
-        String customColor = request.getCustomColor();
         boolean convertPdfToImage = request.isConvertPDFToImage();
 
         // Load the input PDF
@@ -98,8 +97,7 @@ public class WatermarkController {
                         widthSpacer,
                         heightSpacer,
                         fontSize,
-                        alphabet,
+                        alphabet);
-                        customColor);
             } else if ("image".equalsIgnoreCase(watermarkType)) {
                 addImageWatermark(
                         contentStream,
@@ -138,8 +136,7 @@ public class WatermarkController {
             int widthSpacer,
             int heightSpacer,
             float fontSize,
-            String alphabet,
+            String alphabet)
-            String colorString)
             throws IOException {
         String resourceDir = "";
         PDFont font = new PDType1Font(Standard14Fonts.FontName.HELVETICA);
@@ -176,18 +173,7 @@ public class WatermarkController {
         }
 
         contentStream.setFont(font, fontSize);
-
+        contentStream.setNonStrokingColor(Color.LIGHT_GRAY);
-        Color redactColor;
-        try {
-            if (!colorString.startsWith("#")) {
-                colorString = "#" + colorString;
-            }
-            redactColor = Color.decode(colorString);
-        } catch (NumberFormatException e) {
-
-            redactColor = Color.LIGHT_GRAY;
-        }
-        contentStream.setNonStrokingColor(redactColor);
 
         String[] textLines = watermarkText.split("\\\\n");
         float maxLineWidth = 0;

src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -15,6 +15,8 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -29,16 +31,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
 import stirling.software.SPDF.model.SignatureFile;
 import stirling.software.SPDF.service.SignatureService;
 
 @Controller
 @Tag(name = "General", description = "General APIs")
-@Slf4j
 public class GeneralWebController {
 
+    private static final Logger logger = LoggerFactory.getLogger(GeneralWebController.class);
+
     @GetMapping("/pipeline")
     @Hidden
     public String pipelineForm(Model model) {
@@ -80,7 +82,7 @@ public class GeneralWebController {
                 }
 
             } catch (IOException e) {
-                log.error("exception", e);
+                logger.error("exception", e);
             }
         }
         if (pipelineConfigsWithNames.size() == 0) {

src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java

@@ -6,6 +6,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -20,14 +22,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.Hidden;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.Dependency;
 
 @Controller
-@Slf4j
 public class HomeWebController {
 
+    private static final Logger logger = LoggerFactory.getLogger(HomeWebController.class);
+
     @GetMapping("/about")
     @Hidden
     public String gameForm(Model model) {
@@ -48,7 +50,7 @@ public class HomeWebController {
                     mapper.readValue(json, new TypeReference<Map<String, List<Dependency>>>() {});
             model.addAttribute("dependencies", data.get("dependencies"));
         } catch (IOException e) {
-            log.error("exception", e);
+            logger.error("exception", e);
         }
         return "licenses";
     }

src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java

@@ -53,13 +53,6 @@ public class SecurityWebController {
         return "security/cert-sign";
     }
 
-    @GetMapping("/validate-signature")
-    @Hidden
-    public String certSignVerifyForm(Model model) {
-        model.addAttribute("currentPage", "validate-signature");
-        return "security/validate-signature";
-    }
-
     @GetMapping("/remove-cert-sign")
     @Hidden
     public String certUnSignForm(Model model) {

src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

@@ -73,7 +73,6 @@ public class ApplicationProperties {
         private int loginAttemptCount;
         private long loginResetTimeMinutes;
         private String loginMethod = "all";
-        private String customGlobalAPIKey;
 
         public Boolean isAltLogin() {
             return saml2.getEnabled() || oauth2.getEnabled();
@@ -122,19 +121,18 @@ public class ApplicationProperties {
 
         @Getter
         @Setter
-        @ToString
         public static class SAML2 {
             private Boolean enabled = false;
             private Boolean autoCreateUser = false;
             private Boolean blockRegistration = false;
             private String registrationId = "stirling";
-            @ToString.Exclude private String idpMetadataUri;
+            private String idpMetadataUri;
             private String idpSingleLogoutUrl;
             private String idpSingleLoginUrl;
             private String idpIssuer;
             private String idpCert;
-            @ToString.Exclude private String privateKey;
+            private String privateKey;
-            @ToString.Exclude private String spCert;
+            private String spCert;
 
             public InputStream getIdpMetadataUri() throws IOException {
                 if (idpMetadataUri.startsWith("classpath:")) {
@@ -287,7 +285,6 @@ public class ApplicationProperties {
     public static class AutomaticallyGenerated {
         @ToString.Exclude private String key;
         private String UUID;
-        private String appVersion;
     }
 
     @Data

src/main/java/stirling/software/SPDF/model/AuthenticationType.java

@@ -2,5 +2,5 @@ package stirling.software.SPDF.model;
 
 public enum AuthenticationType {
     WEB,
-    SSO
+    OAUTH2
 }

src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -12,20 +14,18 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.utils.GeneralUtils;
 
 @Data
 @NoArgsConstructor
-@Slf4j
 @EqualsAndHashCode(callSuper = true)
 public class PDFWithPageNums extends PDFFile {
 
+    private static final Logger logger = LoggerFactory.getLogger(PDFWithPageNums.class);
+
     @Schema(
             description =
-                    "The pages to select, Supports ranges (e.g., '1,3,5-9'), or 'all' or functions in the"
+                    "The pages to select, Supports ranges (e.g., '1,3,5-9'), or 'all' or functions in the format 'an+b' where 'a' is the multiplier of the page number 'n', and 'b' is a constant (e.g., '2n+1', '3n', '6n-5')\"")
-                            + " format 'an+b' where 'a' is the multiplier of the page number 'n', and 'b' is a"
-                            + " constant (e.g., '2n+1', '3n', '6n-5')\"")
     private String pageNumbers;
 
     @Hidden
@@ -35,7 +35,7 @@ public class PDFWithPageNums extends PDFFile {
             pageCount = Loader.loadPDF(getFileInput().getBytes()).getNumberOfPages();
         } catch (IOException e) {
             // TODO Auto-generated catch block
-            log.error("exception", e);
+            logger.error("exception", e);
         }
         return GeneralUtils.parsePageList(pageNumbers, pageCount, zeroCount);
     }

src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java

@@ -45,9 +45,6 @@ public class AddWatermarkRequest extends PDFFile {
     @Schema(description = "The height spacer between watermark elements", example = "50")
     private int heightSpacer;
 
-    @Schema(description = "The color for watermark", defaultValue = "#d3d3d3")
-    private String customColor = "#d3d3d3";
-
     @Schema(description = "Convert the redacted PDF to an image", defaultValue = "false")
     private boolean convertPDFToImage;
 }

src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationRequest.java

@@ -1,17 +0,0 @@
-package stirling.software.SPDF.model.api.security;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import stirling.software.SPDF.model.api.PDFFile;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class SignatureValidationRequest extends PDFFile {
-
-    @Schema(description = "(Optional) file to compare PDF cert signatures against x.509 format")
-    private MultipartFile certFile;
-}

src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationResult.java

@@ -1,30 +0,0 @@
-package stirling.software.SPDF.model.api.security;
-
-import java.util.List;
-
-import lombok.Data;
-
-@Data
-public class SignatureValidationResult {
-    private boolean valid;
-    private String signerName;
-    private String signatureDate;
-    private String reason;
-    private String location;
-    private String errorMessage;
-    private boolean chainValid;
-    private boolean trustValid;
-    private boolean notExpired;
-    private boolean notRevoked;
-
-    private String issuerDN; // Certificate issuer's Distinguished Name
-    private String subjectDN; // Certificate subject's Distinguished Name
-    private String serialNumber; // Certificate serial number
-    private String validFrom; // Certificate validity start date
-    private String validUntil; // Certificate validity end date
-    private String signatureAlgorithm; // Algorithm used for signing
-    private int keySize; // Key size in bits
-    private String version; // Certificate version
-    private List<String> keyUsages; // List of key usage purposes
-    private boolean isSelfSigned; // Whether the certificate is self-signed
-}

src/main/java/stirling/software/SPDF/repository/UserRepository.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.repository;
 
-import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -20,6 +19,4 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByUsername(String username);
 
     Optional<User> findByApiKey(String apiKey);
-
-    List<User> findByAuthenticationTypeIgnoreCase(String authenticationType);
 }

src/main/java/stirling/software/SPDF/service/CertificateValidationService.java

@@ -1,158 +0,0 @@
-package stirling.software.SPDF.service;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathValidator;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateNotYetValidException;
-import java.security.cert.PKIXParameters;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.stereotype.Service;
-
-import io.github.pixee.security.BoundedLineReader;
-
-import jakarta.annotation.PostConstruct;
-
-@Service
-public class CertificateValidationService {
-    private KeyStore trustStore;
-
-    @PostConstruct
-    private void initializeTrustStore() throws Exception {
-        trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
-        trustStore.load(null, null);
-        loadMozillaCertificates();
-    }
-
-    private void loadMozillaCertificates() throws Exception {
-        try (InputStream is = getClass().getResourceAsStream("/certdata.txt")) {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-            String line;
-            StringBuilder certData = new StringBuilder();
-            boolean inCert = false;
-            int certCount = 0;
-
-            while ((line = BoundedLineReader.readLine(reader, 5_000_000)) != null) {
-                if (line.startsWith("CKA_VALUE MULTILINE_OCTAL")) {
-                    inCert = true;
-                    certData = new StringBuilder();
-                    continue;
-                }
-                if (inCert) {
-                    if ("END".equals(line)) {
-                        inCert = false;
-                        byte[] certBytes = parseOctalData(certData.toString());
-                        if (certBytes != null) {
-                            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                            X509Certificate cert =
-                                    (X509Certificate)
-                                            cf.generateCertificate(
-                                                    new ByteArrayInputStream(certBytes));
-                            trustStore.setCertificateEntry("mozilla-cert-" + certCount++, cert);
-                        }
-                    } else {
-                        certData.append(line).append("\n");
-                    }
-                }
-            }
-        }
-    }
-
-    private byte[] parseOctalData(String data) {
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            String[] tokens = data.split("\\\\");
-            for (String token : tokens) {
-                token = token.trim();
-                if (!token.isEmpty()) {
-                    baos.write(Integer.parseInt(token, 8));
-                }
-            }
-            return baos.toByteArray();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    public boolean validateCertificateChain(X509Certificate cert) {
-        try {
-            CertPathValidator validator = CertPathValidator.getInstance("PKIX");
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            List<X509Certificate> certList = Arrays.asList(cert);
-            CertPath certPath = cf.generateCertPath(certList);
-
-            Set<TrustAnchor> anchors = new HashSet<>();
-            Enumeration<String> aliases = trustStore.aliases();
-            while (aliases.hasMoreElements()) {
-                Object trustCert = trustStore.getCertificate(aliases.nextElement());
-                if (trustCert instanceof X509Certificate) {
-                    anchors.add(new TrustAnchor((X509Certificate) trustCert, null));
-                }
-            }
-
-            PKIXParameters params = new PKIXParameters(anchors);
-            params.setRevocationEnabled(false);
-            validator.validate(certPath, params);
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    public boolean validateTrustStore(X509Certificate cert) {
-        try {
-            Enumeration<String> aliases = trustStore.aliases();
-            while (aliases.hasMoreElements()) {
-                Object trustCert = trustStore.getCertificate(aliases.nextElement());
-                if (trustCert instanceof X509Certificate && cert.equals(trustCert)) {
-                    return true;
-                }
-            }
-            return false;
-        } catch (KeyStoreException e) {
-            return false;
-        }
-    }
-
-    public boolean isRevoked(X509Certificate cert) {
-        try {
-            cert.checkValidity();
-            return false;
-        } catch (CertificateExpiredException | CertificateNotYetValidException e) {
-            return true;
-        }
-    }
-
-    public boolean validateCertificateChainWithCustomCert(
-            X509Certificate cert, X509Certificate customCert) {
-        try {
-            cert.verify(customCert.getPublicKey());
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    public boolean validateTrustWithCustomCert(X509Certificate cert, X509Certificate customCert) {
-        try {
-            // Compare the issuer of the signature certificate with the custom certificate
-            return cert.getIssuerX500Principal().equals(customCert.getSubjectX500Principal());
-        } catch (Exception e) {
-            return false;
-        }
-    }
-}

src/main/java/stirling/software/SPDF/service/CustomPDDocumentFactory.java

@@ -7,18 +7,20 @@ import java.io.InputStream;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.PdfMetadata;
 import stirling.software.SPDF.model.api.PDFFile;
 
 @Component
-@Slf4j
 public class CustomPDDocumentFactory {
 
+    private static final Logger logger = LoggerFactory.getLogger(CustomPDDocumentFactory.class);
+
     private final PdfMetadataService pdfMetadataService;
 
     @Autowired
@@ -131,10 +133,10 @@ public class CustomPDDocumentFactory {
     private PDDocument removezeropassword(PDDocument document) throws IOException {
         if (document.isEncrypted()) {
             try {
-                log.info("Removing security from the source document");
+                logger.info("Removing security from the source document");
                 document.setAllSecurityToBeRemoved(true);
             } catch (Exception e) {
-                log.warn("Cannot decrypt the pdf");
+                logger.warn("Cannot decrypt the pdf");
             }
         }
         return document;

src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java

@@ -24,7 +24,7 @@ public class MetricsAggregatorService {
         this.postHogService = postHogService;
     }
 
-    @Scheduled(fixedRate = 7200000) // Run every 2 hours
+    @Scheduled(fixedRate = 1800000) // Run every 30 minutes
     public void aggregateAndSendMetrics() {
         Map<String, Object> metrics = new HashMap<>();
         Search.in(meterRegistry)
@@ -39,13 +39,6 @@ public class MetricsAggregatorService {
                             if (method == null || uri == null) {
                                 return;
                             }
-                            if (!method.equals("GET") && !method.equals("POST")) {
-                                return;
-                            }
-                            // Skip URIs that are 2 characters or shorter
-                            if (uri.length() <= 2) {
-                                return;
-                            }
 
                             String key =
                                     String.format(

src/main/java/stirling/software/SPDF/service/PdfMetadataService.java

@@ -17,18 +17,15 @@ public class PdfMetadataService {
     private final ApplicationProperties applicationProperties;
     private final String stirlingPDFLabel;
     private final UserServiceInterface userService;
-    private final boolean runningEE;
 
     @Autowired
     public PdfMetadataService(
             ApplicationProperties applicationProperties,
             @Qualifier("StirlingPDFLabel") String stirlingPDFLabel,
-            @Qualifier("runningEE") boolean runningEE,
             @Autowired(required = false) UserServiceInterface userService) {
         this.applicationProperties = applicationProperties;
         this.stirlingPDFLabel = stirlingPDFLabel;
         this.userService = userService;
-        this.runningEE = runningEE;
     }
 
     public PdfMetadata extractMetadataFromPdf(PDDocument pdf) {
@@ -64,8 +61,10 @@ public class PdfMetadataService {
 
         String creator = stirlingPDFLabel;
 
-        if (applicationProperties.getEnterpriseEdition().getCustomMetadata().isAutoUpdateMetadata()
+        if (applicationProperties
-                && runningEE) {
+                .getEnterpriseEdition()
+                .getCustomMetadata()
+                .isAutoUpdateMetadata()) {
 
             creator = applicationProperties.getEnterpriseEdition().getCustomMetadata().getCreator();
             pdf.getDocumentInformation().setProducer(stirlingPDFLabel);
@@ -84,8 +83,10 @@ public class PdfMetadataService {
         pdf.getDocumentInformation().setModificationDate(Calendar.getInstance());
 
         String author = pdfMetadata.getAuthor();
-        if (applicationProperties.getEnterpriseEdition().getCustomMetadata().isAutoUpdateMetadata()
+        if (applicationProperties
-                && runningEE) {
+                .getEnterpriseEdition()
+                .getCustomMetadata()
+                .isAutoUpdateMetadata()) {
             author = applicationProperties.getEnterpriseEdition().getCustomMetadata().getAuthor();
 
             if (userService != null) {

src/main/java/stirling/software/SPDF/service/PostHogService.java

@@ -31,13 +31,11 @@ public class PostHogService {
     private final ApplicationProperties applicationProperties;
     private final UserServiceInterface userService;
     private final Environment env;
-    private boolean configDirMounted;
 
     @Autowired
     public PostHogService(
             PostHog postHog,
             @Qualifier("UUID") String uuid,
-            @Qualifier("configDirMounted") boolean configDirMounted,
             @Qualifier("appVersion") String appVersion,
             ApplicationProperties applicationProperties,
             @Autowired(required = false) UserServiceInterface userService,
@@ -48,7 +46,6 @@ public class PostHogService {
         this.applicationProperties = applicationProperties;
         this.userService = userService;
         this.env = env;
-        this.configDirMounted = configDirMounted;
         captureSystemInfo();
     }
 
@@ -83,7 +80,6 @@ public class PostHogService {
                 deploymentType = "DOCKER";
             }
             metrics.put("deployment_type", deploymentType);
-            metrics.put("mounted_config_dir", configDirMounted);
 
             // System info
             metrics.put("os_name", System.getProperty("os.name"));

src/main/java/stirling/software/SPDF/utils/FileMonitor.java

@@ -9,17 +9,16 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import lombok.extern.slf4j.Slf4j;
-
 @Component
-@Slf4j
 public class FileMonitor {
-
+    private static final Logger logger = LoggerFactory.getLogger(FileMonitor.class);
     private final Map<Path, WatchKey> path2KeyMapping;
     private final Set<Path> newlyDiscoveredFiles;
     private final ConcurrentHashMap.KeySetView<Path, Boolean> readyForProcessingFiles;
@@ -54,7 +53,7 @@ public class FileMonitor {
     private void recursivelyRegisterEntry(Path dir) throws IOException {
         WatchKey key = dir.register(watchService, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
         path2KeyMapping.put(dir, key);
-        log.info("Registered directory: {}", dir);
+        logger.info("Registered directory: {}", dir);
 
         try (Stream<Path> directoryVisitor = Files.walk(dir, 1)) {
             final Iterator<Path> iterator = directoryVisitor.iterator();
@@ -81,13 +80,14 @@ public class FileMonitor {
         readyForProcessingFiles.clear();
 
         if (path2KeyMapping.isEmpty()) {
-            log.warn("not monitoring any directory, even the root directory itself: {}", rootDir);
+            logger.warn(
+                    "not monitoring any directory, even the root directory itself: {}", rootDir);
             if (Files.exists(
                     rootDir)) { // if the root directory exists, re-register the root directory
                 try {
                     recursivelyRegisterEntry(rootDir);
                 } catch (IOException e) {
-                    log.error("unable to register monitoring", e);
+                    logger.error("unable to register monitoring", e);
                 }
             }
         }
@@ -122,7 +122,7 @@ public class FileMonitor {
                                         handleFileModification(relativePathFromRoot);
                                     }
                                 } catch (Exception e) {
-                                    log.error("Error while processing file: {}", path, e);
+                                    logger.error("Error while processing file: {}", path, e);
                                 }
                             });
 

src/main/java/stirling/software/SPDF/utils/FileToPdf.java

@@ -105,7 +105,7 @@ public class FileToPdf {
                         new ByteArrayInputStream(Files.readAllBytes(zipFilePath)))) {
             ZipEntry entry = zipIn.getNextEntry();
             while (entry != null) {
-                Path filePath = tempUnzippedDir.resolve(sanitizeZipFilename(entry.getName()));
+                Path filePath = tempUnzippedDir.resolve(entry.getName());
                 if (!entry.isDirectory()) {
                     Files.createDirectories(filePath.getParent());
                     if (entry.getName().toLowerCase().endsWith(".html")
@@ -175,7 +175,7 @@ public class FileToPdf {
                 ZipSecurity.createHardenedInputStream(new ByteArrayInputStream(fileBytes))) {
             ZipEntry entry = zipIn.getNextEntry();
             while (entry != null) {
-                Path filePath = tempDirectory.resolve(sanitizeZipFilename(entry.getName()));
+                Path filePath = tempDirectory.resolve(entry.getName());
                 if (entry.isDirectory()) {
                     Files.createDirectories(filePath); // Explicitly create the directory structure
                 } else {
@@ -241,14 +241,4 @@ public class FileToPdf {
             Files.deleteIfExists(tempOutputFile);
         }
     }
-
-    static String sanitizeZipFilename(String entryName) {
-        if (entryName == null || entryName.trim().isEmpty()) {
-            return entryName;
-        }
-        while (entryName.contains("../") || entryName.contains("..\\")) {
-            entryName = entryName.replace("../", "").replace("..\\", "");
-        }
-        return entryName;
-    }
 }

src/main/java/stirling/software/SPDF/utils/GeneralUtils.java

@@ -27,6 +27,8 @@ import org.simpleyaml.configuration.file.YamlFile;
 import org.simpleyaml.configuration.file.YamlFileWrapper;
 import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
 import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fathzer.soft.javaluator.DoubleEvaluator;
@@ -34,11 +36,10 @@ import com.fathzer.soft.javaluator.DoubleEvaluator;
 import io.github.pixee.security.HostValidator;
 import io.github.pixee.security.Urls;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 public class GeneralUtils {
 
+    private static final Logger logger = LoggerFactory.getLogger(GeneralUtils.class);
+
     public static File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
         File tempFile = Files.createTempFile("temp", null).toFile();
         try (FileOutputStream os = new FileOutputStream(tempFile)) {
@@ -87,50 +88,15 @@ public class GeneralUtils {
 
     public static boolean isURLReachable(String urlStr) {
         try {
-            // Parse the URL
             URL url = URI.create(urlStr).toURL();
-
-            // Allow only http and https protocols
-            String protocol = url.getProtocol();
-            if (!protocol.equals("http") && !protocol.equals("https")) {
-                return false; // Disallow other protocols
-            }
-
-            // Check if the host is a local address
-            String host = url.getHost();
-            if (isLocalAddress(host)) {
-                return false; // Exclude local addresses
-            }
-
-            // Check if the URL is reachable
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("HEAD");
-            // connection.setConnectTimeout(5000); // Set connection timeout
-            // connection.setReadTimeout(5000);    // Set read timeout
             int responseCode = connection.getResponseCode();
             return (200 <= responseCode && responseCode <= 399);
-        } catch (Exception e) {
+        } catch (MalformedURLException e) {
-            return false; // Return false in case of any exception
+            return false;
-        }
+        } catch (IOException e) {
-    }
+            return false;
-
-    private static boolean isLocalAddress(String host) {
-        try {
-            // Resolve DNS to IP address
-            InetAddress address = InetAddress.getByName(host);
-
-            // Check for local addresses
-            return address.isAnyLocalAddress()
-                    || // Matches 0.0.0.0 or similar
-                    address.isLoopbackAddress()
-                    || // Matches 127.0.0.1 or ::1
-                    address.isSiteLocalAddress()
-                    || // Matches private IPv4 ranges: 192.168.x.x, 10.x.x.x, 172.16.x.x to
-                    // 172.31.x.x
-                    address.getHostAddress()
-                            .startsWith("fe80:"); // Matches link-local IPv6 addresses
-        } catch (Exception e) {
-            return false; // Return false for invalid or unresolved addresses
         }
     }
 
@@ -300,7 +266,7 @@ public class GeneralUtils {
             try {
                 Files.createDirectories(folder);
             } catch (IOException e) {
-                log.error("exception", e);
+                logger.error("exception", e);
                 return false;
             }
         }
@@ -323,10 +289,6 @@ public class GeneralUtils {
         saveKeyToConfig(id, key, true);
     }
 
-    public static void saveKeyToConfig(String id, boolean key) throws IOException {
-        saveKeyToConfig(id, key, true);
-    }
-
     public static void saveKeyToConfig(String id, String key, boolean autoGenerated)
             throws IOException {
         Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml
@@ -345,24 +307,6 @@ public class GeneralUtils {
         settingsYml.save();
     }
 
-    public static void saveKeyToConfig(String id, boolean key, boolean autoGenerated)
-            throws IOException {
-        Path path = Paths.get("configs", "settings.yml");
-
-        final YamlFile settingsYml = new YamlFile(path.toFile());
-        DumperOptions yamlOptionssettingsYml =
-                ((SimpleYamlImplementation) settingsYml.getImplementation()).getDumperOptions();
-        yamlOptionssettingsYml.setSplitLines(false);
-
-        settingsYml.loadWithComments();
-
-        YamlFileWrapper writer = settingsYml.path(id).set(key);
-        if (autoGenerated) {
-            writer.comment("# Automatically Generated Settings (Do Not Edit Directly)");
-        }
-        settingsYml.save();
-    }
-
     public static String generateMachineFingerprint() {
         try {
             // Get the MAC address
@@ -405,33 +349,4 @@ public class GeneralUtils {
             return "GenericID";
         }
     }
-
-    public static boolean isVersionHigher(String currentVersion, String compareVersion) {
-        if (currentVersion == null || compareVersion == null) {
-            return false;
-        }
-
-        // Split versions into components
-        String[] current = currentVersion.split("\\.");
-        String[] compare = compareVersion.split("\\.");
-
-        // Get the length of the shorter version array
-        int length = Math.min(current.length, compare.length);
-
-        // Compare each component
-        for (int i = 0; i < length; i++) {
-            int currentPart = Integer.parseInt(current[i]);
-            int comparePart = Integer.parseInt(compare[i]);
-
-            if (currentPart > comparePart) {
-                return true;
-            }
-            if (currentPart < comparePart) {
-                return false;
-            }
-        }
-
-        // If all components so far are equal, the longer version is considered higher
-        return current.length > compare.length;
-    }
 }

src/main/java/stirling/software/SPDF/utils/ImageProcessingUtils.java

@@ -12,6 +12,8 @@ import java.nio.ByteBuffer;
 
 import javax.imageio.ImageIO;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.drew.imaging.ImageMetadataReader;
@@ -20,11 +22,10 @@ import com.drew.metadata.Metadata;
 import com.drew.metadata.MetadataException;
 import com.drew.metadata.exif.ExifSubIFDDirectory;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 public class ImageProcessingUtils {
 
+    private static final Logger logger = LoggerFactory.getLogger(PdfUtils.class);
+
     static BufferedImage convertColorType(BufferedImage sourceImage, String colorType) {
         BufferedImage convertedImage;
         switch (colorType) {
@@ -96,7 +97,7 @@ public class ImageProcessingUtils {
                 case 8:
                     return 270;
                 default:
-                    log.warn("Unknown orientation tag: {}", orientationTag);
+                    logger.warn("Unknown orientation tag: {}", orientationTag);
                     return 0;
             }
         } catch (ImageProcessingException | MetadataException e) {