feat: Add DGNum customization

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: Frooodle # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['https://www.paypal.com/donate/?hosted_button_id=MN7JPG5G6G3JL'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/1-bug.yml

@@ -11,18 +11,6 @@ body:
 
         This issue form is for reporting bugs only. Please fill out the following sections to help us understand the issue you are facing.
   
-  - type: dropdown
-    id: installation-method
-    attributes:
-      label: Installation Method
-      description: |
-        Indicate whether you are using Docker or a local installation.
-      options:
-        - Docker
-        - Docker ultra lite
-        - Docker fat
-        - Local Installation
-
   - type: textarea
     id: problem
     validations:

.github/ISSUE_TEMPLATE/2-feature.yml

@@ -1,8 +1,6 @@
 name: Feature Request
 description: Submit a new feature request.
 title: "[Feature Request]: "
-labels:
-  - enhancement
 body:
   - type: markdown
     attributes:

.github/dependabot.yml

@@ -9,8 +9,6 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
-    open-pull-requests-limit: 10
-    rebase-strategy: "auto"
   - package-ecosystem: "docker"
     directory: "/" # Location of Dockerfile
     schedule:

.github/labeler-config.yml

@@ -1,54 +0,0 @@
-Translation:
-  - changed-files:
-    - any-glob-to-any-file: 'src/main/resources/messages_*_*.properties'
-    - any-glob-to-any-file: 'scripts/ignore_translation.toml'
-    - any-glob-to-any-file: 'src/main/resources/templates/fragments/languages.html'
-
-Front End:
-  - changed-files:
-    - any-glob-to-any-file: 'src/main/resources/templates/**/*'
-    - any-glob-to-any-file: 'src/main/resources/static/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/**'
-
-Java:
-  - changed-files:
-    - any-glob-to-any-file: 'src/main/java/**/*.java'
-
-Back End:
-  - changed-files:
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/provider/**/*'
-    - any-glob-to-any-file: 'src/main/resources/settings.yml.template'
-    - any-glob-to-any-file: 'src/main/resources/banner.txt'
-
-Security:
-  - changed-files:
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/provider/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/AuthenticationType.java'
-
-API:
-  - changed-files:
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/**/*'
-
-Documentation:
-  - changed-files:
-    - any-glob-to-any-file: '**/*.md'
-    - any-glob-to-any-file: 'scripts/counter_translation.py'
-    - any-glob-to-any-file: 'scripts/ignore_translation.toml'
-
-Docker:
-  - changed-files:
-    - any-glob-to-any-file: 'Dockerfile'
-    - any-glob-to-any-file: 'Dockerfile-*'
-    - any-glob-to-any-file: 'exampleYmlFiles/*.yml'
-
-Test:
-  - changed-files:
-    - any-glob-to-any-file: 'cucumber/**/*'
-    - any-glob-to-any-file: 'src/test**/*'
-
-Github:
-  - changed-files:
-    - any-glob-to-any-file: '.github/**/*'

.github/labels.yml

@@ -1,93 +0,0 @@
-# Labels names are important as they are used by Release Drafter to decide
-# regarding where to record them in changelog or if to skip them.
-#
-# The repository labels will be automatically configured using this file and
-# the GitHub Action https://github.com/marketplace/actions/github-labeler.
-- name: "Back End"
-  color: "20CE6C"
-  description: "Issues related to back-end development"
-  from_name: "Back end"
-- name: "Bug"
-  description: "Something isn't working"
-  color: "EB9CA6"
-  from_name: "bug"
-- name: "dependencies"
-  description: "Pull requests that update a dependency file"
-  color: "5AA8FC"
-- name: "Docker"
-  description: "Pull requests that update Docker code"
-  color: "1FCEFF"
-  from_name: "docker"
-- name: "Documentation"
-  description: "Improvements or additions to documentation"
-  color: "35ABFF"
-  from_name: "documentation"
-- name: "Done for next release"
-  color: "0CDBD1"
-- name: "Done"
-  color: "60F13B"
-- name: "duplicate"
-  description: "This issue or pull request already exists"
-  color: "CDD1D5"
-- name: "enhancement"
-  description: "New feature or request"
-  color: "A0EEEE"
-- name: "fix needs confirmation"
-  color: "60A1E7"
-  description: "Fix needs to be confirmed"
-- name: "Front End"
-  color: "BBD2F1"
-  description: "Issues related to front-end development"
-- name: "github-actions"
-  description: "Pull requests that update GitHub Actions code"
-  color: "999999"
-  from_name: "github_actions"
-- name: "good first issue"
-  description: "Good for newcomers"
-  color: "C1B8FF"
-- name: "help wanted"
-  description: "Extra attention is needed"
-  color: "00E6C4"
-- name: "invalid"
-  description: "This doesn't seem right"
-  color: "E5E566"
-- name: "Java"
-  description: "Pull requests that update Java code"
-  color: "FF9E1F"
-  from_name: "java"
-- name: "Long-term Enhancement"
-  color: "BFDEC3"
-  description: "Enhancements planned for the long term"
-- name: "more-info-needed"
-  color: "00E4F8"
-  description: "More information is needed"
-- name: "needs investigation"
-  color: "B8C3A7"
-  description: "Issues that require further investigation"
-- name: "Prioritised enhancement"
-  color: "4BA2EE"
-  description: "High-priority enhancements"
-- name: "question"
-  description: "Further information is requested"
-  color: "D97EE5"
-- name: "Translation"
-  color: "9FABF9"
-  from_name: "translation"
-- name: "upstream"
-  color: "DEDEDE"
-- name: "v2"
-  color: "FFFF00"
-- name: "wontfix"
-  description: "This will not be worked on"
-  color: "FFFFFF"
-- name: "Security"
-  color: "000000"
-  description: "Security-related issues or pull requests"
-- name: "API"
-  color: "FFFF00"
-  description: "API-related issues or pull requests"
-- name: "Test"
-  color: "FF9E1F"
-  description: "Testing-related issues or pull requests"
-- name: "Stale"
-  color: "000000"

.github/pull_request_template.md

@@ -4,10 +4,15 @@ Please provide a summary of the changes, including relevant motivation and conte
 
 Closes #(issue_number)
 
-## Checklist
+## Checklist:
 
 - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
 - [ ] I have performed a self-review of my own code
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] My changes generate no new warnings
-- [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only)
+
+## Contributor License Agreement
+
+By submitting this pull request, I acknowledge and agree that my contributions will be included in Stirling-PDF and that they can be relicensed in the future under the MPL 2.0 (Mozilla Public License Version 2.0) license.
+
+(This does not change the general open-source nature of Stirling-PDF, simply moving from one license to another license)

.github/release.yml

@@ -1,32 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - Documentation
-      - Test
-      - Github
-
-  categories:
-    - title: Bug Fixes
-      labels:
-        - Bug
-    
-    - title: Enhancements
-      labels:
-        - enhancement
-
-    - title: Minor Enhancements
-      labels:
-        - Java
-        - Front End
-
-    - title: Docker Updates
-      labels:
-        - Docker
-
-    - title: Translation Changes
-      labels:
-        - Translation
-    
-    - title: Other Changes
-      labels:
-        - "*"

.github/scripts/check_language_properties.py

@@ -1,254 +0,0 @@
-"""
-Author: Ludy87
-Description: This script processes .properties files for localization checks. It compares translation files in a branch with
-a reference file to ensure consistency. The script performs two main checks:
-1. Verifies that the number of lines (including comments and empty lines) in the translation files matches the reference file.
-2. Ensures that all keys in the translation files are present in the reference file and vice versa.
-
-The script also provides functionality to update the translation files to match the reference file by adding missing keys and
-adjusting the format.
-
-Usage:
-    python script_name.py --reference-file <path_to_reference_file> --branch <branch_name> [--files <list_of_changed_files>]
-"""
-import copy
-import glob
-import os
-import argparse
-import re
-
-
-def parse_properties_file(file_path):
-    """Parses a .properties file and returns a list of objects (including comments, empty lines, and line numbers)."""
-    properties_list = []
-    with open(file_path, "r", encoding="utf-8") as file:
-        for line_number, line in enumerate(file, start=1):
-            stripped_line = line.strip()
-
-            # Empty lines
-            if not stripped_line:
-                properties_list.append(
-                    {"line_number": line_number, "type": "empty", "content": ""}
-                )
-                continue
-
-            # Comments
-            if stripped_line.startswith("#"):
-                properties_list.append(
-                    {
-                        "line_number": line_number,
-                        "type": "comment",
-                        "content": stripped_line,
-                    }
-                )
-                continue
-
-            # Key-value pairs
-            match = re.match(r"^([^=]+)=(.*)$", line)
-            if match:
-                key, value = match.groups()
-                properties_list.append(
-                    {
-                        "line_number": line_number,
-                        "type": "entry",
-                        "key": key.strip(),
-                        "value": value.strip(),
-                    }
-                )
-
-    return properties_list
-
-
-def write_json_file(file_path, updated_properties):
-    updated_lines = {entry["line_number"]: entry for entry in updated_properties}
-
-    # Sort by line numbers and retain comments and empty lines
-    all_lines = sorted(set(updated_lines.keys()))
-
-    original_format = []
-    for line in all_lines:
-        if line in updated_lines:
-            entry = updated_lines[line]
-        else:
-            entry = None
-        ref_entry = updated_lines[line]
-        if ref_entry["type"] in ["comment", "empty"]:
-            original_format.append(ref_entry)
-        elif entry is None:
-            # Add missing entries from the reference file
-            original_format.append(ref_entry)
-        elif entry["type"] == "entry":
-            # Replace entries with those from the current JSON
-            original_format.append(entry)
-
-    # Write back in the original format
-    with open(file_path, "w", encoding="utf-8") as file:
-        for entry in original_format:
-            if entry["type"] == "comment":
-                file.write(f"{entry['content']}\n")
-            elif entry["type"] == "empty":
-                file.write(f"{entry['content']}\n")
-            elif entry["type"] == "entry":
-                file.write(f"{entry['key']}={entry['value']}\n")
-
-
-def update_missing_keys(reference_file, file_list, branch=""):
-    reference_properties = parse_properties_file(reference_file)
-    for file_path in file_list:
-        basename_current_file = os.path.basename(branch + file_path)
-        if (
-            basename_current_file == os.path.basename(reference_file)
-            or not file_path.endswith(".properties")
-            or not basename_current_file.startswith("messages_")
-        ):
-            continue
-
-        current_properties = parse_properties_file(branch + file_path)
-        updated_properties = []
-        for ref_entry in reference_properties:
-            ref_entry_copy = copy.deepcopy(ref_entry)
-            for current_entry in current_properties:
-                if current_entry["type"] == "entry":
-                    if ref_entry_copy["type"] != "entry":
-                        continue
-                    if ref_entry_copy["key"] == current_entry["key"]:
-                        ref_entry_copy["value"] = current_entry["value"]
-            updated_properties.append(ref_entry_copy)
-        write_json_file(branch + file_path, updated_properties)
-
-
-def check_for_missing_keys(reference_file, file_list, branch):
-    update_missing_keys(reference_file, file_list, branch + "/")
-
-
-def read_properties(file_path):
-    with open(file_path, "r", encoding="utf-8") as file:
-        return file.read().splitlines()
-
-
-def check_for_differences(reference_file, file_list, branch):
-    reference_branch = reference_file.split("/")[0]
-    basename_reference_file = os.path.basename(reference_file)
-
-    report = []
-    report.append(
-        f"### 📋 Checking with the file `{basename_reference_file}` from the `{reference_branch}` - Checking the `{branch}`"
-    )
-    reference_lines = read_properties(reference_file)
-    has_differences = False
-
-    only_reference_file = True
-
-    for file_path in file_list:
-        basename_current_file = os.path.basename(branch + "/" + file_path)
-        if (
-            basename_current_file == basename_reference_file
-            or not file_path.endswith(".properties")
-            or not basename_current_file.startswith("messages_")
-        ):
-            continue
-        only_reference_file = False
-        report.append(f"#### 🗂️ **Checking File:** `{basename_current_file}`...")
-        current_lines = read_properties(branch + "/" + file_path)
-        reference_line_count = len(reference_lines)
-        current_line_count = len(current_lines)
-
-        if reference_line_count != current_line_count:
-            report.append("")
-            report.append("- **Test 1 Status:** ❌ Failed")
-            has_differences = True
-            if reference_line_count > current_line_count:
-                report.append(
-                    f"  - **Issue:** Missing lines! Comments, empty lines, or translation strings are missing. Details: {reference_line_count} (reference) vs {current_line_count} (current)."
-                )
-            elif reference_line_count < current_line_count:
-                report.append(
-                    f"  - **Issue:** Too many lines! Check your translation files! Details: {reference_line_count} (reference) vs {current_line_count} (current)."
-                )
-            # update_missing_keys(reference_file, [file_path], branch + "/")
-        else:
-            report.append("- **Test 1 Status:** ✅ Passed")
-
-        # Check for missing or extra keys
-        current_keys = []
-        reference_keys = []
-        for line in current_lines:
-            if not line.startswith("#") and line != "" and "=" in line:
-                key, _ = line.split("=", 1)
-                current_keys.append(key)
-        for line in reference_lines:
-            if not line.startswith("#") and line != "" and "=" in line:
-                key, _ = line.split("=", 1)
-                reference_keys.append(key)
-
-        current_keys_set = set(current_keys)
-        reference_keys_set = set(reference_keys)
-        missing_keys = current_keys_set.difference(reference_keys_set)
-        extra_keys = reference_keys_set.difference(current_keys_set)
-        missing_keys_list = list(missing_keys)
-        extra_keys_list = list(extra_keys)
-
-        if missing_keys_list or extra_keys_list:
-            has_differences = True
-            missing_keys_str = "`, `".join(missing_keys_list)
-            extra_keys_str = "`, `".join(extra_keys_list)
-            report.append("- **Test 2 Status:** ❌ Failed")
-            if missing_keys_list:
-                report.append(
-                    f"  - **Issue:** There are keys in ***{basename_current_file}*** `{missing_keys_str}` that are not present in ***{basename_reference_file}***!"
-                )
-            if extra_keys_list:
-                report.append(
-                    f"  - **Issue:** There are keys in ***{basename_reference_file}*** `{extra_keys_str}` that are not present in ***{basename_current_file}***!"
-                )
-            # update_missing_keys(reference_file, [file_path], branch + "/")
-        else:
-            report.append("- **Test 2 Status:** ✅ Passed")
-        # if has_differences:
-        #     report.append("")
-        #     report.append(f"#### 🚧 ***{basename_current_file}*** will be corrected...")
-        report.append("")
-        report.append("---")
-        report.append("")
-    # update_file_list = glob.glob(branch + "/src/**/messages_*.properties", recursive=True)
-    # update_missing_keys(reference_file, update_file_list)
-    # report.append("---")
-    # report.append("")
-    if has_differences:
-        report.append("## ❌ Overall Check Status: **_Failed_**")
-    else:
-        report.append("## ✅ Overall Check Status: **_Success_**")
-
-    if not only_reference_file:
-        print("\n".join(report))
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Find missing keys")
-    parser.add_argument(
-        "--reference-file",
-        required=True,
-        help="Path to the reference file.",
-    )
-    parser.add_argument(
-        "--branch",
-        type=str,
-        required=True,
-        help="Branch name.",
-    )
-    parser.add_argument(
-        "--files",
-        nargs="+",
-        required=False,
-        help="List of changed files, separated by spaces.",
-    )
-    args = parser.parse_args()
-
-    file_list = args.files
-    if file_list is None:
-        file_list = glob.glob(
-            os.getcwd() + "/src/**/messages_*.properties", recursive=True
-        )
-        update_missing_keys(args.reference_file, file_list)
-    else:
-        check_for_differences(args.reference_file, file_list, args.branch)

.github/scripts/check_tabulator.py

@@ -1,5 +1,4 @@
 """check_tabulator.py"""
-
 import argparse
 import sys
 

.github/workflows/auto-labeler.yml

@@ -1,20 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-
-jobs:
-  labeler:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      
-      - name: Apply Labels
-        uses: actions/labeler@v5
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          configuration-path: .github/labeler-config.yml
-          sync-labels: true

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build repo
+name: "Build repo"
 
 on:
   push:
@@ -17,72 +17,20 @@ jobs:
 
     strategy:
       fail-fast: false
-      matrix:
-        jdk-version: [17, 21]
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK ${{ matrix.jdk-version }}
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.jdk-version }}
+          java-version: "17"
           distribution: "temurin"
 
-      - name: Set up Gradle
+      - uses: gradle/actions/setup-gradle@v3
-        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: 8.7
 
       - name: Build with Gradle
         run: ./gradlew build --no-build-cache
-
-  docker-compose-tests:
-    # if: github.event_name == 'push' && github.ref == 'refs/heads/main' ||
-    #     (github.event_name == 'pull_request' &&
-    #     contains(github.event.pull_request.labels.*.name, 'licenses') == false &&
-    #     (
-    #       contains(github.event.pull_request.labels.*.name, 'Front End') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Java') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Back End') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Security') ||
-    #       contains(github.event.pull_request.labels.*.name, 'API') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Docker') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Test')
-    #     )
-    #     )
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Set up Java 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: "17"
-          distribution: "adopt"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Install Docker Compose
-        run: |
-          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.7"
-
-      - name: Pip requirements
-        run: |
-           pip install -r ./cucumber/requirements.txt
-
-      - name: Run Docker Compose Tests
-        run: |
-          chmod +x ./test.sh
-          ./test.sh

.github/workflows/check_properties.yml

@@ -1,202 +0,0 @@
-name: Check Properties Files
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-    paths:
-      - "src/main/resources/messages_*.properties"
-  push:
-    paths:
-      - "src/main/resources/messages_en_GB.properties"
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  check-files:
-    if: github.event_name == 'pull_request_target'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout PR branch
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
-          path: pr-branch
-          fetch-depth: 0
-
-      - name: Checkout main branch
-        uses: actions/checkout@v4
-        with:
-          ref: main
-          path: main-branch
-          fetch-depth: 0
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-
-      - name: Install GitHub CLI
-        run: sudo apt-get update && sudo apt-get install -y gh
-
-      - name: Fetch PR changed files
-        id: fetch-pr-changes
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          echo "Fetching PR changed files..."
-          cd pr-branch
-          gh repo set-default ${{ github.repository }}
-          gh pr view ${{ github.event.pull_request.number }} --json files -q ".files[].path" > ../changed_files.txt
-          cd ..
-          echo $(cat changed_files.txt)
-          BRANCH_PATH="pr-branch"
-          echo "BRANCH_PATH=${BRANCH_PATH}" >> $GITHUB_ENV
-          CHANGED_FILES=$(cat changed_files.txt | tr '\n' ' ')
-          echo "CHANGED_FILES=${CHANGED_FILES}" >> $GITHUB_ENV
-          echo "Changed files: ${CHANGED_FILES}"
-          echo "Branch: ${BRANCH_PATH}"
-
-      - name: Determine reference file
-        id: determine-file
-        run: |
-          echo "Determining reference file..."
-          if echo "${{ env.CHANGED_FILES }}" | grep -q 'src/main/resources/messages_en_GB.properties'; then
-              echo "REFERENCE_FILE=pr-branch/src/main/resources/messages_en_GB.properties" >> $GITHUB_ENV
-          else
-              echo "REFERENCE_FILE=main-branch/src/main/resources/messages_en_GB.properties" >> $GITHUB_ENV
-          fi
-          echo "REFERENCE_FILE=${{ env.REFERENCE_FILE }}"
-
-      - name: Show REFERENCE_FILE
-        run: echo "Reference file is set to ${{ env.REFERENCE_FILE }}"
-
-      - name: Run Python script to check files
-        id: run-check
-        run: |
-          python main-branch/.github/scripts/check_language_properties.py --reference-file ${{ env.REFERENCE_FILE }} --branch ${{ env.BRANCH_PATH }} --files ${{ env.CHANGED_FILES }} > failure.txt || true
-
-      - name: Capture output
-        id: capture-output
-        run: |
-          if [ -f failure.txt ] && [ -s failure.txt ]; then
-            echo "Test failed, capturing output..."
-            ERROR_OUTPUT=$(cat failure.txt)
-            echo "ERROR_OUTPUT<<EOF" >> $GITHUB_ENV
-            echo "$ERROR_OUTPUT" >> $GITHUB_ENV
-            echo "EOF" >> $GITHUB_ENV
-            echo $ERROR_OUTPUT
-          else
-            echo "No errors found."
-            echo "ERROR_OUTPUT=" >> $GITHUB_ENV
-          fi
-
-      - name: Post comment on PR
-        if: env.ERROR_OUTPUT != ''
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { GITHUB_REPOSITORY, ERROR_OUTPUT } = process.env;
-            const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
-            const prNumber = context.issue.number;
-
-            // Find existing comment
-            const comments = await github.rest.issues.listComments({
-              owner: repoOwner,
-              repo: repoName,
-              issue_number: prNumber
-            });
-
-            const comment = comments.data.find(c => c.body.includes("## 🚀 Translation Verification Summary"));
-
-            // Only allow the action user to update comments
-            const expectedActor = "github-actions[bot]";
-
-            if (comment && comment.user.login === expectedActor) {
-              // Update existing comment
-              await github.rest.issues.updateComment({
-                owner: repoOwner,
-                repo: repoName,
-                comment_id: comment.id,
-                body: `## 🚀 Translation Verification Summary\n\n\n${ERROR_OUTPUT}\n`
-              });
-              console.log("Updated existing comment.");
-            } else if (!comment) {
-              // Create new comment if no existing comment is found
-              await github.rest.issues.createComment({
-                owner: repoOwner,
-                repo: repoName,
-                issue_number: prNumber,
-                body: `## 🚀 Translation Verification Summary\n\n\n${ERROR_OUTPUT}\n`
-              });
-              console.log("Created new comment.");
-            } else {
-              console.log("Comment update attempt denied. Actor does not match.");
-            }
-
-      # - name: Set up git config
-      #   run: |
-      #     git config --global user.name "github-actions[bot]"
-      #     git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      # - name: Add translation keys
-      #   run: |
-      #     cd ${{ env.BRANCH_PATH }}
-      #     git add src/main/resources/messages_*.properties
-      #     git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-      #     git commit -m "Update translation files" || echo "No changes to commit"
-      # - name: Push
-      #   if: env.CHANGES_DETECTED == 'true'
-      #   run: |
-      #     cd pr-branch
-      #     git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.event.pull_request.head.repo.full_name }}.git
-      #     git push origin ${{ github.head_ref }} || echo "Push failed: possibly no changes to push"
-
-  update-translations-main:
-    if: github.event_name == 'push'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-
-      - name: Run Python script to check files
-        id: run-check
-        run: |
-          python .github/scripts/check_language_properties.py --reference-file src/main/resources/messages_en_GB.properties --branch main
-
-      - name: Set up git config
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Add translation keys
-        run: |
-          git add src/main/resources/messages_*.properties
-          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-
-      - name: Create Pull Request
-        id: cpr
-        if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@v6
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Update translation files"
-          committer: GitHub Action <action@github.com>
-          author: GitHub Action <action@github.com>
-          signoff: true
-          branch: update_translation_files
-          title: "Update translation files"
-          body: |
-            Auto-generated by [create-pull-request][1]
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          labels: Translation
-          draft: false
-          delete-branch: true

.github/workflows/licenses-update.yml

@@ -25,7 +25,7 @@ jobs:
           java-version: "17"
           distribution: "adopt"
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v3
 
       - name: Run Gradle Command
         run: ./gradlew clean generateLicenseReport
@@ -36,8 +36,8 @@ jobs:
 
       - name: Set up git config
         run: |
-          git config --global user.name "github-actions[bot]"
+          git config --global user.email "GitHub Action <action@github.com>"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "GitHub Action <action@github.com>"
 
       - name: Run git add
         run: |
@@ -45,7 +45,6 @@ jobs:
           git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
 
       - name: Create Pull Request
-        id: cpr
         if: env.CHANGES_DETECTED == 'true'
         uses: peter-evans/create-pull-request@v6
         with:
@@ -58,22 +57,6 @@ jobs:
           title: "Update 3rd Party Licenses"
           body: |
             Auto-generated by [create-pull-request][1]
-
             [1]: https://github.com/peter-evans/create-pull-request
-          labels: licenses
           draft: false
           delete-branch: true
-
-      - name: Auto approve
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        run: gh pr review --approve "${{ steps.cpr.outputs.pull-request-number }}"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Enable auto-merge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: squash # Choose the merge method: merge, squash, or rebase

.github/workflows/manage-label.yml

@@ -1,24 +0,0 @@
-name: Manage labels
-
-on:
-  schedule:
-    - cron: "30 20 * * *"
-
-permissions:
-  contents: read
-  issues: write
-
-jobs:
-  labeler:
-    name: Labeler
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v4
-
-      - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@v5
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          yaml-file: .github/labels.yml
-          skip-delete: true

.github/workflows/push-docker.yml

@@ -22,7 +22,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: 8.7
 
