.github/workflows/PR-Demo-Comment-with-react.yml

@@ -37,7 +37,7 @@ jobs:
       pr_repository: ${{ steps.get-pr-info.outputs.repository }}
       pr_ref: ${{ steps.get-pr-info.outputs.ref }}
       comment_id: ${{ github.event.comment.id }}
-      disable_security: ${{ steps.check-security-flag.outputs.disable_security }}
+      enable_security: ${{ steps.check-security-flag.outputs.enable_security }}
 
     steps:
       - name: Harden Runner
@@ -92,10 +92,10 @@ jobs:
         run: |
           if [[ "$COMMENT_BODY" == *"security"* ]] || [[ "$COMMENT_BODY" == *"login"* ]]; then
             echo "Security flags detected in comment"
-            echo "disable_security=false" >> $GITHUB_OUTPUT
+            echo "enable_security=true" >> $GITHUB_OUTPUT
           else
             echo "No security flags detected in comment"
-            echo "disable_security=true" >> $GITHUB_OUTPUT
+            echo "enable_security=false" >> $GITHUB_OUTPUT
           fi
 
       - name: Add 'in_progress' reaction to comment
@@ -155,10 +155,10 @@ jobs:
 
       - name: Run Gradle Command
         run: |
-          if [ "${{ needs.check-comment.outputs.disable_security }}" == "true" ]; then
+          if [ "${{ needs.check-comment.outputs.enable_security }}" == "true" ]; then
-            export DISABLE_ADDITIONAL_FEATURES=true
+            export DOCKER_ENABLE_SECURITY=true
           else
-            export DISABLE_ADDITIONAL_FEATURES=false
+            export DOCKER_ENABLE_SECURITY=false
           fi
           ./gradlew clean build
         env:
@@ -199,7 +199,7 @@ jobs:
         id: deploy
         run: |
           # Set security settings based on flags
-          if [ "${{ needs.check-comment.outputs.disable_security }}" == "false" ]; then
+          if [ "${{ needs.check-comment.outputs.enable_security }}" == "true" ]; then
             DOCKER_SECURITY="true"
             LOGIN_SECURITY="true"
             SECURITY_STATUS="🔒 Security Enabled"
@@ -223,7 +223,7 @@ jobs:
                 - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/config:/configs:rw
                 - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/logs:/logs:rw
               environment:
-                DISABLE_ADDITIONAL_FEATURES: "${DOCKER_SECURITY}"
+                DOCKER_ENABLE_SECURITY: "${DOCKER_SECURITY}"
                 SECURITY_ENABLELOGIN: "${LOGIN_SECURITY}"
                 SYSTEM_DEFAULTLOCALE: en-GB
                 UI_APPNAME: "Stirling-PDF PR#${{ needs.check-comment.outputs.pr_number }}"

.github/workflows/build.yml

@@ -40,12 +40,12 @@ jobs:
       - name: Build with Gradle and no spring security
         run: ./gradlew clean build
         env:
-          DISABLE_ADDITIONAL_FEATURES: true
+          DOCKER_ENABLE_SECURITY: false
 
       - name: Build with Gradle and with spring security
         run: ./gradlew clean build
         env:
-          DISABLE_ADDITIONAL_FEATURES: false
+          DOCKER_ENABLE_SECURITY: true
 
       - name: Upload Test Reports
         if: always()

.github/workflows/multiOSReleases.yml

@@ -48,11 +48,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "-with-login"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     steps:
       - name: Harden Runner
@@ -72,10 +72,10 @@ jobs:
         with:
           gradle-version: 8.14
 
-      - name: Generate jar (Disable Security=${{ matrix.disable_security }})
+      - name: Generate jar (With Security=${{ matrix.enable_security }})
         run: ./gradlew clean createExe
         env:
-          DISABLE_ADDITIONAL_FEATURES: ${{ matrix.disable_security }}
+          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Rename binaries
@@ -98,11 +98,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "with-login-"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     steps:
       - name: Harden Runner
@@ -171,7 +171,7 @@ jobs:
       - name: Build Installer
         run: ./gradlew build jpackage -x test --info
         env:
-          DISABLE_ADDITIONAL_FEATURES: true
+          DOCKER_ENABLE_SECURITY: false
           STIRLING_PDF_DESKTOP_UI: true
           BROWSER_OPEN: true
 

.github/workflows/push-docker.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Run Gradle Command
         run: ./gradlew clean build
         env:
-          DISABLE_ADDITIONAL_FEATURES: true
+          DOCKER_ENABLE_SECURITY: false
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Install cosign

.github/workflows/releaseArtifacts.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "-with-login"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     outputs:
       version: ${{ steps.versionNumber.outputs.versionNumber }}
@@ -39,10 +39,10 @@ jobs:
         with:
           gradle-version: 8.14
 
-      - name: Generate jar (Disable Security=${{ matrix.disable_security }})
+      - name: Generate jar (With Security=${{ matrix.enable_security }})
         run: ./gradlew clean createExe
         env:
-          DISABLE_ADDITIONAL_FEATURES: ${{ matrix.disable_security }}
+          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Get version number
@@ -75,11 +75,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "-with-login"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     steps:
       - name: Harden Runner
@@ -153,11 +153,11 @@ jobs:
       contents: write
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "-with-login"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     steps:
       - name: Harden Runner

.github/workflows/sonarqube.yml

@@ -33,7 +33,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          DISABLE_ADDITIONAL_FEATURES: false
+          DOCKER_ENABLE_SECURITY: true
           STIRLING_PDF_DESKTOP_UI: true
         run: |
           ./gradlew clean build sonar \

.github/workflows/testdriver.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew clean build
         env:
-          DISABLE_ADDITIONAL_FEATURES: true
+          DOCKER_ENABLE_SECURITY: false
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
@@ -76,7 +76,7 @@ jobs:
                 - /stirling/test-${{ github.sha }}/config:/configs:rw
                 - /stirling/test-${{ github.sha }}/logs:/logs:rw
               environment:
-                DISABLE_ADDITIONAL_FEATURES: "true"
+                DOCKER_ENABLE_SECURITY: "false"
                 SECURITY_ENABLELOGIN: "false"
                 SYSTEM_DEFAULTLOCALE: en-GB
                 UI_APPNAME: "Stirling-PDF Test"

.vscode/settings.json

@@ -50,10 +50,8 @@
     ".vscode/",
     "bin/",
     "common/bin/",
-    "proprietary/bin/",
     "build/",
     "common/build/",
-    "proprietary/build/",
     "configs/",
     "customFiles/",
     "docs/",
@@ -68,7 +66,6 @@
     ".gitattributes",
     ".gitignore",
     "common/.gitignore",
-    "proprietary/.gitignore",
     ".pre-commit-config.yaml",
   ],
   // Enables signature help in Java.

DeveloperGuide.md