@@ -72,7 +72,7 @@ jobs:
             type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
 
       - name: Build and push main Dockerfile
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
@@ -98,7 +98,7 @@ jobs:
             type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
 
       - name: Build and push Dockerfile-ultra-lite
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         if: github.ref != 'refs/heads/main'
         with:
           context: .
@@ -111,6 +111,7 @@ jobs:
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
 
+
       - name: Generate tags fat
         id: meta3
         uses: docker/metadata-action@v5
@@ -124,7 +125,7 @@ jobs:
             type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
 
       - name: Build and push main Dockerfile fat
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         if: github.ref != 'refs/heads/main'
         with:
           builder: ${{ steps.buildx.outputs.name }}

.github/workflows/releaseArtifacts.yml

@@ -27,7 +27,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: 8.7
 

.github/workflows/stale.yml

@@ -1,32 +0,0 @@
-name: Close stale issues
-
-on:
-  schedule:
-    - cron: "30 0 * * *"
-  workflow_dispatch:
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - name: 30 days stale issues
-        uses: actions/stale@v9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 30
-          days-before-close: 7
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has had no recent activity.
-            It will be closed if no further activity occurs. Thank you for your contributions.
-          close-issue-message: >
-            This issue has been automatically closed because it has had no recent activity after being marked as stale.
-            Please reopen if you need further assistance.
-          stale-issue-label: "Stale"
-          remove-stale-when-updated: true
-          only-issue-labels: "more-info-needed"
-          days-before-pr-stale: -1 # Prevents PRs from being marked as stale
-          days-before-pr-close: -1 # Prevents PRs from being closed
-          start-date: '2024-07-06T00:00:00Z'  # ISO 8601 Format

.github/workflows/swagger.yml

@@ -18,7 +18,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v3
 
       - name: Generate Swagger documentation
         run: ./gradlew generateOpenApiDocs

.github/workflows/sync_files.yml

@@ -28,8 +28,8 @@ jobs:
         run: python .github/scripts/gradle_to_chart.py
       - name: Set up git config
         run: |
-          git config --global user.name "github-actions[bot]"
+          git config --global user.email "GitHub Action <action@github.com>"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "GitHub Action <action@github.com>"
       - name: Run git add
         run: |
           git add .
@@ -51,7 +51,6 @@ jobs:
             [1]: https://github.com/peter-evans/create-pull-request
           draft: false
           delete-branch: true
-          labels: github-actions
   sync-readme:
     runs-on: ubuntu-latest
     steps:
@@ -66,8 +65,8 @@ jobs:
         run: python scripts/counter_translation.py
       - name: Set up git config
         run: |
-          git config --global user.name "github-actions[bot]"
+          git config --global user.email "GitHub Action <action@github.com>"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "GitHub Action <action@github.com>"
       - name: Run git add
         run: |
           git add .
@@ -89,4 +88,3 @@ jobs:
             [1]: https://github.com/peter-evans/create-pull-request
           draft: false
           delete-branch: true
-          labels: Documentation,Translation,github-actions

.github/workflows/test.yml

@@ -0,0 +1,47 @@
+name: Docker Compose Tests
+
+on:
+  pull_request:
+    paths:
+      - "src/**"
+      - "**.gradle"
+      - "!src/main/java/resources/messages*"
+      - "exampleYmlFiles/**"
+      - "Dockerfile"
+      - "Dockerfile**"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set up Java 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: "17"
+          distribution: "adopt"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Install Docker Compose
+        run: |
+          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          # sudo chmod +x /usr/local/bin/docker-compose
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.7"
+          
+      - name: Pip requirements
+        run: |
+           pip install -r ./cucumber/requirements.txt
+              
+      - name: Run Docker Compose Tests
+        run: |
+          chmod +x ./test.sh
+          ./test.sh

.gitignore

@@ -1,3 +1,5 @@
+
+
 ### Eclipse ###
 .metadata
 bin/
@@ -20,6 +22,7 @@ customFiles/
 configs/
 watchedFolders/
 
+
 # Gradle
 .gradle
 .lock
@@ -116,28 +119,8 @@ watchedFolders/
 *.db
 /build
 
-# Byte-compiled / optimized / DLL files
+/.vscode
-__pycache__/
+/.idea
-*.py[cod]
-*.pyo
-
-# Virtual environments
-.env*
-.venv*
-env*/
-venv*/
-ENV/
-env.bak/
-venv.bak/
-
-# VS Code
-/.vscode/**/*
-!/.vscode/settings.json
-
-# IntelliJ IDEA
-.idea/
-*.iml
-out/
 
 # Ignore Mac DS_Store files
 .DS_Store