@@ -55,7 +55,7 @@ Stirling-PDF uses Lombok to reduce boilerplate code. Some IDEs, like Eclipse, do
 Visit the [Lombok website](https://projectlombok.org/setup/) for installation instructions specific to your IDE.
 
 5. Add environment variable
-For local testing, you should generally be testing the full 'Security' version of Stirling PDF. To do this, you must add the environment flag DISABLE_ADDITIONAL_FEATURES=false to your system and/or IDE build/run step.
+For local testing, you should generally be testing the full 'Security' version of Stirling-PDF. To do this, you must add the environment flag DOCKER_ENABLE_SECURITY=true to your system and/or IDE build/run step.
 
 ## 4. Project Structure
 
@@ -114,9 +114,9 @@ Stirling-PDF offers several Docker versions:
 
 Stirling-PDF provides several example Docker Compose files in the `exampleYmlFiles` directory, such as:
 
-- `docker-compose-latest.yml`: Latest version without login and security features
+- `docker-compose-latest.yml`: Latest version without security features
-- `docker-compose-latest-security.yml`: Latest version with login and security features enabled
+- `docker-compose-latest-security.yml`: Latest version with security features enabled
-- `docker-compose-latest-fat-security.yml`: Fat version with login and security features enabled
+- `docker-compose-latest-fat-security.yml`: Fat version with security features enabled
 
 These files provide pre-configured setups for different scenarios. For example, here's a snippet from `docker-compose-latest-security.yml`:
 
@@ -141,7 +141,7 @@ services:
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       PUID: 1002
       PGID: 1002
@@ -170,7 +170,7 @@ Stirling-PDF uses different Docker images for various configurations. The build
 1. Set the security environment variable:
 
    ```bash
-   export DISABLE_ADDITIONAL_FEATURES=true  # or false for to enable login and security features for builds
+   export DOCKER_ENABLE_SECURITY=false  # or true for security-enabled builds
    ```
 
 2. Build the project with Gradle:
@@ -193,10 +193,10 @@ Stirling-PDF uses different Docker images for various configurations. The build
    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
    ```
 
-   For the fat version (with login and security features enabled):
+   For the fat version (with security enabled):
 
    ```bash
-   export DISABLE_ADDITIONAL_FEATURES=false
+   export DOCKER_ENABLE_SECURITY=true
    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat .
    ```
 

Dockerfile

@@ -23,7 +23,7 @@ LABEL org.opencontainers.image.version="${VERSION_TAG}"
 LABEL org.opencontainers.image.keywords="PDF, manipulation, merge, split, convert, OCR, watermark"
 
 # Set Environment Variables
-ENV DISABLE_ADDITIONAL_FEATURES=true \
+ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
     JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
     JAVA_CUSTOM_OPTS="" \

Dockerfile.fat

@@ -5,8 +5,6 @@ COPY build.gradle .
 COPY settings.gradle .
 COPY gradlew .
 COPY gradle gradle/
-COPY common/build.gradle common/.
-COPY proprietary/build.gradle proprietary/.
 RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
 
 # Set the working directory
@@ -15,8 +13,8 @@ WORKDIR /app
 # Copy the entire project to the working directory
 COPY . .
 
-# Build the application with DISABLE_ADDITIONAL_FEATURES=false
+# Build the application with DOCKER_ENABLE_SECURITY=false
-RUN DISABLE_ADDITIONAL_FEATURES=false \
+RUN DOCKER_ENABLE_SECURITY=true \
     STIRLING_PDF_DESKTOP_UI=false \
     ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube
 
@@ -32,7 +30,7 @@ COPY --from=build /app/build/libs/*.jar app.jar
 ARG VERSION_TAG
 
 # Set Environment Variables
-ENV DISABLE_ADDITIONAL_FEATURES=true \
+ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
     JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
     JAVA_CUSTOM_OPTS="" \

Dockerfile.ultra-lite

@@ -4,7 +4,7 @@ FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be02
 ARG VERSION_TAG
 
 # Set Environment Variables
-ENV DISABLE_ADDITIONAL_FEATURES=true \
+ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
     VERSION_TAG=$VERSION_TAG \
     JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \

LICENSE

@@ -1,13 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Stirling PDF Inc.
+Copyright (c) 2024 Stirling Tools
-
-Portions of this software are licensed as follows:
-
-* All content that resides under the "proprietary/" directory of this repository,
-if that directory exists, is licensed under the license defined in "proprietary/LICENSE".
-* Content outside of the above mentioned directories or restrictions above is
-available under the MIT License as defined below.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -131,10 +131,10 @@ Stirling-PDF currently supports 40 languages!
 | German (Deutsch) (de_DE)                     | ![98%](https://geps.dev/progress/98)   |
 | Greek (Ελληνικά) (el_GR)                     | ![79%](https://geps.dev/progress/79)   |
 | Hindi (हिंदी) (hi_IN)                          | ![78%](https://geps.dev/progress/78)   |
-| Hungarian (Magyar) (hu_HU)                   | ![90%](https://geps.dev/progress/90)   |
+| Hungarian (Magyar) (hu_HU)                   | ![86%](https://geps.dev/progress/86)   |
 | Indonesian (Bahasa Indonesia) (id_ID)        | ![72%](https://geps.dev/progress/72)   |
 | Irish (Gaeilge) (ga_IE)                      | ![80%](https://geps.dev/progress/80)   |
-| Italian (Italiano) (it_IT)                   | ![98%](https://geps.dev/progress/98)   |
+| Italian (Italiano) (it_IT)                   | ![96%](https://geps.dev/progress/96)   |
 | Japanese (日本語) (ja_JP)                    | ![80%](https://geps.dev/progress/80)   |
 | Korean (한국어) (ko_KR)                      | ![79%](https://geps.dev/progress/79)   |
 | Norwegian (Norsk) (no_NB)                    | ![77%](https://geps.dev/progress/77)   |

build.gradle

@@ -9,7 +9,7 @@ plugins {
     id "com.diffplug.spotless" version "7.0.4"
     id "com.github.jk1.dependency-license-report" version "2.9"
     //id "nebula.lint" version "19.0.3"
-    id "org.panteleyev.jpackageplugin" version "1.6.1"
+    id("org.panteleyev.jpackageplugin") version "1.6.1"
     id "org.sonarqube" version "6.2.0.5505"
 }
 
@@ -51,14 +51,29 @@ licenseReport {
 sourceSets {
     main {
         java {
-            if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
+            if (System.getenv("DOCKER_ENABLE_SECURITY") == "false") {
-                || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
+                exclude "stirling/software/SPDF/config/interfaces/DatabaseInterface.java"
-                && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
+                exclude "stirling/software/SPDF/config/security/**"
-                exclude 'stirling/software/proprietary/security/**'
+                exclude "stirling/software/SPDF/controller/api/DatabaseController.java"
+                exclude "stirling/software/SPDF/controller/api/EmailController.java"
+                exclude "stirling/software/SPDF/controller/api/H2SQLCondition.java"
+                exclude "stirling/software/SPDF/controller/api/UserController.java"
+                exclude "stirling/software/SPDF/controller/web/AccountWebController.java"
+                exclude "stirling/software/SPDF/controller/web/DatabaseWebController.java"
+                exclude "stirling/software/SPDF/model/api/Email.java"
+                exclude "stirling/software/SPDF/model/ApiKeyAuthenticationToken.java"
+                exclude "stirling/software/SPDF/model/AttemptCounter.java"
+                exclude "stirling/software/SPDF/model/Authority.java"
+                exclude "stirling/software/SPDF/model/exception/BackupNotFoundException.java"
+                exclude "stirling/software/SPDF/model/exception/NoProviderFoundException.java"
+                exclude "stirling/software/SPDF/model/PersistentLogin.java"
+                exclude "stirling/software/SPDF/model/SessionEntity.java"
+                exclude "stirling/software/SPDF/model/User.java"
+                exclude "stirling/software/SPDF/repository/**"
             }
 
-            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
+            if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") {
-                exclude 'stirling/software/SPDF/UI/impl/**'
+                exclude "stirling/software/SPDF/UI/impl/**"
             }
 
         }
@@ -66,14 +81,15 @@ sourceSets {
 
     test {
         java {
-            if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
+            if (System.getenv("DOCKER_ENABLE_SECURITY") == "false") {
-                || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
+                exclude "stirling/software/SPDF/config/security/**"
-                && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
+                exclude "stirling/software/SPDF/model/ApiKeyAuthenticationTokenTest.java"
-                exclude 'stirling/software/proprietary/security/**'
+                exclude "stirling/software/SPDF/controller/api/EmailControllerTest.java"
+                exclude "stirling/software/SPDF/repository/**"
             }
 
-            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
+            if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") {
-                exclude 'stirling/software/SPDF/UI/impl/**'
+                exclude "stirling/software/SPDF/UI/impl/**"
             }
         }
     }
@@ -110,7 +126,6 @@ jpackage {
     javaOptions = [
         "-DBROWSER_OPEN=true",
         "-DSTIRLING_PDF_DESKTOP_UI=true",
-        "-DDISABLE_ADDITIONAL_FEATURES=false",
         "-Djava.awt.headless=false",
         "-Dapple.awt.UIElement=true",
         "--add-opens=java.base/java.lang=ALL-UNNAMED",
@@ -247,7 +262,6 @@ tasks.register('jpackageMacX64') {
                 // Java options
                 '--java-options', '-DBROWSER_OPEN=true',
                 '--java-options', '-DSTIRLING_PDF_DESKTOP_UI=true',
-                '--java-options', '-DDISABLE_ADDITIONAL_FEATURES=false',
                 '--java-options', '-Djava.awt.headless=false',
                 '--java-options', '-Dapple.awt.UIElement=true',
                 '--java-options', '--add-opens=java.base/java.lang=ALL-UNNAMED',
@@ -276,6 +290,8 @@ tasks.register('jpackageMacX64') {
     }
 }
 
+//jpackage.finalizedBy(jpackageMacX64)
+
 tasks.register('downloadTempJre') {
     group = 'distribution'
     description = 'Downloads and extracts a temporary JRE'
@@ -287,18 +303,18 @@ tasks.register('downloadTempJre') {
             def jreArchive = new File(tmpDir, 'jre.tar.gz')
             def jreDir = new File(tmpDir, 'jre')
 
-            println "Downloading JRE to $jreArchive..."
+            println "🔽 Downloading JRE to $jreArchive..."
             jreArchive.withOutputStream { out ->
                 new URI(jreUrl).toURL().withInputStream { from -> out << from }
             }
 
-            println "Extracting JRE to $jreDir..."
+            println "📦 Extracting JRE to $jreDir..."
             jreDir.mkdirs()
             providers.exec {
                 commandLine 'tar', '-xzf', jreArchive.absolutePath, '-C', jreDir.absolutePath, '--strip-components=1'
             }.result.get()
 
-            println "JRE ready at: $jreDir"
+            println "✅ JRE ready at: $jreDir"
             ext.tempJrePath = jreDir.absolutePath
             project.ext.tempJrePath = jreDir.absolutePath
         } catch (Exception e) {
@@ -360,7 +376,6 @@ spotless {
     java {
         target sourceSets.main.allJava
         target project(':common').sourceSets.main.allJava
-        target project(':proprietary').sourceSets.main.allJava
 
         googleJavaFormat("1.27.0").aosp().reorderImports(false)
 
@@ -426,18 +441,43 @@ dependencies {
     implementation("io.github.pixee:java-security-toolkit:1.2.1")
 
     // Exclude Tomcat and include Jetty
-//    implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
+    implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
     implementation "org.springframework.boot:spring-boot-starter-jetty:$springBootVersion"
-//    implementation "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion"
+
+    implementation "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion"
     implementation 'com.posthog.java:posthog:1.2.0'
     implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
+
+
+    if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
+	    implementation 'io.micrometer:micrometer-registry-prometheus'
+
+        implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
+        implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE"
+        implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
+        implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
+        implementation "org.springframework.boot:spring-boot-starter-mail:$springBootVersion"
+
+        implementation "org.springframework.session:spring-session-core:3.5.0"
+        implementation "org.springframework:spring-jdbc:6.2.7"
+
+        implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
+        // Don't upgrade h2database
+        runtimeOnly "com.h2database:h2:2.3.232"
+        runtimeOnly "org.postgresql:postgresql:42.7.6"
+        constraints {
+            implementation "org.opensaml:opensaml-core:$openSamlVersion"
+            implementation "org.opensaml:opensaml-saml-api:$openSamlVersion"
+            implementation "org.opensaml:opensaml-saml-impl:$openSamlVersion"
+        }
+        implementation "org.springframework.security:spring-security-saml2-service-provider:$springSecuritySamlVersion"
+        // implementation 'org.springframework.security:spring-security-core:$springSecuritySamlVersion'
+        implementation 'com.coveo:saml-client:5.0.0'
+
+    }
     implementation 'org.snakeyaml:snakeyaml-engine:2.9'
 
-    if (System.getenv("DOCKER_ENABLE_SECURITY") != "false" || System.getenv('DISABLE_ADDITIONAL_FEATURES') != 'true'
+    testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
-        || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
-        && System.getProperty('DISABLE_ADDITIONAL_FEATURES') != 'true')) {
-        implementation project(':proprietary')
-    }
 
     // Batik
     implementation "org.apache.xmlgraphics:batik-all:1.19"
@@ -445,12 +485,10 @@ dependencies {
     // TwelveMonkeys
     runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
     runtimeOnly "com.twelvemonkeys.imageio:imageio-bmp:$imageioVersion"
-    runtimeOnly "com.twelvemonkeys.imageio:imageio-jpeg:$imageioVersion"
-    runtimeOnly "com.twelvemonkeys.imageio:imageio-tiff:$imageioVersion"
-    runtimeOnly "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-iff:$imageioVersion"
+    runtimeOnly "com.twelvemonkeys.imageio:imageio-jpeg:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-pcx:$imageioVersion@
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-pict:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-pnm:$imageioVersion"
@@ -458,18 +496,24 @@ dependencies {
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-sgi:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-tga:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-thumbsdb:$imageioVersion"
+    runtimeOnly "com.twelvemonkeys.imageio:imageio-tiff:$imageioVersion"
+    runtimeOnly "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion"
 
     // Image metadata extractor
     implementation "com.drewnoakes:metadata-extractor:2.19.0"
-    implementation "commons-io:commons-io:2.19.0"
-//    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8"
 
-    // General PDF
+    implementation "commons-io:commons-io:2.19.0"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8"
+    //general PDF
+
     // https://mvnrepository.com/artifact/com.opencsv/opencsv
     implementation ("com.opencsv:opencsv:5.11")
-//    implementation ("org.apache.pdfbox:pdfbox:$pdfboxVersion")
+
+    implementation ("org.apache.pdfbox:pdfbox:$pdfboxVersion")
     implementation "org.apache.pdfbox:preflight:$pdfboxVersion"
+
+
     implementation ("org.apache.pdfbox:xmpbox:$pdfboxVersion")
 
     // https://mvnrepository.com/artifact/technology.tabula/tabula
@@ -493,6 +537,7 @@ dependencies {
     // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
     implementation "com.bucket4j:bucket4j_jdk17-core:8.14.0"
     implementation "com.fathzer:javaluator:3.0.6"
+
     implementation 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
 
     developmentOnly("org.springframework.boot:spring-boot-devtools:$springBootVersion")
@@ -502,7 +547,6 @@ dependencies {
     // Mockito (core)
     testImplementation 'org.mockito:mockito-core:5.18.0'
     testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
-    testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 }
 
 tasks.withType(JavaCompile).configureEach {

common/build.gradle

@@ -30,19 +30,19 @@ dependencyManagement {
 }
 
 dependencies {
-    api 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
-    api 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    api 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
+    implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
-    api 'com.fathzer:javaluator:3.0.6'
+    implementation 'com.fathzer:javaluator:3.0.6'
-    api 'com.posthog.java:posthog:1.2.0'
+    implementation 'com.posthog.java:posthog:1.2.0'
-    api 'io.github.pixee:java-security-toolkit:1.2.1'
+    implementation 'io.github.pixee:java-security-toolkit:1.2.1'
-    api 'org.apache.commons:commons-lang3:3.17.0'
+    implementation 'org.apache.commons:commons-lang3:3.17.0'
-    api 'com.drewnoakes:metadata-extractor:2.19.0' // Image metadata extractor
+    implementation 'com.drewnoakes:metadata-extractor:2.19.0' // Image metadata extractor
-    api 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
+    implementation 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
-    api "org.apache.pdfbox:pdfbox:$pdfboxVersion"
+    implementation "org.apache.pdfbox:pdfbox:$pdfboxVersion"
-    api 'jakarta.servlet:jakarta.servlet-api:6.1.0'
+    implementation 'jakarta.servlet:jakarta.servlet-api:6.1.0'
-    api 'org.snakeyaml:snakeyaml-engine:2.9'
+    implementation 'org.snakeyaml:snakeyaml-engine:2.9'
-    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8"
 
     compileOnly "org.projectlombok:lombok:$lombokVersion"
     annotationProcessor "org.projectlombok:lombok:$lombokVersion"

common/src/main/java/stirling/software/common/configuration/AppConfig.java

@@ -10,7 +10,6 @@ import java.util.Properties;
 import java.util.function.Predicate;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -147,22 +146,8 @@ public class AppConfig {
         }
     }
 
+    @ConditionalOnMissingClass("stirling.software.SPDF.config.security.SecurityConfiguration")
     @Bean(name = "activeSecurity")
-    public boolean activeSecurity() {
-        String additionalFeaturesOff = env.getProperty("DISABLE_ADDITIONAL_FEATURES");
-
-        if (additionalFeaturesOff != null) {
-            // DISABLE_ADDITIONAL_FEATURES=true means security OFF, so return false
-            // DISABLE_ADDITIONAL_FEATURES=false means security ON, so return true
-            return !Boolean.parseBoolean(additionalFeaturesOff);
-        }
-
-        return env.getProperty("DOCKER_ENABLE_SECURITY", Boolean.class, true);
-    }
-
-    @Bean(name = "missingActiveSecurity")
-    @ConditionalOnMissingClass(
-            "stirling.software.proprietary.security.configuration.SecurityConfiguration")
     public boolean missingActiveSecurity() {
         return false;
     }

exampleYmlFiles/docker-compose-latest-fat-endpoints-disabled.yml

@@ -20,7 +20,7 @@ services:
       - ./stirling/latest/logs:/logs:rw
       - ../testing/allEndpointsRemovedSettings.yml:/configs/settings.yml:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "false"
       PUID: 1002
       PGID: 1002

exampleYmlFiles/docker-compose-latest-fat-security-postgres.yml

@@ -20,7 +20,7 @@ services:
       - ./stirling/latest/config:/configs:rw
       - ./stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "false"
       PUID: 1002
       PGID: 1002

exampleYmlFiles/docker-compose-latest-fat-security.yml

@@ -18,7 +18,7 @@ services:
       - ./stirling/latest/config:/configs:rw
       - ./stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "false"
       PUID: 1002
       PGID: 1002

exampleYmlFiles/docker-compose-latest-security-with-sso.yml

@@ -18,7 +18,7 @@ services:
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       SECURITY_OAUTH2_ENABLED: "true"
       SECURITY_OAUTH2_AUTOCREATEUSER: "true" # This is set to true to allow auto-creation of non-existing users in Stirling-PDF

exampleYmlFiles/docker-compose-latest-security.yml

@@ -18,7 +18,7 @@ services:
       - ./stirling/latest/config:/configs:rw
       - ./stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       PUID: 1002
       PGID: 1002

exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml

@@ -18,7 +18,7 @@ services:
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       SYSTEM_DEFAULTLOCALE: en-US
       UI_APPNAME: Stirling-PDF-Lite

exampleYmlFiles/docker-compose-latest-ultra-lite.yml

@@ -17,7 +17,7 @@ services:
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "true"
+      DOCKER_ENABLE_SECURITY: "false"
       SECURITY_ENABLELOGIN: "false"
       SYSTEM_DEFAULTLOCALE: en-US
       UI_APPNAME: Stirling-PDF-Ultra-lite

exampleYmlFiles/docker-compose-latest.yml

@@ -18,7 +18,7 @@ services:
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "true"
+      DOCKER_ENABLE_SECURITY: "false"
       SECURITY_ENABLELOGIN: "false"
       LANGS: "en_GB,en_US,ar_AR,de_DE,fr_FR,es_ES,zh_CN,zh_TW,ca_CA,it_IT,sv_SE,pl_PL,ro_RO,ko_KR,pt_BR,ru_RU,el_GR,hi_IN,hu_HU,tr_TR,id_ID"
       SYSTEM_DEFAULTLOCALE: en-US

exampleYmlFiles/test_cicd.yml

@@ -18,7 +18,7 @@ services:
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       PUID: 1002
       PGID: 1002

proprietary/.gitignore

@@ -1,196 +0,0 @@
-### Eclipse ###
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.exe
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-.classpath
-.project
-version.properties
-
-#### Stirling-PDF Files ###
-pipeline/watchedFolders/
-pipeline/finishedFolders/
-customFiles/
-configs/
-watchedFolders/
-clientWebUI/
-!cucumber/
-!cucumber/exampleFiles/
-!cucumber/exampleFiles/example_html.zip
-exampleYmlFiles/stirling/
-/testing/file_snapshots
-SwaggerDoc.json
-
-# Gradle
-.gradle
-.lock
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-.apt_generated_test/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-# Uncomment this line if you wish to ignore the project description file.
-# Typically, this file would be tracked if it contains build/dependency configurations:
-#.project
-
-### Eclipse Patch ###
-# Spring Boot Tooling
-.sts4-cache/
-
-### Git ###
-# Created by git for backups. To disable backups in Git:
-# $ git config --global mergetool.keepBackup false
-*.orig
-
-# Created by git when using merge tools for conflicts
-*.BACKUP.*
-*.BASE.*
-*.LOCAL.*
-*.REMOTE.*
-*_BACKUP_*.txt
-*_BASE_*.txt
-*_LOCAL_*.txt
-*_REMOTE_*.txt
-
-### Java ###
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-*.db
-/build
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*.pyo
-
-# Virtual environments
-.env*
-.venv*
-env*/
-venv*/
-ENV/
-env.bak/
-venv.bak/
-
-# VS Code
-/.vscode/**/*
-!/.vscode/settings.json
-!/.vscode/extensions.json
-
-# IntelliJ IDEA
-.idea/
-*.iml
-out/
-
-# Ignore Mac DS_Store files
-.DS_Store
-**/.DS_Store
-
-# cucumber
-/cucumber/reports/**
-
-# Certs and Security Files
-*.p12
-*.pk8
-*.pem
-*.crt
-*.cer
-*.cert
-*.der
-*.key
-*.csr
-*.kdbx
-*.jks
-*.asc
-
-# SSH Keys
-*.pub
-*.priv
-id_rsa
-id_rsa.pub
-id_ecdsa
-id_ecdsa.pub
-id_ed25519
-id_ed25519.pub
-.ssh/
-*ssh
-
-# cache
-.cache
-.ruff_cache
-.mypy_cache
-.pytest_cache
-.ipynb_checkpoints
-
-**/jcef-bundle/
-
-# node_modules
-node_modules/
-*.mjs

proprietary/LICENSE

@@ -1,51 +0,0 @@
-Stirling PDF User License
-
-Copyright (c) 2025 Stirling PDF Inc.
-
-License Scope & Usage Rights
-
-Production use of the Stirling PDF Software is only permitted with a valid Stirling PDF User License.
-
-For purposes of this license, “the Software” refers to the Stirling PDF application and any associated documentation files
-provided by Stirling PDF Inc. You or your organization may not use the Software in production, at scale, or for business-critical
-processes unless you have agreed to, and remain in compliance with, the Stirling PDF Subscription Terms of Service
-(https://www.stirlingpdf.com/terms) or another valid agreement with Stirling PDF, and hold an active User License subscription
-covering the appropriate number of licensed users.
-
-Trial and Minimal Use
-
-You may use the Software without a paid subscription for the sole purposes of internal trial, evaluation, or minimal use, provided that:
-* Use is limited to the capabilities and restrictions defined by the Software itself;
-* You do not copy, distribute, sublicense, reverse-engineer, or use the Software in client-facing or commercial contexts.
-
-Continued use beyond this scope requires a valid Stirling PDF User License.
-
-Modifications and Derivative Works
-
-You may modify the Software only for development or internal testing purposes. Any such modifications or derivative works:
-
-* May not be deployed in production environments without a valid User License;
-* May not be distributed or sublicensed;
-* Remain the intellectual property of Stirling PDF and/or its licensors;
-* May only be used, copied, or exploited in accordance with the terms of a valid Stirling PDF User License subscription.
-
-Prohibited Actions
-
-Unless explicitly permitted by a paid license or separate agreement, you may not:
-
-* Use the Software in production environments;
-* Copy, merge, distribute, sublicense, or sell the Software;
-* Remove or alter any licensing or copyright notices;
-* Circumvent access restrictions or licensing requirements.
-
-Third-Party Components
-
-The Stirling PDF Software may include components subject to separate open source licenses. Such components remain governed by
-their original license terms as provided by their respective owners.
-
-Disclaimer
-
-THE SOFTWARE IS PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF, OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

proprietary/build.gradle

@@ -1,67 +0,0 @@
-plugins {
-    id 'java-library'
-    id 'io.spring.dependency-management' version '1.1.7'
-}
-
-repositories {
-    mavenCentral()
-    maven { url = "https://build.shibboleth.net/maven/releases" }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-}
-
-configurations.all {
-    exclude group: 'commons-logging', module: 'commons-logging'
-    exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
-}
-
-dependencyManagement {
-    imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.5.0'
-    }
-}
-
-dependencies {
-    implementation project(':common')
-
-    api 'org.springframework:spring-jdbc'
-    api 'org.springframework:spring-webmvc'
-    api 'org.springframework.session:spring-session-core'
-    api "org.springframework.security:spring-security-core:$springSecuritySamlVersion"
-    api "org.springframework.security:spring-security-saml2-service-provider:$springSecuritySamlVersion"
-    api 'org.springframework.boot:spring-boot-starter-jetty'
-    api 'org.springframework.boot:spring-boot-starter-security'
-    api 'org.springframework.boot:spring-boot-starter-data-jpa'
-    api 'org.springframework.boot:spring-boot-starter-oauth2-client'
-    api 'org.springframework.boot:spring-boot-starter-mail'
-    api 'io.swagger.core.v3:swagger-core-jakarta:2.2.30'
-    implementation 'com.bucket4j:bucket4j_jdk17-core:8.14.0'
-
-    // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.80'
-
-    implementation 'io.github.pixee:java-security-toolkit:1.2.1'
-    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE'
-    api 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
-    runtimeOnly 'com.h2database:h2:2.3.232' // Don't upgrade h2database
-    runtimeOnly 'org.postgresql:postgresql:42.7.5'
-    constraints {
-        implementation "org.opensaml:opensaml-core:$openSamlVersion"
-        implementation "org.opensaml:opensaml-saml-api:$openSamlVersion"
-        implementation "org.opensaml:opensaml-saml-impl:$openSamlVersion"
-    }
-    implementation 'com.coveo:saml-client:5.0.0'
-
-    compileOnly "org.projectlombok:lombok:$lombokVersion"
-    annotationProcessor "org.projectlombok:lombok:$lombokVersion"
-
-    testImplementation platform('org.junit:junit-bom:5.10.0')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
-}
-
-tasks.register('prepareKotlinBuildScriptModel') {}

proprietary/src/main/java/stirling/software/proprietary/security/model/AuthenticationType.java

@@ -1,6 +0,0 @@
-package stirling.software.proprietary.security.model;
-
-public enum AuthenticationType {
-    WEB,
-    SSO
-}

proprietary/src/main/java/stirling/software/proprietary/security/model/api/Email.java

@@ -1,40 +0,0 @@
-package stirling.software.proprietary.security.model.api;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import stirling.software.common.model.api.GeneralFile;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@ConditionalOnProperty(value = "mail.enabled", havingValue = "true", matchIfMissing = false)
-public class Email extends GeneralFile {
-
-    @Schema(
-            description = "The recipient's email address",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            format = "email")
-    private String to;
-
-    @Schema(
-            description = "The subject of the email",
-            defaultValue = "Stirling Software PDF Notification",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    private String subject;
-
-    @Schema(
-            description = "The body of the email",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
-            defaultValue =
-                    "This message was automatically generated by Stirling-PDF, an innovative"
-                            + " solution from Stirling Software. For more information, visit our <a"
-                            + " href=\"https://stirling-software.com\">website</a>.<br><br>Please do"
-                            + " not reply directly to this email.")
-    private String body;
-}

proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserDetails.java

@@ -1,17 +0,0 @@
-package stirling.software.proprietary.security.model.api.user;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UpdateUserDetails extends UpdateUserUsername {
-
-    @Schema(
-            description = "new password for user",
-            format = "password",
-            requiredMode = Schema.RequiredMode.REQUIRED)
-    private String newPassword;
-}

proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserUsername.java

@@ -1,14 +0,0 @@
-package stirling.software.proprietary.security.model.api.user;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UpdateUserUsername extends UsernameAndPass {
-
-    @Schema(description = "new username for user")
-    private String newUsername;
-}

proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/Username.java

@@ -1,14 +0,0 @@
-package stirling.software.proprietary.security.model.api.user;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode
-public class Username {
-
-    @Schema(description = "username of user", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String username;
-}

proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UsernameAndPass.java

@@ -1,14 +0,0 @@
-package stirling.software.proprietary.security.model.api.user;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UsernameAndPass extends Username {
-
-    @Schema(description = "password of user", format = "password")
-    private String password;
-}

scripts/download-security-jar.sh

@@ -1,6 +1,6 @@
-echo "Running Stirling PDF with DISABLE_ADDITIONAL_FEATURES=${DISABLE_ADDITIONAL_FEATURES} and VERSION_TAG=${VERSION_TAG}"
+echo "Running Stirling PDF with DOCKER_ENABLE_SECURITY=${DOCKER_ENABLE_SECURITY} and VERSION_TAG=${VERSION_TAG}"
-# Check for $DISABLE_ADDITIONAL_FEATURES and download the appropriate JAR if required
+# Check for DOCKER_ENABLE_SECURITY and download the appropriate JAR if required
-if [ "$DISABLE_ADDITIONAL_FEATURES" = "false" ] && [ "$VERSION_TAG" != "alpha" ]; then
+if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
     if [ ! -f app-security.jar ]; then
         echo "Trying to download from: https://files.stirlingpdf.com/v$VERSION_TAG/Stirling-PDF-with-login.jar"
         curl -L -o app-security.jar https://files.stirlingpdf.com/v$VERSION_TAG/Stirling-PDF-with-login.jar

settings.gradle

@@ -4,4 +4,4 @@ plugins {
 }
 rootProject.name = 'Stirling-PDF'
 
-include 'common', 'proprietary'
+include 'common'

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

@@ -520,7 +520,7 @@ public class KeygenLicenseVerifier {
 
         HttpResponse<String> response =
                 httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-        log.debug("ValidateLicenseResponse body: {}", response.body());
+        log.info("ValidateLicenseResponse body: {}", response.body());
         JsonNode jsonResponse = objectMapper.readTree(response.body());
         if (response.statusCode() == 200) {
             JsonNode metaNode = jsonResponse.path("meta");
@@ -529,9 +529,9 @@ public class KeygenLicenseVerifier {
             String detail = metaNode.path("detail").asText();
             String code = metaNode.path("code").asText();
 
-            log.info("License validity: {}", isValid);
+            log.info("License validity: " + isValid);
-            log.info("Validation detail: {}", detail);
+            log.info("Validation detail: " + detail);
-            log.info("Validation code: {}", code);
+            log.info("Validation code: " + code);
 
             // Check if the license itself has floating attribute
             JsonNode licenseAttrs = jsonResponse.path("data").path("attributes");
@@ -595,7 +595,7 @@ public class KeygenLicenseVerifier {
                             .path("isEnterprise")
                             .asBoolean(false);
 
-            log.debug(applicationProperties.toString());
+            log.info(applicationProperties.toString());
 
         } else {
             log.error("Error validating license. Status code: {}", response.statusCode());

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

@@ -35,11 +35,7 @@ import stirling.software.common.util.UrlUtils;
 @Slf4j
 @EnableScheduling
 @SpringBootApplication(
-        scanBasePackages = {
+        scanBasePackages = {"stirling.software.common", "stirling.software.SPDF"},
-            "stirling.software.common",
-            "stirling.software.SPDF",
-            "stirling.software.proprietary.security"
-        },
         exclude = {
             DataSourceAutoConfiguration.class,
             DataSourceTransactionManagerAutoConfiguration.class

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

@@ -5,7 +5,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 
-import stirling.software.common.configuration.interfaces.ShowAdminInterface;
+import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
 import stirling.software.common.model.ApplicationProperties;
 
 @Configuration

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.filter;
+package stirling.software.SPDF.config;
 
 import java.io.IOException;
 

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.service;
+package stirling.software.SPDF.config.interfaces;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.List;
 import stirling.software.common.model.FileInfo;
 import stirling.software.common.model.exception.UnsupportedProviderException;
 
-public interface DatabaseServiceInterface {
+public interface DatabaseInterface {
     void exportDatabase() throws SQLException, UnsupportedProviderException;
 
     void importDatabase();

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

@@ -0,0 +1,7 @@
+package stirling.software.SPDF.config.interfaces;
+
+public interface ShowAdminInterface {
+    default boolean getShowUpdateOnlyAdmins() {
+        return true;
+    }
+}

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.service;
+package stirling.software.SPDF.config.security;
 
 import java.util.Optional;
 
@@ -8,10 +8,10 @@ import org.springframework.stereotype.Service;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.common.configuration.interfaces.ShowAdminInterface;
+import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.UserRepository;
 import stirling.software.common.model.ApplicationProperties;
-import stirling.software.proprietary.security.database.repository.UserRepository;
-import stirling.software.proprietary.security.model.User;
 
 @Service
 @RequiredArgsConstructor

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security;
+package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 import java.util.Optional;
@@ -17,9 +17,7 @@ import jakarta.servlet.http.HttpServletResponse;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.proprietary.security.model.User;
+import stirling.software.SPDF.model.User;
-import stirling.software.proprietary.security.service.LoginAttemptService;
-import stirling.software.proprietary.security.service.UserService;
 
 @Slf4j
 public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security;
+package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 
@@ -14,8 +14,6 @@ import jakarta.servlet.http.HttpSession;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.util.RequestUriUtils;
-import stirling.software.proprietary.security.service.LoginAttemptService;
-import stirling.software.proprietary.security.service.UserService;
 
 @Slf4j
 public class CustomAuthenticationSuccessHandler

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security;
+package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 import java.security.cert.X509Certificate;
@@ -22,14 +22,14 @@ import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.common.configuration.AppConfig;
+import stirling.software.SPDF.SPDFApplication;
+import stirling.software.SPDF.config.security.saml2.CertificateUtils;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.ApplicationProperties.Security.SAML2;
 import stirling.software.common.model.oauth2.KeycloakProvider;
 import stirling.software.common.util.UrlUtils;
-import stirling.software.proprietary.security.saml2.CertificateUtils;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -38,7 +38,6 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
     public static final String LOGOUT_PATH = "/login?logout=true";
 
     private final ApplicationProperties applicationProperties;
-    private final AppConfig appConfig;
 
     @Override
     public void onLogoutSuccess(
@@ -103,7 +102,7 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
             // Set service provider keys for the SamlClient
             samlClient.setSPKeys(certificate, privateKey);
 
-            // Redirect to identity provider for logout. todo: add relay state
+            // Redirect to identity provider for logout
             samlClient.redirectToIdentityProvider(response, null, nameIdValue);
         } catch (Exception e) {
             log.error(
@@ -173,10 +172,11 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
         }
     }
 
-    private SamlClient getSamlClient(
+    private static SamlClient getSamlClient(
             String registrationId, SAML2 samlConf, List<X509Certificate> certificates)
             throws SamlException {
-        String serverUrl = appConfig.getBaseUrl() + ":" + appConfig.getServerPort();
+        String serverUrl =
+                SPDFApplication.getStaticBaseUrl() + ":" + SPDFApplication.getStaticPort();
 
         String relyingPartyIdentifier =
                 serverUrl + "/saml2/service-provider-metadata/" + registrationId;

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.service;
+package stirling.software.SPDF.config.security;
 
 import java.util.Collection;
 import java.util.Set;
@@ -13,9 +13,9 @@ import org.springframework.stereotype.Service;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.proprietary.security.database.repository.UserRepository;
+import stirling.software.SPDF.model.Authority;
-import stirling.software.proprietary.security.model.Authority;
+import stirling.software.SPDF.model.User;
-import stirling.software.proprietary.security.model.User;
+import stirling.software.SPDF.repository.UserRepository;
 
 @Service
 @RequiredArgsConstructor

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.filter;
+package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -19,9 +19,8 @@ import jakarta.servlet.http.HttpSession;
 
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.model.User;
 import stirling.software.common.util.RequestUriUtils;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.service.UserService;
 
 @Slf4j
 @Component

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

@@ -1,14 +1,10 @@
-package stirling.software.proprietary.security.filter;
+package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jakarta.servlet.Filter;
+import jakarta.servlet.*;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 
 import lombok.RequiredArgsConstructor;

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security;
+package stirling.software.SPDF.config.security;
 
 import java.sql.SQLException;
 import java.util.UUID;
@@ -10,11 +10,10 @@ import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.config.interfaces.DatabaseInterface;
+import stirling.software.SPDF.model.Role;
 import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.enumeration.Role;
 import stirling.software.common.model.exception.UnsupportedProviderException;
-import stirling.software.proprietary.security.service.DatabaseServiceInterface;
-import stirling.software.proprietary.security.service.UserService;
 
 @Slf4j
 @Component
@@ -25,7 +24,7 @@ public class InitialSecuritySetup {
 
     private final ApplicationProperties applicationProperties;
 
-    private final DatabaseServiceInterface databaseService;
+    private final DatabaseInterface databaseService;
 
     @PostConstruct
     public void init() {

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.service;
+package stirling.software.SPDF.config.security;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -10,8 +10,8 @@ import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.model.AttemptCounter;
 import stirling.software.common.model.ApplicationProperties;
-import stirling.software.proprietary.security.model.AttemptCounter;
 
 @Service
 @Slf4j

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

@@ -1,12 +1,10 @@
-package stirling.software.proprietary.security;
+package stirling.software.SPDF.config.security;
 
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.proprietary.security.filter.IPRateLimitingFilter;
-
 @Component
 @RequiredArgsConstructor
 public class RateLimitResetScheduler {

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.configuration;
+package stirling.software.SPDF.config.security;
 
 import java.util.Optional;
 
@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 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.security.authentication.ProviderManager;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
@@ -29,32 +30,23 @@ import org.springframework.security.web.servlet.util.matcher.PathPatternRequestM
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.common.configuration.AppConfig;
+import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationFailureHandler;
+import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
+import stirling.software.SPDF.config.security.oauth2.CustomOAuth2UserService;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticationFailureHandler;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticationSuccessHandler;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2ResponseAuthenticationConverter;
+import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
+import stirling.software.SPDF.repository.PersistentLoginRepository;
 import stirling.software.common.model.ApplicationProperties;
-import stirling.software.proprietary.security.CustomAuthenticationFailureHandler;
-import stirling.software.proprietary.security.CustomAuthenticationSuccessHandler;
-import stirling.software.proprietary.security.CustomLogoutSuccessHandler;
-import stirling.software.proprietary.security.database.repository.JPATokenRepositoryImpl;
-import stirling.software.proprietary.security.database.repository.PersistentLoginRepository;
-import stirling.software.proprietary.security.filter.FirstLoginFilter;
-import stirling.software.proprietary.security.filter.IPRateLimitingFilter;
-import stirling.software.proprietary.security.filter.UserAuthenticationFilter;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.oauth2.CustomOAuth2AuthenticationFailureHandler;
-import stirling.software.proprietary.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticationFailureHandler;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticationSuccessHandler;
-import stirling.software.proprietary.security.saml2.CustomSaml2ResponseAuthenticationConverter;
-import stirling.software.proprietary.security.service.CustomOAuth2UserService;
-import stirling.software.proprietary.security.service.CustomUserDetailsService;
-import stirling.software.proprietary.security.service.LoginAttemptService;
-import stirling.software.proprietary.security.service.UserService;
-import stirling.software.proprietary.security.session.SessionPersistentRegistry;
 
-@Slf4j
 @Configuration
 @EnableWebSecurity
 @EnableMethodSecurity
+@Slf4j
+@DependsOn("runningProOrHigher")
 public class SecurityConfiguration {
 
     private final CustomUserDetailsService userDetailsService;
@@ -63,7 +55,6 @@ public class SecurityConfiguration {
     private final boolean runningProOrHigher;
 
     private final ApplicationProperties applicationProperties;
-    private final AppConfig appConfig;
     private final UserAuthenticationFilter userAuthenticationFilter;
     private final LoginAttemptService loginAttemptService;
     private final FirstLoginFilter firstLoginFilter;
@@ -79,7 +70,6 @@ public class SecurityConfiguration {
             @Lazy UserService userService,
             @Qualifier("loginEnabled") boolean loginEnabledValue,
             @Qualifier("runningProOrHigher") boolean runningProOrHigher,
-            AppConfig appConfig,
             ApplicationProperties applicationProperties,
             UserAuthenticationFilter userAuthenticationFilter,
             LoginAttemptService loginAttemptService,
@@ -94,7 +84,6 @@ public class SecurityConfiguration {
         this.userService = userService;
         this.loginEnabledValue = loginEnabledValue;
         this.runningProOrHigher = runningProOrHigher;
-        this.appConfig = appConfig;
         this.applicationProperties = applicationProperties;
         this.userAuthenticationFilter = userAuthenticationFilter;
         this.loginAttemptService = loginAttemptService;
@@ -172,8 +161,7 @@ public class SecurityConfiguration {
                                             PathPatternRequestMatcher.withDefaults()
                                                     .matcher("/logout"))
                                     .logoutSuccessHandler(
-                                            new CustomLogoutSuccessHandler(
+                                            new CustomLogoutSuccessHandler(applicationProperties))
-                                                    applicationProperties, appConfig))
                                     .clearAuthentication(true)
                                     .invalidateHttpSession(true)
                                     .deleteCookies("JSESSIONID", "remember-me"));
@@ -241,12 +229,13 @@ public class SecurityConfiguration {
                 http.oauth2Login(
                         oauth2 ->
                                 oauth2.loginPage("/oauth2")
+                                        .
                                         /*
                                         This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database.
                                         If user exists, login proceeds as usual. If user does not exist, then it is auto-created but only if 'OAUTH2AutoCreateUser'
                                         is set as true, else login fails with an error message advising the same.
                                          */
-                                        .successHandler(
+                                        successHandler(
                                                 new CustomOAuth2AuthenticationSuccessHandler(
                                                         loginAttemptService,
                                                         applicationProperties,
@@ -298,14 +287,15 @@ public class SecurityConfiguration {
                                 });
             }
         } else {
-            log.debug("Login is not enabled.");
+            log.debug("SAML 2 login is not enabled. Using default.");
             http.authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
         }
         return http.build();
     }
 
     public DaoAuthenticationProvider daoAuthenticationProvider() {
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider(userDetailsService);
+        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+        provider.setUserDetailsService(userDetailsService);
         provider.setPasswordEncoder(passwordEncoder());
         return provider;
     }
@@ -321,4 +311,9 @@ public class SecurityConfiguration {
     public PersistentTokenRepository persistentTokenRepository() {
         return new JPATokenRepositoryImpl(persistentLoginRepository);
     }
+
+    @Bean
+    public boolean activeSecurity() {
+        return true;
+    }
 }

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.filter;
+package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 import java.util.List;
@@ -24,14 +24,13 @@ import jakarta.servlet.http.HttpServletResponse;
 
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
+import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
+import stirling.software.SPDF.model.ApiKeyAuthenticationToken;
+import stirling.software.SPDF.model.User;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.ApplicationProperties.Security.SAML2;
-import stirling.software.proprietary.security.model.ApiKeyAuthenticationToken;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
-import stirling.software.proprietary.security.service.UserService;
-import stirling.software.proprietary.security.session.SessionPersistentRegistry;
 
 @Slf4j
 @Component

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.filter;
+package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -24,7 +24,7 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
-import stirling.software.common.model.enumeration.Role;
+import stirling.software.SPDF.model.Role;
 
 @Component
 public class UserBasedRateLimitingFilter extends OncePerRequestFilter {

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

@@ -1,5 +1,6 @@
-package stirling.software.proprietary.security.service;
+package stirling.software.SPDF.config.security;
 
+import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,17 +28,18 @@ import org.springframework.transaction.annotation.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.config.interfaces.DatabaseInterface;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
+import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
+import stirling.software.SPDF.model.AuthenticationType;
+import stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.Role;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.AuthorityRepository;
+import stirling.software.SPDF.repository.UserRepository;
 import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.enumeration.Role;
 import stirling.software.common.model.exception.UnsupportedProviderException;
 import stirling.software.common.service.UserServiceInterface;
-import stirling.software.proprietary.security.database.repository.AuthorityRepository;
-import stirling.software.proprietary.security.database.repository.UserRepository;
-import stirling.software.proprietary.security.model.AuthenticationType;
-import stirling.software.proprietary.security.model.Authority;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
-import stirling.software.proprietary.security.session.SessionPersistentRegistry;
 
 @Service
 @Slf4j
@@ -54,7 +56,7 @@ public class UserService implements UserServiceInterface {
 
     private final SessionPersistentRegistry sessionRegistry;
 
-    private final DatabaseServiceInterface databaseService;
+    private final DatabaseInterface databaseService;
 
     private final ApplicationProperties.Security.OAUTH2 oAuth2;
 
@@ -86,7 +88,7 @@ public class UserService implements UserServiceInterface {
 
     public Authentication getAuthentication(String apiKey) {
         Optional<User> user = getUserByApiKey(apiKey);
-        if (user.isEmpty()) {
+        if (!user.isPresent()) {
             throw new UsernameNotFoundException("API key is not valid");
         }
         // Convert the user into an Authentication object
@@ -303,7 +305,10 @@ public class UserService implements UserServiceInterface {
     }
 
     public void changeUsername(User user, String newUsername)
-            throws IllegalArgumentException, SQLException, UnsupportedProviderException {
+            throws IllegalArgumentException,
+                    IOException,
+                    SQLException,
+                    UnsupportedProviderException {
         if (!isUsernameValid(newUsername)) {
             throw new IllegalArgumentException(getInvalidUsernameMessage());
         }
@@ -413,7 +418,7 @@ public class UserService implements UserServiceInterface {
 
         if (principal instanceof UserDetails detailsUser) {
             return detailsUser.getUsername();
-        } else if (principal instanceof User domainUser) {
+        } else if (principal instanceof stirling.software.SPDF.model.User domainUser) {
             return domainUser.getUsername();
         } else if (principal instanceof OAuth2User oAuth2User) {
             return oAuth2User.getAttribute(oAuth2.getUseAsUsername());

src/main/java/stirling/software/SPDF/config/security/database/DatabaseConfig.java

@@ -1,15 +1,11 @@
-package stirling.software.proprietary.security.configuration;
+package stirling.software.SPDF.config.security.database;
 
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -21,14 +17,14 @@ import stirling.software.common.model.exception.UnsupportedProviderException;
 @Slf4j
 @Getter
 @Configuration
-@EnableJpaRepositories(basePackages = "stirling.software.proprietary.security.database.repository")
-@EntityScan({"stirling.software.proprietary.security.model"})
 public class DatabaseConfig {
 
     public final String DATASOURCE_DEFAULT_URL;
 
     public static final String DATASOURCE_URL_TEMPLATE = "jdbc:%s://%s:%4d/%s";
+    public static final String DEFAULT_DRIVER = "org.h2.Driver";
     public static final String DEFAULT_USERNAME = "sa";
+    public static final String POSTGRES_DRIVER = "org.postgresql.Driver";
 
     private final ApplicationProperties.Datasource datasource;
     private final boolean runningProOrHigher;
@@ -58,32 +54,19 @@ public class DatabaseConfig {
     public DataSource dataSource() throws UnsupportedProviderException {
         DataSourceBuilder<?> dataSourceBuilder = DataSourceBuilder.create();
 
-        if (!runningProOrHigher || !datasource.isEnableCustomDatabase()) {
+        if (!runningProOrHigher) {
             return useDefaultDataSource(dataSourceBuilder);
         }
 
-        return useCustomDataSource(dataSourceBuilder);
+        if (!datasource.isEnableCustomDatabase()) {
+            return useDefaultDataSource(dataSourceBuilder);
         }
 
-    private DataSource useDefaultDataSource(DataSourceBuilder<?> dataSourceBuilder) {
-        log.info("Using default H2 database");
-
-        dataSourceBuilder
-                .url(DATASOURCE_DEFAULT_URL)
-                .driverClassName(DatabaseDriver.H2.getDriverClassName())
-                .username(DEFAULT_USERNAME);
-
-        return dataSourceBuilder.build();
-    }
-
-    @ConditionalOnBooleanProperty(name = "premium.enabled")
-    private DataSource useCustomDataSource(DataSourceBuilder<?> dataSourceBuilder)
-            throws UnsupportedProviderException {
         log.info("Using custom database configuration");
 
         if (!datasource.getCustomDatabaseUrl().isBlank()) {
             if (datasource.getCustomDatabaseUrl().contains("postgresql")) {
-                dataSourceBuilder.driverClassName(DatabaseDriver.POSTGRESQL.getDriverClassName());
+                dataSourceBuilder.driverClassName(POSTGRES_DRIVER);
             }
 
             dataSourceBuilder.url(datasource.getCustomDatabaseUrl());
@@ -102,6 +85,15 @@ public class DatabaseConfig {
         return dataSourceBuilder.build();
     }
 
+    private DataSource useDefaultDataSource(DataSourceBuilder<?> dataSourceBuilder) {
+        log.info("Using default H2 database");
+
+        dataSourceBuilder.url(DATASOURCE_DEFAULT_URL);
+        dataSourceBuilder.username(DEFAULT_USERNAME);
+
+        return dataSourceBuilder.build();
+    }
+
     /**
      * Generate the URL the <code>DataSource</code> will use to connect to the database
      *
@@ -131,11 +123,11 @@ public class DatabaseConfig {
             switch (driver) {
                 case H2 -> {
                     log.debug("H2 driver selected");
-                    return DatabaseDriver.H2.getDriverClassName();
+                    return DEFAULT_DRIVER;
                 }
                 case POSTGRESQL -> {
                     log.debug("Postgres driver selected");
-                    return DatabaseDriver.POSTGRESQL.getDriverClassName();
+                    return POSTGRES_DRIVER;
                 }
                 default -> {
                     log.warn("{} driver selected", driverName);

src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.service;
+package stirling.software.SPDF.config.security.database;
 
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
@@ -27,14 +27,15 @@ import org.springframework.stereotype.Service;
 
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.config.interfaces.DatabaseInterface;
+import stirling.software.SPDF.model.exception.BackupNotFoundException;
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.FileInfo;
-import stirling.software.proprietary.security.model.exception.BackupNotFoundException;
 
 @Slf4j
 @Service
-public class DatabaseService implements DatabaseServiceInterface {
+public class DatabaseService implements DatabaseInterface {
 
     public static final String BACKUP_PREFIX = "backup_";
     public static final String SQL_SUFFIX = ".sql";

src/main/java/stirling/software/SPDF/config/security/database/ScheduledTasks.java

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.database;
+package stirling.software.SPDF.config.security.database;
 
 import java.sql.SQLException;
 
@@ -8,15 +8,16 @@ import org.springframework.stereotype.Component;
 
 import lombok.RequiredArgsConstructor;
 
+import stirling.software.SPDF.config.interfaces.DatabaseInterface;
+import stirling.software.SPDF.controller.api.H2SQLCondition;
 import stirling.software.common.model.exception.UnsupportedProviderException;
-import stirling.software.proprietary.security.service.DatabaseServiceInterface;
 
 @Component
 @Conditional(H2SQLCondition.class)
 @RequiredArgsConstructor
 public class ScheduledTasks {
 
-    private final DatabaseServiceInterface databaseService;
+    private final DatabaseInterface databaseService;
 
     @Scheduled(cron = "0 0 0 * * ?")
     public void performBackup() throws SQLException, UnsupportedProviderException {

src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.service;
+package stirling.software.SPDF.config.security.mail;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.mail.javamail.JavaMailSender;
@@ -12,8 +12,8 @@ import jakarta.mail.internet.MimeMessage;
 
 import lombok.RequiredArgsConstructor;
 
+import stirling.software.SPDF.model.api.Email;
 import stirling.software.common.model.ApplicationProperties;
-import stirling.software.proprietary.security.model.api.Email;
 
 /**
  * Service class responsible for sending emails, including those with attachments. It uses

src/main/java/stirling/software/SPDF/config/security/mail/MailConfig.java

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.configuration;
+package stirling.software.SPDF.config.security.mail;
 
 import java.util.Properties;
 

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.oauth2;
+package stirling.software.SPDF.config.security.oauth2;
 
 import java.io.IOException;
 

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.oauth2;
+package stirling.software.SPDF.config.security.oauth2;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -17,13 +17,13 @@ import jakarta.servlet.http.HttpSession;
 
 import lombok.RequiredArgsConstructor;
 
+import stirling.software.SPDF.config.security.LoginAttemptService;
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.exception.UnsupportedProviderException;
 import stirling.software.common.util.RequestUriUtils;
-import stirling.software.proprietary.security.model.AuthenticationType;
-import stirling.software.proprietary.security.service.LoginAttemptService;
-import stirling.software.proprietary.security.service.UserService;
 
 @RequiredArgsConstructor
 public class CustomOAuth2AuthenticationSuccessHandler

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.service;
+package stirling.software.SPDF.config.security.oauth2;
 
 import java.util.Optional;
 
@@ -13,10 +13,12 @@ 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.User;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.enumeration.UsernameAttribute;
-import stirling.software.proprietary.security.model.User;
 
 @Slf4j
 public class CustomOAuth2UserService implements OAuth2UserService<OidcUserRequest, OidcUser> {

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.oauth2;
+package stirling.software.SPDF.config.security.oauth2;
 
 import static org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE;
 import static stirling.software.common.util.ProviderUtils.validateProvider;
@@ -10,7 +10,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -26,6 +25,9 @@ import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
 
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.model.exception.NoProviderFoundException;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2.Client;
@@ -34,13 +36,10 @@ import stirling.software.common.model.oauth2.GitHubProvider;
 import stirling.software.common.model.oauth2.GoogleProvider;
 import stirling.software.common.model.oauth2.KeycloakProvider;
 import stirling.software.common.model.oauth2.Provider;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.model.exception.NoProviderFoundException;
-import stirling.software.proprietary.security.service.UserService;
 
 @Slf4j
 @Configuration
-@ConditionalOnBooleanProperty("security.oauth2.enabled")
+@ConditionalOnProperty(value = "security.oauth2.enabled", havingValue = "true")
 public class OAuth2Configuration {
 
     public static final String REDIRECT_URI_PATH = "{baseUrl}/login/oauth2/code/";
@@ -55,6 +54,7 @@ public class OAuth2Configuration {
     }
 
     @Bean
+    @ConditionalOnProperty(value = "security.oauth2.enabled", havingValue = "true")
     public ClientRegistrationRepository clientRegistrationRepository()
             throws NoProviderFoundException {
         List<ClientRegistration> registrations = new ArrayList<>();

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.saml2;
+package stirling.software.SPDF.config.security.saml2;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.saml2;
+package stirling.software.SPDF.config.security.saml2;
 
 import java.io.Serializable;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.saml2;
+package stirling.software.SPDF.config.security.saml2;
 
 import java.io.IOException;
 

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.saml2;
+package stirling.software.SPDF.config.security.saml2;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -16,13 +16,13 @@ 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.AuthenticationType;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.SAML2;
 import stirling.software.common.model.exception.UnsupportedProviderException;
 import stirling.software.common.util.RequestUriUtils;
-import stirling.software.proprietary.security.model.AuthenticationType;
-import stirling.software.proprietary.security.service.LoginAttemptService;
-import stirling.software.proprietary.security.service.UserService;
 
 @AllArgsConstructor
 @Slf4j

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

@@ -1,10 +1,6 @@
-package stirling.software.proprietary.security.saml2;
+package stirling.software.SPDF.config.security.saml2;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.saml2.core.Assertion;
@@ -20,8 +16,8 @@ import org.springframework.security.saml2.provider.service.authentication.Saml2A
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.proprietary.security.model.User;
+import stirling.software.SPDF.config.security.UserService;
-import stirling.software.proprietary.security.service.UserService;
+import stirling.software.SPDF.model.User;
 
 @Slf4j
 @ConditionalOnProperty(name = "security.saml2.enabled", havingValue = "true")

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

@@ -1,11 +1,10 @@
-package stirling.software.proprietary.security.saml2;
+package stirling.software.SPDF.config.security.saml2;
 
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.UUID;
 
 import org.opensaml.saml.saml2.core.AuthnRequest;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,8 +29,8 @@ import stirling.software.common.model.ApplicationProperties.Security.SAML2;
 
 @Configuration
 @Slf4j
+@ConditionalOnProperty(value = "security.saml2.enabled", havingValue = "true")
 @RequiredArgsConstructor
-@ConditionalOnBooleanProperty("security.saml2.enabled")
 public class SAML2Configuration {
 
     private final ApplicationProperties applicationProperties;

src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.session;
+package stirling.software.SPDF.config.security.session;
 
 import org.springframework.stereotype.Component;
 
@@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class CustomHttpSessionListener implements HttpSessionListener {
 
-    private final SessionPersistentRegistry sessionPersistentRegistry;
+    private SessionPersistentRegistry sessionPersistentRegistry;
 
     public CustomHttpSessionListener(SessionPersistentRegistry sessionPersistentRegistry) {
         super();

src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java

@@ -1,12 +1,7 @@
-package stirling.software.proprietary.security.session;
+package stirling.software.SPDF.config.security.session;
 
 import java.time.Duration;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.session.SessionInformation;
@@ -19,9 +14,8 @@ import jakarta.transaction.Transactional;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.proprietary.security.database.repository.SessionRepository;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
-import stirling.software.proprietary.security.model.SessionEntity;
+import stirling.software.SPDF.model.SessionEntity;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
 
 @Component
 @RequiredArgsConstructor

src/main/java/stirling/software/SPDF/config/security/session/SessionRegistryConfig.java

@@ -1,11 +1,9 @@
-package stirling.software.proprietary.security.session;
+package stirling.software.SPDF.config.security.session;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.core.session.SessionRegistryImpl;
 
-import stirling.software.proprietary.security.database.repository.SessionRepository;
-
 @Configuration
 public class SessionRegistryConfig {
 

src/main/java/stirling/software/SPDF/config/security/session/SessionRepository.java

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.database.repository;
+package stirling.software.SPDF.config.security.session;
 
 import java.util.Date;
 import java.util.List;
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository;
 
 import jakarta.transaction.Transactional;
 
-import stirling.software.proprietary.security.model.SessionEntity;
+import stirling.software.SPDF.model.SessionEntity;
 
 @Repository
 public interface SessionRepository extends JpaRepository<SessionEntity, String> {

src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.session;
+package stirling.software.SPDF.config.security.session;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.controller.api;
+package stirling.software.SPDF.controller.api;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,8 +27,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.proprietary.security.database.H2SQLCondition;
+import stirling.software.SPDF.config.security.database.DatabaseService;
-import stirling.software.proprietary.security.service.DatabaseService;
 
 @Slf4j
 @Controller

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.controller.api;
+package stirling.software.SPDF.controller.api;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
@@ -18,8 +18,8 @@ import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.proprietary.security.model.api.Email;
+import stirling.software.SPDF.config.security.mail.EmailService;
-import stirling.software.proprietary.security.service.EmailService;
+import stirling.software.SPDF.model.api.Email;
 
 /**
  * Controller for handling email-related API requests. This controller exposes an endpoint for

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.database;
+package stirling.software.SPDF.controller.api;
 
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
@@ -12,12 +12,8 @@ public class H2SQLCondition implements Condition {
                 Boolean.parseBoolean(
                         context.getEnvironment()
                                 .getProperty("system.datasource.enableCustomDatabase"));
-
-        if (!enableCustomDatabase) {
-            return false;
-        }
-
         String dataSourceType = context.getEnvironment().getProperty("system.datasource.type");
-        return "h2".equalsIgnoreCase(dataSourceType);
+        return !enableCustomDatabase
+                || (enableCustomDatabase && "h2".equalsIgnoreCase(dataSourceType));
     }
 }

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.controller.api;
+package stirling.software.SPDF.controller.api;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -29,15 +29,15 @@ import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
+import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
+import stirling.software.SPDF.model.AuthenticationType;
+import stirling.software.SPDF.model.Role;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.model.api.user.UsernameAndPass;
 import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.enumeration.Role;
 import stirling.software.common.model.exception.UnsupportedProviderException;
-import stirling.software.proprietary.security.model.AuthenticationType;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.model.api.user.UsernameAndPass;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
-import stirling.software.proprietary.security.service.UserService;
-import stirling.software.proprietary.security.session.SessionPersistentRegistry;
 
 @Controller
 @Tag(name = "User", description = "User APIs")

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

@@ -23,8 +23,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
+import stirling.software.SPDF.model.api.GeneralFile;
 import stirling.software.common.configuration.RuntimePathConfig;
-import stirling.software.common.model.api.GeneralFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;

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

@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.SPDFApplication;
 import stirling.software.SPDF.model.ApiEndpoint;
-import stirling.software.common.model.enumeration.Role;
+import stirling.software.SPDF.model.Role;
 import stirling.software.common.service.UserServiceInterface;
 
 @Service

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

@@ -35,7 +35,7 @@ import stirling.software.SPDF.SPDFApplication;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.PipelineResult;
-import stirling.software.common.model.enumeration.Role;
+import stirling.software.SPDF.model.Role;
 import stirling.software.common.service.UserServiceInterface;
 
 @Service

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

@@ -4,18 +4,9 @@ import java.io.IOException;
 
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.*;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PDDocumentInformation;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageTree;
-import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
-import org.apache.pdfbox.pdmodel.interactive.action.PDAction;
+import org.apache.pdfbox.pdmodel.interactive.action.*;
-import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
-import org.apache.pdfbox.pdmodel.interactive.action.PDActionLaunch;
-import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
-import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLink;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.controller.web;
+package stirling.software.SPDF.controller.web;
 
 import static stirling.software.common.util.ProviderUtils.validateProvider;
 
@@ -29,21 +29,21 @@ import jakarta.servlet.http.HttpServletRequest;
 
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
+import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
+import stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.Role;
+import stirling.software.SPDF.model.SessionEntity;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.UserRepository;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2.Client;
 import stirling.software.common.model.ApplicationProperties.Security.SAML2;
-import stirling.software.common.model.enumeration.Role;
 import stirling.software.common.model.oauth2.GitHubProvider;
 import stirling.software.common.model.oauth2.GoogleProvider;
 import stirling.software.common.model.oauth2.KeycloakProvider;
-import stirling.software.proprietary.security.database.repository.UserRepository;
-import stirling.software.proprietary.security.model.Authority;
-import stirling.software.proprietary.security.model.SessionEntity;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
-import stirling.software.proprietary.security.session.SessionPersistentRegistry;
 
 @Controller
 @Slf4j

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.controller.web;
+package stirling.software.SPDF.controller.web;
 
 import java.util.List;
 
@@ -14,8 +14,8 @@ import jakarta.servlet.http.HttpServletRequest;
 
 import lombok.RequiredArgsConstructor;
 
+import stirling.software.SPDF.config.security.database.DatabaseService;
 import stirling.software.common.model.FileInfo;
-import stirling.software.proprietary.security.service.DatabaseService;
 
 @Controller
 @Tag(name = "Database Management", description = "Database management and security APIs")

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.model;
+package stirling.software.SPDF.model;
 
 import java.util.Collection;
 

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.model;
+package stirling.software.SPDF.model;
 
 public class AttemptCounter {
     private int attemptCount;

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

@@ -0,0 +1,6 @@
+package stirling.software.SPDF.model;
+
+public enum AuthenticationType {
+    WEB,
+    SSO
+}

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.model;
+package stirling.software.SPDF.model;
 
 import java.io.Serializable;
 

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

@@ -0,0 +1,19 @@
+package stirling.software.SPDF.model;
+
+import java.util.Calendar;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class PdfMetadata {
+    private String author;
+    private String producer;
+    private String title;
+    private String creator;
+    private String subject;
+    private String keywords;
+    private Calendar creationDate;
+    private Calendar modificationDate;
+}

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.model;
+package stirling.software.SPDF.model;
 
 import java.util.Date;
 

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

@@ -0,0 +1,66 @@
+package stirling.software.SPDF.model;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum Role {
+
+    // Unlimited access
+    ADMIN("ROLE_ADMIN", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.admin"),
+
+    // Unlimited access
+    USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.user"),
+
+    // 40 API calls Per Day, 40 web calls
+    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40, "adminUserSettings.apiUser"),
+
+    // 20 API calls Per Day, 20 web calls
+    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20, "adminUserSettings.extraApiUser"),
+
+    // 0 API calls per day and 20 web calls
+    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20, "adminUserSettings.webOnlyUser"),
+
+    INTERNAL_API_USER(
+            "STIRLING-PDF-BACKEND-API-USER",
+            Integer.MAX_VALUE,
+            Integer.MAX_VALUE,
+            "adminUserSettings.internalApiUser"),
+
+    DEMO_USER("ROLE_DEMO_USER", 100, 100, "adminUserSettings.demoUser");
+
+    private final String roleId;
+    private final int apiCallsPerDay;
+    private final int webCallsPerDay;
+    private final String roleName;
+
+    public static String getRoleNameByRoleId(String roleId) {
+        // Using the fromString method to get the Role enum based on the roleId
+        Role role = fromString(roleId);
+        // Return the roleName of the found Role enum
+        return role.getRoleName();
+    }
+
+    // Method to retrieve all role IDs and role names
+    public static Map<String, String> getAllRoleDetails() {
+        // Using LinkedHashMap to preserve order
+        Map<String, String> roleDetails = new LinkedHashMap<>();
+        for (Role role : Role.values()) {
+            roleDetails.put(role.getRoleId(), role.getRoleName());
+        }
+        return roleDetails;
+    }
+
+    public static Role fromString(String roleId) {
+        for (Role role : Role.values()) {
+            if (role.getRoleId().equalsIgnoreCase(roleId)) {
+                return role;
+            }
+        }
+        throw new IllegalArgumentException("No Role defined for id: " + roleId);
+    }
+}

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.model;
+package stirling.software.SPDF.model;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.model;
+package stirling.software.SPDF.model;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -15,8 +15,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
-import stirling.software.common.model.enumeration.Role;
-
 @Entity
 @Table(name = "users")
 @NoArgsConstructor

src/main/java/stirling/software/SPDF/model/exception/BackupNotFoundException.java

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.model.exception;
+package stirling.software.SPDF.model.exception;
 
 public class BackupNotFoundException extends RuntimeException {
     public BackupNotFoundException(String message) {

src/main/java/stirling/software/SPDF/model/exception/NoProviderFoundException.java

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.model.exception;
+package stirling.software.SPDF.model.exception;
 
 public class NoProviderFoundException extends Exception {
     public NoProviderFoundException(String message) {

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

@@ -1,11 +1,11 @@
-package stirling.software.proprietary.security.database.repository;
+package stirling.software.SPDF.repository;
 
 import java.util.Set;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import stirling.software.proprietary.security.model.Authority;
+import stirling.software.SPDF.model.Authority;
 
 @Repository
 public interface AuthorityRepository extends JpaRepository<Authority, Long> {

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

@@ -1,4 +1,4 @@
-package stirling.software.proprietary.security.database.repository;
+package stirling.software.SPDF.repository;
 
 import java.util.Date;
 
@@ -6,7 +6,7 @@ import org.springframework.security.web.authentication.rememberme.PersistentReme
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
 import org.springframework.transaction.annotation.Transactional;
 
-import stirling.software.proprietary.security.model.PersistentLogin;
+import stirling.software.SPDF.model.PersistentLogin;
 
 public class JPATokenRepositoryImpl implements PersistentTokenRepository {