@@ -145,19 +128,3 @@ out/
 
 #cucumber
 /cucumber/reports/**
-
-# Certs
-*.p12
-*.pem
-*.crt
-*.cer
-*.der
-*.key
-*.csr
-
-# cache
-.ruff_cache
-.mypy_cache
-.pytest_cache
-.ipynb_checkpoints
-

.vscode/settings.json

@@ -1,53 +0,0 @@
-{
-  "java.compile.nullAnalysis.mode": "automatic",
-  "files.eol": "auto",
-  "java.configuration.updateBuildConfiguration": "interactive",
-  "black-formatter.args": ["--line-length", "127"],
-  "flake8.args": ["--max-line-length", "127"],
-  "pylint.args": ["max-line-length", "127"],
-  "[java]": {
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.rulers": [127]
-  },
-  "[python]": {
-    "editor.tabSize": 2,
-    "editor.detectIndentation": false,
-    "editor.rulers": [127]
-  },
-  "[gradle-build]": {
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.rulers": [127]
-  },
-  "[gradle]": {
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.rulers": [127]
-  },
-  "[html]": {
-    "editor.tabSize": 2,
-    "editor.rulers": [127],
-    "files.trimFinalNewlines": false,
-    "files.insertFinalNewline": false
-  },
-  "[javascript]": {
-    "editor.tabSize": 2,
-    "editor.rulers": [127]
-  },
-  "[yaml]": {
-    "files.trimFinalNewlines": false,
-    "files.insertFinalNewline": false
-  },
-  "diffEditor.maxComputationTime": 0,
-  "editor.wordSegmenterLocales": null,
-  "editor.guides.bracketPairs": "active",
-  "editor.guides.bracketPairsHorizontal": "active",
-  "files.insertFinalNewline": true,
-  "files.trimFinalNewlines": true,
-  "files.trimTrailingWhitespace": true,
-  "editor.indentSize": "tabSize",
-  "editor.stickyScroll.enabled": false,
-  "editor.minimap.enabled": false,
-  "editor.formatOnSave": true
-}

DATABASE.md

@@ -1,40 +0,0 @@
-# New Database Backup and Import Functionality
-
-**Full activation will take place on approximately January 5th, 2025!**
-
-Why is the waiting time six months?
-
-There are users who only install updates sporadically; if they skip the preparation, it can/will lead to data loss in the database.
-
-## Functionality Overview
-
-The newly introduced feature enhances the application with robust database backup and import capabilities. This feature is designed to ensure data integrity and provide a straightforward way to manage database backups. Here's how it works:
-
-1. Automatic Backup Creation
-   - The system automatically creates a database backup every day at midnight. This ensures that there is always a recent backup available, minimizing the risk of data loss.
-2. Manual Backup Export
-   - Admin actions that modify the user database trigger a manual export of the database. This keeps the backup up-to-date with the latest changes and provides an extra layer of data security.
-3. Importing Database Backups
-   - Admin users can import a database backup either via the web interface or API endpoints. This allows for easy restoration of the database to a previous state in case of data corruption or other issues.
-   - The import process ensures that the database structure and data are correctly restored, maintaining the integrity of the application.
-4. Managing Backup Files
-   - Admins can view a list of all existing backup files, along with their creation dates and sizes. This helps in managing storage and identifying the most recent or relevant backups.
-   - Backup files can be downloaded for offline storage or transferred to other environments, providing flexibility in database management.
-   - Unnecessary backup files can be deleted through the interface to free up storage space and maintain an organized backup directory.
-
-## User Interface
-
-### Web Interface
-
-1. Upload SQL files to import database backups.
-2. View details of existing backups, such as file names, creation dates, and sizes.
-3. Download backup files for offline storage.
-4. Delete outdated or unnecessary backup files.
-
-### API Endpoints
-
-1. Import database backups by uploading SQL files.
-2. Download backup files.
-3. Delete backup files.
-
-This new functionality streamlines database management, ensuring that backups are always available and easy to manage, thus improving the reliability and resilience of the application.

Dockerfile

@@ -1,5 +1,5 @@
 # Main stage
-FROM alpine:3.20.3
+FROM alpine:3.20.0
 
 # Copy necessary files
 COPY scripts /scripts
@@ -39,16 +39,16 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         libreoffice \
 # pdftohtml
         poppler-utils \
-# OCR MY PDF (unpaper for descew and other advanced features)
+# OCR MY PDF (unpaper for descew and other advanced featues)
         ocrmypdf \
         tesseract-ocr-data-eng \
 # CV
         py3-opencv \
 # python3/pip
-        python3 \
+        python3 && \
-        py3-pip && \
+    wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
 # uno unoconv and HTML
-    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
+    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \
     mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
     fc-cache -f -v && \

Dockerfile-fat

@@ -12,7 +12,7 @@ RUN DOCKER_ENABLE_SECURITY=true \
 ./gradlew clean build 
 
 # Main stage
-FROM alpine:3.20.3
+FROM alpine:3.20.0
 
 # Copy necessary files
 COPY scripts /scripts
@@ -31,7 +31,7 @@ ENV DOCKER_ENABLE_SECURITY=false \
     PGID=1000 \
     UMASK=022 \
     FAT_DOCKER=true \
-    INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false
+    INSTALL_BOOK_AND_ADVANCED_HTML_OPS=true
     
 
 # JDK for app
@@ -45,6 +45,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         tini \
         bash \
         curl \
+        calibre@testing \
         shadow \
         su-exec \
         openssl \
@@ -61,10 +62,10 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # CV
         py3-opencv \
 # python3/pip
-        python3 \
+        python3 && \
-    py3-pip && \
+    wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
 # uno unoconv and HTML
-    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
+    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \
     mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
     fc-cache -f -v && \

Dockerfile-ultra-lite

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

Endpoint-groups.md

@@ -15,7 +15,7 @@
 | file-to-pdf         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
 | img-to-pdf          |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |
 | pdf-to-html         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
-| pdf-to-img          |         | ✔️       |          |       |     | ✔️      |        |             |          | ✔️    |            |
+| pdf-to-img          |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |
 | pdf-to-pdfa         |         | ✔️       |          |       | ✔️   |        |        |             | ✔️        |      |            |
 | pdf-to-markdown     |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |
 | pdf-to-presentation |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |

HowToAddNewLanguage.md

@@ -1,6 +1,7 @@
 <p align="center"><img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
 </p>
 
+
 # How to add new languages to Stirling-PDF
 
 Fork Stirling-PDF and make a new branch out of Main
@@ -13,14 +14,13 @@ https://github.com/Stirling-Tools/Stirling-PDF/tree/main/src/main/resources/stat
 Any SVG flags are fine, i got most of mine from [here](https://flagicons.lipis.dev/)
 If your language isn't represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia
 
-For example to add Polish you would add
 
+For example to add Polish you would add
 ```html
 <a class="dropdown-item lang_dropdown-item" href="" data-language-code="pl_PL">
     <img src="images/flags/pl.svg" alt="icon" width="20" height="15"> Polski
 </a>
 ```
-
 The data-language-code is the code used to reference the file in the next step.
 
 Start by copying the existing english property file
@@ -29,6 +29,7 @@ Start by copying the existing english property file
 
 Copy and rename it to messages_{your data-language-code here}.properties, in the polish example you would set the name to messages_pl_PL.properties
 
+
 Then simply translate all property entries within that file and make a PR into main for others to use!
 
 If you do not have a java IDE i am happy to verify the changes worked once you raise PR (but won't be able to verify the translations themselves)
@@ -47,10 +48,4 @@ ignore = [
 ]
 ```
 
-## Add New Translation Tags
-
-- **Important**: If you add any new translation tags, they must first be added to the `messages_en_GB.properties` file. This ensures consistency across all language files.
-- New translation tags **must be added** to the `messages_en_GB.properties` file to maintain a reference for other languages.
-- After adding the new tags to `messages_en_GB.properties`, add and translate them in the respective language file (e.g., `messages_pl_PL.properties`).
-
 Make sure to place the entry under the correct language section. This helps maintain the accuracy of translation progress statistics and ensures that the translation tool or scripts do not misinterpret the completion rate.

LICENSE

@@ -1,21 +1,674 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2024 Stirling Tools
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+                            Preamble
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+  The GNU General Public License is a free, copyleft license for
-copies or substantial portions of the Software.
+software and other kinds of works.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  The licenses for most software and other practical works are designed
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+to take away your freedom to share and change the works.  By contrast,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+the GNU General Public License is intended to guarantee your freedom to
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+share and change all versions of a program--to make sure it remains free
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+software for all its users.  We, the Free Software Foundation, use the
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+GNU General Public License for most of our software; it applies also to
-SOFTWARE.
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -5,6 +5,8 @@
 [![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/Cn8pWhQRxZ)
 [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
+[![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/donate/?hosted_button_id=MN7JPG5G6G3JL)
+[![Github Sponsor](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle)
 
 [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
 [<img src="https://www.ssdnodes.com/wp-content/uploads/2023/11/footer-logo.svg" alt="Name" height="40">](https://www.ssdnodes.com/manage/aff.php?aff=2216&register=true)
@@ -22,10 +24,8 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Dark mode support.
 - Custom download options
 - Parallel file processing and downloads
-- Custom 'Pipelines' to run multiple features in a queue
 - API for integration with external scripts
 - Optional Login and Authentication support (see [here](https://github.com/Stirling-Tools/Stirling-PDF/tree/main#login-authentication) for documentation)
-- Database Backup and Import (see [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DATABASE.md) for documentation)
 
 ## **PDF Features**
 
@@ -45,7 +45,6 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Auto Split PDF (With physically scanned page dividers).
 - Extract page(s).
 - Convert PDF to a single page.
-- Overlay PDFs ontop of each other
 
 ### **Conversion Operations**
 
@@ -82,7 +81,6 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Edit metadata.
 - Flatten PDFs.
 - Get all information on a PDF to view or export as JSON.
-- Show/Detect embedded Javascript
 
 For a overview of the tasks and the technology each uses please view [Endpoint-groups.md](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md)
 
@@ -100,8 +98,6 @@ Demo of the app is available [here](https://stirlingpdf.io).
 - [PDF-LIB.js](https://github.com/Hopding/pdf-lib)
 
 ## How to use
-### Windows
-For windows users download the latest Stirling-PDF.exe from our [release](https://github.com/Stirling-Tools/Stirling-PDF/releases) section or by clicking [here](https://github.com/Stirling-Tools/Stirling-PDF/releases/latest/download/Stirling-PDF.exe)
 
 ### Locally
 
@@ -168,46 +164,42 @@ Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR
 
 ## Supported Languages
 
-Stirling PDF currently supports 38!
+Stirling PDF currently supports 32!
 
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                    | ![99%](https://geps.dev/progress/99)   |
-| Basque (Euskara) (eu_ES)                    | ![60%](https://geps.dev/progress/60)   |
-| Bulgarian (Български) (bg_BG)               | ![91%](https://geps.dev/progress/91)   |
-| Catalan (Català) (ca_CA)                    | ![47%](https://geps.dev/progress/47)   |
-| Croatian (Hrvatski) (hr_HR)                 | ![91%](https://geps.dev/progress/91)   |
-| Czech (Česky) (cs_CZ)                       | ![87%](https://geps.dev/progress/87)   |
-| Danish (Dansk) (da_DK)                      | ![96%](https://geps.dev/progress/96)   |
-| Dutch (Nederlands) (nl_NL)                  | ![93%](https://geps.dev/progress/93)   |
 | English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                   | ![90%](https://geps.dev/progress/90)   |
+| Arabic (العربية) (ar_AR)                    | ![46%](https://geps.dev/progress/46)   |
-| German (Deutsch) (de_DE)                    | ![98%](https://geps.dev/progress/98) |
+| German (Deutsch) (de_DE)                    | ![99%](https://geps.dev/progress/99)   |
-| Greek (Ελληνικά) (el_GR)                    | ![79%](https://geps.dev/progress/79)   |
+| French (Français) (fr_FR)                   | ![93%](https://geps.dev/progress/93)   |
-| Hindi (हिंदी) (hi_IN)                          | ![76%](https://geps.dev/progress/76)   |
+| Spanish (Español) (es_ES)                   | ![93%](https://geps.dev/progress/93)   |
-| Hungarian (Magyar) (hu_HU)                  | ![73%](https://geps.dev/progress/73)   |
+| Simplified Chinese (简体中文) (zh_CN)       | ![99%](https://geps.dev/progress/99)   |
-| Indonesia (Bahasa Indonesia) (id_ID)        | ![74%](https://geps.dev/progress/74)   |
+| Traditional Chinese (繁體中文) (zh_TW)      | ![98%](https://geps.dev/progress/98)   |
-| Irish (Gaeilge) (ga_IE)                     | ![95%](https://geps.dev/progress/95)   |
+| Catalan (Català) (ca_CA)                    | ![49%](https://geps.dev/progress/49)   |
 | Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
-| Japanese (日本語) (ja_JP)                   | ![89%](https://geps.dev/progress/89)   |
+| Swedish (Svenska) (sv_SE)                   | ![40%](https://geps.dev/progress/40)   |
-| Korean (한국어) (ko_KR)                     | ![81%](https://geps.dev/progress/81)   |
+| Polish (Polski) (pl_PL)                     | ![92%](https://geps.dev/progress/92)   |
-| Norwegian (Norsk) (no_NB)                   | ![95%](https://geps.dev/progress/95)   |
+| Romanian (Română) (ro_RO)                   | ![39%](https://geps.dev/progress/39)   |
-| Polish (Polski) (pl_PL)                     | ![89%](https://geps.dev/progress/89)   |
+| Korean (한국어) (ko_KR)                     | ![86%](https://geps.dev/progress/86)   |
-| Portuguese (Português) (pt_PT)              | ![76%](https://geps.dev/progress/76)   |
+| Portuguese Brazilian (Português) (pt_BR)    | ![61%](https://geps.dev/progress/61)   |
-| Portuguese Brazilian (Português) (pt_BR)    | ![98%](https://geps.dev/progress/98)   |
+| Portuguese (Português) (pt_PT)              | ![80%](https://geps.dev/progress/80)   |
-| Romanian (Română) (ro_RO)                   | ![97%](https://geps.dev/progress/97)   |
+| Russian (Русский) (ru_RU)                   | ![86%](https://geps.dev/progress/86)   |
-| Russian (Русский) (ru_RU)                   | ![81%](https://geps.dev/progress/81)   |
+| Basque (Euskara) (eu_ES)                    | ![63%](https://geps.dev/progress/63)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![76%](https://geps.dev/progress/76)   |
+| Japanese (日本語) (ja_JP)                   | ![92%](https://geps.dev/progress/92)   |
-| Simplified Chinese (简体中文) (zh_CN)       | ![98%](https://geps.dev/progress/98)   |
+| Dutch (Nederlands) (nl_NL)                  | ![98%](https://geps.dev/progress/98)   |
-| Slovakian (Slovensky) (sk_SK)               | ![89%](https://geps.dev/progress/89)   |
+| Greek (Ελληνικά) (el_GR)                    | ![84%](https://geps.dev/progress/84)   |
-| Spanish (Español) (es_ES)                   | ![98%](https://geps.dev/progress/98)   |
-| Swedish (Svenska) (sv_SE)                   | ![97%](https://geps.dev/progress/97)   |
-| Thai (ไทย) (th_TH)                          | ![96%](https://geps.dev/progress/96) |
-| Traditional Chinese (繁體中文) (zh_TW)      | ![95%](https://geps.dev/progress/95)   |
 | Turkish (Türkçe) (tr_TR)                    | ![96%](https://geps.dev/progress/96)   |
-| Ukrainian (Українська) (uk_UA)              | ![87%](https://geps.dev/progress/87)   |
+| Indonesia (Bahasa Indonesia) (id_ID)        | ![78%](https://geps.dev/progress/78)   |
-| Vietnamese (Tiếng Việt) (vi_VN)             | ![96%](https://geps.dev/progress/96)   |
+| Hindi (हिंदी) (hi_IN)                          | ![78%](https://geps.dev/progress/78)   |
+| Hungarian (Magyar) (hu_HU)                  | ![77%](https://geps.dev/progress/77)   |
+| Bulgarian (Български) (bg_BG)               | ![96%](https://geps.dev/progress/96)   |
+| Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![80%](https://geps.dev/progress/80)   |
+| Ukrainian (Українська) (uk_UA)              | ![92%](https://geps.dev/progress/92)   |
+| Slovakian (Slovensky) (sk_SK)               | ![93%](https://geps.dev/progress/93)   |
+| Czech (Česky) (cs_CZ)                       | ![92%](https://geps.dev/progress/92)   |
+| Croatian (Hrvatski) (hr_HR)                 | ![97%](https://geps.dev/progress/97)   |
+| Norwegian (Norsk) (no_NB)                   | ![97%](https://geps.dev/progress/97)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 
@@ -240,39 +232,37 @@ The Current list of settings is
 security:
   enableLogin: false # set to 'true' to enable login
   csrfDisabled: true # Set to 'true' to disable CSRF protection (not recommended for production)
-  loginAttemptCount: 5 # lock user account after 5 tries; when using e.g. Fail2Ban you can deactivate the function with -1
+  loginAttemptCount: 5 # lock user account after 5 tries
   loginResetTimeMinutes: 120 # lock account for 2 hours after x attempts
-  loginMethod: all # 'all' (Login Username/Password and OAuth2[must be enabled and configured]), 'normal'(only Login with Username/Password) or 'oauth2'(only Login with OAuth2)
+#  initialLogin:
-  initialLogin:
+#    username: "admin" # Initial username for the first login
-    username: '' # Initial username for the first login
+#    password: "stirling" # Initial password for the first login
-    password: '' # Initial password for the first login
+#  oauth2:
-  oauth2:
+#    enabled: false # set to 'true' to enable login (Note: enableLogin must also be 'true' for this to work)
-    enabled: false # set to 'true' to enable login (Note: enableLogin must also be 'true' for this to work)
+#    issuer: "" # set to any provider that supports OpenID Connect Discovery (/.well-known/openid-configuration) end-point
-    client:
+#    clientId: "" # Client ID from your provider
-      keycloak:
+#    clientSecret: "" # Client Secret from your provider
-        issuer: '' # URL of the Keycloak realm's OpenID Connect Discovery endpoint
+#    autoCreateUser: false # set to 'true' to allow auto-creation of non-existing users
-        clientId: '' # Client ID for Keycloak OAuth2
+#    useAsUsername: "email" # Default is 'email'; custom fields can be used as the username
-        clientSecret: '' # Client Secret for Keycloak OAuth2
+#    scopes: "openid, profile, email" # Specify the scopes for which the application will request permissions
-        scopes: openid, profile, email # Scopes for Keycloak OAuth2
+#    provider: "google" # Set this to your OAuth provider's name, e.g., 'google' or 'keycloak'
-        useAsUsername: preferred_username # Field to use as the username for Keycloak OAuth2
+#    client:
-      google:
+#      google:
-        clientId: '' # Client ID for Google OAuth2
+#        clientId: "" # Client ID for Google OAuth2
-        clientSecret: '' # Client Secret for Google OAuth2
+#        clientSecret: "" # Client Secret for Google OAuth2
-        scopes: https://www.googleapis.com/auth/userinfo.email, https://www.googleapis.com/auth/userinfo.profile # Scopes for Google OAuth2
+#        scopes: "https://www.googleapis.com/auth/userinfo.email, https://www.googleapis.com/auth/userinfo.profile" # Scopes for Google OAuth2
-        useAsUsername: email # Field to use as the username for Google OAuth2
+#        useAsUsername: "email" # Field to use as the username for Google OAuth2
-      github:
+#      github:
-        clientId: '' # Client ID for GitHub OAuth2
+#        clientId: "" # Client ID for GitHub OAuth2
-        clientSecret: '' # Client Secret for GitHub OAuth2
+#        clientSecret: "" # Client Secret for GitHub OAuth2
-        scopes: read:user # Scope for GitHub OAuth2
+#        scopes: "read:user" # Scope for GitHub OAuth2
-        useAsUsername: login # Field to use as the username for GitHub OAuth2
+#        useAsUsername: "login" # Field to use as the username for GitHub OAuth2
-    issuer: '' # set to any provider that supports OpenID Connect Discovery (/.well-known/openid-configuration) end-point
+#      keycloak:
-    clientId: '' # Client ID from your provider
+#        issuer: "http://192.168.0.123:8888/realms/stirling-pdf" # URL of the Keycloak realm's OpenID Connect Discovery endpoint
-    clientSecret: '' # Client Secret from your provider
+#        clientId: "stirling-pdf" # Client ID for Keycloak OAuth2
-    autoCreateUser: false # set to 'true' to allow auto-creation of non-existing users
+#        clientSecret: "" # Client Secret for Keycloak OAuth2
-    blockRegistration: false # set to 'true' to deny login with SSO without prior registration by an admin
+#        scopes: "openid, profile, email" # Scopes for Keycloak OAuth2
-    useAsUsername: email # Default is 'email'; custom fields can be used as the username
+#        useAsUsername: "email" # Field to use as the username for Keycloak OAuth2
-    scopes: openid, profile, email # Specify the scopes for which the application will request permissions
-    provider: google # Set this to your OAuth provider's name, e.g., 'google' or 'keycloak'
 
 system:
   defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc)
@@ -283,9 +273,9 @@ system:
   customHTMLFiles: false # enable to have files placed in /customFiles/templates override the existing template html files
 
 ui:
-  appName: '' # Application's visible name
+  appName: null # Application's visible name
-  homeDescription: '' # Short description or tagline shown on homepage.
+  homeDescription: null # Short description or tagline shown on homepage.
-  appNameNavbar: '' # Name displayed on the navigation bar
+  appNameNavbar: null # Name displayed on the navigation bar
 
 endpoints:
   toRemove: [] # List endpoints to disable (e.g. ['img-to-pdf', 'remove-pages'])
@@ -319,7 +309,7 @@ For those wanting to use Stirling-PDFs backend API to link with their own custom
 
 ![stirling-login](images/login-light.png)
 
-### Prerequisites
+### Prerequisites:
 
 - User must have the folder ./configs volumed within docker so that it is retained during updates.
 - Docker users must download the security jar version by setting ``DOCKER_ENABLE_SECURITY`` to ``true`` in environment variables.

build.gradle

@@ -1,33 +1,25 @@
 plugins {
     id "java"
-    id "org.springframework.boot" version "3.3.3"
+    id "org.springframework.boot" version "3.3.0"
-    id "io.spring.dependency-management" version "1.1.6"
+    id "io.spring.dependency-management" version "1.1.5"
     id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
     id "io.swagger.swaggerhub" version "1.3.2"
-    id "edu.sc.seis.launch4j" version "3.0.6"
+    id "edu.sc.seis.launch4j" version "3.0.5"
     id "com.diffplug.spotless" version "6.25.0"
-    id "com.github.jk1.dependency-license-report" version "2.9"
+    id "com.github.jk1.dependency-license-report" version "2.8"
-	//id "nebula.lint" version "19.0.3"
 }
 
 import com.github.jk1.license.render.*
 
 ext {
-    springBootVersion = "3.3.3"
+    springBootVersion = "3.3.0"
-    pdfboxVersion = "3.0.3"
-    logbackVersion = "1.5.7"
-    imageioVersion = "3.11.0"
-    lombokVersion = "1.18.34"
-    bouncycastleVersion = "1.78.1"
 }
 
 group = "stirling.software"
-version = "0.29.0"
+version = "0.26.1"
 
-java {
 // 17 is lowest but we support and recommend 21
-    sourceCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = "17"
-}
 
 repositories {
     mavenCentral()
@@ -44,14 +36,10 @@ sourceSets {
             if (System.getenv("DOCKER_ENABLE_SECURITY") == "false") {
                 exclude "stirling/software/SPDF/config/security/**"
                 exclude "stirling/software/SPDF/controller/api/UserController.java"
-                exclude "stirling/software/SPDF/controller/api/DatabaseController.java"
                 exclude "stirling/software/SPDF/controller/web/AccountWebController.java"
-                exclude "stirling/software/SPDF/controller/web/DatabaseWebController.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/PersistentLogin.java"
-                exclude "stirling/software/SPDF/model/SessionEntity.java"
                 exclude "stirling/software/SPDF/model/User.java"
                 exclude "stirling/software/SPDF/repository/**"
             }
@@ -101,42 +89,37 @@ spotless {
     }
 }
 
-//gradleLint {
-//        rules=['unused-dependency']
-//    }
 tasks.wrapper {
     gradleVersion = "8.7"
 }
-//tasks.withType(JavaCompile) {
+
-//    options.compilerArgs << "-Xlint:deprecation"
-//}
-configurations.all {
-    exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
-}
 dependencies {
     //security updates
+    implementation "ch.qos.logback:logback-classic:1.5.6"
+    implementation "ch.qos.logback:logback-core:1.5.6"
     implementation "org.springframework:spring-webmvc:6.1.9"
 
-    implementation("io.github.pixee:java-security-toolkit:1.2.0")
+    implementation("io.github.pixee:java-security-toolkit:1.1.3")
 
     // implementation "org.yaml:snakeyaml:2.2"
     implementation 'com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4'
     
     // Exclude Tomcat and include Jetty
-    implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
+    implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion") {
+        exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
+    }
     implementation "org.springframework.boot:spring-boot-starter-jetty:$springBootVersion"
 
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion"
 
     if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
         implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
-        runtimeOnly "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE"
+        implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE"
         implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
         implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
 
         //2.2.x requires rebuild of DB file.. need migration path
-        runtimeOnly "com.h2database:h2:2.1.214"
+        implementation "com.h2database:h2:2.1.214"
-        // implementation "com.h2database:h2:2.2.224"
     }
 
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
@@ -145,25 +128,26 @@ dependencies {
     implementation "org.apache.xmlgraphics:batik-all:1.17"
 
     // TwelveMonkeys
-    runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
+    implementation "com.twelvemonkeys.imageio:imageio-batik:3.10.1"
-    runtimeOnly "com.twelvemonkeys.imageio:imageio-bmp:$imageioVersion"
+    implementation "com.twelvemonkeys.imageio:imageio-bmp:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-hdr:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-icns:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-iff:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-iff:3.10.1"
-    runtimeOnly "com.twelvemonkeys.imageio:imageio-jpeg:$imageioVersion"
+    implementation "com.twelvemonkeys.imageio:imageio-jpeg:3.11.0"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-pcx:$imageioVersion@
+    // implementation "com.twelvemonkeys.imageio:imageio-pcx:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-pict:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-pict:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-pnm:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-pnm:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-psd:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-psd:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-sgi:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-sgi:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-tga:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-tga:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-thumbsdb:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-thumbsdb:3.10.1"
-    runtimeOnly "com.twelvemonkeys.imageio:imageio-tiff:$imageioVersion"
+    implementation "com.twelvemonkeys.imageio:imageio-tiff:3.10.1"
-    runtimeOnly "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion"
+    implementation "com.twelvemonkeys.imageio:imageio-webp:3.10.1"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-xwd:3.10.1"
 
     implementation "commons-io:commons-io:2.16.1"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"
+
     //general PDF
 
     // https://mvnrepository.com/artifact/com.opencsv/opencsv
@@ -171,33 +155,33 @@ dependencies {
         exclude group: "commons-logging", module: "commons-logging"
     }
 
-    implementation ("org.apache.pdfbox:pdfbox:$pdfboxVersion") {
+    implementation ("org.apache.pdfbox:pdfbox:3.0.2") {
         exclude group: "commons-logging", module: "commons-logging"
     }
 
-    implementation ("org.apache.pdfbox:xmpbox:$pdfboxVersion") {
+    implementation ("org.apache.pdfbox:xmpbox:3.0.2") {
         exclude group: "commons-logging", module: "commons-logging"
     }
+    implementation "com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4"
 
-    implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
+    implementation "org.bouncycastle:bcprov-jdk18on:1.78.1"
-
+    implementation "org.bouncycastle:bcpkix-jdk18on:1.78.1"
-    implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
-    implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
     implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    implementation "io.micrometer:micrometer-core:1.13.4"
+    implementation "io.micrometer:micrometer-core:1.13.0"
     implementation group: "com.google.zxing", name: "core", version: "3.5.3"
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation "org.commonmark:commonmark:0.22.0"
     implementation "org.commonmark:commonmark-ext-gfm-tables:0.22.0"
     // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
-    implementation "com.bucket4j:bucket4j_jdk17-core:8.14.0"
+    implementation "com.bucket4j:bucket4j_jdk17-core:8.12.1"
-    implementation "com.fathzer:javaluator:3.0.5"
+
+	implementation "com.fathzer:javaluator:3.0.4"
 
     developmentOnly("org.springframework.boot:spring-boot-devtools:$springBootVersion")
-    compileOnly "org.projectlombok:lombok:$lombokVersion"
+    compileOnly "org.projectlombok:lombok:1.18.32"
-    annotationProcessor "org.projectlombok:lombok:$lombokVersion"
+    annotationProcessor "org.projectlombok:lombok:1.18.32"
 
-    testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.mockito:mockito-inline:3.12.4'
 }
 
 tasks.withType(JavaCompile).configureEach {

chart/stirling-pdf/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.29.0
+appVersion: 0.26.1
 description: locally hosted web application that allows you to perform various operations
   on PDF files
 home: https://github.com/Stirling-Tools/Stirling-PDF

chart/stirling-pdf/templates/deployment.yaml

@@ -62,10 +62,8 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.containerSecurityContext | nindent 10 }}
-        env:
-        - name: SYSTEM_ROOTURIPATH
-          value: {{ .Values.rootPath}}
 {{- if .Values.envs }}
+        env:
 {{ toYaml .Values.envs | indent 8 }}
 {{- end }}
 {{- if .Values.extraArgs }}
@@ -77,13 +75,13 @@ spec:
           containerPort: 8080
         livenessProbe:
           httpGet:
-            path: {{ .Values.rootPath}}
+            path: /
             port: http
 {{ toYaml .Values.probes.livenessHttpGetConfig | indent 12 }}
 {{ toYaml .Values.probes.liveness | indent 10 }}
         readinessProbe:
           httpGet:
-            path: {{ .Values.rootPath}}
+            path: /
             port: http
 {{ toYaml .Values.probes.readinessHttpGetConfig | indent 12 }}
 {{ toYaml .Values.probes.readiness | indent 10 }}

chart/stirling-pdf/values.yaml

@@ -15,9 +15,6 @@ secret:
 commonLabels: {}
 # team_name: dev
 
-# rootpath for the application
-rootPath: /
-
 envs: []
 # - name: UI_APP_NAME
 #   value: "Stirling PDF"
@@ -27,6 +24,8 @@ envs: []
 #   value: "Stirling PDF"
 # - name: ALLOW_GOOGLE_VISIBILITY
 #   value: "true"
+# - name: APP_ROOT_PATH
+#   value: "/"
 # - name: APP_LOCALE
 #   value: "en_GB"
 

cucumber/exampleFiles/ghost1.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 210
->>
-stream
-Gap@Gb79+X'F"5[`EfJOD4:mD<%*=m+N>oDG,>NK`<U'B^0WYY,dWl^i_UcRk`<"L=<NPC$BtQ<5l$3<Y!?BuoCSYQ6GSt25lpqr0IrP?S[b)9%M"e'HHFqcRO'9eRaR0'DYi*Y.:nEMFAoTM;rPL%EF]`CfoELVl_Q,"LS:%iI;Nc[&bG.*65O]ecfK1'*<>5P_s[usI/ph*0pV~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@Gb79+X'F"5Y`EfJOV2A9=!fB]F'tK1LS`,]G+MiTenb&V2-^hqa(5IE#Nr59/!"Qm*5_(BdF!0&h!Yhk/A+\iS'%6tuO$O)9LaZS+flr([1p2&#RS1p/gT[B;rDj-=&=iqUlj(P^/5U@eCFqn4:<lU`l`.HXqG-',hJH.DI.(6L\luSAW`Q'oje[qgVLVIXg%PXe+,<$7('~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@GbmK%f(e+0_`ODoa2.):e/i+N3r(.o*Qf\gSNb(bt4FIubi@GIOE=p8Ir3;CbQ@KuG^cdJhODZKQ*upt+*rdZ%!mFmN$*.P)K;`s#]G=8AO3s3DGB.RCOn?[F]bEIg,a>25?B%dh\Z/C6opFE'el@I,P\u\V\]:*JYrrsNJ&d,11VL;$h!43eGu&1X6$+5-h\Vr6!+>4Je,~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001527 00000 n 
-0000001827 00000 n 
-trailer
-<<
-/ID 
-[<0d5cf047e754e05f8d574f067785875c><0d5cf047e754e05f8d574f067785875c>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2127
-%%EOF

cucumber/exampleFiles/ghost2.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 207
->>
-stream
-Gap@G:CDb.*/<p2MVk["e@)7*Z0@"b%+@f/9pA%_U<oOkVp?PnGRb81iPg?0i?(]%^_CSf##%;<!7Ne/-%RR^p@t7hKYZ9eJVHV]fjjHIB:6DrW+2\p16@*`r^CpQZZH'2Pjqd<.&hM2UO%$Wi$te%4QmS;<E"QS\!deQG_XtuEK>b(UbS>%`/0S`k\\5'TNY0mmgH?`8]i_0~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 207
->>
-stream
-Gap@G]afWJ'Lm;=if<;s>V*7BTJ]oQ@P!(q5S+WG1%>L@?8Ue;c>[fY&&IOd5@t@TY@+q.5T<Z'81"J("KhsBa+&u4"n'#6)AjfImh)%$0tVC:aGk",=aJJH#/4]i.WJr9c"cibYm:M-44<%FFlG0Cl\Z'nmo7C"TR+7dk3T#iD(9Pq'\;rQku%o>A_`50SO&7M04=8M'O<Am~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@GYmu@>'Ld5[if35r/JNaJ.A.7fP9RpSN*8k^-sEER0,enq1Rsuo@R/uCO-^&Y`F'9d^a?9)?ns+F&dXm[HMgPn6Ep+%TRk5Nh+!(+[H#H:U^.^(YL,PKS'%j/:3O\hJVEK-UUekJTd[A$N^((K^#0Du`i@,/^f5KiUISGr")3/+f9NF8NO1+iUgm^b"X\cE^+[:s!0]Gu6i~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001524 00000 n 
-0000001822 00000 n 
-trailer
-<<
-/ID 
-[<407fc55425168745e56176202aad30c9><407fc55425168745e56176202aad30c9>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2122
-%%EOF

cucumber/exampleFiles/ghost3.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G]+0EH(e/_@iZH]:>:>hu1e>07BJg5<'#:.C1n)e#(QJ6R1Rsuo_gpn.+0-H5$/#"iYR[B.9\'>7!aDAC*rf/t&6O#aH<?-7IT'\?X(&TcABG=ON*Nq`4k=o&p@3,0*31r<)TAP2Pk94p0\"R-_sY1$AYo[8B\?4R>feLAB\mpjZhp"`@J3;"Fm97#9+W,"eb95\+#p\^HN~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G]+0EX'Eriuig+>QHNeD'#n%Sq#n%BW`C'uDUOYK)HdS4E9JMsp+HUmDj&H-t*4?UamXX0peVspk"i_@ba+&u"J>UYDKV_^G,7V==aTZZ<YO7:sNSQ[6"Ja-29NtYjd#=`J@D'h+[QW=:EEb?A<k!f+\`g^?,Vgp7_)91[lR\f.Tkf7VIPLVYM&deF!aYt9Ip^"N",3F'*W~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G]+0EH(e/_@iZH]:>J`g!jPCLm;?AgU"fdk"PQZD\d?lRI_oWc[$tp^]O\:3fK8kWeX2&Jcg0+RoJ]j;2j*upu!b4.o&f)b$I@7CfIYjP^#\VjhC=QhQ]^lV-@<0Tam!0.+Dn@("AK%N,Uc7hb+6VoQ$q2q[7]BB92RoY/.j2N028i1jNf'@<1+Fqf$1&"8omHk`#DHP>OT~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001526 00000 n 
-0000001826 00000 n 
-trailer
-<<
-/ID 
-[<80da26147a484f2b7573da8151a93d2e><80da26147a484f2b7573da8151a93d2e>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2126
-%%EOF

cucumber/exampleFiles/pdfa1.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 206
->>
-stream
-Gap@G\IO3f&4Lr[@S4&T2aReWZ3N'9",Ncra>5AuK^J(o@r?=EP>b]h[L@XZ8q7#[c:#H2:^/=b,p3^,&f-Q.'H%!U?%N\iVa1pLMlh/41\A8@dF5@0al:-1?L;D%LpL3g\9`.3c6N/Mp=sE/nO%^@%Cc3`]e`qqS@[pkUWemMZC<P\fkqa55u)*hIUoU437-gb!e_*&B/,&~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G\IO3V'LdA_ig"8P1PS=kA5Q_GQ\P]*S3\>Q`jHYt?8UdkV`6]UV*On)+1VMV+A@.iF:*6sWfM9f"s.NmVuMto!p7-+,Rb<.h,pdi-&OQ5KO\RRFj.j"A)ScTQ7$hudF^TnZ'XuQA5"O]rYkt><-DJmj'"Ri>n!4`^m409XX`e)AR'*rGsn6m79.18+^ba=qRuss"-A3k+9~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 210
->>
-stream
-Gap@G]+0EH(e/_@iZH]:.1fBHK`Xl'[i1&AjX(\k8hbgo(QJ6R1Rsuo6_I1A5Gg$JL;D#$J2CX;+Cf*cUHk2%H1XmpWe+qZ5moJ#B]>b%%[d,mfSSkS4A:Q4NlOFfrL7eA,s45"eUSakM;927AA,1"-LZ)&nZ/ah=8_X7:?ZMj@J@;r7d`t]Z0\d39M%:$k8[S5D"2oSap4s80l?~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001523 00000 n 
-0000001823 00000 n 
-trailer
-<<
-/ID 
-[<88edee24ee67bd7d6b7cf53cfa2222b0><88edee24ee67bd7d6b7cf53cfa2222b0>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2124
-%%EOF

cucumber/exampleFiles/pdfa2.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@GYmu@>'Ld5[if35rI0]sG)F[U^"c>T)"\\os-r:1V0,enq1Rsuo,*67.@k7U.LRF-P.e"CM2V!>iYi<g`nXh!K?n@$t^rY1$+^0'>=B8H6e;F1WmG#,(eS00(Qe9&:O@nI879DTsT,njXAB?`8:>,Hn3*RV!qh4;&@6%]<9Y*>QZ].Z5o;RAZXg7d[#+bphHs_Ep!QR2TZ2~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 210
->>
-stream
-Gap@G]+0EH(e/_@iZH]:>=,iY1bE)XN?M;1'J/>i&HY;gks]*rj:!DKpb8@`prC#N+9E#o#-<G*!#p7e6j-1sX2k5S,6XmM"taYkfK^k">%usEeEk=sR<UT"dm`rXD;!S`_jS9LU+(R%e'V%WSMfHP.pXZEQqTQq=&D[I[PS(41(NIAZ1R/U?:Z=hSXu!NDF)bpG2F+/I/q/u1-Y~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G_$YcZ'LhbF`EQB$nqi=8S<;#HbK3&f>rnodRPo`Vf4P[3cJidY(I=[K5NWCT'<lHgci?oCRVNST&[k#q4oSC0FWgAt1pD4d_(hIRjn_Nt+cFgJlfm[1U8@/M4r^Pk<@F!@e?%/!-Vq;]nfdLi9]P2M)ck9?)%oNXa_\N<-d"(pjlH%-G`T@Sj&P(j6.@#Xh\Vr6!1iI2/H~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001526 00000 n 
-0000001827 00000 n 
-trailer
-<<
-/ID 
-[<4fcc82a085fe71e34a32d1b23c8b939f><4fcc82a085fe71e34a32d1b23c8b939f>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2127
-%%EOF

cucumber/features/environment.py

@@ -14,8 +14,3 @@ def after_scenario(context, scenario):
         os.remove('response_file')
     if hasattr(context, 'file_name') and os.path.exists(context.file_name):
         os.remove(context.file_name)
-
-    # Remove any temporary files
-    for temp_file in os.listdir('.'):
-        if temp_file.startswith('genericNonCustomisableName') or temp_file.startswith('temp_image_'):
-            os.remove(temp_file)

cucumber/features/examples.feature

@@ -1,4 +1,4 @@
-@example @general
+@example
 Feature: API Validation
 
   @positive @password
@@ -92,10 +92,10 @@ Feature: API Validation
       | threshold    | 90          |
       | whitePercent | 99.9        |
     When I send the API request to the endpoint "/api/v1/misc/remove-blanks"
-    Then the response content type should be "application/octet-stream"
+    Then the response content type should be "application/pdf"
-    And the response file should have extension ".zip"
-    And the response ZIP should contain 1 files
     And the response file should have size greater than 0
+    And the response PDF should contain 0 pages
+	And the response status code should be 200
 
   @positive @flatten
   Scenario: Flatten PDF

cucumber/features/external.feature

@@ -32,7 +32,7 @@ Feature: API Validation
   @ocr @positive
   Scenario: Extract Image Scans
     Given I generate a PDF file as "fileInput"
-	And the pdf contains 3 images of size 300x300 on 2 pages
+	And the pdf contains 3 images on 2 pages
     And the request data includes
       | parameter        | value       |
       | angleThreshold        | 5         |
@@ -125,7 +125,8 @@ Feature: API Validation
 
   @ocr
   Scenario: PDFA
-    Given I use an example file at "exampleFiles/pdfa2.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | outputFormat     | pdfa       |
@@ -136,7 +137,8 @@ Feature: API Validation
 	
   @ocr
   Scenario: PDFA1
-    Given I use an example file at "exampleFiles/pdfa1.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | outputFormat     | pdfa-1       |
@@ -147,7 +149,8 @@ Feature: API Validation
 	
   @compress @ghostscript @positive
   Scenario: Compress
-    Given I use an example file at "exampleFiles/ghost3.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | optimizeLevel     | 4       |
@@ -158,7 +161,8 @@ Feature: API Validation
 	
   @compress @ghostscript @positive
   Scenario: Compress
-    Given I use an example file at "exampleFiles/ghost2.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | optimizeLevel     | 1       |
@@ -171,7 +175,8 @@ Feature: API Validation
 	
   @compress @ghostscript @positive
   Scenario: Compress
-    Given I use an example file at "exampleFiles/ghost1.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | optimizeLevel     | 1       |

cucumber/features/general.feature

@@ -94,21 +94,3 @@ Feature: API Validation
     | 1         | 10         | 2         | 10            |
 
 
-  @extract-images
-  Scenario Outline: Extract Image Scans duplicates
-    Given I use an example file at "exampleFiles/images.pdf" as parameter "fileInput"
-    And the request data includes
-      | parameter        | value       |
-      | format        | <format>         |
-    When I send the API request to the endpoint "/api/v1/misc/extract-images"
-    Then the response content type should be "application/octet-stream"
-	And the response file should have extension ".zip"
-	And the response ZIP should contain 2 files
-    And the response file should have size greater than 0
-	And the response status code should be 200
-	
-	Examples:
-    | format | 
-    | png        | 
-    | gif         |
-    | jpeg        | 

cucumber/features/steps/step_definitions.py

@@ -6,14 +6,11 @@ import io
 import random
 import string
 from reportlab.lib.pagesizes import letter
-from reportlab.lib.utils import ImageReader
 from reportlab.pdfgen import canvas
 import mimetypes
 import requests
 import zipfile
 import shutil
-import re
-from PIL import Image, ImageDraw
 
 #########
 # GIVEN #
@@ -46,6 +43,8 @@ def step_use_example_file(context, filePath, fileInput):
     except FileNotFoundError:
         raise FileNotFoundError(f"The example file '{filePath}' does not exist.")
 
+        
+
 @given('the pdf contains {page_count:d} pages')
 def step_pdf_contains_pages(context, page_count):
     writer = PdfWriter()
@@ -67,6 +66,8 @@ def step_pdf_contains_blank_pages(context, page_count):
     context.files[context.param_name].close()
     context.files[context.param_name] = open(context.file_name, 'rb')
 
+
+
 def create_black_box_image(file_name, size):
     can = canvas.Canvas(file_name, pagesize=size)
     width, height = size
@@ -75,25 +76,9 @@ def create_black_box_image(file_name, size):
     can.showPage()
     can.save()
 
-@given(u'the pdf contains {image_count:d} images of size {width:d}x{height:d} on {page_count:d} pages')
+def create_pdf_with_black_boxes(file_name, image_count, page_count):
-def step_impl(context, image_count, width, height, page_count):
+    page_width, page_height = letter
-    context.param_name = "fileInput"
+    box_size = 72  # 1 inch by 1 inch black box
-    context.file_name = "genericNonCustomisableName.pdf"
-    create_pdf_with_images_and_boxes(context.file_name, image_count, page_count, width, height)
-    if not hasattr(context, 'files'):
-        context.files = {}
-    context.files[context.param_name] = open(context.file_name, 'rb')
-
-def add_black_boxes_to_image(image):
-    if isinstance(image, str):
-        image = Image.open(image)
-
-    draw = ImageDraw.Draw(image)
-    draw.rectangle([(0, 0), image.size], fill=(0, 0, 0))  # Fill image with black
-    return image
-
-def create_pdf_with_images_and_boxes(file_name, image_count, page_count, image_width, image_height):
-    page_width, page_height = max(letter[0], image_width), max(letter[1], image_height)
     boxes_per_page = image_count // page_count + (1 if image_count % page_count != 0 else 0)
     
     writer = PdfWriter()
@@ -101,31 +86,15 @@ def create_pdf_with_images_and_boxes(file_name, image_count, page_count, image_w
     
     for page in range(page_count):
         packet = io.BytesIO()
-        can = canvas.Canvas(packet, pagesize=(page_width, page_height))
+        can = canvas.Canvas(packet, pagesize=letter)
         
         for i in range(boxes_per_page):
             if box_counter >= image_count:
                 break
-
+            x = (i % (page_width // box_size)) * box_size
-            # Simulating a dynamic image creation (replace this with your actual image creation logic)
+            y = page_height - ((i // (page_width // box_size) + 1) * box_size)
-            # For demonstration, we'll create a simple black image
+            can.setFillColorRGB(0, 0, 0)
-            dummy_image = Image.new('RGB', (image_width, image_height), color='white')  # Create a white image
+            can.rect(x, y, box_size, box_size, fill=1)
-            dummy_image = add_black_boxes_to_image(dummy_image)  # Add black boxes
-
-            # Convert the PIL Image to bytes to pass to drawImage
-            image_bytes = io.BytesIO()
-            dummy_image.save(image_bytes, format='PNG')
-            image_bytes.seek(0)
-
-            # Check if the image fits in the current page dimensions
-            x = (i % (page_width // image_width)) * image_width
-            y = page_height - (((i % (page_height // image_height)) + 1) * image_height)
-
-            if x + image_width > page_width or y < 0:
-                break
-
-            # Add the image to the PDF
-            can.drawImage(ImageReader(image_bytes), x, y, width=image_width, height=image_height)
             box_counter += 1
             
         can.showPage()
@@ -134,16 +103,9 @@ def create_pdf_with_images_and_boxes(file_name, image_count, page_count, image_w
         new_pdf = PdfReader(packet)
         writer.add_page(new_pdf.pages[0])
     
-    # Write the PDF to file
     with open(file_name, 'wb') as f:
         writer.write(f)
 
-    # Clean up temporary image files
-    for i in range(image_count):
-        temp_image_path = f"temp_image_{i}.png"
-        if os.path.exists(temp_image_path):
-            os.remove(temp_image_path)
-
 @given('the pdf contains {image_count:d} images on {page_count:d} pages')
 def step_pdf_contains_images(context, image_count, page_count):
     if not hasattr(context, 'param_name'):
@@ -156,6 +118,7 @@ def step_pdf_contains_images(context, image_count, page_count):
         context.files[context.param_name].close()
     context.files[context.param_name] = open(context.file_name, 'rb')
 
+    
 @given('the pdf contains {page_count:d} pages with random text')
 def step_pdf_contains_pages_with_random_text(context, page_count):
     buffer = io.BytesIO()
@@ -223,21 +186,6 @@ def save_generated_pdf(context, filename):
 # WHEN #
 ########
 
-@when('I send a GET request to "{endpoint}"')
-def step_send_get_request(context, endpoint):
-    base_url = "http://localhost:8080"
-    full_url = f"{base_url}{endpoint}"
-    response = requests.get(full_url)
-    context.response = response
-
-@when('I send a GET request to "{endpoint}" with parameters')
-def step_send_get_request_with_params(context, endpoint):
-    base_url = "http://localhost:8080"
-    params = {row['parameter']: row['value'] for row in context.table}
-    full_url = f"{base_url}{endpoint}"
-    response = requests.get(full_url, params=params)
-    context.response = response
-
 @when('I send the API request to the endpoint "{endpoint}"')
 def step_send_api_request(context, endpoint):
     url = f"http://localhost:8080{endpoint}"
@@ -330,6 +278,7 @@ def step_save_response_file(context, filename):
         f.write(context.response.content)
     print(f"Saved response content to {filename}")
 
+
 @then('the response PDF should contain {page_count:d} pages')
 def step_check_response_pdf_page_count(context, page_count):
     response_file = io.BytesIO(context.response.content)
@@ -356,26 +305,3 @@ def step_check_response_zip_doc_page_count(context, doc_count, pages_per_doc):
                 reader = PdfReader(pdf_file)
                 actual_pages_per_doc = len(reader.pages)
                 assert actual_pages_per_doc == pages_per_doc, f"Expected {pages_per_doc} pages per document but got {actual_pages_per_doc} pages in document {file_name}"
-
-@then('the JSON value of "{key}" should be "{expected_value}"')
-def step_check_json_value(context, key, expected_value):
-    actual_value = context.response.json().get(key)
-    assert actual_value == expected_value, \
-        f"Expected JSON value for '{key}' to be '{expected_value}' but got '{actual_value}'"
-
-@then('JSON list entry containing "{identifier_key}" as "{identifier_value}" should have "{target_key}" as "{target_value}"')
-def step_check_json_list_entry(context, identifier_key, identifier_self, target_key, target_value):
-    json_response = context.response.json()
-    for entry in json_response:
-        if entry.get(identifier_key) == identifier_value:
-            assert entry.get(target_key) == target_value, \
-                f"Expected {target_key} to be {target_value} in entry where {identifier_key} is {identifier_value}, but found {entry.get(target_key)}"
-            break
-    else:
-        raise AssertionError(f"No entry with {identifier_key} as {identifier_value} found")
-
-@then('the response should match the regex "{pattern}"')
-def step_response_matches_regex(context, pattern):
-    response_text = context.response.text
-    assert re.match(pattern, response_text), \
-        f"Response '{response_text}' does not match the expected pattern '{pattern}'"

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

@@ -1,3 +1,4 @@
+version: '3.3'
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security-Fat

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

@@ -1,3 +1,4 @@
+version: '3.3'
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security

exampleYmlFiles/docker-compose-latest-security.yml

@@ -1,3 +1,4 @@
+version: '3.3'
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security

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

@@ -1,3 +1,4 @@
+version: '3.3'
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Ultra-Lite-Security

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

@@ -1,3 +1,4 @@
+version: '3.3'
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Ultra-Lite

exampleYmlFiles/docker-compose-latest.yml

@@ -1,3 +1,4 @@
+version: '3.3'
 services:
   stirling-pdf:
     container_name: Stirling-PDF
@@ -21,6 +22,7 @@ services:
       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"
+      INSTALL_BOOK_AND_ADVANCED_HTML_OPS: "true"
       SYSTEM_DEFAULTLOCALE: en-US
       UI_APPNAME: Stirling-PDF
       UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest

scripts/ignore_translation.toml

@@ -10,11 +10,7 @@ ignore = [
 
 [ca_CA]
 ignore = [
-    'PDFToText.tags',
-    'adminUserSettings.admin',
     'language.direction',
-    'survey.button',
-    'watermark.type.1',
 ]
 
 [cs_CZ]
@@ -25,11 +21,6 @@ ignore = [
     'text',
 ]
 
-[da_DK]
-ignore = [
-    'language.direction',
-]
-
 [de_DE]
 ignore = [
     'AddStampRequest.alphabet',
@@ -57,7 +48,6 @@ ignore = [
 ignore = [
     'adminUserSettings.roles',
     'color',
-    'error',
     'language.direction',
     'no',
     'showJS.tags',
@@ -70,31 +60,8 @@ ignore = [
 
 [fr_FR]
 ignore = [
-    'AddStampRequest.alphabet',
-    'AddStampRequest.position',
-    'AddStampRequest.rotation',
-    'PDFToBook.selectText.1',
-    'addPageNumbers.selectText.3',
-    'adminUserSettings.actions',
-    'alphabet',
-    'compare.document.1',
-    'compare.document.2',
-    'info',
     'language.direction',
-    'licenses.license',
-    'licenses.module',
-    'licenses.nav',
-    'licenses.version',
-    'pdfOrganiser.mode',
-    'pipeline.title',
-    'pipelineOptions.pipelineHeader',
     'sponsor',
-    'watermark.type.2',
-]
-
-[ga_IE]
-ignore = [
-    'language.direction',
 ]
 
 [hi_IN]
@@ -104,7 +71,6 @@ ignore = [
 
 [hr_HR]
 ignore = [
-    'PDFToBook.selectText.1',
     'font',
     'home.pipeline.title',
     'info',
@@ -149,7 +115,6 @@ ignore = [
 [nl_NL]
 ignore = [
     'HTMLToPDF.print',
-    'adjustContrast.contrast',
     'compare.document.1',
     'compare.document.2',
     'error',
@@ -165,25 +130,17 @@ ignore = [
 
 [no_NB]
 ignore = [
-    'PDFToBook.selectText.1',
-    'adminUserSettings.admin',
-    'info',
     'language.direction',
-    'oops',
-    'sponsor',
 ]
 
 [pl_PL]
 ignore = [
-    'PDFToBook.selectText.1',
     'language.direction',
 ]
 
 [pt_BR]
 ignore = [
-    'changeMetadata.trapped',
     'language.direction',
-    'pipelineOptions.pipelineHeader',
 ]
 
 [pt_PT]
@@ -203,20 +160,12 @@ ignore = [
 
 [sk_SK]
 ignore = [
-    'adminUserSettings.admin',
-    'home.multiTool.title',
-    'info',
     'language.direction',
-    'navbar.sections.security',
-    'text',
-    'watermark.type.1',
 ]
 
 [sr_LATN_RS]
 ignore = [
     'language.direction',
-    'licenses.version',
-    'poweredBy',
 ]
 
 [sv_SE]
@@ -224,14 +173,6 @@ ignore = [
     'language.direction',
 ]
 
-[th_TH]
-ignore = [
-    'language.direction',
-    'pipeline.title',
-    'pipelineOptions.pipelineHeader',
-    'showJS.tags',
-]
-
 [tr_TR]
 ignore = [
     'language.direction',
@@ -242,14 +183,6 @@ ignore = [
     'language.direction',
 ]
 
-[vi_VN]
-ignore = [
-    'language.direction',
-    'pipeline.title',
-    'pipelineOptions.pipelineHeader',
-    'showJS.tags',
-]
-
 [zh_CN]
 ignore = [
     'language.direction',

scripts/init-without-ocr.sh

@@ -12,8 +12,7 @@ fi
 umask "$UMASK" || true
 
 if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" && "$FAT_DOCKER" != "true" ]]; then
-  echo "issue with calibre in current version, feature currently disabled on Stirling-PDF"
+  apk add --no-cache calibre@testing
-  #apk add --no-cache calibre@testing
 fi
 
 if [[ "$FAT_DOCKER" != "true" ]]; then

scripts/png_to_webp.py

@@ -1,174 +0,0 @@
-"""
-Author: Ludy87
-Description: This script converts a PDF file to WebP images. It includes functionality to resize images if they exceed specified dimensions and handle conversion of PDF pages to WebP format.
-
-Example
--------
-To convert a PDF file to WebP images with each page as a separate WebP file:
-    python script.py input.pdf output_directory
-
-To convert a PDF file to a single WebP image:
-    python script.py input.pdf output_directory --single
-
-To adjust the DPI resolution for rendering PDF pages:
-    python script.py input.pdf output_directory --dpi 150
-"""
-
-import argparse
-import os
-from pdf2image import convert_from_path
-from PIL import Image
-
-
-def resize_image(input_image_path, output_image_path, max_size=(16383, 16383)):
-    """
-    Resize the image if its dimensions exceed the maximum allowed size and save it as WebP.
-
-    Parameters
-    ----------
-    input_image_path : str
-        Path to the input image file.
-    output_image_path : str
-        Path where the output WebP image will be saved.
-    max_size : tuple of int, optional
-        Maximum allowed dimensions for the image (width, height). Default is (16383, 16383).
-
-    Returns
-    -------
-    None
-    """
-    try:
-        # Open the image
-        image = Image.open(input_image_path)
-        width, height = image.size
-        max_width, max_height = max_size
-
-        # Check if the image dimensions exceed the maximum allowed dimensions
-        if width > max_width or height > max_height:
-            # Calculate the scaling ratio
-            ratio = min(max_width / width, max_height / height)
-            new_width = int(width * ratio)
-            new_height = int(height * ratio)
-
-            # Resize the image
-            resized_image = image.resize((new_width, new_height), Image.LANCZOS)
-            resized_image.save(output_image_path, format="WEBP", quality=100)
-            print(
-                f"The image was successfully resized to ({new_width}, {new_height}) and saved as WebP: {output_image_path}"
-            )
-        else:
-            # If dimensions are within the allowed limits, save the image directly
-            image.save(output_image_path, format="WEBP", quality=100)
-            print(f"The image was successfully saved as WebP: {output_image_path}")
-    except Exception as e:
-        print(f"An error occurred: {e}")
-
-
-def convert_image_to_webp(input_image, output_file):
-    """
-    Convert an image to WebP format, resizing it if it exceeds the maximum dimensions.
-
-    Parameters
-    ----------
-    input_image : str
-        Path to the input image file.
-    output_file : str
-        Path where the output WebP image will be saved.
-
-    Returns
-    -------
-    None
-    """
-    # Resize the image if it exceeds the maximum dimensions
-    resize_image(input_image, output_file, max_size=(16383, 16383))
-
-
-def pdf_to_webp(pdf_path, output_dir, dpi=300):
-    """
-    Convert each page of a PDF file to WebP images.
-
-    Parameters
-    ----------
-    pdf_path : str
-        Path to the input PDF file.
-    output_dir : str
-        Directory where the WebP images will be saved.
-    dpi : int, optional
-        DPI resolution for rendering PDF pages. Default is 300.
-
-    Returns
-    -------
-    None
-    """
-    # Convert the PDF to a list of images
-    images = convert_from_path(pdf_path, dpi=dpi)
-
-    for page_number, image in enumerate(images):
-        # Define temporary PNG path
-        temp_png_path = os.path.join(output_dir, f"temp_page_{page_number + 1}.png")
-        image.save(temp_png_path, format="PNG")
-
-        # Define the output path for WebP
-        output_path = os.path.join(output_dir, f"page_{page_number + 1}.webp")
-
-        # Convert PNG to WebP
-        convert_image_to_webp(temp_png_path, output_path)
-
-        # Delete the temporary PNG file
-        os.remove(temp_png_path)
-
-
-def main(pdf_image_path, output_dir, dpi=300, single_images_flag=False):
-    """
-    Main function to handle conversion from PDF to WebP images.
-
-    Parameters
-    ----------
-    pdf_image_path : str
-        Path to the input PDF file or image.
-    output_dir : str
-        Directory where the WebP images will be saved.
-    dpi : int, optional
-        DPI resolution for rendering PDF pages. Default is 300.
-    single_images_flag : bool, optional
-        If True, combine all pages into a single WebP image. Default is False.
-
-    Returns
-    -------
-    None
-    """
-    if single_images_flag:
-        # Combine all pages into a single WebP image
-        output_path = os.path.join(output_dir, "combined_image.webp")
-        convert_image_to_webp(pdf_image_path, output_path)
-    else:
-        # Convert each PDF page to a separate WebP image
-        pdf_to_webp(pdf_image_path, output_dir, dpi)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Convert a PDF file to WebP images.")
-    parser.add_argument("pdf_path", help="The path to the input PDF file.")
-    parser.add_argument(
-        "output_dir", help="The directory where the WebP images should be saved."
-    )
-    parser.add_argument(
-        "--dpi",
-        type=int,
-        default=300,
-        help="The DPI resolution for rendering the PDF pages (default: 300).",
-    )
-    parser.add_argument(
-        "--single",
-        action="store_true",
-        help="Combine all pages into a single WebP image.",
-    )
-    args = parser.parse_args()
-
-    os.makedirs(args.output_dir, exist_ok=True)
-    main(
-        args.pdf_path,
-        args.output_dir,
-        dpi=args.dpi,
-        single_images_flag=args.single,
-    )

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

@@ -1,25 +0,0 @@
-package stirling.software.SPDF.EE;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-import stirling.software.SPDF.model.ApplicationProperties;
-
-@Configuration
-@Lazy
-public class EEAppConfig {
-
-    private static final Logger logger = LoggerFactory.getLogger(EEAppConfig.class);
-
-    @Autowired ApplicationProperties applicationProperties;
-
-    @Bean(name = "RunningEE")
-    public boolean runningEnterpriseEdition() {
-        // TODO: Implement EE detection
-        return false;
-    }
-}

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

@@ -45,6 +45,7 @@ public class SPdfApplication {
         // Check if the BROWSER_OPEN environment variable is set to true
         String browserOpenEnv = env.getProperty("BROWSER_OPEN");
         boolean browserOpen = browserOpenEnv != null && "true".equalsIgnoreCase(browserOpenEnv);
+
         if (browserOpen) {
             try {
                 String url = "http://localhost:" + getNonStaticPort();
@@ -65,7 +66,6 @@ public class SPdfApplication {
     public static void main(String[] args) throws IOException, InterruptedException {
 
         SpringApplication app = new SpringApplication(SPdfApplication.class);
-        app.setAdditionalProfiles("default");
         app.addInitializers(new ConfigInitializer());
         Map<String, String> propertyFiles = new HashMap<>();
 
@@ -79,14 +79,13 @@ public class SPdfApplication {
 
         // custom javs settings file
         if (Files.exists(Paths.get("configs/custom_settings.yml"))) {
-            String existingLocation =
+            String existing = propertyFiles.getOrDefault("spring.config.additional-location", "");
-                    propertyFiles.getOrDefault("spring.config.additional-location", "");
+            if (!existing.isEmpty()) {
-            if (!existingLocation.isEmpty()) {
+                existing += ",";
-                existingLocation += ",";
             }
             propertyFiles.put(
                     "spring.config.additional-location",
-                    existingLocation + "file:configs/custom_settings.yml");
+                    existing + "file:configs/custom_settings.yml");
         } else {
             logger.warn("Custom configuration file 'configs/custom_settings.yml' does not exist.");
         }

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

@@ -126,38 +126,14 @@ public class AppConfig {
     }
 
     @Bean(name = "directoryFilter")
-    public Predicate<Path> processOnlyFiles() {
+    public Predicate<Path> processPDFOnlyFilter() {
         return path -> {
             if (Files.isDirectory(path)) {
                 return !path.toString().contains("processing");
             } else {
-                return true;
+                String fileName = path.getFileName().toString();
+                return fileName.endsWith(".pdf");
             }
         };
     }
-
-    @Bean(name = "termsAndConditions")
-    public String termsAndConditions() {
-        return applicationProperties.getLegal().getTermsAndConditions();
-    }
-
-    @Bean(name = "privacyPolicy")
-    public String privacyPolicy() {
-        return applicationProperties.getLegal().getPrivacyPolicy();
-    }
-
-    @Bean(name = "cookiePolicy")
-    public String cookiePolicy() {
-        return applicationProperties.getLegal().getCookiePolicy();
-    }
-
-    @Bean(name = "impressum")
-    public String impressum() {
-        return applicationProperties.getLegal().getImpressum();
-    }
-
-    @Bean(name = "accessibilityStatement")
-    public String accessibilityStatement() {
-        return applicationProperties.getLegal().getAccessibilityStatement();
-    }
 }

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

@@ -18,7 +18,7 @@ class AppUpdateService {
     @Bean(name = "shouldShow")
     @Scope("request")
     public boolean shouldShow() {
-        boolean showUpdate = applicationProperties.getSystem().isShowUpdate();
+        boolean showUpdate = applicationProperties.getSystem().getShowUpdate();
         boolean showAdminResult = (showAdmin != null) ? showAdmin.getShowUpdateOnlyAdmins() : true;
         return showUpdate && showAdminResult;
     }

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

@@ -22,8 +22,7 @@ public class CleanUrlInterceptor implements HandlerInterceptor {
                     "error",
                     "erroroauth",
                     "file",
-                    "messageType",
+                    "messageType");
-                    "infoMessage");
 
     @Override
     public boolean preHandle(
@@ -32,25 +31,25 @@ public class CleanUrlInterceptor implements HandlerInterceptor {
         String queryString = request.getQueryString();
         if (queryString != null && !queryString.isEmpty()) {
             String requestURI = request.getRequestURI();
-            Map<String, String> allowedParameters = new HashMap<>();
+            Map<String, String> parameters = new HashMap<>();
 
             // Keep only the allowed parameters
             String[] queryParameters = queryString.split("&");
             for (String param : queryParameters) {
-                String[] keyValuePair = param.split("=");
+                String[] keyValue = param.split("=");
-                if (keyValuePair.length != 2) {
+                if (keyValue.length != 2) {
                     continue;
                 }
-                if (ALLOWED_PARAMS.contains(keyValuePair[0])) {
+                if (ALLOWED_PARAMS.contains(keyValue[0])) {
-                    allowedParameters.put(keyValuePair[0], keyValuePair[1]);
+                    parameters.put(keyValue[0], keyValue[1]);
                 }
             }
 
             // If there are any parameters that are not allowed
-            if (allowedParameters.size() != queryParameters.length) {
+            if (parameters.size() != queryParameters.length) {
                 // Construct new query string
                 StringBuilder newQueryString = new StringBuilder();
-                for (Map.Entry<String, String> entry : allowedParameters.entrySet()) {
+                for (Map.Entry<String, String> entry : parameters.entrySet()) {
                     if (newQueryString.length() > 0) {
                         newQueryString.append("&");
                     }

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

@@ -14,8 +14,6 @@ import java.util.List;
 
 import org.simpleyaml.configuration.comments.CommentType;
 import org.simpleyaml.configuration.file.YamlFile;
-import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
-import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContextInitializer;
@@ -73,17 +71,9 @@ public class ConfigInitializer
             }
 
             final YamlFile settingsTemplateFile = new YamlFile(tempTemplatePath.toFile());
-            DumperOptions yamlOptionsSettingsTemplateFile =
-                    ((SimpleYamlImplementation) settingsTemplateFile.getImplementation())
-                            .getDumperOptions();
-            yamlOptionsSettingsTemplateFile.setSplitLines(false);
             settingsTemplateFile.loadWithComments();
 
             final YamlFile settingsFile = new YamlFile(settingsPath.toFile());
-            DumperOptions yamlOptionsSettingsFile =
-                    ((SimpleYamlImplementation) settingsFile.getImplementation())
-                            .getDumperOptions();
-            yamlOptionsSettingsFile.setSplitLines(false);
             settingsFile.loadWithComments();
 
             // Load headers and comments
@@ -91,10 +81,6 @@ public class ConfigInitializer
 
             // Create a new file for temporary settings
             final YamlFile tempSettingFile = new YamlFile(settingsPath.toFile());
-            DumperOptions yamlOptionsTempSettingFile =
-                    ((SimpleYamlImplementation) tempSettingFile.getImplementation())
-                            .getDumperOptions();
-            yamlOptionsTempSettingFile.setSplitLines(false);
             tempSettingFile.createNewFile(true);
             tempSettingFile.setHeader(header);
 

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

@@ -1,16 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-import java.util.List;
-
-import stirling.software.SPDF.utils.FileInfo;
-
-public interface DatabaseBackupInterface {
-    void exportDatabase() throws IOException;
-
-    boolean importDatabase();
-
-    boolean hasBackup();
-
-    List<FileInfo> getBackupList();
-}

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

@@ -137,7 +137,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Other", "auto-rename");
         addEndpointToGroup("Other", "get-info-on-pdf");
         addEndpointToGroup("Other", "show-javascript");
-        addEndpointToGroup("Other", "remove-image-pdf");
 
         // CLI
         addEndpointToGroup("CLI", "compress-pdf");
@@ -166,7 +165,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Python", REMOVE_BLANKS);
         addEndpointToGroup("Python", "html-to-pdf");
         addEndpointToGroup("Python", "url-to-pdf");
-        addEndpointToGroup("Python", "pdf-to-img");
 
         // openCV
         addEndpointToGroup("OpenCV", "extract-image-scans");
@@ -223,7 +221,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "split-pdf-by-sections");
         addEndpointToGroup("Java", REMOVE_BLANKS);
         addEndpointToGroup("Java", "pdf-to-text");
-        addEndpointToGroup("Java", "remove-image-pdf");
 
         // Javascript
         addEndpointToGroup("Javascript", "pdf-organizer");

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

@@ -13,7 +13,6 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import stirling.software.SPDF.utils.RequestUriUtils;
 
 @Component
 public class MetricsFilter extends OncePerRequestFilter {
@@ -31,16 +30,32 @@ public class MetricsFilter extends OncePerRequestFilter {
             throws ServletException, IOException {
         String uri = request.getRequestURI();
 
-        if (RequestUriUtils.isTrackableResource(request.getContextPath(), uri)) {
+        // System.out.println("uri="+uri + ", method=" + request.getMethod() );
+        // Ignore static resources
+        if (!(uri.startsWith("/js")
+                || uri.startsWith("/v1/api-docs")
+                || uri.endsWith("robots.txt")
+                || uri.startsWith("/images")
+                || uri.endsWith(".png")
+                || uri.endsWith(".ico")
+                || uri.endsWith(".css")
+                || uri.endsWith(".map")
+                || uri.endsWith(".svg")
+                || uri.endsWith(".js")
+                || uri.contains("swagger")
+                || uri.startsWith("/api/v1/info")
+                || uri.startsWith("/site.webmanifest")
+                || uri.startsWith("/fonts")
+                || uri.startsWith("/pdfjs"))) {
 
             Counter counter =
                     Counter.builder("http.requests")
-                            .tag("session", request.getSession().getId())
-                            .tag("method", request.getMethod())
                             .tag("uri", uri)
+                            .tag("method", request.getMethod())
                             .register(meterRegistry);
 
             counter.increment();
+            // System.out.println("Counted");
         }
 
         filterChain.doFilter(request, response);

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

@@ -1,109 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.util.Calendar;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
-import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.PdfMetadata;
-
-@Service
-public class PdfMetadataService {
-
-    private final ApplicationProperties applicationProperties;
-    private final String appVersion;
-    private final UserServiceInterface userService;
-
-    @Autowired
-    public PdfMetadataService(
-            ApplicationProperties applicationProperties,
-            @Qualifier("appVersion") String appVersion,
-            @Autowired(required = false) UserServiceInterface userService) {
-        this.applicationProperties = applicationProperties;
-        this.appVersion = appVersion;
-        this.userService = userService;
-    }
-
-    public PdfMetadata extractMetadataFromPdf(PDDocument pdf) {
-        return PdfMetadata.builder()
-                .author(pdf.getDocumentInformation().getAuthor())
-                .producer(pdf.getDocumentInformation().getProducer())
-                .title(pdf.getDocumentInformation().getTitle())
-                .creator(pdf.getDocumentInformation().getCreator())
-                .subject(pdf.getDocumentInformation().getSubject())
-                .keywords(pdf.getDocumentInformation().getKeywords())
-                .creationDate(pdf.getDocumentInformation().getCreationDate())
-                .modificationDate(pdf.getDocumentInformation().getModificationDate())
-                .build();
-    }
-
-    public void setDefaultMetadata(PDDocument pdf) {
-        PdfMetadata metadata = extractMetadataFromPdf(pdf);
-        setMetadataToPdf(pdf, metadata);
-    }
-
-    public void setMetadataToPdf(PDDocument pdf, PdfMetadata pdfMetadata) {
-        setMetadataToPdf(pdf, pdfMetadata, false);
-    }
-
-    public void setMetadataToPdf(PDDocument pdf, PdfMetadata pdfMetadata, boolean newlyCreated) {
-        if (newlyCreated || pdfMetadata.getCreationDate() == null) {
-            setNewDocumentMetadata(pdf, pdfMetadata);
-        }
-        setCommonMetadata(pdf, pdfMetadata);
-    }
-
-    private void setNewDocumentMetadata(PDDocument pdf, PdfMetadata pdfMetadata) {
-
-        String creator = "Stirling-PDF";
-
-        //        if (applicationProperties
-        //                .getEnterpriseEdition()
-        //                .getCustomMetadata()
-        //                .isAutoUpdateMetadata()) {
-
-        // producer =
-        //
-        // applicationProperties.getEnterpriseEdition().getCustomMetadata().getProducer();
-        // creator =
-        // applicationProperties.getEnterpriseEdition().getCustomMetadata().getCreator();
-        // title = applicationProperties.getEnterpriseEdition().getCustomMetadata().getTitle();
-
-        //            if ("{filename}".equals(title)) {
-        //                title = "Filename"; // Replace with actual filename logic
-        //            } else if ("{unchanged}".equals(title)) {
-        //                title = pdfMetadata.getTitle(); // Keep the original title
-        //            }
-        //        }
-
-        pdf.getDocumentInformation().setCreator(creator + " " + appVersion);
-        pdf.getDocumentInformation().setCreationDate(Calendar.getInstance());
-    }
-
-    private void setCommonMetadata(PDDocument pdf, PdfMetadata pdfMetadata) {
-        String producer = "Stirling-PDF";
-        String title = pdfMetadata.getTitle();
-        pdf.getDocumentInformation().setTitle(title);
-        pdf.getDocumentInformation().setProducer(producer + " " + appVersion);
-        pdf.getDocumentInformation().setSubject(pdfMetadata.getSubject());
-        pdf.getDocumentInformation().setKeywords(pdfMetadata.getKeywords());
-        pdf.getDocumentInformation().setModificationDate(Calendar.getInstance());
-
-        String author = pdfMetadata.getAuthor();
-        // if (applicationProperties
-        //        .getEnterpriseEdition()
-        //        .getCustomMetadata()
-        //        .isAutoUpdateMetadata()) {
-        //    author = applicationProperties.getEnterpriseEdition().getCustomMetadata().getAuthor();
-
-        // if (userService != null) {
-        //    author = author.replace("username", userService.getCurrentUsername());
-        // }
-        // }
-        pdf.getDocumentInformation().setAuthor(author);
-    }
-}

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

@@ -20,7 +20,7 @@ class AppUpdateAuthService implements ShowAdminInterface {
 
     @Override
     public boolean getShowUpdateOnlyAdmins() {
-        boolean showUpdate = applicationProperties.getSystem().isShowUpdate();
+        boolean showUpdate = applicationProperties.getSystem().getShowUpdate();
         if (!showUpdate) {
             return showUpdate;
         }

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

@@ -3,8 +3,9 @@ package stirling.software.SPDF.config.security;
 import java.io.IOException;
 import java.util.Optional;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.InternalAuthenticationServiceException;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
@@ -14,16 +15,17 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationFa
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.User;
 
-@Slf4j
 public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
 
     private LoginAttemptService loginAttemptService;
 
     private UserService userService;
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomAuthenticationFailureHandler.class);
+
     public CustomAuthenticationFailureHandler(
             final LoginAttemptService loginAttemptService, UserService userService) {
         this.loginAttemptService = loginAttemptService;
@@ -37,17 +39,14 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
             AuthenticationException exception)
             throws IOException, ServletException {
 
-        if (exception instanceof DisabledException) {
-            log.error("User is deactivated: ", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/logout?userIsDisabled=true");
-            return;
-        }
-
         String ip = request.getRemoteAddr();
-        log.error("Failed login attempt from IP: {}", ip);
+        logger.error("Failed login attempt from IP: {}", ip);
 
-        if (exception instanceof LockedException) {
+        String contextPath = request.getContextPath();
-            getRedirectStrategy().sendRedirect(request, response, "/login?error=locked");
+
+        if (exception.getClass().isAssignableFrom(InternalAuthenticationServiceException.class)
+                || "Password must not be null".equalsIgnoreCase(exception.getMessage())) {
+            response.sendRedirect(contextPath + "/login?error=oauth2AuthenticationError");
             return;
         }
 
@@ -55,25 +54,20 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
         Optional<User> optUser = userService.findByUsernameIgnoreCase(username);
 
         if (username != null && optUser.isPresent() && !isDemoUser(optUser)) {
-            log.info(
+            logger.info(
                     "Remaining attempts for user {}: {}",
-                    username,
+                    optUser.get().getUsername(),
                     loginAttemptService.getRemainingAttempts(username));
             loginAttemptService.loginFailed(username);
-            if (loginAttemptService.isBlocked(username) || exception instanceof LockedException) {
+            if (loginAttemptService.isBlocked(username)
-                getRedirectStrategy().sendRedirect(request, response, "/login?error=locked");
+                    || exception.getClass().isAssignableFrom(LockedException.class)) {
+                response.sendRedirect(contextPath + "/login?error=locked");
                 return;
             }
         }
-        if (exception instanceof BadCredentialsException
+        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)
-                || exception instanceof UsernameNotFoundException) {
+                || exception.getClass().isAssignableFrom(UsernameNotFoundException.class)) {
-            getRedirectStrategy().sendRedirect(request, response, "/login?error=badcredentials");
+            response.sendRedirect(contextPath + "/login?error=badcredentials");
-            return;
-        }
-        if (exception instanceof InternalAuthenticationServiceException
-                || "Password must not be null".equalsIgnoreCase(exception.getMessage())) {
-            getRedirectStrategy()
-                    .sendRedirect(request, response, "/login?error=oauth2AuthenticationError");
             return;
         }
 

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

@@ -10,20 +10,15 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
-@Slf4j
 public class CustomAuthenticationSuccessHandler
         extends SavedRequestAwareAuthenticationSuccessHandler {
 
     private LoginAttemptService loginAttemptService;
-    private UserService userService;
 
-    public CustomAuthenticationSuccessHandler(
+    public CustomAuthenticationSuccessHandler(LoginAttemptService loginAttemptService) {
-            LoginAttemptService loginAttemptService, UserService userService) {
         this.loginAttemptService = loginAttemptService;
-        this.userService = userService;
     }
 
     @Override
@@ -32,10 +27,6 @@ public class CustomAuthenticationSuccessHandler
             throws ServletException, IOException {
 
         String userName = request.getParameter("username");
-        if (userService.isUserDisabled(userName)) {
-            getRedirectStrategy().sendRedirect(request, response, "/logout?userIsDisabled=true");
-            return;
-        }
         loginAttemptService.loginSucceeded(userName);
 
         // Get the saved request

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

@@ -2,26 +2,32 @@ package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
 
+    @Autowired SessionRegistry sessionRegistry;
+
     @Override
     public void onLogoutSuccess(
             HttpServletRequest request, HttpServletResponse response, Authentication authentication)
             throws IOException, ServletException {
-
+        HttpSession session = request.getSession(false);
-        if (request.getParameter("userIsDisabled") != null) {
+        if (session != null) {
-            getRedirectStrategy()
+            String sessionId = session.getId();
-                    .sendRedirect(request, response, "/login?erroroauth=userIsDisabled");
+            sessionRegistry.removeSessionInformation(sessionId);
-            return;
+            session.invalidate();
+            logger.debug("Session invalidated: " + sessionId);
         }
 
-        getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
+        response.sendRedirect(request.getContextPath() + "/login?logout=true");
     }
 }

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

@@ -6,35 +6,28 @@ import java.nio.file.Paths;
 import java.util.UUID;
 
 import org.simpleyaml.configuration.file.YamlFile;
-import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
+import org.slf4j.Logger;
-import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import jakarta.annotation.PostConstruct;
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.DatabaseBackupInterface;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.Role;
 
 @Component
-@Slf4j
 public class InitialSecuritySetup {
 
     @Autowired private UserService userService;
 
     @Autowired private ApplicationProperties applicationProperties;
 
-    @Autowired private DatabaseBackupInterface databaseBackupHelper;
+    private static final Logger logger = LoggerFactory.getLogger(InitialSecuritySetup.class);
 
     @PostConstruct
-    public void init() throws IllegalArgumentException, IOException {
+    public void init() {
-        if (databaseBackupHelper.hasBackup() && !userService.hasUsers()) {
+        if (!userService.hasUsers()) {
-            databaseBackupHelper.importDatabase();
-        } else if (!userService.hasUsers()) {
             initializeAdminUser();
-        } else {
-            databaseBackupHelper.exportDatabase();
         }
         initializeInternalApiUser();
     }
@@ -48,11 +41,12 @@ public class InitialSecuritySetup {
         }
     }
 
-    private void initializeAdminUser() throws IOException {
+    private void initializeAdminUser() {
         String initialUsername =
                 applicationProperties.getSecurity().getInitialLogin().getUsername();
         String initialPassword =
                 applicationProperties.getSecurity().getInitialLogin().getPassword();
+
         if (initialUsername != null
                 && !initialUsername.isEmpty()
                 && initialPassword != null
@@ -60,9 +54,9 @@ public class InitialSecuritySetup {
                 && !userService.findByUsernameIgnoreCase(initialUsername).isPresent()) {
             try {
                 userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId());
-                log.info("Admin user created: " + initialUsername);
+                logger.info("Admin user created: " + initialUsername);
             } catch (IllegalArgumentException e) {
-                log.error("Failed to initialize security setup", e);
+                logger.error("Failed to initialize security setup", e);
                 System.exit(1);
             }
         } else {
@@ -70,23 +64,23 @@ public class InitialSecuritySetup {
         }
     }
 
-    private void createDefaultAdminUser() throws IllegalArgumentException, IOException {
+    private void createDefaultAdminUser() {
         String defaultUsername = "admin";
         String defaultPassword = "stirling";
         if (!userService.findByUsernameIgnoreCase(defaultUsername).isPresent()) {
             userService.saveUser(defaultUsername, defaultPassword, Role.ADMIN.getRoleId(), true);
-            log.info("Default admin user created: " + defaultUsername);
+            logger.info("Default admin user created: " + defaultUsername);
         }
     }
 
-    private void initializeInternalApiUser() throws IllegalArgumentException, IOException {
+    private void initializeInternalApiUser() {
         if (!userService.usernameExistsIgnoreCase(Role.INTERNAL_API_USER.getRoleId())) {
             userService.saveUser(
                     Role.INTERNAL_API_USER.getRoleId(),
                     UUID.randomUUID().toString(),
                     Role.INTERNAL_API_USER.getRoleId());
             userService.addApiKeyToUser(Role.INTERNAL_API_USER.getRoleId());
-            log.info("Internal API user created: " + Role.INTERNAL_API_USER.getRoleId());
+            logger.info("Internal API user created: " + Role.INTERNAL_API_USER.getRoleId());
         }
     }
 
@@ -94,9 +88,6 @@ public class InitialSecuritySetup {
         Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml
 
         final YamlFile settingsYml = new YamlFile(path.toFile());
-        DumperOptions yamlOptionssettingsYml =
-                ((SimpleYamlImplementation) settingsYml.getImplementation()).getDumperOptions();
-        yamlOptionssettingsYml.setSplitLines(false);
 
         settingsYml.loadWithComments();
 

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

@@ -3,32 +3,29 @@ package stirling.software.SPDF.config.security;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.PostConstruct;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.AttemptCounter;
 
 @Service
-@Slf4j
 public class LoginAttemptService {
 
-    @Autowired private ApplicationProperties applicationProperties;
+    @Autowired ApplicationProperties applicationProperties;
+
+    private static final Logger logger = LoggerFactory.getLogger(LoginAttemptService.class);
 
     private int MAX_ATTEMPT;
     private long ATTEMPT_INCREMENT_TIME;
     private ConcurrentHashMap<String, AttemptCounter> attemptsCache;
-    private boolean isBlockedEnabled = true;
 
     @PostConstruct
     public void init() {
         MAX_ATTEMPT = applicationProperties.getSecurity().getLoginAttemptCount();
-        if (MAX_ATTEMPT == -1) {
-            isBlockedEnabled = false;
-            log.info("Login attempt tracking is disabled.");
-        }
         ATTEMPT_INCREMENT_TIME =
                 TimeUnit.MINUTES.toMillis(
                         applicationProperties.getSecurity().getLoginResetTimeMinutes());
@@ -36,16 +33,14 @@ public class LoginAttemptService {
     }
 
     public void loginSucceeded(String key) {
-        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
+        if (key == null || key.trim().isEmpty()) {
             return;
         }
         attemptsCache.remove(key.toLowerCase());
     }
 
     public void loginFailed(String key) {
-        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
+        if (key == null || key.trim().isEmpty()) return;
-            return;
-        }
 
         AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
         if (attemptCounter == null) {
@@ -60,9 +55,7 @@ public class LoginAttemptService {
     }
 
     public boolean isBlocked(String key) {
-        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
+        if (key == null || key.trim().isEmpty()) return false;
-            return false;
-        }
         AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
         if (attemptCounter == null) {
             return false;
@@ -72,9 +65,7 @@ public class LoginAttemptService {
     }
 
     public int getRemainingAttempts(String key) {
-        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
+        if (key == null || key.trim().isEmpty()) return MAX_ATTEMPT;
-            return Integer.MAX_VALUE; // Arbitrarily high number if tracking is disabled
-        }
 
         AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
         if (attemptCounter == null) {

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

@@ -10,6 +10,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -17,6 +18,8 @@ import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.session.SessionRegistryImpl;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
@@ -34,7 +37,6 @@ import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationF
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2LogoutSuccessHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2UserService;
-import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
@@ -45,7 +47,7 @@ import stirling.software.SPDF.model.provider.KeycloakProvider;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 
 @Configuration
-@EnableWebSecurity
+@EnableWebSecurity()
 @EnableMethodSecurity
 public class SecurityConfiguration {
 
@@ -71,7 +73,11 @@ public class SecurityConfiguration {
     @Autowired private LoginAttemptService loginAttemptService;
 
     @Autowired private FirstLoginFilter firstLoginFilter;
-    @Autowired private SessionPersistentRegistry sessionRegistry;
+
+    @Bean
+    public SessionRegistry sessionRegistry() {
+        return new SessionRegistryImpl();
+    }
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
@@ -88,7 +94,7 @@ public class SecurityConfiguration {
                                     .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
                                     .maximumSessions(10)
                                     .maxSessionsPreventsLogin(false)
-                                    .sessionRegistry(sessionRegistry)
+                                    .sessionRegistry(sessionRegistry())
                                     .expiredUrl("/login?logout=true"));
 
             http.formLogin(
@@ -97,7 +103,7 @@ public class SecurityConfiguration {
                                             .loginPage("/login")
                                             .successHandler(
                                                     new CustomAuthenticationSuccessHandler(
-                                                            loginAttemptService, userService))
+                                                            loginAttemptService))
                                             .defaultSuccessUrl("/")
                                             .failureHandler(
                                                     new CustomAuthenticationFailureHandler(
@@ -149,15 +155,12 @@ public class SecurityConfiguration {
                                                     })
                                             .permitAll()
                                             .anyRequest()
-                                            .authenticated());
+                                            .authenticated())
+                    .authenticationProvider(authenticationProvider());
 
             // Handle OAUTH2 Logins
-            if (applicationProperties.getSecurity().getOauth2() != null
+            if (applicationProperties.getSecurity().getOAUTH2() != null
-                    && applicationProperties.getSecurity().getOauth2().getEnabled()
+                    && applicationProperties.getSecurity().getOAUTH2().getEnabled()) {
-                    && !applicationProperties
-                            .getSecurity()
-                            .getLoginMethod()
-                            .equalsIgnoreCase("normal")) {
 
                 http.oauth2Login(
                                 oauth2 ->
@@ -189,7 +192,9 @@ public class SecurityConfiguration {
                                 logout ->
                                         logout.logoutSuccessHandler(
                                                         new CustomOAuth2LogoutSuccessHandler(
-                                                        applicationProperties)));
+                                                                this.applicationProperties,
+                                                                sessionRegistry()))
+                                                .invalidateHttpSession(true));
             }
         } else {
             http.csrf(csrf -> csrf.disable())
@@ -222,7 +227,7 @@ public class SecurityConfiguration {
     }
 
     private Optional<ClientRegistration> googleClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
         if (oauth == null || !oauth.getEnabled()) {
             return Optional.empty();
         }
@@ -251,7 +256,7 @@ public class SecurityConfiguration {
     }
 
     private Optional<ClientRegistration> keycloakClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
         if (oauth == null || !oauth.getEnabled()) {
             return Optional.empty();
         }
@@ -275,7 +280,7 @@ public class SecurityConfiguration {
     }
 
     private Optional<ClientRegistration> githubClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
         if (oauth == null || !oauth.getEnabled()) {
             return Optional.empty();
         }
@@ -304,7 +309,7 @@ public class SecurityConfiguration {
     }
 
     private Optional<ClientRegistration> oidcClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
         if (oauth == null
                 || oauth.getIssuer() == null
                 || oauth.getIssuer().isEmpty()
@@ -352,7 +357,7 @@ public class SecurityConfiguration {
                             String useAsUsername =
                                     applicationProperties
                                             .getSecurity()
-                                            .getOauth2()
+                                            .getOAUTH2()
                                             .getUseAsUsername();
                             Optional<User> userOpt =
                                     userService.findByUsernameIgnoreCase(
@@ -377,6 +382,14 @@ public class SecurityConfiguration {
         return new IPRateLimitingFilter(maxRequestsPerIp, maxRequestsPerIp);
     }
 
+    @Bean
+    public DaoAuthenticationProvider authenticationProvider() {
+        DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
+        authProvider.setUserDetailsService(userDetailsService);
+        authProvider.setPasswordEncoder(passwordEncoder());
+        return authProvider;
+    }
+
     @Bean
     public PersistentTokenRepository persistentTokenRepository() {
         return new JPATokenRepositoryImpl();

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

@@ -1,9 +1,6 @@
 package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -11,11 +8,9 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.session.SessionInformation;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -23,16 +18,14 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApiKeyAuthenticationToken;
-import stirling.software.SPDF.model.User;
 
 @Component
 public class UserAuthenticationFilter extends OncePerRequestFilter {
 
-    @Autowired @Lazy private UserService userService;
+    @Autowired private UserDetailsService userDetailsService;
 
-    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
+    @Autowired @Lazy private UserService userService;
 
     @Autowired
     @Qualifier("loginEnabled")
@@ -58,20 +51,15 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
                 try {
                     // Use API key to authenticate. This requires you to have an authentication
                     // provider for API keys.
-                    Optional<User> user = userService.getUserByApiKey(apiKey);
+                    UserDetails userDetails = userService.loadUserByApiKey(apiKey);
-                    if (!user.isPresent()) {
+                    if (userDetails == null) {
                         response.setStatus(HttpStatus.UNAUTHORIZED.value());
                         response.getWriter().write("Invalid API Key.");
                         return;
                     }
-                    List<SimpleGrantedAuthority> authorities =
+                    authentication =
-                            user.get().getAuthorities().stream()
+                            new ApiKeyAuthenticationToken(
-                                    .map(
+                                    userDetails, apiKey, userDetails.getAuthorities());
-                                            authority ->
-                                                    new SimpleGrantedAuthority(
-                                                            authority.getAuthority()))
-                                    .collect(Collectors.toList());
-                    authentication = new ApiKeyAuthenticationToken(user.get(), apiKey, authorities);
                     SecurityContextHolder.getContext().setAuthentication(authentication);
                 } catch (AuthenticationException e) {
                     // If API key authentication fails, deny the request
@@ -99,43 +87,6 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
             }
         }
 
-        // Check if the authenticated user is disabled and invalidate their session if so
-        if (authentication != null && authentication.isAuthenticated()) {
-            Object principal = authentication.getPrincipal();
-            String username = null;
-            if (principal instanceof UserDetails) {
-                username = ((UserDetails) principal).getUsername();
-            } else if (principal instanceof OAuth2User) {
-                username = ((OAuth2User) principal).getName();
-            } else if (principal instanceof String) {
-                username = (String) principal;
-            }
-
-            List<SessionInformation> sessionsInformations =
-                    sessionPersistentRegistry.getAllSessions(principal, false);
-
-            if (username != null) {
-                boolean isUserExists = userService.usernameExistsIgnoreCase(username);
-                boolean isUserDisabled = userService.isUserDisabled(username);
-
-                if (!isUserExists || isUserDisabled) {
-                    for (SessionInformation sessionsInformation : sessionsInformations) {
-                        sessionsInformation.expireNow();
-                        sessionPersistentRegistry.expireSession(sessionsInformation.getSessionId());
-                    }
-                }
-
-                if (!isUserExists) {
-                    response.sendRedirect(request.getContextPath() + "/logout?badcredentials=true");
-                    return;
-                }
-                if (isUserDisabled) {
-                    response.sendRedirect(request.getContextPath() + "/logout?userIsDisabled=true");
-                    return;
-                }
-            }
-        }
-
         filterChain.doFilter(request, response);
     }
 
@@ -159,10 +110,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
         };
 
         for (String pattern : permitAllPatterns) {
-            if (uri.startsWith(pattern)
+            if (uri.startsWith(pattern) || uri.endsWith(".svg")) {
-                    || uri.endsWith(".svg")
-                    || uri.endsWith(".png")
-                    || uri.endsWith(".ico")) {
                 return true;
             }
         }

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

@@ -1,7 +1,10 @@
 package stirling.software.SPDF.config.security;
 
-import java.io.IOException;
+import java.util.Collection;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,16 +14,11 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.session.SessionInformation;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 
-import stirling.software.SPDF.config.DatabaseBackupInterface;
-import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
 import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.model.Authority;
@@ -40,17 +38,12 @@ public class UserService implements UserServiceInterface {
 
     @Autowired private MessageSource messageSource;
 
-    @Autowired private SessionPersistentRegistry sessionRegistry;
-
-    @Autowired DatabaseBackupInterface databaseBackupHelper;
-
     // Handle OAUTH2 login and user auto creation.
-    public boolean processOAuth2PostLogin(String username, boolean autoCreateUser)
+    public boolean processOAuth2PostLogin(String username, boolean autoCreateUser) {
-            throws IllegalArgumentException, IOException {
         if (!isUsernameValid(username)) {
             return false;
         }
-        Optional<User> existingUser = findByUsernameIgnoreCase(username);
+        Optional<User> existingUser = userRepository.findByUsernameIgnoreCase(username);
         if (existingUser.isPresent()) {
             return true;
         }
@@ -62,8 +55,8 @@ public class UserService implements UserServiceInterface {
     }
 
     public Authentication getAuthentication(String apiKey) {
-        Optional<User> user = getUserByApiKey(apiKey);
+        User user = getUserByApiKey(apiKey);
-        if (!user.isPresent()) {
+        if (user == null) {
             throw new UsernameNotFoundException("API key is not valid");
         }
 
@@ -71,7 +64,7 @@ public class UserService implements UserServiceInterface {
         return new UsernamePasswordAuthenticationToken(
                 user, // principal (typically the user)
                 null, // credentials (we don't expose the password or API key here)
-                getAuthorities(user.get()) // user's authorities (roles/permissions)
+                getAuthorities(user) // user's authorities (roles/permissions)
                 );
     }
 
@@ -86,17 +79,18 @@ public class UserService implements UserServiceInterface {
         String apiKey;
         do {
             apiKey = UUID.randomUUID().toString();
-        } while (userRepository.findByApiKey(apiKey).isPresent()); // Ensure uniqueness
+        } while (userRepository.findByApiKey(apiKey) != null); // Ensure uniqueness
         return apiKey;
     }
 
     public User addApiKeyToUser(String username) {
-        Optional<User> user = findByUsernameIgnoreCase(username);
+        User user =
-        if (user.isPresent()) {
+                userRepository
-            user.get().setApiKey(generateApiKey());
+                        .findByUsernameIgnoreCase(username)
-            return userRepository.save(user.get());
+                        .orElseThrow(() -> new UsernameNotFoundException("User not found"));
-        }
+
-        throw new UsernameNotFoundException("User not found");
+        user.setApiKey(generateApiKey());
+        return userRepository.save(user);
     }
 
     public User refreshApiKeyForUser(String username) {
@@ -105,40 +99,39 @@ public class UserService implements UserServiceInterface {
 
     public String getApiKeyForUser(String username) {
         User user =
-                findByUsernameIgnoreCase(username)
+                userRepository
+                        .findByUsernameIgnoreCase(username)
                         .orElseThrow(() -> new UsernameNotFoundException("User not found"));
         return user.getApiKey();
     }
 
     public boolean isValidApiKey(String apiKey) {
-        return userRepository.findByApiKey(apiKey).isPresent();
+        return userRepository.findByApiKey(apiKey) != null;
     }
 
-    public Optional<User> getUserByApiKey(String apiKey) {
+    public User getUserByApiKey(String apiKey) {
         return userRepository.findByApiKey(apiKey);
     }
 
-    public Optional<User> loadUserByApiKey(String apiKey) {
+    public UserDetails loadUserByApiKey(String apiKey) {
-        Optional<User> user = userRepository.findByApiKey(apiKey);
+        User user = userRepository.findByApiKey(apiKey);
-
+        if (user != null) {
-        if (user.isPresent()) {
+            // Convert your User entity to a UserDetails object with authorities
-            return user;
+            return new org.springframework.security.core.userdetails.User(
+                    user.getUsername(),
+                    user.getPassword(), // you might not need this for API key auth
+                    getAuthorities(user));
         }
         return null; // or throw an exception
     }
 
     public boolean validateApiKeyForUser(String username, String apiKey) {
-        Optional<User> userOpt = findByUsernameIgnoreCase(username);
+        Optional<User> userOpt = userRepository.findByUsernameIgnoreCase(username);
         return userOpt.isPresent() && apiKey.equals(userOpt.get().getApiKey());
     }
 
     public void saveUser(String username, AuthenticationType authenticationType)
-            throws IllegalArgumentException, IOException {
+            throws IllegalArgumentException {
-        saveUser(username, authenticationType, Role.USER.getRoleId());
-    }
-
-    public void saveUser(String username, AuthenticationType authenticationType, String role)
-            throws IllegalArgumentException, IOException {
         if (!isUsernameValid(username)) {
             throw new IllegalArgumentException(getInvalidUsernameMessage());
         }
@@ -146,14 +139,12 @@ public class UserService implements UserServiceInterface {
         user.setUsername(username);
         user.setEnabled(true);
         user.setFirstLogin(false);
-        user.addAuthority(new Authority(role, user));
+        user.addAuthority(new Authority(Role.USER.getRoleId(), user));
         user.setAuthenticationType(authenticationType);
         userRepository.save(user);
-        databaseBackupHelper.exportDatabase();
     }
 
-    public void saveUser(String username, String password)
+    public void saveUser(String username, String password) throws IllegalArgumentException {
-            throws IllegalArgumentException, IOException {
         if (!isUsernameValid(username)) {
             throw new IllegalArgumentException(getInvalidUsernameMessage());
         }
@@ -163,11 +154,10 @@ public class UserService implements UserServiceInterface {
         user.setEnabled(true);
         user.setAuthenticationType(AuthenticationType.WEB);
         userRepository.save(user);
-        databaseBackupHelper.exportDatabase();
     }
 
     public void saveUser(String username, String password, String role, boolean firstLogin)
-            throws IllegalArgumentException, IOException {
+            throws IllegalArgumentException {
         if (!isUsernameValid(username)) {
             throw new IllegalArgumentException(getInvalidUsernameMessage());
         }
@@ -179,16 +169,15 @@ public class UserService implements UserServiceInterface {
         user.setAuthenticationType(AuthenticationType.WEB);
         user.setFirstLogin(firstLogin);
         userRepository.save(user);
-        databaseBackupHelper.exportDatabase();
     }
 
     public void saveUser(String username, String password, String role)
-            throws IllegalArgumentException, IOException {
+            throws IllegalArgumentException {
         saveUser(username, password, role, false);
     }
 
     public void deleteUser(String username) {
-        Optional<User> userOpt = findByUsernameIgnoreCase(username);
+        Optional<User> userOpt = userRepository.findByUsernameIgnoreCase(username);
         if (userOpt.isPresent()) {
             for (Authority authority : userOpt.get().getAuthorities()) {
                 if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
@@ -197,28 +186,28 @@ public class UserService implements UserServiceInterface {
             }
             userRepository.delete(userOpt.get());
         }
-        invalidateUserSessions(username);
     }
 
     public boolean usernameExists(String username) {
-        return findByUsername(username).isPresent();
+        return userRepository.findByUsername(username).isPresent();
     }
 
     public boolean usernameExistsIgnoreCase(String username) {
-        return findByUsernameIgnoreCase(username).isPresent();
+        return userRepository.findByUsernameIgnoreCase(username).isPresent();
     }
 
     public boolean hasUsers() {
         long userCount = userRepository.count();
-        if (findByUsernameIgnoreCase(Role.INTERNAL_API_USER.getRoleId()).isPresent()) {
+        if (userRepository
+                .findByUsernameIgnoreCase(Role.INTERNAL_API_USER.getRoleId())
+                .isPresent()) {
             userCount -= 1;
         }
         return userCount > 0;
     }
 
-    public void updateUserSettings(String username, Map<String, String> updates)
+    public void updateUserSettings(String username, Map<String, String> updates) {
-            throws IOException {
+        Optional<User> userOpt = userRepository.findByUsernameIgnoreCase(username);
-        Optional<User> userOpt = findByUsernameIgnoreCaseWithSettings(username);
         if (userOpt.isPresent()) {
             User user = userOpt.get();
             Map<String, String> settingsMap = user.getSettings();
@@ -231,7 +220,6 @@ public class UserService implements UserServiceInterface {
             user.setSettings(settingsMap);
 
             userRepository.save(user);
-            databaseBackupHelper.exportDatabase();
         }
     }
 
@@ -243,47 +231,32 @@ public class UserService implements UserServiceInterface {
         return userRepository.findByUsernameIgnoreCase(username);
     }
 
-    public Optional<User> findByUsernameIgnoreCaseWithSettings(String username) {
-        return userRepository.findByUsernameIgnoreCaseWithSettings(username);
-    }
-
     public Authority findRole(User user) {
         return authorityRepository.findByUserId(user.getId());
     }
 
-    public void changeUsername(User user, String newUsername)
+    public void changeUsername(User user, String newUsername) throws IllegalArgumentException {
-            throws IllegalArgumentException, IOException {
         if (!isUsernameValid(newUsername)) {
             throw new IllegalArgumentException(getInvalidUsernameMessage());
         }
         user.setUsername(newUsername);
         userRepository.save(user);
-        databaseBackupHelper.exportDatabase();
     }
 
-    public void changePassword(User user, String newPassword) throws IOException {
+    public void changePassword(User user, String newPassword) {
         user.setPassword(passwordEncoder.encode(newPassword));
         userRepository.save(user);
-        databaseBackupHelper.exportDatabase();
     }
 
-    public void changeFirstUse(User user, boolean firstUse) throws IOException {
+    public void changeFirstUse(User user, boolean firstUse) {
         user.setFirstLogin(firstUse);
         userRepository.save(user);
-        databaseBackupHelper.exportDatabase();
     }
 
-    public void changeRole(User user, String newRole) throws IOException {
+    public void changeRole(User user, String newRole) {
         Authority userAuthority = this.findRole(user);
         userAuthority.setAuthority(newRole);
         authorityRepository.save(userAuthority);
-        databaseBackupHelper.exportDatabase();
-    }
-
-    public void changeUserEnabled(User user, Boolean enbeled) throws IOException {
-        user.setEnabled(enbeled);
-        userRepository.save(user);
-        databaseBackupHelper.exportDatabase();
     }
 
     public boolean isPasswordCorrect(User user, String currentPassword) {
@@ -307,50 +280,14 @@ public class UserService implements UserServiceInterface {
     }
 
     public boolean hasPassword(String username) {
-        Optional<User> user = findByUsernameIgnoreCase(username);
+        Optional<User> user = userRepository.findByUsernameIgnoreCase(username);
         return user.isPresent() && user.get().hasPassword();
     }
 
     public boolean isAuthenticationTypeByUsername(
             String username, AuthenticationType authenticationType) {
-        Optional<User> user = findByUsernameIgnoreCase(username);
+        Optional<User> user = userRepository.findByUsernameIgnoreCase(username);
         return user.isPresent()
                 && authenticationType.name().equalsIgnoreCase(user.get().getAuthenticationType());
     }
-
-    public boolean isUserDisabled(String username) {
-        Optional<User> userOpt = findByUsernameIgnoreCase(username);
-        return userOpt.map(user -> !user.isEnabled()).orElse(false);
-    }
-
-    public void invalidateUserSessions(String username) {
-        String usernameP = "";
-        for (Object principal : sessionRegistry.getAllPrincipals()) {
-            for (SessionInformation sessionsInformation :
-                    sessionRegistry.getAllSessions(principal, false)) {
-                if (principal instanceof UserDetails) {
-                    UserDetails userDetails = (UserDetails) principal;
-                    usernameP = userDetails.getUsername();
-                } else if (principal instanceof OAuth2User) {
-                    OAuth2User oAuth2User = (OAuth2User) principal;
-                    usernameP = oAuth2User.getName();
-                } else if (principal instanceof String) {
-                    usernameP = (String) principal;
-                }
-                if (usernameP.equalsIgnoreCase(username)) {
-                    sessionRegistry.expireSession(sessionsInformation.getSessionId());
-                }
-            }
-        }
-    }
-
-    public String getCurrentUsername() {
-        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-
-        if (principal instanceof UserDetails) {
-            return ((UserDetails) principal).getUsername();
-        } else {
-            return principal.toString();
-        }
-    }
 }

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

@@ -1,228 +0,0 @@
-package stirling.software.SPDF.config.security.database;
-
-import java.io.IOException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.DatabaseBackupInterface;
-import stirling.software.SPDF.utils.FileInfo;
-
-@Slf4j
-@Configuration
-public class DatabaseBackupHelper implements DatabaseBackupInterface {
-
-    @Value("${spring.datasource.url}")
-    private String url;
-
-    private Path backupPath = Paths.get("configs/db/backup/");
-
-    @Override
-    public boolean hasBackup() {
-        // Check if there is at least one backup
-        return !getBackupList().isEmpty();
-    }
-
-    @Override
-    public List<FileInfo> getBackupList() {
-        // Check if the backup directory exists, and create it if it does not
-        ensureBackupDirectoryExists();
-
-        List<FileInfo> backupFiles = new ArrayList<>();
-
-        // Read the backup directory and filter for files with the prefix "backup_" and suffix
-        // ".sql"
-        try (DirectoryStream<Path> stream =
-                Files.newDirectoryStream(
-                        backupPath,
-                        path ->
-                                path.getFileName().toString().startsWith("backup_")
-                                        && path.getFileName().toString().endsWith(".sql"))) {
-            for (Path entry : stream) {
-                BasicFileAttributes attrs = Files.readAttributes(entry, BasicFileAttributes.class);
-                LocalDateTime modificationDate =
-                        LocalDateTime.ofInstant(
-                                attrs.lastModifiedTime().toInstant(), ZoneId.systemDefault());
-                LocalDateTime creationDate =
-                        LocalDateTime.ofInstant(
-                                attrs.creationTime().toInstant(), ZoneId.systemDefault());
-                long fileSize = attrs.size();
-                backupFiles.add(
-                        new FileInfo(
-                                entry.getFileName().toString(),
-                                entry.toString(),
-                                modificationDate,
-                                fileSize,
-                                creationDate));
-            }
-        } catch (IOException e) {
-            log.error("Error reading backup directory: {}", e.getMessage(), e);
-        }
-        return backupFiles;
-    }
-
-    // Imports a database backup from the specified file.
-    public boolean importDatabaseFromUI(String fileName) throws IOException {
-        return this.importDatabaseFromUI(getBackupFilePath(fileName));
-    }
-
-    // Imports a database backup from the specified path.
-    public boolean importDatabaseFromUI(Path tempTemplatePath) throws IOException {
-        boolean success = executeDatabaseScript(tempTemplatePath);
-        if (success) {
-            LocalDateTime dateNow = LocalDateTime.now();
-            DateTimeFormatter myFormatObj = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
-            Path insertOutputFilePath =
-                    this.getBackupFilePath("backup_user_" + dateNow.format(myFormatObj) + ".sql");
-            Files.copy(tempTemplatePath, insertOutputFilePath);
-            Files.deleteIfExists(tempTemplatePath);
-        }
-        return success;
-    }
-
-    @Override
-    public boolean importDatabase() {
-        if (!this.hasBackup()) return false;
-
-        List<FileInfo> backupList = this.getBackupList();
-        backupList.sort(Comparator.comparing(FileInfo::getModificationDate).reversed());
-
-        return executeDatabaseScript(Paths.get(backupList.get(0).getFilePath()));
-    }
-
-    @Override
-    public void exportDatabase() throws IOException {
-        // Check if the backup directory exists, and create it if it does not
-        ensureBackupDirectoryExists();
-
-        // Filter and delete old backups if there are more than 5
-        List<FileInfo> filteredBackupList =
-                this.getBackupList().stream()
-                        .filter(backup -> !backup.getFileName().startsWith("backup_user_"))
-                        .collect(Collectors.toList());
-
-        if (filteredBackupList.size() > 5) {
-            filteredBackupList.sort(
-                    Comparator.comparing(
-                            p -> p.getFileName().substring(7, p.getFileName().length() - 4)));
-            Files.deleteIfExists(Paths.get(filteredBackupList.get(0).getFilePath()));
-            log.info("Deleted oldest backup: {}", filteredBackupList.get(0).getFileName());
-        }
-
-        LocalDateTime dateNow = LocalDateTime.now();
-        DateTimeFormatter myFormatObj = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
-        Path insertOutputFilePath =
-                this.getBackupFilePath("backup_" + dateNow.format(myFormatObj) + ".sql");
-        String query = "SCRIPT SIMPLE COLUMNS DROP to ?;";
-
-        try (Connection conn = DriverManager.getConnection(url, "sa", "");
-                PreparedStatement stmt = conn.prepareStatement(query)) {
-            stmt.setString(1, insertOutputFilePath.toString());
-            stmt.execute();
-            log.info("Database export completed: {}", insertOutputFilePath);
-        } catch (SQLException e) {
-            log.error("Error during database export: {}", e.getMessage(), e);
-        }
-    }
-
-    // Retrieves the H2 database version.
-    public String getH2Version() {
-        String version = "Unknown";
-        try (Connection conn = DriverManager.getConnection(url, "sa", "")) {
-            try (Statement stmt = conn.createStatement();
-                    ResultSet rs = stmt.executeQuery("SELECT H2VERSION() AS version")) {
-                if (rs.next()) {
-                    version = rs.getString("version");
-                    log.info("H2 Database Version: {}", version);
-                }
-            }
-        } catch (SQLException e) {
-            log.error("Error retrieving H2 version: {}", e.getMessage(), e);
-        }
-        return version;
-    }
-
-    // Deletes a backup file.
-    public boolean deleteBackupFile(String fileName) throws IOException {
-        if (!isValidFileName(fileName)) {
-            log.error("Invalid file name: {}", fileName);
-            return false;
-        }
-        Path filePath = this.getBackupFilePath(fileName);
-        if (Files.deleteIfExists(filePath)) {
-            log.info("Deleted backup file: {}", fileName);
-            return true;
-        } else {
-            log.error("File not found or could not be deleted: {}", fileName);
-            return false;
-        }
-    }
-
-    // Gets the Path object for a given backup file name.
-    public Path getBackupFilePath(String fileName) {
-        Path filePath = Paths.get(backupPath.toString(), fileName).normalize();
-        if (!filePath.startsWith(backupPath)) {
-            throw new SecurityException("Path traversal detected");
-        }
-        return filePath;
-    }
-
-    private boolean executeDatabaseScript(Path scriptPath) {
-        String query = "RUNSCRIPT from ?;";
-
-        try (Connection conn = DriverManager.getConnection(url, "sa", "");
-                PreparedStatement stmt = conn.prepareStatement(query)) {
-            stmt.setString(1, scriptPath.toString());
-            stmt.execute();
-            log.info("Database import completed: {}", scriptPath);
-            return true;
-        } catch (SQLException e) {
-            log.error("Error during database import: {}", e.getMessage(), e);
-            return false;
-        }
-    }
-
-    private void ensureBackupDirectoryExists() {
-        if (Files.notExists(backupPath)) {
-            try {
-                Files.createDirectories(backupPath);
-            } catch (IOException e) {
-                log.error("Error creating directories: {}", e.getMessage());
-            }
-        }
-    }
-
-    private boolean isValidFileName(String fileName) {
-        // Check for invalid characters or sequences
-        return fileName != null
-                && !fileName.contains("..")
-                && !fileName.contains("/")
-                && !fileName.contains("\\")
-                && !fileName.contains(":")
-                && !fileName.contains("*")
-                && !fileName.contains("?")
-                && !fileName.contains("\"")
-                && !fileName.contains("<")
-                && !fileName.contains(">")
-                && !fileName.contains("|");
-    }
-}

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

@@ -1,18 +0,0 @@
-package stirling.software.SPDF.config.security.database;
-
-import java.io.IOException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ScheduledTasks {
-
-    @Autowired private DatabaseBackupHelper databaseBackupService;
-
-    @Scheduled(cron = "0 0 0 * * ?")
-    public void performBackup() throws IOException {
-        databaseBackupService.exportDatabase();
-    }
-}

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

@@ -2,8 +2,8 @@ package stirling.software.SPDF.config.security.oauth2;
 
 import java.io.IOException;
 
-import org.springframework.security.authentication.BadCredentialsException;
+import org.slf4j.Logger;
-import org.springframework.security.authentication.DisabledException;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
@@ -13,34 +13,19 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationFa
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
 public class CustomOAuth2AuthenticationFailureHandler
         extends SimpleUrlAuthenticationFailureHandler {
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomOAuth2AuthenticationFailureHandler.class);
+
     @Override
     public void onAuthenticationFailure(
             HttpServletRequest request,
             HttpServletResponse response,
             AuthenticationException exception)
             throws IOException, ServletException {
-
-        if (exception instanceof BadCredentialsException) {
-            log.error("BadCredentialsException", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/login?error=badcredentials");
-            return;
-        }
-        if (exception instanceof DisabledException) {
-            log.error("User is deactivated: ", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/logout?userIsDisabled=true");
-            return;
-        }
-        if (exception instanceof LockedException) {
-            log.error("Account locked: ", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/logout?error=locked");
-            return;
-        }
         if (exception instanceof OAuth2AuthenticationException) {
             OAuth2Error error = ((OAuth2AuthenticationException) exception).getError();
 
@@ -49,13 +34,17 @@ public class CustomOAuth2AuthenticationFailureHandler
             if (error.getErrorCode().equals("Password must not be null")) {
                 errorCode = "userAlreadyExistsWeb";
             }
-            log.error("OAuth2 Authentication error: " + errorCode);
+            logger.error("OAuth2 Authentication error: " + errorCode);
-            log.error("OAuth2AuthenticationException", exception);
             getRedirectStrategy()
                     .sendRedirect(request, response, "/logout?erroroauth=" + errorCode);
             return;
-        }
+        } else if (exception instanceof LockedException) {
-        log.error("Unhandled authentication exception", exception);
+            logger.error("Account locked: ", exception);
+            getRedirectStrategy().sendRedirect(request, response, "/logout?error=locked");
+            return;
+        } else {
+            logger.error("Unhandled authentication exception", exception);
             super.onAuthenticationFailure(request, response, exception);
         }
     }
+}

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

@@ -2,9 +2,10 @@ package stirling.software.SPDF.config.security.oauth2;
 
 import java.io.IOException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.savedrequest.SavedRequest;
@@ -25,6 +26,9 @@ public class CustomOAuth2AuthenticationSuccessHandler
 
     private LoginAttemptService loginAttemptService;
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomOAuth2AuthenticationSuccessHandler.class);
+
     private ApplicationProperties applicationProperties;
     private UserService userService;
 
@@ -42,17 +46,6 @@ public class CustomOAuth2AuthenticationSuccessHandler
             HttpServletRequest request, HttpServletResponse response, Authentication authentication)
             throws ServletException, IOException {
 
-        Object principal = authentication.getPrincipal();
-        String username = "";
-
-        if (principal instanceof OAuth2User) {
-            OAuth2User oauthUser = (OAuth2User) principal;
-            username = oauthUser.getName();
-        } else if (principal instanceof UserDetails) {
-            UserDetails oauthUser = (UserDetails) principal;
-            username = oauthUser.getUsername();
-        }
-
         // Get the saved request
         HttpSession session = request.getSession(false);
         String contextPath = request.getContextPath();
@@ -66,7 +59,10 @@ public class CustomOAuth2AuthenticationSuccessHandler
             // Redirect to the original destination
             super.onAuthenticationSuccess(request, response, authentication);
         } else {
-            OAUTH2 oAuth = applicationProperties.getSecurity().getOauth2();
+            OAuth2User oauthUser = (OAuth2User) authentication.getPrincipal();
+            OAUTH2 oAuth = applicationProperties.getSecurity().getOAUTH2();
+
+            String username = oauthUser.getName();
 
             if (loginAttemptService.isBlocked(username)) {
                 if (session != null) {
@@ -82,16 +78,9 @@ public class CustomOAuth2AuthenticationSuccessHandler
                     && oAuth.getAutoCreateUser()) {
                 response.sendRedirect(contextPath + "/logout?oauth2AuthenticationErrorWeb=true");
                 return;
-            }
+            } else {
                 try {
-                if (oAuth.getBlockRegistration()
-                        && !userService.usernameExistsIgnoreCase(username)) {
-                    response.sendRedirect(contextPath + "/logout?oauth2_admin_blocked_user=true");
-                    return;
-                }
-                if (principal instanceof OAuth2User) {
                     userService.processOAuth2PostLogin(username, oAuth.getAutoCreateUser());
-                }
                     response.sendRedirect(contextPath + "/");
                     return;
                 } catch (IllegalArgumentException e) {
@@ -101,3 +90,4 @@ public class CustomOAuth2AuthenticationSuccessHandler
             }
         }
     }
+}

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

@@ -2,26 +2,34 @@ package stirling.software.SPDF.config.security.oauth2;
 
 import java.io.IOException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
+import jakarta.servlet.http.HttpSession;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.Provider;
 import stirling.software.SPDF.model.provider.UnsupportedProviderException;
 import stirling.software.SPDF.utils.UrlUtils;
 
-@Slf4j
 public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomOAuth2LogoutSuccessHandler.class);
+
+    private final SessionRegistry sessionRegistry;
     private final ApplicationProperties applicationProperties;
 
-    public CustomOAuth2LogoutSuccessHandler(ApplicationProperties applicationProperties) {
+    public CustomOAuth2LogoutSuccessHandler(
+            ApplicationProperties applicationProperties, SessionRegistry sessionRegistry) {
+        this.sessionRegistry = sessionRegistry;
         this.applicationProperties = applicationProperties;
     }
 
@@ -34,16 +42,7 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
         String issuer = null;
         String clientId = null;
 
-        if (authentication == null) {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
-            if (request.getParameter("userIsDisabled") != null) {
-                response.sendRedirect(
-                        request.getContextPath() + "/login?erroroauth=userIsDisabled");
-            } else {
-                super.onLogoutSuccess(request, response, authentication);
-            }
-            return;
-        }
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
 
         if (authentication instanceof OAuth2AuthenticationToken) {
             OAuth2AuthenticationToken oauthToken = (OAuth2AuthenticationToken) authentication;
@@ -54,8 +53,9 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
                 issuer = provider.getIssuer();
                 clientId = provider.getClientId();
             } catch (UnsupportedProviderException e) {
-                log.error(e.getMessage());
+                logger.error(e.getMessage());
             }
+
         } else {
             registrationId = oauth.getProvider() != null ? oauth.getProvider() : "";
             issuer = oauth.getIssuer();
@@ -70,16 +70,18 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
             param = "erroroauth=" + sanitizeInput(errorMessage);
         } else if (request.getParameter("oauth2AutoCreateDisabled") != null) {
             param = "error=oauth2AutoCreateDisabled";
-        } else if (request.getParameter("oauth2_admin_blocked_user") != null) {
-            param = "erroroauth=oauth2_admin_blocked_user";
-        } else if (request.getParameter("userIsDisabled") != null) {
-            param = "erroroauth=userIsDisabled";
-        } else if (request.getParameter("badcredentials") != null) {
-            param = "error=badcredentials";
         }
 
         String redirect_url = UrlUtils.getOrigin(request) + "/login?" + param;
 
+        HttpSession session = request.getSession(false);
+        if (session != null) {
+            String sessionId = session.getId();
+            sessionRegistry.removeSessionInformation(sessionId);
+            session.invalidate();
+            logger.info("Session invalidated: " + sessionId);
+        }
+
         switch (registrationId.toLowerCase()) {
             case "keycloak":
                 // Add Keycloak specific logout URL if needed
@@ -90,13 +92,13 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
                                 + clientId
                                 + "&post_logout_redirect_uri="
                                 + response.encodeRedirectURL(redirect_url);
-                log.info("Redirecting to Keycloak logout URL: " + logoutUrl);
+                logger.info("Redirecting to Keycloak logout URL: " + logoutUrl);
                 response.sendRedirect(logoutUrl);
                 break;
             case "github":
                 // Add GitHub specific logout URL if needed
                 String githubLogoutUrl = "https://github.com/logout";
-                log.info("Redirecting to GitHub logout URL: " + githubLogoutUrl);
+                logger.info("Redirecting to GitHub logout URL: " + githubLogoutUrl);
                 response.sendRedirect(githubLogoutUrl);
                 break;
             case "google":
@@ -104,14 +106,13 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
                 // String googleLogoutUrl =
                 // "https://accounts.google.com/Logout?continue=https://appengine.google.com/_ah/logout?continue="
                 //                 + response.encodeRedirectURL(redirect_url);
-                log.info("Google does not have a specific logout URL");
+                // logger.info("Redirecting to Google logout URL: " + googleLogoutUrl);
-                // log.info("Redirecting to Google logout URL: " + googleLogoutUrl);
                 // response.sendRedirect(googleLogoutUrl);
                 // break;
             default:
-                String defaultRedirectUrl = request.getContextPath() + "/login?" + param;
+                String redirectUrl = request.getContextPath() + "/login?" + param;
-                log.info("Redirecting to default logout URL: " + defaultRedirectUrl);
+                logger.info("Redirecting to default logout URL: " + redirectUrl);
-                response.sendRedirect(defaultRedirectUrl);
+                response.sendRedirect(redirectUrl);
                 break;
         }
     }

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

@@ -43,7 +43,7 @@ public class CustomOAuth2UserService implements OAuth2UserService<OidcUserReques
 
     @Override
     public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException {
-        OAUTH2 oauth2 = applicationProperties.getSecurity().getOauth2();
+        OAUTH2 oauth2 = applicationProperties.getSecurity().getOAUTH2();
         String usernameAttribute = oauth2.getUseAsUsername();
         if (usernameAttribute == null || usernameAttribute.trim().isEmpty()) {
             Client client = oauth2.getClient();

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

@@ -1,26 +0,0 @@
-package stirling.software.SPDF.config.security.session;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import jakarta.servlet.http.HttpSessionEvent;
-import jakarta.servlet.http.HttpSessionListener;
-import lombok.extern.slf4j.Slf4j;
-
-@Component
-@Slf4j
-public class CustomHttpSessionListener implements HttpSessionListener {
-
-    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
-
-    @Override
-    public void sessionCreated(HttpSessionEvent se) {
-        log.info("Session created: " + se.getSession().getId());
-    }
-
-    @Override
-    public void sessionDestroyed(HttpSessionEvent se) {
-        log.info("Session destroyed: " + se.getSession().getId());
-        sessionPersistentRegistry.expireSession(se.getSession().getId());
-    }
-}

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

@@ -1,183 +0,0 @@
-package stirling.software.SPDF.config.security.session;
-
-import java.time.Duration;
-import java.util.ArrayList;
-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;
-import org.springframework.security.core.session.SessionRegistry;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.stereotype.Component;
-
-import jakarta.transaction.Transactional;
-import stirling.software.SPDF.model.SessionEntity;
-
-@Component
-public class SessionPersistentRegistry implements SessionRegistry {
-
-    private final SessionRepository sessionRepository;
-
-    @Value("${server.servlet.session.timeout:30m}")
-    private Duration defaultMaxInactiveInterval;
-
-    public SessionPersistentRegistry(SessionRepository sessionRepository) {
-        this.sessionRepository = sessionRepository;
-    }
-
-    @Override
-    public List<Object> getAllPrincipals() {
-        List<SessionEntity> sessions = sessionRepository.findAll();
-        List<Object> principals = new ArrayList<>();
-        for (SessionEntity session : sessions) {
-            principals.add(session.getPrincipalName());
-        }
-        return principals;
-    }
-
-    @Override
-    public List<SessionInformation> getAllSessions(
-            Object principal, boolean includeExpiredSessions) {
-        List<SessionInformation> sessionInformations = new ArrayList<>();
-        String principalName = null;
-
-        if (principal instanceof UserDetails) {
-            principalName = ((UserDetails) principal).getUsername();
-        } else if (principal instanceof OAuth2User) {
-            principalName = ((OAuth2User) principal).getName();
-        } else if (principal instanceof String) {
-            principalName = (String) principal;
-        }
-
-        if (principalName != null) {
-            List<SessionEntity> sessionEntities =
-                    sessionRepository.findByPrincipalName(principalName);
-            for (SessionEntity sessionEntity : sessionEntities) {
-                if (includeExpiredSessions || !sessionEntity.isExpired()) {
-                    sessionInformations.add(
-                            new SessionInformation(
-                                    sessionEntity.getPrincipalName(),
-                                    sessionEntity.getSessionId(),
-                                    sessionEntity.getLastRequest()));
-                }
-            }
-        }
-        return sessionInformations;
-    }
-
-    @Override
-    @Transactional
-    public void registerNewSession(String sessionId, Object principal) {
-        String principalName = null;
-
-        if (principal instanceof UserDetails) {
-            principalName = ((UserDetails) principal).getUsername();
-        } else if (principal instanceof OAuth2User) {
-            principalName = ((OAuth2User) principal).getName();
-        } else if (principal instanceof String) {
-            principalName = (String) principal;
-        }
-
-        if (principalName != null) {
-            SessionEntity sessionEntity = new SessionEntity();
-            sessionEntity.setSessionId(sessionId);
-            sessionEntity.setPrincipalName(principalName);
-            sessionEntity.setLastRequest(new Date()); // Set lastRequest to the current date
-            sessionEntity.setExpired(false);
-            sessionRepository.save(sessionEntity);
-        }
-    }
-
-    @Override
-    @Transactional
-    public void removeSessionInformation(String sessionId) {
-        sessionRepository.deleteById(sessionId);
-    }
-
-    @Override
-    @Transactional
-    public void refreshLastRequest(String sessionId) {
-        Optional<SessionEntity> sessionEntityOpt = sessionRepository.findById(sessionId);
-        if (sessionEntityOpt.isPresent()) {
-            SessionEntity sessionEntity = sessionEntityOpt.get();
-            sessionEntity.setLastRequest(new Date()); // Update lastRequest to the current date
-            sessionRepository.save(sessionEntity);
-        }
-    }
-
-    @Override
-    public SessionInformation getSessionInformation(String sessionId) {
-        Optional<SessionEntity> sessionEntityOpt = sessionRepository.findById(sessionId);
-        if (sessionEntityOpt.isPresent()) {
-            SessionEntity sessionEntity = sessionEntityOpt.get();
-            return new SessionInformation(
-                    sessionEntity.getPrincipalName(),
-                    sessionEntity.getSessionId(),
-                    sessionEntity.getLastRequest());
-        }
-        return null;
-    }
-
-    // Retrieve all non-expired sessions
-    public List<SessionEntity> getAllSessionsNotExpired() {
-        return sessionRepository.findByExpired(false);
-    }
-
-    // Retrieve all sessions
-    public List<SessionEntity> getAllSessions() {
-        return sessionRepository.findAll();
-    }
-
-    // Mark a session as expired
-    public void expireSession(String sessionId) {
-        Optional<SessionEntity> sessionEntityOpt = sessionRepository.findById(sessionId);
-        if (sessionEntityOpt.isPresent()) {
-            SessionEntity sessionEntity = sessionEntityOpt.get();
-            sessionEntity.setExpired(true); // Set expired to true
-            sessionRepository.save(sessionEntity);
-        }
-    }
-
-    // Get the maximum inactive interval for sessions
-    public int getMaxInactiveInterval() {
-        return (int) defaultMaxInactiveInterval.getSeconds();
-    }
-
-    // Retrieve a session entity by session ID
-    public SessionEntity getSessionEntity(String sessionId) {
-        return sessionRepository.findBySessionId(sessionId);
-    }
-
-    // Update session details by principal name
-    public void updateSessionByPrincipalName(
-            String principalName, boolean expired, Date lastRequest) {
-        sessionRepository.saveByPrincipalName(expired, lastRequest, principalName);
-    }
-
-    // Find the latest session for a given principal name
-    public Optional<SessionEntity> findLatestSession(String principalName) {
-        List<SessionEntity> allSessions = sessionRepository.findByPrincipalName(principalName);
-        if (allSessions.isEmpty()) {
-            return Optional.empty();
-        }
-
-        // Sort sessions by lastRequest in descending order
-        Collections.sort(
-                allSessions,
-                new Comparator<SessionEntity>() {
-                    @Override
-                    public int compare(SessionEntity s1, SessionEntity s2) {
-                        // Sort by lastRequest in descending order
-                        return s2.getLastRequest().compareTo(s1.getLastRequest());
-                    }
-                });
-
-        // The first session in the list is the latest session for the given principal name
-        return Optional.of(allSessions.get(0));
-    }
-}

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

@@ -1,20 +0,0 @@
-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;
-
-@Configuration
-public class SessionRegistryConfig {
-
-    @Bean
-    public SessionRegistryImpl sessionRegistry() {
-        return new SessionRegistryImpl();
-    }
-
-    @Bean
-    public SessionPersistentRegistry sessionPersistentRegistry(
-            SessionRepository sessionRepository) {
-        return new SessionPersistentRegistry(sessionRepository);
-    }
-}

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

@@ -1,31 +0,0 @@
-package stirling.software.SPDF.config.security.session;
-
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import jakarta.transaction.Transactional;
-import stirling.software.SPDF.model.SessionEntity;
-
-@Repository
-public interface SessionRepository extends JpaRepository<SessionEntity, String> {
-    List<SessionEntity> findByPrincipalName(String principalName);
-
-    List<SessionEntity> findByExpired(boolean expired);
-
-    SessionEntity findBySessionId(String sessionId);
-
-    @Modifying
-    @Transactional
-    @Query(
-            "UPDATE SessionEntity s SET s.expired = :expired, s.lastRequest = :lastRequest WHERE s.principalName = :principalName")
-    void saveByPrincipalName(
-            @Param("expired") boolean expired,
-            @Param("lastRequest") Date lastRequest,
-            @Param("principalName") String principalName);
-}

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

@@ -1,35 +0,0 @@
-package stirling.software.SPDF.config.security.session;
-
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.security.core.session.SessionInformation;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SessionScheduled {
-    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
-
-    @Scheduled(cron = "0 0/5 * * * ?")
-    public void expireSessions() {
-        Instant now = Instant.now();
-
-        for (Object principal : sessionPersistentRegistry.getAllPrincipals()) {
-            List<SessionInformation> sessionInformations =
-                    sessionPersistentRegistry.getAllSessions(principal, false);
-            for (SessionInformation sessionInformation : sessionInformations) {
-                Date lastRequest = sessionInformation.getLastRequest();
-                int maxInactiveInterval = sessionPersistentRegistry.getMaxInactiveInterval();
-                Instant expirationTime =
-                        lastRequest.toInstant().plus(maxInactiveInterval, ChronoUnit.SECONDS);
-                if (now.isAfter(expirationTime)) {
-                    sessionPersistentRegistry.expireSession(sessionInformation.getSessionId());
-                }
-            }
-        }
-    }
-}

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

@@ -13,7 +13,6 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +23,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.general.CropPdfForm;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -34,13 +32,6 @@ public class CropController {
 
     private static final Logger logger = LoggerFactory.getLogger(CropController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public CropController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(value = "/crop", consumes = "multipart/form-data")
     @Operation(
             summary = "Crops a PDF document",
@@ -49,8 +40,7 @@ public class CropController {
     public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm form) throws IOException {
         PDDocument sourceDocument = Loader.loadPDF(form.getFileInput().getBytes());
 
-        PDDocument newDocument =
+        PDDocument newDocument = new PDDocument();
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
 
         int totalPages = sourceDocument.getNumberOfPages();
 

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

@@ -1,144 +0,0 @@
-package stirling.software.SPDF.controller.api;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-
-import org.eclipse.jetty.http.HttpStatus;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.security.database.DatabaseBackupHelper;
-
-@Slf4j
-@Controller
-@RequestMapping("/api/v1/database")
-@PreAuthorize("hasRole('ROLE_ADMIN')")
-@Tag(name = "Database", description = "Database APIs")
-public class DatabaseController {
-
-    @Autowired DatabaseBackupHelper databaseBackupHelper;
-
-    @Hidden
-    @PostMapping(consumes = "multipart/form-data", value = "import-database")
-    @Operation(
-            summary = "Import database backup",
-            description = "This endpoint imports a database backup from a SQL file.")
-    public String importDatabase(
-            @RequestParam("fileInput") MultipartFile file, RedirectAttributes redirectAttributes)
-            throws IllegalArgumentException, IOException {
-        if (file == null || file.isEmpty()) {
-            redirectAttributes.addAttribute("error", "fileNullOrEmpty");
-            return "redirect:/database";
-        }
-        log.info("Received file: {}", file.getOriginalFilename());
-        Path tempTemplatePath = Files.createTempFile("backup_", ".sql");
-        try (InputStream in = file.getInputStream()) {
-            Files.copy(in, tempTemplatePath, StandardCopyOption.REPLACE_EXISTING);
-            boolean importSuccess = databaseBackupHelper.importDatabaseFromUI(tempTemplatePath);
-            if (importSuccess) {
-                redirectAttributes.addAttribute("infoMessage", "importIntoDatabaseSuccessed");
-            } else {
-                redirectAttributes.addAttribute("error", "failedImportFile");
-            }
-        } catch (Exception e) {
-            log.error("Error importing database: {}", e.getMessage());
-            redirectAttributes.addAttribute("error", "failedImportFile");
-        }
-        return "redirect:/database";
-    }
-
-    @Hidden
-    @GetMapping("/import-database-file/{fileName}")
-    public String importDatabaseFromBackupUI(@PathVariable String fileName)
-            throws IllegalArgumentException, IOException {
-        if (fileName == null || fileName.isEmpty()) {
-            return "redirect:/database?error=fileNullOrEmpty";
-        }
-
-        // Check if the file exists in the backup list
-        boolean fileExists =
-                databaseBackupHelper.getBackupList().stream()
-                        .anyMatch(backup -> backup.getFileName().equals(fileName));
-        if (!fileExists) {
-            log.error("File {} not found in backup list", fileName);
-            return "redirect:/database?error=fileNotFound";
-        }
-        log.info("Received file: {}", fileName);
-        if (databaseBackupHelper.importDatabaseFromUI(fileName)) {
-            log.info("File {} imported to database", fileName);
-            return "redirect:/database?infoMessage=importIntoDatabaseSuccessed";
-        }
-        return "redirect:/database?error=failedImportFile";
-    }
-
-    @Hidden
-    @GetMapping("/delete/{fileName}")
-    @Operation(
-            summary = "Delete a database backup file",
-            description =
-                    "This endpoint deletes a database backup file with the specified file name.")
-    public String deleteFile(@PathVariable String fileName) {
-        if (fileName == null || fileName.isEmpty()) {
-            throw new IllegalArgumentException("File must not be null or empty");
-        }
-        try {
-            if (databaseBackupHelper.deleteBackupFile(fileName)) {
-                log.info("Deleted file: {}", fileName);
-            } else {
-                log.error("Failed to delete file: {}", fileName);
-                return "redirect:/database?error=failedToDeleteFile";
-            }
-        } catch (IOException e) {
-            log.error("Error deleting file: {}", e.getMessage());
-            return "redirect:/database?error=" + e.getMessage();
-        }
-        return "redirect:/database";
-    }
-
-    @Hidden
-    @GetMapping("/download/{fileName}")
-    @Operation(
-            summary = "Download a database backup file",
-            description =
-                    "This endpoint downloads a database backup file with the specified file name.")
-    public ResponseEntity<?> downloadFile(@PathVariable String fileName) {
-        if (fileName == null || fileName.isEmpty()) {
-            throw new IllegalArgumentException("File must not be null or empty");
-        }
-        try {
-            Path filePath = databaseBackupHelper.getBackupFilePath(fileName);
-            InputStreamResource resource = new InputStreamResource(Files.newInputStream(filePath));
-            return ResponseEntity.ok()
-                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + fileName)
-                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                    .contentLength(Files.size(filePath))
-                    .body(resource);
-        } catch (IOException e) {
-            log.error("Error downloading file: {}", e.getMessage());
-            return ResponseEntity.status(HttpStatus.SEE_OTHER_303)
-                    .location(URI.create("/database?error=downloadFailed"))
-                    .build();
-        }
-    }
-}

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

@@ -22,7 +22,6 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,7 +33,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.general.MergePdfsRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -45,16 +43,9 @@ public class MergeController {
 
     private static final Logger logger = LoggerFactory.getLogger(MergeController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public MergeController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     // Merges a list of PDDocument objects into a single PDDocument
     public PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
-        PDDocument mergedDoc = pdfDocumentFactory.createNewDocument();
+        PDDocument mergedDoc = new PDDocument();
         for (PDDocument doc : documents) {
             for (PDPage page : doc.getPages()) {
                 mergedDoc.addPage(page);

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

@@ -14,7 +14,6 @@ import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,7 +26,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.general.MergeMultiplePagesRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -37,13 +35,6 @@ public class MultiPageLayoutController {
 
     private static final Logger logger = LoggerFactory.getLogger(MultiPageLayoutController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public MultiPageLayoutController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(value = "/multi-page-layout", consumes = "multipart/form-data")
     @Operation(
             summary = "Merge multiple pages of a PDF document into a single page",
@@ -69,8 +60,7 @@ public class MultiPageLayoutController {
         int rows = pagesPerSheet == 2 || pagesPerSheet == 3 ? 1 : (int) Math.sqrt(pagesPerSheet);
 
         PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
-        PDDocument newDocument =
+        PDDocument newDocument = new PDDocument();
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
         PDPage newPage = new PDPage(PDRectangle.A4);
         newDocument.addPage(newPage);
 

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

@@ -1,82 +0,0 @@
-package stirling.software.SPDF.controller.api;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import io.swagger.v3.oas.annotations.Operation;
-
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
-import stirling.software.SPDF.service.PdfImageRemovalService;
-import stirling.software.SPDF.utils.WebResponseUtils;
-
-/**
- * Controller class for handling PDF image removal requests. Provides an endpoint to remove images
- * from a PDF file to reduce its size.
- */
-@RestController
-@RequestMapping("/api/v1/general")
-public class PdfImageRemovalController {
-
-    // Service for removing images from PDFs
-    private final PdfImageRemovalService pdfImageRemovalService;
-
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    /**
-     * Constructor for dependency injection of PdfImageRemovalService.
-     *
-     * @param pdfImageRemovalService The service used for removing images from PDFs.
-     */
-    @Autowired
-    public PdfImageRemovalController(
-            PdfImageRemovalService pdfImageRemovalService,
-            CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfImageRemovalService = pdfImageRemovalService;
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
-    /**
-     * Endpoint to remove images from a PDF file.
-     *
-     * <p>This method processes the uploaded PDF file, removes all images, and returns the modified
-     * PDF file with a new name indicating that images were removed.
-     *
-     * @param file The PDF file with images to be removed.
-     * @return ResponseEntity containing the modified PDF file as byte array with appropriate
-     *     content type and filename.
-     * @throws IOException If an error occurs while processing the PDF file.
-     */
-    @PostMapping(consumes = "multipart/form-data", value = "/remove-image-pdf")
-    @Operation(
-            summary = "Remove images from file to reduce the file size.",
-            description =
-                    "This endpoint remove images from file to reduce the file size.Input:PDF Output:PDF Type:MISO")
-    public ResponseEntity<byte[]> removeImages(@ModelAttribute PDFFile file) throws IOException {
-        // Load the PDF document
-        PDDocument document = pdfDocumentFactory.load(file);
-
-        // Remove images from the PDF document using the service
-        PDDocument modifiedDocument = pdfImageRemovalService.removeImagesFromPdf(document);
-
-        // Create a ByteArrayOutputStream to hold the modified PDF data
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-        // Save the modified PDF document to the output stream
-        modifiedDocument.save(outputStream);
-        modifiedDocument.close();
-
-        // Generate a new filename for the modified PDF
-        String mergedFileName =
-                file.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
-                        + "_removed_images.pdf";
-
-        // Convert the byte array to a web response and return it
-        return WebResponseUtils.bytesToWebResponse(outputStream.toByteArray(), mergedFileName);
-    }
-}

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

@@ -12,7 +12,6 @@ import java.util.Map;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.multipdf.Overlay;
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -26,7 +25,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.general.OverlayPdfsRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -35,13 +33,6 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class PdfOverlayController {
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public PdfOverlayController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(value = "/overlay-pdfs", consumes = "multipart/form-data")
     @Operation(
             summary = "Overlay PDF files in various modes",
@@ -65,7 +56,7 @@ public class PdfOverlayController {
             // "FixedRepeatOverlay"
             int[] counts = request.getCounts(); // Used for FixedRepeatOverlay mode
 
-            try (PDDocument basePdf = pdfDocumentFactory.load(baseFile);
+            try (PDDocument basePdf = Loader.loadPDF(baseFile.getBytes());
                     Overlay overlay = new Overlay()) {
                 Map<Integer, String> overlayGuide =
                         prepareOverlayGuide(

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

@@ -10,7 +10,6 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,7 +24,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.model.SortTypes;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -36,13 +34,6 @@ public class RearrangePagesPDFController {
 
     private static final Logger logger = LoggerFactory.getLogger(RearrangePagesPDFController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public RearrangePagesPDFController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/remove-pages")
     @Operation(
             summary = "Remove pages from a PDF file",
@@ -54,7 +45,7 @@ public class RearrangePagesPDFController {
         MultipartFile pdfFile = request.getFileInput();
         String pagesToDelete = request.getPageNumbers();
 
-        PDDocument document = pdfDocumentFactory.load(pdfFile);
+        PDDocument document = Loader.loadPDF(pdfFile.getBytes());
 
         // Split the page order string into an array of page numbers or range of numbers
         String[] pageOrderArr = pagesToDelete.split(",");

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

@@ -2,12 +2,12 @@ package stirling.software.SPDF.controller.api;
 
 import java.io.IOException;
 
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +20,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.general.RotatePDFRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -30,13 +29,6 @@ public class RotationController {
 
     private static final Logger logger = LoggerFactory.getLogger(RotationController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public RotationController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/rotate-pdf")
     @Operation(
             summary = "Rotate a PDF file",
@@ -47,7 +39,7 @@ public class RotationController {
         MultipartFile pdfFile = request.getFileInput();
         Integer angle = request.getAngle();
         // Load the PDF document
-        PDDocument document = pdfDocumentFactory.load(request);
+        PDDocument document = Loader.loadPDF(pdfFile.getBytes());
 
         // Get the list of pages in the document
         PDPageTree pages = document.getPages();

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

@@ -15,7 +15,6 @@ import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,7 +27,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.general.ScalePagesRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -38,13 +36,6 @@ public class ScalePagesController {
 
     private static final Logger logger = LoggerFactory.getLogger(ScalePagesController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public ScalePagesController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(value = "/scale-pages", consumes = "multipart/form-data")
     @Operation(
             summary = "Change the size of a PDF page/document",
@@ -56,11 +47,29 @@ public class ScalePagesController {
         String targetPDRectangle = request.getPageSize();
         float scaleFactor = request.getScaleFactor();
 
-        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
+        Map<String, PDRectangle> sizeMap = new HashMap<>();
-        PDDocument outputDocument =
+        // Add A0 - A10
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
+        sizeMap.put("A0", PDRectangle.A0);
+        sizeMap.put("A1", PDRectangle.A1);
+        sizeMap.put("A2", PDRectangle.A2);
+        sizeMap.put("A3", PDRectangle.A3);
+        sizeMap.put("A4", PDRectangle.A4);
+        sizeMap.put("A5", PDRectangle.A5);
+        sizeMap.put("A6", PDRectangle.A6);
 
-        PDRectangle targetSize = getTargetSize(targetPDRectangle, sourceDocument);
+        // Add other sizes
+        sizeMap.put("LETTER", PDRectangle.LETTER);
+        sizeMap.put("LEGAL", PDRectangle.LEGAL);
+
+        if (!sizeMap.containsKey(targetPDRectangle)) {
+            throw new IllegalArgumentException(
+                    "Invalid PDRectangle. It must be one of the following: A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10");
+        }
+
+        PDRectangle targetSize = sizeMap.get(targetPDRectangle);
+
+        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
+        PDDocument outputDocument = new PDDocument();
 
         int totalPages = sourceDocument.getNumberOfPages();
         for (int i = 0; i < totalPages; i++) {
@@ -107,45 +116,4 @@ public class ScalePagesController {
                 Filenames.toSimpleFileName(file.getOriginalFilename()).replaceFirst("[.][^.]+$", "")
                         + "_scaled.pdf");
     }
-
-    private PDRectangle getTargetSize(String targetPDRectangle, PDDocument sourceDocument) {
-        if (targetPDRectangle.equals("KEEP")) {
-            if (sourceDocument.getNumberOfPages() == 0) {
-                return null;
-            }
-
-            // use the first page to determine the target page size
-            PDPage sourcePage = sourceDocument.getPage(0);
-            PDRectangle sourceSize = sourcePage.getMediaBox();
-
-            return sourceSize;
-        }
-
-        Map<String, PDRectangle> sizeMap = getSizeMap();
-
-        if (sizeMap.containsKey(targetPDRectangle)) {
-            return sizeMap.get(targetPDRectangle);
-        }
-
-        throw new IllegalArgumentException(
-                "Invalid PDRectangle. It must be one of the following: A0, A1, A2, A3, A4, A5, A6, LETTER, LEGAL, KEEP");
-    }
-
-    private Map<String, PDRectangle> getSizeMap() {
-        Map<String, PDRectangle> sizeMap = new HashMap<>();
-        // Add A0 - A6
-        sizeMap.put("A0", PDRectangle.A0);
-        sizeMap.put("A1", PDRectangle.A1);
-        sizeMap.put("A2", PDRectangle.A2);
-        sizeMap.put("A3", PDRectangle.A3);
-        sizeMap.put("A4", PDRectangle.A4);
-        sizeMap.put("A5", PDRectangle.A5);
-        sizeMap.put("A6", PDRectangle.A6);
-
-        // Add other sizes
-        sizeMap.put("LETTER", PDRectangle.LETTER);
-        sizeMap.put("LEGAL", PDRectangle.LEGAL);
-
-        return sizeMap;
-    }
 }

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

@@ -15,7 +15,6 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -28,8 +27,9 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import stirling.software.SPDF.model.PdfMetadata;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
+import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -38,12 +38,6 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 public class SplitPDFController {
 
     private static final Logger logger = LoggerFactory.getLogger(SplitPDFController.class);
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public SplitPDFController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
 
     @PostMapping(consumes = "multipart/form-data", value = "/split-pages")
     @Operation(
@@ -57,7 +51,7 @@ public class SplitPDFController {
         // open the pdf document
 
         PDDocument document = Loader.loadPDF(file.getBytes());
-        // PdfMetadata metadata = PdfMetadataService.extractMetadataFromPdf(document);
+        PdfMetadata metadata = PdfUtils.extractMetadataFromPdf(document);
         int totalPages = document.getNumberOfPages();
         List<Integer> pageNumbers = request.getPageNumbersList(document, false);
         System.out.println(
@@ -76,8 +70,7 @@ public class SplitPDFController {
         List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
         int previousPageNumber = 0;
         for (int splitPoint : pageNumbers) {
-            try (PDDocument splitDocument =
+            try (PDDocument splitDocument = new PDDocument()) {
-                    pdfDocumentFactory.createNewDocumentBasedOnOldDocument(document)) {
                 for (int i = previousPageNumber; i <= splitPoint; i++) {
                     PDPage page = document.getPage(i);
                     splitDocument.addPage(page);
@@ -86,7 +79,7 @@ public class SplitPDFController {
                 previousPageNumber = splitPoint + 1;
 
                 // Transfer metadata to split pdf
-                // PdfMetadataService.setMetadataToPdf(splitDocument, metadata);
+                PdfUtils.setMetadataToPdf(splitDocument, metadata);
 
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 splitDocument.save(baos);

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

@@ -1,307 +0,0 @@
-package stirling.software.SPDF.controller.api;
-
-import java.io.ByteArrayOutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
-import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import io.github.pixee.security.Filenames;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import stirling.software.SPDF.config.PdfMetadataService;
-import stirling.software.SPDF.model.PdfMetadata;
-import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
-import stirling.software.SPDF.utils.WebResponseUtils;
-
-@RestController
-@RequestMapping("/api/v1/general")
-@Tag(name = "General", description = "General APIs")
-public class SplitPdfByChaptersController {
-
-    private static final Logger logger =
-            LoggerFactory.getLogger(SplitPdfByChaptersController.class);
-
-    private final PdfMetadataService pdfMetadataService;
-
-    @Autowired
-    public SplitPdfByChaptersController(PdfMetadataService pdfMetadataService) {
-        this.pdfMetadataService = pdfMetadataService;
-    }
-
-    @PostMapping(value = "/split-pdf-by-chapters", consumes = "multipart/form-data")
-    @Operation(
-            summary = "Split PDFs by Chapters",
-            description = "Splits a PDF into chapters and returns a ZIP file.")
-    public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfByChaptersRequest request)
-            throws Exception {
-        MultipartFile file = request.getFileInput();
-        boolean includeMetadata = request.getIncludeMetadata();
-        Integer bookmarkLevel =
-                request.getBookmarkLevel(); // levels start from 0 (top most bookmarks)
-        if (bookmarkLevel < 0) {
-            return ResponseEntity.badRequest().body("Invalid bookmark level".getBytes());
-        }
-        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
-
-        // checks if the document is encrypted by an empty user password
-        if (sourceDocument.isEncrypted()) {
-            try {
-                sourceDocument.setAllSecurityToBeRemoved(true);
-                logger.info("Removing security from the source document ");
-            } catch (Exception e) {
-                logger.warn("Cannot decrypt the pdf");
-            }
-        }
-        PDDocumentOutline outline = sourceDocument.getDocumentCatalog().getDocumentOutline();
-
-        if (outline == null) {
-            logger.warn("No outline found for {}", file.getOriginalFilename());
-            return ResponseEntity.badRequest().body("No outline found".getBytes());
-        }
-        List<Bookmark> bookmarks = new ArrayList<>();
-        try {
-            bookmarks =
-                    extractOutlineItems(
-                            sourceDocument,
-                            outline.getFirstChild(),
-                            bookmarks,
-                            outline.getFirstChild().getNextSibling(),
-                            0,
-                            bookmarkLevel);
-            // to handle last page edge case
-            bookmarks.get(bookmarks.size() - 1).setEndPage(sourceDocument.getNumberOfPages());
-            Bookmark lastBookmark = bookmarks.get(bookmarks.size() - 1);
-
-        } catch (Exception e) {
-            logger.error("Unable to extract outline items", e);
-            return ResponseEntity.internalServerError()
-                    .body("Unable to extract outline items".getBytes());
-        }
-
-        boolean allowDuplicates = request.getAllowDuplicates();
-        if (!allowDuplicates) {
-            /*
-            duplicates are generated when multiple bookmarks correspond to the same page,
-            if the user doesn't want duplicates mergeBookmarksThatCorrespondToSamePage() method will merge the titles of all
-            the bookmarks that correspond to the same page, and treat them as a single bookmark
-            */
-            bookmarks = mergeBookmarksThatCorrespondToSamePage(bookmarks);
-        }
-        for (Bookmark bookmark : bookmarks) {
-            logger.info(
-                    "{}::::{} to {}",
-                    bookmark.getTitle(),
-                    bookmark.getStartPage(),
-                    bookmark.getEndPage());
-        }
-        List<ByteArrayOutputStream> splitDocumentsBoas =
-                getSplitDocumentsBoas(sourceDocument, bookmarks, includeMetadata);
-
-        Path zipFile = createZipFile(bookmarks, splitDocumentsBoas);
-
-        byte[] data = Files.readAllBytes(zipFile);
-        Files.deleteIfExists(zipFile);
-
-        String filename =
-                Filenames.toSimpleFileName(file.getOriginalFilename())
-                        .replaceFirst("[.][^.]+$", "");
-        sourceDocument.close();
-        return WebResponseUtils.bytesToWebResponse(
-                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
-    }
-
-    private List<Bookmark> mergeBookmarksThatCorrespondToSamePage(List<Bookmark> bookmarks) {
-        String mergedTitle = "";
-        List<Bookmark> chaptersToBeRemoved = new ArrayList<>();
-        for (Bookmark bookmark : bookmarks) {
-            if (bookmark.getStartPage() == bookmark.getEndPage()) {
-                mergedTitle = mergedTitle.concat(bookmark.getTitle().concat(" "));
-                chaptersToBeRemoved.add(bookmark);
-            } else {
-                if (!mergedTitle.isEmpty()) {
-                    if (mergedTitle.length() > 255) {
-                        mergedTitle = mergedTitle.substring(0, 253) + "...";
-                    }
-
-                    bookmarks.set(
-                            bookmarks.indexOf(bookmark),
-                            new Bookmark(
-                                    mergedTitle, bookmark.getStartPage(), bookmark.getEndPage()));
-                }
-                mergedTitle = "";
-            }
-        }
-        bookmarks.removeAll(chaptersToBeRemoved);
-        return bookmarks;
-    }
-
-    private static List<Bookmark> extractOutlineItems(
-            PDDocument sourceDocument,
-            PDOutlineItem current,
-            List<Bookmark> bookmarks,
-            PDOutlineItem nextParent,
-            int level,
-            int maxLevel)
-            throws Exception {
-
-        while (current != null) {
-
-            String currentTitle = current.getTitle().replace("/", "");
-            int firstPage =
-                    sourceDocument.getPages().indexOf(current.findDestinationPage(sourceDocument));
-            PDOutlineItem child = current.getFirstChild();
-            PDOutlineItem nextSibling = current.getNextSibling();
-            int endPage;
-            if (child != null && level < maxLevel) {
-                endPage =
-                        sourceDocument
-                                .getPages()
-                                .indexOf(child.findDestinationPage(sourceDocument));
-            } else if (nextSibling != null) {
-                endPage =
-                        sourceDocument
-                                .getPages()
-                                .indexOf(nextSibling.findDestinationPage(sourceDocument));
-            } else if (nextParent != null) {
-
-                endPage =
-                        sourceDocument
-                                .getPages()
-                                .indexOf(nextParent.findDestinationPage(sourceDocument));
-            } else {
-                endPage = -2;
-                /*
-                happens when we have something like this:
-                Outline Item 2
-                    Outline Item 2.1
-                        Outline Item 2.1.1
-                    Outline Item 2.2
-                        Outline 2.2.1
-                        Outline 2.2.2 <--- this item neither has an immediate next parent nor an immediate next sibling
-                Outline Item 3
-                 */
-            }
-            if (!bookmarks.isEmpty()
-                    && bookmarks.get(bookmarks.size() - 1).getEndPage() == -2
-                    && firstPage
-                            >= bookmarks
-                                    .get(bookmarks.size() - 1)
-                                    .getStartPage()) { // for handling the above-mentioned case
-                Bookmark previousBookmark = bookmarks.get(bookmarks.size() - 1);
-                previousBookmark.setEndPage(firstPage);
-            }
-            bookmarks.add(new Bookmark(currentTitle, firstPage, endPage));
-
-            // Recursively process children
-            if (child != null && level < maxLevel) {
-                extractOutlineItems(
-                        sourceDocument, child, bookmarks, nextSibling, level + 1, maxLevel);
-            }
-
-            current = nextSibling;
-        }
-        return bookmarks;
-    }
-
-    private Path createZipFile(
-            List<Bookmark> bookmarks, List<ByteArrayOutputStream> splitDocumentsBoas)
-            throws Exception {
-        Path zipFile = Files.createTempFile("split_documents", ".zip");
-        String fileNumberFormatter = "%0" + (Integer.toString(bookmarks.size()).length()) + "d ";
-        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
-            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
-
-                // split files will be named as "[FILE_NUMBER] [BOOKMARK_TITLE].pdf"
-
-                String fileName =
-                        String.format(fileNumberFormatter, i)
-                                + bookmarks.get(i).getTitle()
-                                + ".pdf";
-                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
-                byte[] pdf = baos.toByteArray();
-
-                ZipEntry pdfEntry = new ZipEntry(fileName);
-                zipOut.putNextEntry(pdfEntry);
-                zipOut.write(pdf);
-                zipOut.closeEntry();
-
-                logger.info("Wrote split document {} to zip file", fileName);
-            }
-        } catch (Exception e) {
-            logger.error("Failed writing to zip", e);
-            throw e;
-        }
-
-        logger.info("Successfully created zip file with split documents: {}", zipFile);
-        return zipFile;
-    }
-
-    public List<ByteArrayOutputStream> getSplitDocumentsBoas(
-            PDDocument sourceDocument, List<Bookmark> bookmarks, boolean includeMetadata)
-            throws Exception {
-        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
-        PdfMetadata metadata = null;
-        if (includeMetadata) {
-            metadata = pdfMetadataService.extractMetadataFromPdf(sourceDocument);
-        }
-        for (Bookmark bookmark : bookmarks) {
-            try (PDDocument splitDocument = new PDDocument()) {
-                boolean isSinglePage = (bookmark.getStartPage() == bookmark.getEndPage());
-
-                for (int i = bookmark.getStartPage();
-                        i < bookmark.getEndPage() + (isSinglePage ? 1 : 0);
-                        i++) {
-                    PDPage page = sourceDocument.getPage(i);
-                    splitDocument.addPage(page);
-                    logger.info("Adding page {} to split document", i);
-                }
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                if (includeMetadata) {
-                    pdfMetadataService.setMetadataToPdf(splitDocument, metadata);
-                }
-
-                splitDocument.save(baos);
-
-                splitDocumentsBoas.add(baos);
-            } catch (Exception e) {
-                logger.error("Failed splitting documents and saving them", e);
-                throw e;
-            }
-        }
-        return splitDocumentsBoas;
-    }
-}
-
-@Data
-@EqualsAndHashCode
-@NoArgsConstructor
-@AllArgsConstructor
-class Bookmark {
-    private String title;
-    private int startPage;
-    private int endPage;
-}

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

@@ -20,7 +20,6 @@ import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -34,7 +33,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -45,13 +43,6 @@ public class SplitPdfBySectionsController {
     private static final Logger logger =
             LoggerFactory.getLogger(SplitPdfBySectionsController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public SplitPdfBySectionsController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(value = "/split-pdf-by-sections", consumes = "multipart/form-data")
     @Operation(
             summary = "Split PDF pages into smaller sections",
@@ -74,7 +65,7 @@ public class SplitPdfBySectionsController {
                 Filenames.toSimpleFileName(file.getOriginalFilename())
                         .replaceFirst("[.][^.]+$", "");
         if (merge) {
-            MergeController mergeController = new MergeController(pdfDocumentFactory);
+            MergeController mergeController = new MergeController();
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             mergeController.mergeDocuments(splitDocuments).save(baos);
             return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), filename + "_split.pdf");

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

@@ -12,7 +12,6 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -26,7 +25,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -36,12 +34,6 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 public class SplitPdfBySizeController {
 
     private static final Logger logger = LoggerFactory.getLogger(SplitPdfBySizeController.class);
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public SplitPdfBySizeController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
 
     @PostMapping(value = "/split-by-size-or-count", consumes = "multipart/form-data")
     @Operation(
@@ -92,8 +84,7 @@ public class SplitPdfBySizeController {
             PDDocument sourceDocument, long maxBytes, ZipOutputStream zipOut, String baseFilename)
             throws IOException {
         long currentSize = 0;
-        PDDocument currentDoc =
+        PDDocument currentDoc = new PDDocument();
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
         int fileIndex = 1;
 
         for (int pageIndex = 0; pageIndex < sourceDocument.getNumberOfPages(); pageIndex++) {
@@ -130,8 +121,7 @@ public class SplitPdfBySizeController {
             PDDocument sourceDocument, int pageCount, ZipOutputStream zipOut, String baseFilename)
             throws IOException {
         int currentPageCount = 0;
-        PDDocument currentDoc =
+        PDDocument currentDoc = new PDDocument();
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
         int fileIndex = 1;
         for (PDPage page : sourceDocument.getPages()) {
             currentDoc.addPage(page);
@@ -162,8 +152,7 @@ public class SplitPdfBySizeController {
         int currentPageIndex = 0;
         int fileIndex = 1;
         for (int i = 0; i < documentCount; i++) {
-            PDDocument currentDoc =
+            PDDocument currentDoc = new PDDocument();
-                    pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
             int pagesToAdd = pagesPerDocument + (i < extraPages ? 1 : 0);
 
             for (int j = 0; j < pagesToAdd; j++) {

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

@@ -13,7 +13,6 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +23,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -34,13 +32,6 @@ public class ToSinglePageController {
 
     private static final Logger logger = LoggerFactory.getLogger(ToSinglePageController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public ToSinglePageController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/pdf-to-single-page")
     @Operation(
             summary = "Convert a multi-page PDF into a single long page PDF",
@@ -62,8 +53,7 @@ public class ToSinglePageController {
         }
 
         // Create new document and page with calculated dimensions
-        PDDocument newDocument =
+        PDDocument newDocument = new PDDocument();
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
         PDPage newPage = new PDPage(new PDRectangle(maxWidth, totalHeight));
         newDocument.addPage(newPage);
 

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

@@ -1,9 +1,7 @@
 package stirling.software.SPDF.controller.api;
 
-import java.io.IOException;
 import java.security.Principal;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -13,8 +11,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.session.SessionInformation;
+import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -31,8 +29,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.config.security.UserService;
-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;
@@ -44,12 +40,9 @@ public class UserController {
 
     @Autowired private UserService userService;
 
-    @Autowired SessionPersistentRegistry sessionRegistry;
-
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/register")
-    public String register(@ModelAttribute UsernameAndPass requestModel, Model model)
+    public String register(@ModelAttribute UsernameAndPass requestModel, Model model) {
-            throws IOException {
         if (userService.usernameExistsIgnoreCase(requestModel.getUsername())) {
             model.addAttribute("error", "Username already exists");
             return "register";
@@ -70,8 +63,7 @@ public class UserController {
             @RequestParam(name = "newUsername") String newUsername,
             HttpServletRequest request,
             HttpServletResponse response,
-            RedirectAttributes redirectAttributes)
+            RedirectAttributes redirectAttributes) {
-            throws IOException {
 
         if (!userService.isUsernameValid(newUsername)) {
             return new RedirectView("/account?messageType=invalidUsername", true);
@@ -124,8 +116,7 @@ public class UserController {
             @RequestParam(name = "newPassword") String newPassword,
             HttpServletRequest request,
             HttpServletResponse response,
-            RedirectAttributes redirectAttributes)
+            RedirectAttributes redirectAttributes) {
-            throws IOException {
         if (principal == null) {
             return new RedirectView("/change-creds?messageType=notAuthenticated", true);
         }
@@ -158,8 +149,7 @@ public class UserController {
             @RequestParam(name = "newPassword") String newPassword,
             HttpServletRequest request,
             HttpServletResponse response,
-            RedirectAttributes redirectAttributes)
+            RedirectAttributes redirectAttributes) {
-            throws IOException {
         if (principal == null) {
             return new RedirectView("/account?messageType=notAuthenticated", true);
         }
@@ -186,8 +176,7 @@ public class UserController {
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/updateUserSettings")
-    public String updateUserSettings(HttpServletRequest request, Principal principal)
+    public String updateUserSettings(HttpServletRequest request, Principal principal) {
-            throws IOException {
         Map<String, String[]> paramMap = request.getParameterMap();
         Map<String, String> updates = new HashMap<>();
 
@@ -208,13 +197,11 @@ public class UserController {
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/saveUser")
     public RedirectView saveUser(
-            @RequestParam(name = "username", required = true) String username,
+            @RequestParam(name = "username") String username,
-            @RequestParam(name = "password", required = true) String password,
+            @RequestParam(name = "password") String password,
             @RequestParam(name = "role") String role,
-            @RequestParam(name = "authType") String authType,
             @RequestParam(name = "forceChange", required = false, defaultValue = "false")
-                    boolean forceChange)
+                    boolean forceChange) {
-            throws IllegalArgumentException, IOException {
 
         if (!userService.isUsernameValid(username)) {
             return new RedirectView("/addUsers?messageType=invalidUsername", true);
@@ -243,15 +230,7 @@ public class UserController {
             return new RedirectView("/addUsers?messageType=invalidRole", true);
         }
 
-        if (authType.equalsIgnoreCase(AuthenticationType.OAUTH2.toString())) {
-            userService.saveUser(username, AuthenticationType.OAUTH2, role);
-        } else {
-            if (password.isBlank()) {
-                return new RedirectView("/addUsers?messageType=invalidPassword", true);
-            }
         userService.saveUser(username, password, role, forceChange);
-        }
-
         return new RedirectView(
                 "/addUsers", true); // Redirect to account page after adding the user
     }
@@ -261,8 +240,7 @@ public class UserController {
     public RedirectView changeRole(
             @RequestParam(name = "username") String username,
             @RequestParam(name = "role") String role,
-            Authentication authentication)
+            Authentication authentication) {
-            throws IOException {
 
         Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
 
@@ -293,60 +271,6 @@ public class UserController {
         User user = userOpt.get();
 
         userService.changeRole(user, role);
-
-        return new RedirectView(
-                "/addUsers", true); // Redirect to account page after adding the user
-    }
-
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @PostMapping("/admin/changeUserEnabled/{username}")
-    public RedirectView changeUserEnabled(
-            @PathVariable("username") String username,
-            @RequestParam("enabled") boolean enabled,
-            Authentication authentication)
-            throws IOException {
-
-        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
-
-        if (!userOpt.isPresent()) {
-            return new RedirectView("/addUsers?messageType=userNotFound", true);
-        }
-        if (!userService.usernameExistsIgnoreCase(username)) {
-            return new RedirectView("/addUsers?messageType=userNotFound", true);
-        }
-        // Get the currently authenticated username
-        String currentUsername = authentication.getName();
-
-        // Check if the provided username matches the current session's username
-        if (currentUsername.equalsIgnoreCase(username)) {
-            return new RedirectView("/addUsers?messageType=disabledCurrentUser", true);
-        }
-        User user = userOpt.get();
-
-        userService.changeUserEnabled(user, enabled);
-
-        if (!enabled) {
-            // Invalidate all sessions if the user is being disabled
-            List<Object> principals = sessionRegistry.getAllPrincipals();
-            String userNameP = "";
-            for (Object principal : principals) {
-                List<SessionInformation> sessionsInformations =
-                        sessionRegistry.getAllSessions(principal, false);
-                if (principal instanceof UserDetails) {
-                    userNameP = ((UserDetails) principal).getUsername();
-                } else if (principal instanceof OAuth2User) {
-                    userNameP = ((OAuth2User) principal).getName();
-                } else if (principal instanceof String) {
-                    userNameP = (String) principal;
-                }
-                if (userNameP.equalsIgnoreCase(username)) {
-                    for (SessionInformation sessionsInformation : sessionsInformations) {
-                        sessionRegistry.expireSession(sessionsInformation.getSessionId());
-                    }
-                }
-            }
-        }
-
         return new RedirectView(
                 "/addUsers", true); // Redirect to account page after adding the user
     }
@@ -354,7 +278,7 @@ public class UserController {
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/deleteUser/{username}")
     public RedirectView deleteUser(
-            @PathVariable("username") String username, Authentication authentication) {
+            @PathVariable(name = "username") String username, Authentication authentication) {
 
         if (!userService.usernameExistsIgnoreCase(username)) {
             return new RedirectView("/addUsers?messageType=deleteUsernameExists", true);
@@ -367,18 +291,27 @@ public class UserController {
         if (currentUsername.equalsIgnoreCase(username)) {
             return new RedirectView("/addUsers?messageType=deleteCurrentUser", true);
         }
-
+        invalidateUserSessions(username);
-        // Invalidate all sessions before deleting the user
-        List<SessionInformation> sessionsInformations =
-                sessionRegistry.getAllSessions(authentication.getPrincipal(), false);
-        for (SessionInformation sessionsInformation : sessionsInformations) {
-            sessionRegistry.expireSession(sessionsInformation.getSessionId());
-            sessionRegistry.removeSessionInformation(sessionsInformation.getSessionId());
-        }
         userService.deleteUser(username);
         return new RedirectView("/addUsers", true);
     }
 
+    @Autowired private SessionRegistry sessionRegistry;
+
+    private void invalidateUserSessions(String username) {
+        for (Object principal : sessionRegistry.getAllPrincipals()) {
+            if (principal instanceof UserDetails) {
+                UserDetails userDetails = (UserDetails) principal;
+                if (userDetails.getUsername().equals(username)) {
+                    for (SessionInformation session :
+                            sessionRegistry.getAllSessions(principal, false)) {
+                        session.expireNow();
+                    }
+                }
+            }
+        }
+    }
+
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/get-api-key")
     public ResponseEntity<String> getApiKey(Principal principal) {