saml test

.github/pull_request_template.md

@@ -4,10 +4,9 @@ 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)

.github/scripts/gradle_to_chart.py

@@ -8,20 +8,17 @@ gradle_path = "build.gradle"
 
 def get_chart_version(path):
     """
-    Reads the version and the appVersion from Chart.yaml.
+    Reads the appVersion from Chart.yaml.
 
     Args:
         path (str): The file path to the Chart.yaml.
 
     Returns:
-        dict: The version under "chart" key and the appVersion under "app" key.
+        str: The appVersion if found, otherwise an empty string.
     """
     with open(path, encoding="utf-8") as file:
         chart_yaml = yaml.safe_load(file)
-    return {
-      "chart": chart_yaml["version"],
-      "app": chart_yaml["appVersion"]
-    }
+    return chart_yaml.get("appVersion", "")
 
 
 def get_gradle_version(path):
@@ -42,46 +39,17 @@ def get_gradle_version(path):
     return ""
 
 
-def get_new_chart_version(chart_version, old_app_version, new_app_version):
-  """
-  Get the new chart version from
-
-  Args:
-      str: The current chart version.
-      str: The current app version.
-      str: The new app version.
-
-  Returns:
-    str: The new chart version to update to.
-  """
-  chart_major, chart_minor, chart_patch = chart_version.split(".")
-
-  old_major, old_minor, old_patch = old_app_version.split(".")
-  new_major, new_minor, new_patch = new_app_version.split(".")
-
-  if old_major != new_major:
-    new_chart_version = f"{int(chart_major)+1}.0.0"
-  elif old_minor != new_minor:
-    new_chart_version = f"{chart_major}.{int(chart_minor)+1}.0"
-  elif old_patch != new_patch:
-    new_chart_version = f"{chart_major}.{chart_minor}.{int(chart_patch)+1}"
-
-  return new_chart_version
-
-
-def update_chart_version(path, new_chart_version, new_app_version):
+def update_chart_version(path, new_version):
     """
-    Updates the version and the appVersion in Chart.yaml with a new version.
+    Updates the appVersion in Chart.yaml with a new version.
 
     Args:
         path (str): The file path to the Chart.yaml.
-        new_chart_version (str): The new chart version to update to.
-        new_app_version (str): The new app version to update to.
+        new_version (str): The new version to update to.
     """
     with open(path, encoding="utf-8") as file:
         chart_yaml = yaml.safe_load(file)
-    chart_yaml["version"] = new_chart_version
-    chart_yaml["appVersion"] = new_app_version
+    chart_yaml["appVersion"] = new_version
     with open(path, "w", encoding="utf-8") as file:
         yaml.safe_dump(chart_yaml, file)
 
@@ -90,11 +58,10 @@ def update_chart_version(path, new_chart_version, new_app_version):
 chart_version = get_chart_version(chart_yaml_path)
 gradle_version = get_gradle_version(gradle_path)
 
-if chart_version["app"] != gradle_version:
-    new_chart_version = get_new_chart_version(chart_version["chart"], chart_version["app"], gradle_version, )
+if chart_version != gradle_version:
     print(
-        f"Versions do not match. Updating Chart.yaml from {chart_version['chart']} to {new_chart_version}."
+        f"Versions do not match. Updating Chart.yaml from {chart_version} to {gradle_version}."
     )
-    update_chart_version(chart_yaml_path, new_chart_version, gradle_version)
+    update_chart_version(chart_yaml_path, gradle_version)
 else:
     print("Versions match. No update required.")

.gitignore

@@ -4,7 +4,6 @@ bin/
 tmp/
 *.tmp
 *.bak
-*.exe
 *.swp
 *~.nib
 local.properties
@@ -111,6 +110,7 @@ watchedFolders/
 *.war
 *.nar
 *.ear
+*.zip
 *.tar.gz
 *.rar
 *.db

CONTRIBUTING.md

@@ -29,7 +29,7 @@ If you would like to add or modify a translation, please see [How to add new lan
 
 ## Docs
 
-Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://docs.stirlingpdf.com/](https://docs.stirlingpdf.com/).
+Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://stirlingtools.com/docs/](https://stirlingtools.com/docs/).
 
 ## Fixing Bugs or Adding a New Feature
 
@@ -41,4 +41,4 @@ If, at any point of time, you have a question, please feel free to ask in the sa
 
 ## License
 
-By contributing to this project, you agree that your contributions will be licensed under the [MIT License](LICENSE).
+By contributing to this project, you agree that your contributions will be licensed under the [GPL 3 License](LICENSE). You also acknowledge and agree that your 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.

DeveloperGuide.md

@@ -1,557 +0,0 @@
-# Stirling-PDF Developer Guide
-
-## 1. Introduction
-
-Stirling-PDF is a robust, locally hosted web-based PDF manipulation tool. This guide focuses on Docker-based development and testing, which is the recommended approach for working with the full version of Stirling-PDF.
-
-## 2. Project Overview
-
-Stirling-PDF is built using:
-- Spring Boot + Thymeleaf
-- PDFBox
-- LibreOffice
-- OcrMyPdf
-- HTML, CSS, JavaScript
-- Docker
-- PDF.js
-- PDF-LIB.js
-- Lombok
-
-## 3. Development Environment Setup
-
-### Prerequisites
-- Docker
-- Git
-- Java JDK 17 or later
-- Gradle 7.0 or later (Included within repo)
-
-### Setup Steps
-1. Clone the repository:
-   ```
-   git clone https://github.com/Stirling-Tools/Stirling-PDF.git
-   cd Stirling-PDF
-   ```
-
-2. Install Docker and JDK17 if not already installed.
-
-3. Install a recommended Java IDE such as Eclipse, IntelliJ or VSCode
-
-4. Lombok Setup
-Stirling-PDF uses Lombok to reduce boilerplate code. Some IDEs, like Eclipse, don't support Lombok out of the box. To set up Lombok in your development environment:
-Visit the [Lombok website](https://projectlombok.org/setup/) for installation instructions specific to your IDE.
-
-5. Add environment variable
-For local testing you should generally be testing the full 'Security' version of Stirling-PDF to do this you must add the environment flag DOCKER_ENABLE_SECURITY=true to your system and/or IDE build/run step
-
-
-## 4. Project Structure
-
-```
-Stirling-PDF/
-├── .github/               # GitHub-specific files (workflows, issue templates)
-├── configs/               # Configuration files used by stirling at runtime (generated at runtime)
-├── cucumber/              # Cucumber test files
-│   ├── features/
-├── customFiles/           # Custom static files and templates (generated at runtime used to replace existing files)
-├── docs/                  # Documentation files
-├── exampleYmlFiles/       # Example YAML configuration files
-├── images/                # Image assets
-├── pipeline/              # Pipeline-related files (generated at runtime)
-├── scripts/               # Utility scripts
-├── src/                   # Source code
-│   ├── main/
-│   │   ├── java/
-│   │   │   └── stirling/
-│   │   │       └── software/
-│   │   │           └── SPDF/
-│   │   │               ├── config/
-│   │   │               ├── controller/
-│   │   │               ├── model/
-│   │   │               ├── repository/
-│   │   │               ├── service/
-│   │   │               └── utils/
-│   │   └── resources/
-│   │       ├── static/
-│   │       │   ├── css/
-│   │       │   ├── js/
-│   │       │   └── pdfjs/
-│   │       └── templates/
-│   └── test/
-│       └── java/
-│           └── stirling/
-│               └── software/
-│                   └── SPDF/
-├── build.gradle           # Gradle build configuration
-├── Dockerfile             # Main Dockerfile
-├── Dockerfile-ultra-lite  # Dockerfile for ultra-lite version
-├── Dockerfile-fat         # Dockerfile for fat version
-├── docker-compose.yml     # Docker Compose configuration
-└── test.sh                # Test script to deploy all docker versions and run cuke tests
-```
-
-## 5. Docker-based Development
-
-Stirling-PDF offers several Docker versions:
-- Full: All features included
-- Ultra-Lite: Basic PDF operations only
-- Fat: Includes additional libraries and fonts predownloaded
-
-### Example Docker Compose Files
-
-Stirling-PDF provides several example Docker Compose files in the `exampleYmlFiles` directory such as :
-
-- `docker-compose-latest.yml`: Latest version without security features
-- `docker-compose-latest-security.yml`: Latest version with security features enabled
-- `docker-compose-latest-fat-security.yml`: Fat version with security features enabled
-
-These files provide pre-configured setups for different scenarios. For example, here's a snippet from `docker-compose-latest-security.yml`:
-
-```yaml
-services:
-  stirling-pdf:
-    container_name: Stirling-PDF-Security
-    image: frooodle/s-pdf:latest
-    deploy:
-      resources:
-        limits:
-          memory: 4G
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
-      interval: 5s
-      timeout: 10s
-      retries: 16
-    ports:
-      - "8080:8080"
-    volumes:
-      - /stirling/latest/data:/usr/share/tessdata:rw
-      - /stirling/latest/config:/configs:rw
-      - /stirling/latest/logs:/logs:rw
-    environment:
-      DOCKER_ENABLE_SECURITY: "true"
-      SECURITY_ENABLELOGIN: "true"
-      PUID: 1002
-      PGID: 1002
-      UMASK: "022"
-      SYSTEM_DEFAULTLOCALE: en-US
-      UI_APPNAME: Stirling-PDF
-      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest with Security
-      UI_APPNAMENAVBAR: Stirling-PDF Latest
-      SYSTEM_MAXFILESIZE: "100"
-      METRICS_ENABLED: "true"
-      SYSTEM_GOOGLEVISIBILITY: "true"
-    restart: on-failure:5
-```
-
-To use these example files, copy the desired file to your project root and rename it to `docker-compose.yml`, or specify the file explicitly when running Docker Compose:
-
-```bash
-docker-compose -f exampleYmlFiles/docker-compose-latest-security.yml up
-```
-
-### Building Docker Images
-
-Stirling-PDF uses different Docker images for various configurations. The build process is controlled by environment variables and uses specific Dockerfile variants. Here's how to build the Docker images:
-
-1. Set the security environment variable:
-   ```bash
-   export DOCKER_ENABLE_SECURITY=false  # or true for security-enabled builds
-   ```
-
-2. Build the project with Gradle:
-   ```bash
-   ./gradlew clean build
-   ```
-
-3. Build the Docker images:
-
-   For the latest version:
-   ```bash
-   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile .
-   ```
-
-   For the ultra-lite version:
-   ```bash
-   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
-   ```
-
-   For the fat version (with security enabled):
-   ```bash
-   export DOCKER_ENABLE_SECURITY=true
-   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-fat -f ./Dockerfile-fat .
-   ```
-
-Note: The `--no-cache` and `--pull` flags ensure that the build process uses the latest base images and doesn't use cached layers, which is useful for testing and ensuring reproducible builds. however to improve build times these can often be removed depending on your usecase
-
-
-
-## 6. Testing
-
-### Comprehensive Testing Script
-
-Stirling-PDF provides a `test.sh` script in the root directory. This script builds all versions of Stirling-PDF, checks that each version works, and runs Cucumber tests. It's recommended to run this script before submitting a final pull request.
-
-To run the test script:
-
-```bash
-./test.sh
-```
-
-This script performs the following actions:
-1. Builds all Docker images (full, ultra-lite, fat)
-2. Runs each version to ensure it starts correctly
-3. Executes Cucumber tests against main version and ensures feature compatibility, in the event these tests fail your PR will not be merged
-
-Note: The `test.sh` script will run automatically when you raise a PR. However, it's recommended to run it locally first to save resources and catch any issues early.
-
-### Full Testing with Docker
-
-1. Build and run the Docker container per the above instructions:
-
-2. Access the application at `http://localhost:8080` and manually test all features developed.
-
-
-### Local Testing (Java and UI Components)
-
-For quick iterations and development of Java backend, JavaScript, and UI components, you can run and test Stirling-PDF locally without Docker. This approach allows you to work on and verify changes to:
-
-- Java backend logic
-- RESTful API endpoints
-- JavaScript functionality
-- User interface components and styling
-- Thymeleaf templates
-
-To run Stirling-PDF locally:
-
-1. Compile and run the project using built in IDE methods or by running:
-   ```
-   ./gradlew bootRun
-   ```
-
-2. Access the application at `http://localhost:8080` in your web browser.
-
-3. Manually test the features you're working on through the UI.
-
-4. For API changes, use tools like Postman or curl to test endpoints directly.
-
-Important notes:
-- Local testing doesn't include features that depend on external tools like OCRmyPDF, LibreOffice, or Python scripts.
-- There are currently no automated unit tests. All testing is done manually through the UI or API calls. (You are welcome to add JUnits!)
-- Always verify your changes in the full Docker environment before submitting pull requests, as some integrations and features will only work in the complete setup.
-
-
-## 7. Contributing
-
-1. Fork the repository on GitHub.
-2. Create a new branch for your feature or bug fix.
-3. Make your changes and commit them with clear, descriptive messages and ensure any documentation is updated related to your changes.
-4. Test your changes thoroughly in the Docker environment.
-5. Run the `test.sh` script to ensure all versions build correctly and pass the Cucumber tests:
-   ```bash
-   ./test.sh
-   ```
-6. Push your changes to your fork.
-7. Submit a pull request to the main repository. 
-8. See additional [contributing guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
-
-When you raise a PR:
-- The `test.sh` script will run automatically against your PR.
-- The PR checks will verify versioning and dependency updates.
-- Documentation will be automatically updated for dependency changes.
-- Security issues will be checked using Snyk and PixeeBot.
-
-Address any issues that arise from these checks before finalizing your pull request.
-
-## 8. API Documentation
-
-API documentation is available at `/swagger-ui/index.html` when running the application. You can also view the latest API documentation [here](https://app.swaggerhub.com/apis-docs/Stirling-Tools/Stirling-PDF/).
-
-## 9. Customization
-
-Stirling-PDF can be customized through environment variables or a `settings.yml` file. Key customization options include:
-- Application name and branding
-- Security settings
-- UI customization
-- Endpoint management
-
-When using Docker, pass environment variables using the `-e` flag or in your `docker-compose.yml` file.
-
-Example:
-```
-docker run -p 8080:8080 -e APP_NAME="My PDF Tool" stirling-pdf:full
-```
-
-Refer to the main README for a full list of customization options.
-
-## 10. Language Translations
-
-For managing language translations that affect multiple files, Stirling-PDF provides a helper script:
-
-```bash
-/scripts/replace_translation_line.sh
-```
-
-This script helps you make consistent replacements across language files.
-
-When contributing translations:
-1. Use the helper script for multi-file changes.
-2. Ensure all language files are updated consistently.
-3. The PR checks will verify consistency in language file updates.
-
-Remember to test your changes thoroughly to ensure they don't break any existing functionality.
-
-
-
-
-# Code examples
-
-### Overview of Thymeleaf
-
-Thymeleaf is a  server-side Java HTML template engine. It is used in Stirling-PDF to render dynamic web pages. Thymeleaf integrates heavily with Spring Boot
-
-### Thymeleaf overview
-
-In Stirling-PDF, Thymeleaf is used to create HTML templates that are rendered on the server side. These templates are located in the `src/main/resources/templates` directory. Thymeleaf templates use a combination of HTML and special Thymeleaf attributes to dynamically generate content.
-Some examples of this are 
-```html
-<th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-or
-<th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
-```
-Where it uses the th:block, th: indicating its a special thymeleaf element to be used serverside in generating the html, and block being the actual element type.
-In this case we are inserting the ``navbar`` entry within the ``fragments/navbar.html`` fragment into the ``th:block`` element.
-
-They can be more complex such as
-```html
-<th:block th:insert="~{fragments/common :: head(title=#{pageExtracter.title}, header=#{pageExtracter.header})}"></th:block>
-```
-Which is the same as above but passes the parameters title and header into the fragment common.html to be used in its HTML generation
-
-Thymeleaf can also be used to loop through objects or pass things from java side into html side.
-```java
- @GetMapping
-       public String newFeaturePage(Model model) {
-           model.addAttribute("exampleData", exampleData);
-           return "new-feature";
-       }
-```
-in above example if exampleData is a list of  plain java objects of class Person and within it you had id, name, age etc. You can reference it like so
-```html
-<tbody>
-   <!-- Use th:each to iterate over the list -->
-   <tr th:each="person : ${exampleData}">
-       <td th:text="${person.id}"></td>
-       <td th:text="${person.name}"></td>
-       <td th:text="${person.age}"></td>
-       <td th:text="${person.email}"></td>
-   </tr>
-</tbody>
-```
-This would generate n entries of tr for each person in exampleData
-
-### Adding a New Feature to the Backend (API)
-
-1. **Create a New Controller:**
-   - Create a new Java class in the `src/main/java/stirling/software/SPDF/controller/api` directory.
-   - Annotate the class with `@RestController` and `@RequestMapping` to define the API endpoint.
-   - Ensure to add API documentation annotations like `@Tag(name = "General", description = "General APIs")` and `@Operation(summary = "Crops a PDF document", description = "This operation takes an input PDF file and crops it according to the given coordinates. Input:PDF Output:PDF Type:SISO")`.
-
-   ```java
-   package stirling.software.SPDF.controller.api;
-
-   import org.springframework.web.bind.annotation.GetMapping;
-   import org.springframework.web.bind.annotation.RequestMapping;
-   import org.springframework.web.bind.annotation.RestController;
-   import io.swagger.v3.oas.annotations.Operation;
-   import io.swagger.v3.oas.annotations.tags.Tag;
-
-   @RestController
-   @RequestMapping("/api/v1/new-feature")
-   @Tag(name = "General", description = "General APIs")
-   public class NewFeatureController {
-
-       @GetMapping
-       @Operation(summary = "New Feature", description = "This is a new feature endpoint.")
-       public String newFeature() {
-           return "NewFeatureResponse"; // This refers to the NewFeatureResponse.html template presenting the user with the generated html from that file when they navigate to /api/v1/new-feature
-       }
-   }
-   ```
-
-2. **Define the Service Layer:** (Not required but often useful)
-   - Create a new service class in the `src/main/java/stirling/software/SPDF/service` directory.
-   - Implement the business logic for the new feature.
-
-   ```java
-   package stirling.software.SPDF.service;
-
-   import org.springframework.stereotype.Service;
-
-   @Service
-   public class NewFeatureService {
-
-       public String getNewFeatureData() {
-           // Implement business logic here
-           return "New Feature Data";
-       }
-   }
-   ```
-
-2b. **Integrate the Service with the Controller:**
-   - Autowire the service class in the controller and use it to handle the API request.
-
-   ```java
-   package stirling.software.SPDF.controller.api;
-
-   import org.springframework.beans.factory.annotation.Autowired;
-   import org.springframework.web.bind.annotation.GetMapping;
-   import org.springframework.web.bind.annotation.RequestMapping;
-   import org.springframework.web.bind.annotation.RestController;
-   import stirling.software.SPDF.service.NewFeatureService;
-   import io.swagger.v3.oas.annotations.Operation;
-   import io.swagger.v3.oas.annotations.tags.Tag;
-
-   @RestController
-   @RequestMapping("/api/v1/new-feature")
-   @Tag(name = "General", description = "General APIs")
-   public class NewFeatureController {
-
-       @Autowired
-       private NewFeatureService newFeatureService;
-
-       @GetMapping
-       @Operation(summary = "New Feature", description = "This is a new feature endpoint.")
-       public String newFeature() {
-           return newFeatureService.getNewFeatureData();
-       }
-   }
-   ```
-
-### Adding a New Feature to the Frontend (UI)
-
-1. **Create a New Thymeleaf Template:**
-   - Create a new HTML file in the `src/main/resources/templates` directory.
-   - Use Thymeleaf attributes to dynamically generate content.
-   - Use `extract-page.html` as a base example for the HTML template, useful to ensure importing of the general layout, navbar and footer.
-
-   ```html
-   <!DOCTYPE html>
-   <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
-     <head>
-     <th:block th:insert="~{fragments/common :: head(title=#{newFeature.title}, header=#{newFeature.header})}"></th:block>
-     </head>
-
-     <body>
-       <div id="page-container">
-         <div id="content-wrap">
-           <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-           <br><br>
-           <div class="container">
-             <div class="row justify-content-center">
-               <div class="col-md-6 bg-card">
-                 <div class="tool-header">
-                   <span class="material-symbols-rounded tool-header-icon organize">upload</span>
-                   <span class="tool-header-text" th:text="#{newFeature.header}"></span>
-                 </div>
-                 <form th:action="@{'/api/v1/new-feature'}" method="post" enctype="multipart/form-data">
-                   <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
-                   <input type="hidden" id="customMode" name="customMode" value="">
-                   <div class="mb-3">
-                     <label for="featureInput" th:text="#{newFeature.prompt}"></label>
-                     <input type="text" class="form-control" id="featureInput" name="featureInput" th:placeholder="#{newFeature.placeholder}" required>
-                   </div>
-
-                   <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{newFeature.submit}"></button>
-                 </form>
-               </div>
-             </div>
-           </div>
-         </div>
-         <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
-       </div>
-     </body>
-   </html>
-   ```
-
-2. **Create a New Controller for the UI:**
-   - Create a new Java class in the `src/main/java/stirling/software/SPDF/controller/ui` directory.
-   - Annotate the class with `@Controller` and `@RequestMapping` to define the UI endpoint.
-
-   ```java
-   package stirling.software.SPDF.controller.ui;
-
-   import org.springframework.beans.factory.annotation.Autowired;
-   import org.springframework.stereotype.Controller;
-   import org.springframework.ui.Model;
-   import org.springframework.web.bind.annotation.GetMapping;
-   import org.springframework.web.bind.annotation.RequestMapping;
-   import stirling.software.SPDF.service.NewFeatureService;
-
-   @Controller
-   @RequestMapping("/new-feature")
-   public class NewFeatureUIController {
-
-       @Autowired
-       private NewFeatureService newFeatureService;
-
-       @GetMapping
-       public String newFeaturePage(Model model) {
-           model.addAttribute("newFeatureData", newFeatureService.getNewFeatureData());
-           return "new-feature";
-       }
-   }
-   ```
-
-3. **Update the Navigation Bar:**
-   - Add a link to the new feature page in the navigation bar.
-   - Update the `src/main/resources/templates/fragments/navbar.html` file.
-
-   ```html
-   <li class="nav-item">
-       <a class="nav-link" th:href="@{/new-feature}">New Feature</a>
-   </li>
-   ```
-
-
-## Adding New Translations to Existing Language Files in Stirling-PDF
-
-When adding a new feature or modifying existing ones in Stirling-PDF, you'll need to add new translation entries to the existing language files. Here's a step-by-step guide:
-
-### 1. Locate Existing Language Files
-
-Find the existing `messages.properties` files in the `src/main/resources` directory. You'll see files like:
-
-- `messages.properties` (default, usually English)
-- `messages_en_GB.properties`
-- `messages_fr.properties`
-- `messages_de.properties`
-- etc.
-
-### 2. Add New Translation Entries
-
-Open each of these files and add your new translation entries. For example, if you're adding a new feature called "PDF Splitter", 
-Use descriptive, hierarchical keys (e.g., `feature.element.description`)
-you might add:
-
-```properties
-pdfSplitter.title=PDF Splitter
-pdfSplitter.description=Split your PDF into multiple documents
-pdfSplitter.button.split=Split PDF
-pdfSplitter.input.pages=Enter page numbers to split
-```
-
-Add these entries to the default GB language file and any others you wish, translating the values as appropriate for each language.
-
-### 3. Use Translations in Thymeleaf Templates
-
-In your Thymeleaf templates, use the `#{key}` syntax to reference the new translations:
-
-```html
-<h1 th:text="#{pdfSplitter.title}">PDF Splitter</h1>
-<p th:text="#{pdfSplitter.description}">Split your PDF into multiple documents</p>
-<input type="text" th:placeholder="#{pdfSplitter.input.pages}">
-<button th:text="#{pdfSplitter.button.split}">Split PDF</button>
-```
-
-
-
-Remember, never hard-code text in your templates or Java code. Always use translation keys to ensure proper localization.

Dockerfile

@@ -1,5 +1,5 @@
 # Main stage
-FROM alpine:3.20.3
+FROM alpine:3.20.2
 
 # Copy necessary files
 COPY scripts /scripts

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.2
 
 # Copy necessary files
 COPY scripts /scripts

Dockerfile-ultra-lite

@@ -1,5 +1,5 @@
 # use alpine
-FROM alpine:3.20.3
+FROM alpine:3.20.2
 
 ARG VERSION_TAG
 
@@ -15,7 +15,6 @@ ENV DOCKER_ENABLE_SECURITY=false \
 # Copy necessary files
 COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh
 COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
-COPY scripts/installFonts.sh /scripts/installFonts.sh
 COPY pipeline /pipeline
 COPY build/libs/*.jar app.jar
 
@@ -34,11 +33,11 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         su-exec \
         openjdk21-jre && \
     # User permissions
-    mkdir -p /configs /logs /customFiles /usr/share/fonts/opentype/noto && \
+    mkdir /configs /logs /customFiles && \
     chmod +x /scripts/*.sh && \
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts  /configs /customFiles /pipeline && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar    
 
 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI

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.

LocalRunGuide.md

@@ -257,11 +257,9 @@ To override the default configuration, you can add the following to `/.git/Stirl
 
 ```bash
 server:
-  host: 0.0.0.0 # Not working - use instead address
-  address: 0.0.0.0
+  host: 0.0.0.0
   port: 3000
 ```
-'-Djava.net.preferIPv4Stack=true' --> To force ipv4 only in the java starting command
 
 **Note:** This file is created after the first application launch. To have it before that, you can create the directory and add the file yourself.
 

README.md

@@ -100,8 +100,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
 
@@ -166,55 +164,48 @@ Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "pod
 
 Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md
 
-## Reuse stored files
-
-Certain functionality like ``Sign`` Supports pre-saved files stored at ``/customFiles/signatures/``, image files placed within here will be accesable to be used via webUI
-Currently this supports two folder types
-- ``/customFiles/signatures/ALL_USERS`` accessible to all users, useful for orginasations were many users use same files or for users not using authentication
-- ``/customFiles/signatures/{username}`` such as ``/customFiles/signatures/froodle``  accessible to only the ``froodle`` username, private for all others
-
 ## Supported Languages
 
 Stirling PDF currently supports 38!
 
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                    | ![93%](https://geps.dev/progress/93)   |
-| Basque (Euskara) (eu_ES)                    | ![56%](https://geps.dev/progress/56)   |
-| Bulgarian (Български) (bg_BG)               | ![98%](https://geps.dev/progress/98)   |
-| Catalan (Català) (ca_CA)                    | ![44%](https://geps.dev/progress/44)   |
-| Croatian (Hrvatski) (hr_HR)                 | ![86%](https://geps.dev/progress/86)   |
-| Czech (Česky) (cs_CZ)                       | ![82%](https://geps.dev/progress/82)   |
-| Danish (Dansk) (da_DK)                      | ![90%](https://geps.dev/progress/90)   |
-| Dutch (Nederlands) (nl_NL)                  | ![87%](https://geps.dev/progress/87)   |
+| Arabic (العربية) (ar_AR)                    | ![44%](https://geps.dev/progress/44)   |
+| Basque (Euskara) (eu_ES)                    | ![60%](https://geps.dev/progress/60)   |
+| Bulgarian (Български) (bg_BG)               | ![92%](https://geps.dev/progress/92)   |
+| Catalan (Català) (ca_CA)                    | ![47%](https://geps.dev/progress/47)   |
+| Croatian (Hrvatski) (hr_HR)                 | ![92%](https://geps.dev/progress/92)   |
+| Czech (Česky) (cs_CZ)                       | ![88%](https://geps.dev/progress/88)   |
+| Danish (Dansk) (da_DK)                      | ![9%](https://geps.dev/progress/9)   |
+| Dutch (Nederlands) (nl_NL)                  | ![94%](https://geps.dev/progress/94)   |
 | English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                   | ![94%](https://geps.dev/progress/94)   |
-| German (Deutsch) (de_DE)                    | ![97%](https://geps.dev/progress/97) |
-| Greek (Ελληνικά) (el_GR)                    | ![75%](https://geps.dev/progress/75)   |
-| Hindi (हिंदी) (hi_IN)                          | ![71%](https://geps.dev/progress/71)   |
-| Hungarian (Magyar) (hu_HU)                  | ![69%](https://geps.dev/progress/69)   |
-| Indonesia (Bahasa Indonesia) (id_ID)        | ![95%](https://geps.dev/progress/95)   |
-| Irish (Gaeilge) (ga_IE)                     | ![89%](https://geps.dev/progress/89)   |
-| Italian (Italiano) (it_IT)                  | ![98%](https://geps.dev/progress/98)   |
-| Japanese (日本語) (ja_JP)                   | ![86%](https://geps.dev/progress/86)   |
-| Korean (한국어) (ko_KR)                     | ![76%](https://geps.dev/progress/76)   |
-| Norwegian (Norsk) (no_NB)                   | ![89%](https://geps.dev/progress/89)   |
-| Polish (Polski) (pl_PL)                     | ![98%](https://geps.dev/progress/98)   |
-| Portuguese (Português) (pt_PT)              | ![71%](https://geps.dev/progress/71)   |
-| Portuguese Brazilian (Português) (pt_BR)    | ![98%](https://geps.dev/progress/98)   |
-| Romanian (Română) (ro_RO)                   | ![91%](https://geps.dev/progress/91)   |
-| Russian (Русский) (ru_RU)                   | ![76%](https://geps.dev/progress/76)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![71%](https://geps.dev/progress/71)   |
-| Simplified Chinese (简体中文) (zh_CN)       | ![92%](https://geps.dev/progress/92)   |
-| Slovakian (Slovensky) (sk_SK)               | ![83%](https://geps.dev/progress/83)   |
-| Spanish (Español) (es_ES)                   | ![97%](https://geps.dev/progress/97)   |
-| Swedish (Svenska) (sv_SE)                   | ![93%](https://geps.dev/progress/93)   |
-| Thai (ไทย) (th_TH)                          | ![90%](https://geps.dev/progress/90) |
-| Traditional Chinese (繁體中文) (zh_TW)      | ![98%](https://geps.dev/progress/98)   |
-| Turkish (Türkçe) (tr_TR)                    | ![93%](https://geps.dev/progress/93)   |
-| Ukrainian (Українська) (uk_UA)              | ![81%](https://geps.dev/progress/81)   |
-| Vietnamese (Tiếng Việt) (vi_VN)             | ![90%](https://geps.dev/progress/90)   |
+| French (Français) (fr_FR)                   | ![91%](https://geps.dev/progress/91)   |
+| German (Deutsch) (de_DE)                    | ![99%](https://geps.dev/progress/99) |
+| Greek (Ελληνικά) (el_GR)                    | ![80%](https://geps.dev/progress/80)   |
+| Hindi (हिंदी) (hi_IN)                          | ![75%](https://geps.dev/progress/75)   |
+| Hungarian (Magyar) (hu_HU)                  | ![74%](https://geps.dev/progress/74)   |
+| Indonesia (Bahasa Indonesia) (id_ID)        | ![74%](https://geps.dev/progress/74)   |
+| Irish (Gaeilge) (ga_IE)                     | ![96%](https://geps.dev/progress/96)   |
+| Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
+| Japanese (日本語) (ja_JP)                   | ![90%](https://geps.dev/progress/90)   |
+| Korean (한국어) (ko_KR)                     | ![82%](https://geps.dev/progress/82)   |
+| Norwegian (Norsk) (no_NB)                   | ![96%](https://geps.dev/progress/96)   |
+| Polish (Polski) (pl_PL)                     | ![90%](https://geps.dev/progress/90)   |
+| Portuguese (Português) (pt_PT)              | ![76%](https://geps.dev/progress/76)   |
+| Portuguese Brazilian (Português) (pt_BR)    | ![99%](https://geps.dev/progress/99)   |
+| Romanian (Română) (ro_RO)                   | ![38%](https://geps.dev/progress/38)   |
+| Russian (Русский) (ru_RU)                   | ![82%](https://geps.dev/progress/82)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![76%](https://geps.dev/progress/76)   |
+| Simplified Chinese (简体中文) (zh_CN)       | ![96%](https://geps.dev/progress/96)   |
+| Slovakian (Slovensky) (sk_SK)               | ![90%](https://geps.dev/progress/90)   |
+| Spanish (Español) (es_ES)                   | ![99%](https://geps.dev/progress/99)   |
+| Swedish (Svenska) (sv_SE)                   | ![38%](https://geps.dev/progress/38)   |
+| Thai (ไทย) (th_TH)                          | ![97%](https://geps.dev/progress/97) |
+| Traditional Chinese (繁體中文) (zh_TW)      | ![96%](https://geps.dev/progress/96)   |
+| Turkish (Türkçe) (tr_TR)                    | ![97%](https://geps.dev/progress/97)   |
+| Ukrainian (Українська) (uk_UA)              | ![87%](https://geps.dev/progress/87)   |
+| Vietnamese (Tiếng Việt) (vi_VN)             | ![97%](https://geps.dev/progress/97)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "org.springframework.boot" version "3.3.5"
+    id "org.springframework.boot" version "3.3.3"
     id "io.spring.dependency-management" version "1.1.6"
     id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
     id "io.swagger.swaggerhub" version "1.3.2"
@@ -13,16 +13,16 @@ plugins {
 import com.github.jk1.license.render.*
 
 ext {
-    springBootVersion = "3.3.5"
+    springBootVersion = "3.3.3"
     pdfboxVersion = "3.0.3"
     logbackVersion = "1.5.7"
-    imageioVersion = "3.12.0"
+    imageioVersion = "3.11.0"
     lombokVersion = "1.18.34"
     bouncycastleVersion = "1.78.1"
 }
 
 group = "stirling.software"
-version = "0.31.1"
+version = "0.28.3"
 
 java {
     // 17 is lowest but we support and recommend 21
@@ -32,9 +32,11 @@ java {
 repositories {
     mavenCentral()
     maven { url "https://jitpack.io" }
-    maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
     maven {
-        url 'https://build.shibboleth.net/maven/releases'
+        url "https://build.shibboleth.net/nexus/content/repositories/releases/"
+    }
+    maven {
+        url "https://build.shibboleth.net/maven/releases/"
     }
 }
 
@@ -118,8 +120,12 @@ configurations.all {
     exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
 }
 dependencies {
+
+
+
+
     //security updates
-    implementation "org.springframework:spring-webmvc:6.1.14"
+    implementation "org.springframework:spring-webmvc:6.1.9"
 
     implementation("io.github.pixee:java-security-toolkit:1.2.0")
 
@@ -131,37 +137,23 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-jetty:$springBootVersion"
 
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion"
-    implementation 'com.posthog.java:posthog:1.1.1'
-    implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
 
-
-    if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
+if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
         implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
-        implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE"
+        runtimeOnly "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE"
         implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
         implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
 
-		implementation 'org.springframework.security:spring-security-saml2-service-provider:6.3.4'
-	    implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
         //2.2.x requires rebuild of DB file.. need migration path
         runtimeOnly "com.h2database:h2:2.1.214"
         // implementation "com.h2database:h2:2.2.224"
-        constraints {
-            implementation "org.opensaml:opensaml-core"
-            implementation "org.opensaml:opensaml-saml-api"
-            implementation "org.opensaml:opensaml-saml-impl"
-        }
-        implementation "org.springframework.security:spring-security-saml2-service-provider"
-
-        implementation 'com.coveo:saml-client:5.0.0'
-
-
-    }
+    implementation 'org.springframework.security:spring-security-saml2-service-provider:6.3.3'
+      }
 
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 
     // Batik
-    implementation "org.apache.xmlgraphics:batik-all:1.18"
+    implementation "org.apache.xmlgraphics:batik-all:1.17"
 
     // TwelveMonkeys
     runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
@@ -181,10 +173,7 @@ dependencies {
     runtimeOnly "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion"
 
-    // Image metadata extractor
-    implementation "com.drewnoakes:metadata-extractor:2.19.0"
-
-    implementation "commons-io:commons-io:2.17.0"
+    implementation "commons-io:commons-io:2.16.1"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"
     //general PDF
 
@@ -206,14 +195,14 @@ dependencies {
     implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
     implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
     implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    implementation "io.micrometer:micrometer-core:1.13.6"
+    implementation "io.micrometer:micrometer-core:1.13.3"
     implementation group: "com.google.zxing", name: "core", version: "3.5.3"
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
-    implementation "org.commonmark:commonmark:0.24.0"
-    implementation "org.commonmark:commonmark-ext-gfm-tables:0.24.0"
+    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.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"

chart/stirling-pdf/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.31.1
+appVersion: 0.28.3
 description: locally hosted web application that allows you to perform various operations
   on PDF files
 home: https://github.com/Stirling-Tools/Stirling-PDF
@@ -13,4 +13,4 @@ maintainers:
 name: stirling-pdf-chart
 sources:
 - https://github.com/Stirling-Tools/Stirling-PDF
-version: 1.0.1
+version: 1.0.0

cucumber/exampleFiles/example.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-
-<h1>My First Heading</h1>
-
-<p>My first paragraph.</p>
-
-</body>
-</html>
-

cucumber/exampleFiles/example.md

@@ -1,16 +0,0 @@
-header
-============
-
-Header2
-------------
-text
-
-text2
-
-## **PDF Features**
-
-### **Page Operations**
-
-- View and modify PDFs - View multi page PDFs with custom viewing sorting and searching. Plus on page edit features like annotate, draw and adding text and images. (Using PDF.js with Joxit and Liberation.Liberation fonts)
-- Full interactive GUI for merging/splitting/rotating/moving PDFs and their pages.
-- Merge multiple PDFs together into a single resultant file.

cucumber/features/external.feature

@@ -123,7 +123,7 @@ Feature: API Validation
     | odt    | .odt      |
     | doc    | .doc      |
 
-  @ocr @pdfa1
+  @ocr
   Scenario: PDFA
     Given I use an example file at "exampleFiles/pdfa2.pdf" as parameter "fileInput"
 	And the request data includes
@@ -134,7 +134,7 @@ Feature: API Validation
     And the response file should have extension ".pdf"
     And the response file should have size greater than 100
 	
-  @ocr @pdfa2
+  @ocr
   Scenario: PDFA1
     Given I use an example file at "exampleFiles/pdfa1.pdf" as parameter "fileInput"
 	And the request data includes
@@ -218,28 +218,6 @@ Feature: API Validation
    |  .odt   | 
    |  .pptx   | 
    |  .rtf   | 
+
+
 		
-  @calibre @positive @htmltopdf
-  Scenario: Convert HTML to PDF
-  Given I use an example file at "exampleFiles/example.html" as parameter "fileInput"
-  When I send the API request to the endpoint "/api/v1/convert/html/pdf"
-  Then the response status code should be 200
-  And the response file should have size greater than 100
-  And the response file should have extension ".pdf"
-  
-  @calibre @positive @zippedhtmltopdf
-  Scenario: Convert zipped HTML to PDF
-  Given I use an example file at "exampleFiles/example_html.zip" as parameter "fileInput"
-  When I send the API request to the endpoint "/api/v1/convert/html/pdf"
-  Then the response status code should be 200
-  And the response file should have size greater than 100
-  And the response file should have extension ".pdf"
-  
-  @calibre @positive @markdowntopdf
-  Scenario: Convert Markdown to PDF
-  Given I use an example file at "exampleFiles/example.md" as parameter "fileInput"
-  When I send the API request to the endpoint "/api/v1/convert/markdown/pdf"
-  Then the response status code should be 200
-  And the response file should have size greater than 100
-  And the response file should have extension ".pdf"
-  

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

@@ -1,3 +1,4 @@
+version: '3.3'
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security-Fat
@@ -7,7 +8,7 @@ services:
         limits:
           memory: 4G
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP'"]
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
       interval: 5s
       timeout: 10s
       retries: 16
@@ -19,7 +20,7 @@ services:
       - /stirling/latest/logs:/logs:rw
     environment:
       DOCKER_ENABLE_SECURITY: "true"
-      SECURITY_ENABLELOGIN: "false"
+      SECURITY_ENABLELOGIN: "true"
       PUID: 1002
       PGID: 1002
       UMASK: "022"

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

scripts/remove_translation_keys.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Check if a key was provided
-if [ $# -eq 0 ]; then
-    echo "Please provide a key to remove."
-    exit 1
-fi
-
-key_to_remove="$1"
-
-for file in ../src/main/resources/messages_*.properties; do
-    # If the key ends with a dot, remove all keys starting with it
-    if [[ "$key_to_remove" == *. ]]; then
-        sed -i "/^${key_to_remove//./\\.}/d" "$file"
-    else
-        # Otherwise, remove only the exact key match
-        sed -i "/^${key_to_remove//./\\.}=/d" "$file"
-    fi
-    echo "Updated $file"
-done

scripts/replace_translation_line.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-translation_key="pdfToPDFA.credit"
-old_value="OCRmyPDF"
-new_value="ghostscript"
-
-for file in ../src/main/resources/messages_*.properties; do
-  sed -i "/^$translation_key=/s/$old_value/$new_value/" "$file"
-  echo "Updated $file"
-done

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

@@ -1,23 +0,0 @@
-package stirling.software.SPDF.EE;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.model.ApplicationProperties;
-
-@Configuration
-@Lazy
-@Slf4j
-public class EEAppConfig {
-
-    @Autowired ApplicationProperties applicationProperties;
-    @Autowired private LicenseKeyChecker licenseKeyChecker;
-
-    @Bean(name = "runningEE")
-    public boolean runningEnterpriseEdition() {
-        return licenseKeyChecker.getEnterpriseEnabledResult();
-    }
-}

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

@@ -1,204 +0,0 @@
-package stirling.software.SPDF.EE;
-
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.posthog.java.shaded.org.json.JSONObject;
-
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.GeneralUtils;
-
-@Service
-@Slf4j
-public class KeygenLicenseVerifier {
-    private static final String ACCOUNT_ID = "e5430f69-e834-4ae4-befd-b602aae5f372";
-    private static final String BASE_URL = "https://api.keygen.sh/v1/accounts";
-    private static final ObjectMapper objectMapper = new ObjectMapper();
-
-    private final ApplicationProperties applicationProperties;
-
-    @Autowired
-    public KeygenLicenseVerifier(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
-
-    public boolean verifyLicense(String licenseKey) {
-        try {
-            log.info("Checking license key");
-            String machineFingerprint = generateMachineFingerprint();
-
-            // First, try to validate the license
-            JsonNode validationResponse = validateLicense(licenseKey, machineFingerprint);
-            if (validationResponse != null) {
-                boolean isValid = validationResponse.path("meta").path("valid").asBoolean();
-                String licenseId = validationResponse.path("data").path("id").asText();
-                if (!isValid) {
-                    String code = validationResponse.path("meta").path("code").asText();
-                    log.debug(code);
-                    if ("NO_MACHINE".equals(code)
-                            || "NO_MACHINES".equals(code)
-                            || "FINGERPRINT_SCOPE_MISMATCH".equals(code)) {
-                        log.info(
-                                "License not activated for this machine. Attempting to activate...");
-                        boolean activated =
-                                activateMachine(licenseKey, licenseId, machineFingerprint);
-                        if (activated) {
-                            // Revalidate after activation
-                            validationResponse = validateLicense(licenseKey, machineFingerprint);
-                            isValid =
-                                    validationResponse != null
-                                            && validationResponse
-                                                    .path("meta")
-                                                    .path("valid")
-                                                    .asBoolean();
-                        }
-                    }
-                }
-                return isValid;
-            }
-
-            return false;
-        } catch (Exception e) {
-            log.error("Error verifying license: " + e.getMessage());
-            return false;
-        }
-    }
-
-    private JsonNode validateLicense(String licenseKey, String machineFingerprint)
-            throws Exception {
-        HttpClient client = HttpClient.newHttpClient();
-        String requestBody =
-                String.format(
-                        "{\"meta\":{\"key\":\"%s\",\"scope\":{\"fingerprint\":\"%s\"}}}",
-                        licenseKey, machineFingerprint);
-        HttpRequest request =
-                HttpRequest.newBuilder()
-                        .uri(
-                                URI.create(
-                                        BASE_URL
-                                                + "/"
-                                                + ACCOUNT_ID
-                                                + "/licenses/actions/validate-key"))
-                        .header("Content-Type", "application/vnd.api+json")
-                        .header("Accept", "application/vnd.api+json")
-                        // .header("Authorization", "License " + licenseKey)
-                        .POST(HttpRequest.BodyPublishers.ofString(requestBody))
-                        .build();
-
-        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-        log.info(" validateLicenseResponse body: " + response.body());
-        JsonNode jsonResponse = objectMapper.readTree(response.body());
-        if (response.statusCode() == 200) {
-
-            JsonNode metaNode = jsonResponse.path("meta");
-            boolean isValid = metaNode.path("valid").asBoolean();
-
-            String detail = metaNode.path("detail").asText();
-            String code = metaNode.path("code").asText();
-
-            log.debug("License validity: " + isValid);
-            log.debug("Validation detail: " + detail);
-            log.debug("Validation code: " + code);
-
-            int users =
-                    jsonResponse
-                            .path("data")
-                            .path("attributes")
-                            .path("metadata")
-                            .path("users")
-                            .asInt(0);
-            applicationProperties.getEnterpriseEdition().setMaxUsers(users);
-            log.info(applicationProperties.toString());
-
-        } else {
-            log.error("Error validating license. Status code: " + response.statusCode());
-        }
-        return jsonResponse;
-    }
-
-    private boolean activateMachine(String licenseKey, String licenseId, String machineFingerprint)
-            throws Exception {
-        HttpClient client = HttpClient.newHttpClient();
-
-        String hostname;
-        try {
-            hostname = java.net.InetAddress.getLocalHost().getHostName();
-        } catch (Exception e) {
-            hostname = "Unknown";
-        }
-
-        JSONObject body =
-                new JSONObject()
-                        .put(
-                                "data",
-                                new JSONObject()
-                                        .put("type", "machines")
-                                        .put(
-                                                "attributes",
-                                                new JSONObject()
-                                                        .put("fingerprint", machineFingerprint)
-                                                        .put(
-                                                                "platform",
-                                                                System.getProperty(
-                                                                        "os.name")) // Added
-                                                        // platform
-                                                        // parameter
-                                                        .put(
-                                                                "name",
-                                                                hostname)) // Added name parameter
-                                        .put(
-                                                "relationships",
-                                                new JSONObject()
-                                                        .put(
-                                                                "license",
-                                                                new JSONObject()
-                                                                        .put(
-                                                                                "data",
-                                                                                new JSONObject()
-                                                                                        .put(
-                                                                                                "type",
-                                                                                                "licenses")
-                                                                                        .put(
-                                                                                                "id",
-                                                                                                licenseId)))));
-
-        HttpRequest request =
-                HttpRequest.newBuilder()
-                        .uri(URI.create(BASE_URL + "/" + ACCOUNT_ID + "/machines"))
-                        .header("Content-Type", "application/vnd.api+json")
-                        .header("Accept", "application/vnd.api+json")
-                        .header(
-                                "Authorization",
-                                "License " + licenseKey) // Keep the license key authentication
-                        .POST(
-                                HttpRequest.BodyPublishers.ofString(
-                                        body.toString())) // Send the JSON body
-                        .build();
-
-        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-        log.debug("activateMachine Response body: " + response.body());
-        if (response.statusCode() == 201) {
-            log.info("Machine activated successfully");
-            return true;
-        } else {
-            log.error(
-                    "Error activating machine. Status code: {}, error: {}",
-                    response.statusCode(),
-                    response.body());
-
-            return false;
-        }
-    }
-
-    private String generateMachineFingerprint() {
-        return GeneralUtils.generateMachineFingerprint();
-    }
-}

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

@@ -1,59 +0,0 @@
-package stirling.software.SPDF.EE;
-
-import java.io.IOException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.GeneralUtils;
-
-@Component
-@Slf4j
-public class LicenseKeyChecker {
-
-    private final KeygenLicenseVerifier licenseService;
-
-    private final ApplicationProperties applicationProperties;
-
-    private boolean enterpriseEnbaledResult = false;
-
-    @Autowired
-    public LicenseKeyChecker(
-            KeygenLicenseVerifier licenseService, ApplicationProperties applicationProperties) {
-        this.licenseService = licenseService;
-        this.applicationProperties = applicationProperties;
-    }
-
-    @Scheduled(fixedRate = 604800000, initialDelay = 1000) // 7 days in milliseconds
-    public void checkLicensePeriodically() {
-        checkLicense();
-    }
-
-    private void checkLicense() {
-        if (!applicationProperties.getEnterpriseEdition().isEnabled()) {
-            enterpriseEnbaledResult = false;
-        } else {
-            enterpriseEnbaledResult =
-                    licenseService.verifyLicense(
-                            applicationProperties.getEnterpriseEdition().getKey());
-            if (enterpriseEnbaledResult) {
-                log.info("License key is valid.");
-            } else {
-                log.info("License key is invalid.");
-            }
-        }
-    }
-
-    public void updateLicenseKey(String newKey) throws IOException {
-        applicationProperties.getEnterpriseEdition().setKey(newKey);
-        GeneralUtils.saveKeyToConfig("EnterpriseEdition.key", newKey, false);
-        checkLicense();
-    }
-
-    public boolean getEnterpriseEnabledResult() {
-        return enterpriseEnbaledResult;
-    }
-}

src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java

@@ -1,39 +0,0 @@
-package stirling.software.SPDF.Factories;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.model.api.misc.HighContrastColorCombination;
-import stirling.software.SPDF.model.api.misc.ReplaceAndInvert;
-import stirling.software.SPDF.utils.misc.CustomColorReplaceStrategy;
-import stirling.software.SPDF.utils.misc.InvertFullColorStrategy;
-import stirling.software.SPDF.utils.misc.ReplaceAndInvertColorStrategy;
-
-@Component
-public class ReplaceAndInvertColorFactory {
-
-    public ReplaceAndInvertColorStrategy replaceAndInvert(
-            MultipartFile file,
-            ReplaceAndInvert replaceAndInvertOption,
-            HighContrastColorCombination highContrastColorCombination,
-            String backGroundColor,
-            String textColor) {
-
-        if (replaceAndInvertOption == ReplaceAndInvert.CUSTOM_COLOR
-                || replaceAndInvertOption == ReplaceAndInvert.HIGH_CONTRAST_COLOR) {
-
-            return new CustomColorReplaceStrategy(
-                    file,
-                    replaceAndInvertOption,
-                    textColor,
-                    backGroundColor,
-                    highContrastColorCombination);
-
-        } else if (replaceAndInvertOption == ReplaceAndInvert.FULL_INVERSION) {
-
-            return new InvertFullColorStrategy(file, replaceAndInvertOption);
-        }
-
-        return null;
-    }
-}

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

@@ -11,9 +11,6 @@ import org.slf4j.LoggerFactory;
 
 import io.github.pixee.security.SystemCommand;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 public class LibreOfficeListener {
 
     private static final Logger logger = LoggerFactory.getLogger(LibreOfficeListener.class);
@@ -34,7 +31,7 @@ public class LibreOfficeListener {
     private LibreOfficeListener() {}
 
     private boolean isListenerRunning() {
-        log.info("waiting for listener to start");
+        System.out.println("waiting for listener to start");
         try (Socket socket = new Socket()) {
             socket.connect(
                     new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second

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

@@ -1,7 +1,6 @@
 package stirling.software.SPDF;
 
 import java.io.IOException;
-import java.net.ServerSocket;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -31,61 +30,30 @@ public class SPdfApplication {
     private static final Logger logger = LoggerFactory.getLogger(SPdfApplication.class);
 
     @Autowired private Environment env;
+
     @Autowired ApplicationProperties applicationProperties;
 
-    private static String baseUrlStatic;
     private static String serverPortStatic;
 
-    @Value("${baseUrl:http://localhost}")
-    private String baseUrl;
-
     @Value("${server.port:8080}")
     public void setServerPortStatic(String port) {
-        if ("auto".equalsIgnoreCase(port)) {
-            // Use Spring Boot's automatic port assignment (server.port=0)
-            SPdfApplication.serverPortStatic =
-                    "0"; // This will let Spring Boot assign an available port
-        } else {
-            SPdfApplication.serverPortStatic = port;
-        }
-    }
-
-    // Optionally keep this method if you want to provide a manual port-incrementation fallback.
-    private static String findAvailablePort(int startPort) {
-        int port = startPort;
-        while (!isPortAvailable(port)) {
-            port++;
-        }
-        return String.valueOf(port);
-    }
-
-    private static boolean isPortAvailable(int port) {
-        try (ServerSocket socket = new ServerSocket(port)) {
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
+        SPdfApplication.serverPortStatic = port;
     }
 
     @PostConstruct
     public void init() {
-        baseUrlStatic = this.baseUrl;
         // Check if the BROWSER_OPEN environment variable is set to true
         String browserOpenEnv = env.getProperty("BROWSER_OPEN");
         boolean browserOpen = browserOpenEnv != null && "true".equalsIgnoreCase(browserOpenEnv);
         if (browserOpen) {
             try {
-                String url = baseUrl + ":" + getStaticPort();
+                String url = "http://localhost:" + getNonStaticPort();
 
                 String os = System.getProperty("os.name").toLowerCase();
                 Runtime rt = Runtime.getRuntime();
                 if (os.contains("win")) {
                     // For Windows
                     SystemCommand.runCommand(rt, "rundll32 url.dll,FileProtocolHandler " + url);
-                } else if (os.contains("mac")) {
-                    SystemCommand.runCommand(rt, "open " + url);
-                } else if (os.contains("nix") || os.contains("nux")) {
-                    SystemCommand.runCommand(rt, "xdg-open " + url);
                 }
             } catch (Exception e) {
                 logger.error("Error opening browser: {}", e.getMessage());
@@ -101,13 +69,15 @@ public class SPdfApplication {
         app.addInitializers(new ConfigInitializer());
         Map<String, String> propertyFiles = new HashMap<>();
 
-        // External config files
+        // stirling pdf settings file
         if (Files.exists(Paths.get("configs/settings.yml"))) {
             propertyFiles.put("spring.config.additional-location", "file:configs/settings.yml");
         } else {
-            logger.warn("External configuration file 'configs/settings.yml' does not exist.");
+            logger.warn(
+                    "External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
         }
 
+        // custom javs settings file
         if (Files.exists(Paths.get("configs/custom_settings.yml"))) {
             String existingLocation =
                     propertyFiles.getOrDefault("spring.config.additional-location", "");
@@ -130,31 +100,28 @@ public class SPdfApplication {
 
         app.run(args);
 
-        // Ensure directories are created
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("Thread interrupted while sleeping", e);
+        }
+
         try {
             Files.createDirectories(Path.of("customFiles/static/"));
             Files.createDirectories(Path.of("customFiles/templates/"));
         } catch (Exception e) {
             logger.error("Error creating directories: {}", e.getMessage());
         }
-
         printStartupLogs();
     }
 
     private static void printStartupLogs() {
         logger.info("Stirling-PDF Started.");
-        String url = baseUrlStatic + ":" + getStaticPort();
+        String url = "http://localhost:" + getStaticPort();
         logger.info("Navigate to {}", url);
     }
 
-    public static String getStaticBaseUrl() {
-        return baseUrlStatic;
-    }
-
-    public String getNonStaticBaseUrl() {
-        return baseUrlStatic;
-    }
-
     public static String getStaticPort() {
         return serverPortStatic;
     }

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

@@ -15,7 +15,6 @@ 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.context.annotation.Scope;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -136,54 +135,4 @@ public class AppConfig {
             }
         };
     }
-
-    @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();
-    }
-
-    @Bean(name = "analyticsPrompt")
-    @Scope("request")
-    public boolean analyticsPrompt() {
-        return applicationProperties.getSystem().getEnableAnalytics() == null
-                || "undefined".equals(applicationProperties.getSystem().getEnableAnalytics());
-    }
-
-    @Bean(name = "analyticsEnabled")
-    @Scope("request")
-    public boolean analyticsEnabled() {
-        if (applicationProperties.getEnterpriseEdition().isEnabled()) return true;
-        return applicationProperties.getSystem().getEnableAnalytics() != null
-                && Boolean.parseBoolean(applicationProperties.getSystem().getEnableAnalytics());
-    }
-
-    @Bean(name = "StirlingPDFLabel")
-    public String stirlingPDFLabel() {
-        return "Stirling-PDF" + " v" + appVersion();
-    }
-
-    @Bean(name = "UUID")
-    public String uuid() {
-        return applicationProperties.getAutomaticallyGenerated().getUUID();
-    }
 }

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

@@ -5,7 +5,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
-import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Service
@@ -19,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/Beans.java

@@ -14,7 +14,7 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
-public class LocaleConfiguration implements WebMvcConfigurer {
+public class Beans implements WebMvcConfigurer {
 
     @Autowired ApplicationProperties applicationProperties;
 

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.config.interfaces;
+package stirling.software.SPDF.config;
 
 import java.io.IOException;
 import java.util.List;

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

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,7 +42,7 @@ public class EndpointConfiguration {
 
     public void disableEndpoint(String endpoint) {
         if (!endpointStatuses.containsKey(endpoint) || endpointStatuses.get(endpoint) != false) {
-            logger.debug("Disabling {}", endpoint);
+            logger.info("Disabling {}", endpoint);
             endpointStatuses.put(endpoint, false);
         }
     }
@@ -77,23 +76,6 @@ public class EndpointConfiguration {
         }
     }
 
-    public void logDisabledEndpointsSummary() {
-        List<String> disabledList =
-                endpointStatuses.entrySet().stream()
-                        .filter(entry -> !entry.getValue()) // only get disabled endpoints (value
-                        // is false)
-                        .map(Map.Entry::getKey)
-                        .sorted()
-                        .collect(Collectors.toList());
-
-        if (!disabledList.isEmpty()) {
-            logger.info(
-                    "Total disabled endpoints: {}. Disabled endpoints: {}",
-                    disabledList.size(),
-                    String.join(", ", disabledList));
-        }
-    }
-
     public void init() {
         // Adding endpoints to "PageOps" group
         addEndpointToGroup("PageOps", "remove-pages");
@@ -181,12 +163,14 @@ public class EndpointConfiguration {
 
         // python
         addEndpointToGroup("Python", "extract-image-scans");
+        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");
+        addEndpointToGroup("OpenCV", REMOVE_BLANKS);
 
         // LibreOffice
         addEndpointToGroup("LibreOffice", "repair");
@@ -246,17 +230,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Javascript", "sign");
         addEndpointToGroup("Javascript", "compare");
         addEndpointToGroup("Javascript", "adjust-contrast");
-
-        // Ghostscript dependent endpoints
-        addEndpointToGroup("Ghostscript", "compress-pdf");
-        addEndpointToGroup("Ghostscript", "pdf-to-pdfa");
-
-        // Weasyprint dependent endpoints
-        addEndpointToGroup("Weasyprint", "html-to-pdf");
-        addEndpointToGroup("Weasyprint", "url-to-pdf");
-
-        // Pdftohtml dependent endpoints
-        addEndpointToGroup("Pdftohtml", "pdf-to-html");
     }
 
     private void processEnvironmentConfigs() {
@@ -278,9 +251,5 @@ public class EndpointConfiguration {
         }
     }
 
-    public Set<String> getEndpointsForGroup(String group) {
-        return endpointGroups.getOrDefault(group, new HashSet<>());
-    }
-
     private static final String REMOVE_BLANKS = "remove-blanks";
 }

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

@@ -1,146 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-
-import jakarta.annotation.PostConstruct;
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration
-@Slf4j
-public class ExternalAppDepConfig {
-    @Autowired private EndpointConfiguration endpointConfiguration;
-
-    private boolean isCommandAvailable(String command) {
-        try {
-            ProcessBuilder processBuilder = new ProcessBuilder();
-            if (System.getProperty("os.name").toLowerCase().contains("windows")) {
-                processBuilder.command("where", command);
-            } else {
-                processBuilder.command("which", command);
-            }
-            Process process = processBuilder.start();
-            int exitCode = process.waitFor();
-            return exitCode == 0;
-        } catch (Exception e) {
-            log.debug("Error checking for command {}: {}", command, e.getMessage());
-            return false;
-        }
-    }
-
-    private final Map<String, List<String>> commandToGroupMapping =
-            new HashMap<>() {
-                {
-                    put("gs", List.of("Ghostscript"));
-                    put("soffice", List.of("LibreOffice"));
-                    put("ocrmypdf", List.of("OCRmyPDF"));
-                    put("weasyprint", List.of("Weasyprint"));
-                    put("pdftohtml", List.of("Pdftohtml"));
-                }
-            };
-
-    private List<String> getAffectedFeatures(String group) {
-        return endpointConfiguration.getEndpointsForGroup(group).stream()
-                .map(endpoint -> formatEndpointAsFeature(endpoint))
-                .collect(Collectors.toList());
-    }
-
-    private String formatEndpointAsFeature(String endpoint) {
-        // First replace common terms
-        String feature = endpoint.replace("-", " ").replace("pdf", "PDF").replace("img", "image");
-
-        // Split into words and capitalize each word
-        return Arrays.stream(feature.split("\\s+"))
-                .map(word -> capitalizeWord(word))
-                .collect(Collectors.joining(" "));
-    }
-
-    private String capitalizeWord(String word) {
-        if (word.isEmpty()) {
-            return word;
-        }
-        if ("pdf".equalsIgnoreCase(word)) {
-            return "PDF";
-        }
-        return word.substring(0, 1).toUpperCase() + word.substring(1).toLowerCase();
-    }
-
-    private void checkDependencyAndDisableGroup(String command) {
-        boolean isAvailable = isCommandAvailable(command);
-        if (!isAvailable) {
-            List<String> affectedGroups = commandToGroupMapping.get(command);
-
-            if (affectedGroups != null) {
-                for (String group : affectedGroups) {
-                    List<String> affectedFeatures = getAffectedFeatures(group);
-                    endpointConfiguration.disableGroup(group);
-                    log.warn(
-                            "Missing dependency: {} - Disabling group: {} (Affected features: {})",
-                            command,
-                            group,
-                            affectedFeatures != null && !affectedFeatures.isEmpty()
-                                    ? String.join(", ", affectedFeatures)
-                                    : "unknown");
-                }
-            }
-        }
-    }
-
-    @PostConstruct
-    public void checkDependencies() {
-
-        // Check core dependencies
-        checkDependencyAndDisableGroup("gs");
-        checkDependencyAndDisableGroup("soffice");
-        checkDependencyAndDisableGroup("ocrmypdf");
-        checkDependencyAndDisableGroup("weasyprint");
-        checkDependencyAndDisableGroup("pdftohtml");
-
-        // Special handling for Python/OpenCV dependencies
-        boolean pythonAvailable = isCommandAvailable("python3") || isCommandAvailable("python");
-        if (!pythonAvailable) {
-            List<String> pythonFeatures = getAffectedFeatures("Python");
-            List<String> openCVFeatures = getAffectedFeatures("OpenCV");
-
-            endpointConfiguration.disableGroup("Python");
-            endpointConfiguration.disableGroup("OpenCV");
-            log.warn(
-                    "Missing dependency: Python - Disabling Python features: {} and OpenCV features: {}",
-                    String.join(", ", pythonFeatures),
-                    String.join(", ", openCVFeatures));
-        } else {
-            // If Python is available, check for OpenCV
-            try {
-                ProcessBuilder processBuilder = new ProcessBuilder();
-                if (System.getProperty("os.name").toLowerCase().contains("windows")) {
-                    processBuilder.command("python", "-c", "import cv2");
-                } else {
-                    processBuilder.command("python3", "-c", "import cv2");
-                }
-                Process process = processBuilder.start();
-                int exitCode = process.waitFor();
-                if (exitCode != 0) {
-                    List<String> openCVFeatures = getAffectedFeatures("OpenCV");
-                    endpointConfiguration.disableGroup("OpenCV");
-                    log.warn(
-                            "OpenCV not available in Python - Disabling OpenCV features: {}",
-                            String.join(", ", openCVFeatures));
-                }
-            } catch (Exception e) {
-                List<String> openCVFeatures = getAffectedFeatures("OpenCV");
-                endpointConfiguration.disableGroup("OpenCV");
-                log.warn(
-                        "Error checking OpenCV: {} - Disabling OpenCV features: {}",
-                        e.getMessage(),
-                        String.join(", ", openCVFeatures));
-            }
-        }
-        endpointConfiguration.logDisabledEndpointsSummary();
-    }
-}

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

@@ -1,63 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-import java.util.UUID;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import io.micrometer.common.util.StringUtils;
-
-import jakarta.annotation.PostConstruct;
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.GeneralUtils;
-
-@Component
-@Slf4j
-@Order(Ordered.HIGHEST_PRECEDENCE + 1)
-public class InitialSetup {
-
-    @Autowired private ApplicationProperties applicationProperties;
-
-    @PostConstruct
-    public void initUUIDKey() throws IOException {
-        String uuid = applicationProperties.getAutomaticallyGenerated().getUUID();
-        if (!GeneralUtils.isValidUUID(uuid)) {
-            uuid = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
-            GeneralUtils.saveKeyToConfig("AutomaticallyGenerated.UUID", uuid);
-            applicationProperties.getAutomaticallyGenerated().setUUID(uuid);
-        }
-    }
-
-    @PostConstruct
-    public void initSecretKey() throws IOException {
-        String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
-        if (!GeneralUtils.isValidUUID(secretKey)) {
-            secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
-            GeneralUtils.saveKeyToConfig("AutomaticallyGenerated.key", secretKey);
-            applicationProperties.getAutomaticallyGenerated().setKey(secretKey);
-        }
-    }
-
-    @PostConstruct
-    public void initLegalUrls() throws IOException {
-        // Initialize Terms and Conditions
-        String termsUrl = applicationProperties.getLegal().getTermsAndConditions();
-        if (StringUtils.isEmpty(termsUrl)) {
-            String defaultTermsUrl = "https://www.stirlingpdf.com/terms-and-conditions";
-            GeneralUtils.saveKeyToConfig("legal.termsAndConditions", defaultTermsUrl);
-            applicationProperties.getLegal().setTermsAndConditions(defaultTermsUrl);
-        }
-
-        // Initialize Privacy Policy
-        String privacyUrl = applicationProperties.getLegal().getPrivacyPolicy();
-        if (StringUtils.isEmpty(privacyUrl)) {
-            String defaultPrivacyUrl = "https://www.stirlingpdf.com/privacy-policy";
-            GeneralUtils.saveKeyToConfig("legal.privacyPolicy", defaultPrivacyUrl);
-            applicationProperties.getLegal().setPrivacyPolicy(defaultPrivacyUrl);
-        }
-    }
-}

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

@@ -13,8 +13,6 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-import stirling.software.SPDF.utils.RequestUriUtils;
 
 @Component
 public class MetricsFilter extends OncePerRequestFilter {
@@ -32,17 +30,32 @@ public class MetricsFilter extends OncePerRequestFilter {
             throws ServletException, IOException {
         String uri = request.getRequestURI();
 
-        if (RequestUriUtils.isTrackableResource(request.getContextPath(), uri)) {
-            HttpSession session = request.getSession(false);
-            String sessionId = (session != null) ? session.getId() : "no-session";
+        // 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", sessionId)
-                            .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/PostHogConfig.java

@@ -1,34 +0,0 @@
-package stirling.software.SPDF.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.posthog.java.PostHog;
-
-import jakarta.annotation.PreDestroy;
-
-@Configuration
-public class PostHogConfig {
-
-    @Value("${posthog.api.key}")
-    private String posthogApiKey;
-
-    @Value("${posthog.host}")
-    private String posthogHost;
-
-    private PostHog postHogClient;
-
-    @Bean
-    public PostHog postHogClient() {
-        postHogClient = new PostHog.Builder(posthogApiKey).host(posthogHost).build();
-        return postHogClient;
-    }
-
-    @PreDestroy
-    public void shutdownPostHog() {
-        if (postHogClient != null) {
-            postHogClient.shutdown();
-        }
-    }
-}

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.config.interfaces;
+package stirling.software.SPDF.config;
 
 public interface ShowAdminInterface {
     default boolean getShowUpdateOnlyAdmins() {

src/main/java/stirling/software/SPDF/config/fingerprint/FingerprintBasedSessionFilter.java

@@ -1,68 +0,0 @@
-// package stirling.software.SPDF.config.fingerprint;
-//
-// import java.io.IOException;
-//
-// import org.springframework.beans.factory.annotation.Autowired;
-// import org.springframework.stereotype.Component;
-// import org.springframework.web.filter.OncePerRequestFilter;
-//
-// import jakarta.servlet.FilterChain;
-// 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;
-//
-//// @Component
-// @Slf4j
-// public class FingerprintBasedSessionFilter extends OncePerRequestFilter {
-//    private final FingerprintGenerator fingerprintGenerator;
-//    private final FingerprintBasedSessionManager sessionManager;
-//
-//    @Autowired
-//    public FingerprintBasedSessionFilter(
-//            FingerprintGenerator fingerprintGenerator,
-//            FingerprintBasedSessionManager sessionManager) {
-//        this.fingerprintGenerator = fingerprintGenerator;
-//        this.sessionManager = sessionManager;
-//    }
-//
-//    @Override
-//    protected void doFilterInternal(
-//            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-//            throws ServletException, IOException {
-//
-//        if (RequestUriUtils.isStaticResource(request.getContextPath(), request.getRequestURI())) {
-//            filterChain.doFilter(request, response);
-//            return;
-//        }
-//
-//        String fingerprint = fingerprintGenerator.generateFingerprint(request);
-//        log.debug("Generated fingerprint for request: {}", fingerprint);
-//
-//        HttpSession session = request.getSession();
-//        boolean isNewSession = session.isNew();
-//        String sessionId = session.getId();
-//
-//        if (isNewSession) {
-//            log.info("New session created: {}", sessionId);
-//        }
-//
-//        if (!sessionManager.isFingerPrintAllowed(fingerprint)) {
-//            log.info("Blocked fingerprint detected, redirecting: {}", fingerprint);
-//            response.sendRedirect(request.getContextPath() + "/too-many-requests");
-//            return;
-//        }
-//
-//        session.setAttribute("userFingerprint", fingerprint);
-//        session.setAttribute(
-//                FingerprintBasedSessionManager.STARTUP_TIMESTAMP,
-//                FingerprintBasedSessionManager.APP_STARTUP_TIME);
-//
-//        sessionManager.registerFingerprint(fingerprint, sessionId);
-//
-//        log.debug("Proceeding with request: {}", request.getRequestURI());
-//        filterChain.doFilter(request, response);
-//    }
-// }

src/main/java/stirling/software/SPDF/config/fingerprint/FingerprintBasedSessionManager.java

@@ -1,134 +0,0 @@
-// package stirling.software.SPDF.config.fingerprint;
-//
-// import java.util.Iterator;
-// import java.util.Map;
-// import java.util.concurrent.ConcurrentHashMap;
-// import java.util.concurrent.TimeUnit;
-//
-// import org.springframework.scheduling.annotation.Scheduled;
-// import org.springframework.stereotype.Component;
-//
-// import jakarta.servlet.http.HttpSession;
-// import jakarta.servlet.http.HttpSessionAttributeListener;
-// import jakarta.servlet.http.HttpSessionEvent;
-// import jakarta.servlet.http.HttpSessionListener;
-// import lombok.AllArgsConstructor;
-// import lombok.Data;
-// import lombok.extern.slf4j.Slf4j;
-//
-// @Slf4j
-// @Component
-// public class FingerprintBasedSessionManager
-//        implements HttpSessionListener, HttpSessionAttributeListener {
-//    private static final ConcurrentHashMap<String, FingerprintInfo> activeFingerprints =
-//            new ConcurrentHashMap<>();
-//
-//    // To be reduced in later version to 8~
-//    private static final int MAX_ACTIVE_FINGERPRINTS = 30;
-//
-//    static final String STARTUP_TIMESTAMP = "appStartupTimestamp";
-//    static final long APP_STARTUP_TIME = System.currentTimeMillis();
-//    private static final long FINGERPRINT_EXPIRATION = TimeUnit.MINUTES.toMillis(30);
-//
-//    @Override
-//    public void sessionCreated(HttpSessionEvent se) {
-//        HttpSession session = se.getSession();
-//        String sessionId = session.getId();
-//        String fingerprint = (String) session.getAttribute("userFingerprint");
-//
-//        if (fingerprint == null) {
-//            log.warn("Session created without fingerprint: {}", sessionId);
-//            return;
-//        }
-//
-//        synchronized (activeFingerprints) {
-//            if (activeFingerprints.size() >= MAX_ACTIVE_FINGERPRINTS
-//                    && !activeFingerprints.containsKey(fingerprint)) {
-//                log.info("Max fingerprints reached. Marking session as blocked: {}", sessionId);
-//                session.setAttribute("blocked", true);
-//            } else {
-//                activeFingerprints.put(
-//                        fingerprint, new FingerprintInfo(sessionId, System.currentTimeMillis()));
-//                log.info(
-//                        "New fingerprint registered: {}. Total active fingerprints: {}",
-//                        fingerprint,
-//                        activeFingerprints.size());
-//            }
-//            session.setAttribute(STARTUP_TIMESTAMP, APP_STARTUP_TIME);
-//        }
-//    }
-//
-//    @Override
-//    public void sessionDestroyed(HttpSessionEvent se) {
-//        HttpSession session = se.getSession();
-//        String fingerprint = (String) session.getAttribute("userFingerprint");
-//
-//        if (fingerprint != null) {
-//            synchronized (activeFingerprints) {
-//                activeFingerprints.remove(fingerprint);
-//                log.info(
-//                        "Fingerprint removed: {}. Total active fingerprints: {}",
-//                        fingerprint,
-//                        activeFingerprints.size());
-//            }
-//        }
-//    }
-//
-//    public boolean isFingerPrintAllowed(String fingerprint) {
-//        synchronized (activeFingerprints) {
-//            return activeFingerprints.size() < MAX_ACTIVE_FINGERPRINTS
-//                    || activeFingerprints.containsKey(fingerprint);
-//        }
-//    }
-//
-//    public void registerFingerprint(String fingerprint, String sessionId) {
-//        synchronized (activeFingerprints) {
-//            activeFingerprints.put(
-//                    fingerprint, new FingerprintInfo(sessionId, System.currentTimeMillis()));
-//        }
-//    }
-//
-//    public void unregisterFingerprint(String fingerprint) {
-//        synchronized (activeFingerprints) {
-//            activeFingerprints.remove(fingerprint);
-//        }
-//    }
-//
-//    @Scheduled(fixedRate = 1800000) // Run every 30 mins
-//    public void cleanupStaleFingerprints() {
-//        log.info("Starting cleanup of stale fingerprints");
-//        long now = System.currentTimeMillis();
-//        int removedCount = 0;
-//
-//        synchronized (activeFingerprints) {
-//            Iterator<Map.Entry<String, FingerprintInfo>> iterator =
-//                    activeFingerprints.entrySet().iterator();
-//            while (iterator.hasNext()) {
-//                Map.Entry<String, FingerprintInfo> entry = iterator.next();
-//                FingerprintInfo info = entry.getValue();
-//
-//                if (now - info.getLastAccessTime() > FINGERPRINT_EXPIRATION) {
-//                    iterator.remove();
-//                    removedCount++;
-//                    log.info("Removed stale fingerprint: {}", entry.getKey());
-//                }
-//            }
-//        }
-//
-//        log.info("Cleanup complete. Removed {} stale fingerprints", removedCount);
-//    }
-//
-//    public void updateLastAccessTime(String fingerprint) {
-//        FingerprintInfo info = activeFingerprints.get(fingerprint);
-//        if (info != null) {
-//            info.setLastAccessTime(System.currentTimeMillis());
-//        }
-//    }
-//
-//    @Data
-//    @AllArgsConstructor
-//    private static class FingerprintInfo {
-//        private String sessionId;
-//        private long lastAccessTime;
-//    }
-// }

src/main/java/stirling/software/SPDF/config/fingerprint/FingerprintGenerator.java

@@ -1,77 +0,0 @@
-// package stirling.software.SPDF.config.fingerprint;
-//
-// import java.security.MessageDigest;
-// import java.security.NoSuchAlgorithmException;
-//
-// import org.springframework.stereotype.Component;
-//
-// import jakarta.servlet.http.HttpServletRequest;
-//
-// @Component
-// public class FingerprintGenerator {
-//
-//    public String generateFingerprint(HttpServletRequest request) {
-//        if (request == null) {
-//            return "";
-//        }
-//        StringBuilder fingerprintBuilder = new StringBuilder();
-//
-//        // Add IP address
-//        fingerprintBuilder.append(request.getRemoteAddr());
-//
-//        // Add X-Forwarded-For header if present (for clients behind proxies)
-//        String forwardedFor = request.getHeader("X-Forwarded-For");
-//        if (forwardedFor != null) {
-//            fingerprintBuilder.append(forwardedFor);
-//        }
-//
-//        // Add User-Agent
-//        String userAgent = request.getHeader("User-Agent");
-//        if (userAgent != null) {
-//            fingerprintBuilder.append(userAgent);
-//        }
-//
-//        // Add Accept-Language header
-//        String acceptLanguage = request.getHeader("Accept-Language");
-//        if (acceptLanguage != null) {
-//            fingerprintBuilder.append(acceptLanguage);
-//        }
-//
-//        // Add Accept header
-//        String accept = request.getHeader("Accept");
-//        if (accept != null) {
-//            fingerprintBuilder.append(accept);
-//        }
-//
-//        // Add Connection header
-//        String connection = request.getHeader("Connection");
-//        if (connection != null) {
-//            fingerprintBuilder.append(connection);
-//        }
-//
-//        // Add server port
-//        fingerprintBuilder.append(request.getServerPort());
-//
-//        // Add secure flag
-//        fingerprintBuilder.append(request.isSecure());
-//
-//        // Generate a hash of the fingerprint
-//        return generateHash(fingerprintBuilder.toString());
-//    }
-//
-//    private String generateHash(String input) {
-//        try {
-//            MessageDigest digest = MessageDigest.getInstance("SHA-256");
-//            byte[] hash = digest.digest(input.getBytes());
-//            StringBuilder hexString = new StringBuilder();
-//            for (byte b : hash) {
-//                String hex = Integer.toHexString(0xff & b);
-//                if (hex.length() == 1) hexString.append('0');
-//                hexString.append(hex);
-//            }
-//            return hexString.toString();
-//        } catch (NoSuchAlgorithmException e) {
-//            throw new RuntimeException("Failed to generate fingerprint hash", e);
-//        }
-//    }
-// }

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

@@ -7,7 +7,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
-import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
+import stirling.software.SPDF.config.ShowAdminInterface;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.UserRepository;
@@ -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/CustomLogoutSuccessHandler.java

@@ -1,237 +1,27 @@
 package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-import java.util.ArrayList;
-import java.util.List;
 
-import org.springframework.core.io.Resource;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
-import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication;
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
 
-import com.coveo.saml.SamlClient;
-
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.SPdfApplication;
-import stirling.software.SPDF.config.security.saml2.CertificateUtils;
-import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
-import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
-import stirling.software.SPDF.model.Provider;
-import stirling.software.SPDF.model.provider.UnsupportedProviderException;
-import stirling.software.SPDF.utils.UrlUtils;
 
-@Slf4j
-@AllArgsConstructor
 public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
 
-    private final ApplicationProperties applicationProperties;
-
     @Override
     public void onLogoutSuccess(
             HttpServletRequest request, HttpServletResponse response, Authentication authentication)
             throws IOException, ServletException {
 
-        if (!response.isCommitted()) {
-            // Handle user logout due to disabled account
-            if (request.getParameter("userIsDisabled") != null) {
-                response.sendRedirect(
-                        request.getContextPath() + "/login?erroroauth=userIsDisabled");
-                return;
-            }
-            // Handle OAuth2 authentication error
-            if (request.getParameter("oauth2AuthenticationErrorWeb") != null) {
-                response.sendRedirect(
-                        request.getContextPath() + "/login?erroroauth=userAlreadyExistsWeb");
-                return;
-            }
-            if (authentication != null) {
-                // Handle SAML2 logout redirection
-                if (authentication instanceof Saml2Authentication) {
-                    getRedirect_saml2(request, response, authentication);
-                    return;
-                }
-                // Handle OAuth2 logout redirection
-                else if (authentication instanceof OAuth2AuthenticationToken) {
-                    getRedirect_oauth2(request, response, authentication);
-                    return;
-                }
-                // Handle Username/Password logout
-                else if (authentication instanceof UsernamePasswordAuthenticationToken) {
-                    getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
-                    return;
-                }
-                // Handle unknown authentication types
-                else {
-                    log.error(
-                            "authentication class unknown: "
-                                    + authentication.getClass().getSimpleName());
-                    getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
-                    return;
-                }
-            } else {
-                // Redirect to login page after logout
-                getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
-                return;
-            }
-        }
-    }
-
-    // Redirect for SAML2 authentication logout
-    private void getRedirect_saml2(
-            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws IOException {
-
-        SAML2 samlConf = applicationProperties.getSecurity().getSaml2();
-        String registrationId = samlConf.getRegistrationId();
-
-        Saml2Authentication samlAuthentication = (Saml2Authentication) authentication;
-        CustomSaml2AuthenticatedPrincipal principal =
-                (CustomSaml2AuthenticatedPrincipal) samlAuthentication.getPrincipal();
-
-        String nameIdValue = principal.getName();
-
-        try {
-            // Read certificate from the resource
-            Resource certificateResource = samlConf.getSpCert();
-            X509Certificate certificate = CertificateUtils.readCertificate(certificateResource);
-
-            List<X509Certificate> certificates = new ArrayList<>();
-            certificates.add(certificate);
-
-            // Construct URLs required for SAML configuration
-            String serverUrl =
-                    SPdfApplication.getStaticBaseUrl() + ":" + SPdfApplication.getStaticPort();
-
-            String relyingPartyIdentifier =
-                    serverUrl + "/saml2/service-provider-metadata/" + registrationId;
-
-            String assertionConsumerServiceUrl = serverUrl + "/login/saml2/sso/" + registrationId;
-
-            String idpUrl = samlConf.getIdpSingleLogoutUrl();
-
-            String idpIssuer = samlConf.getIdpIssuer();
-
-            // Create SamlClient instance for SAML logout
-            SamlClient samlClient =
-                    new SamlClient(
-                            relyingPartyIdentifier,
-                            assertionConsumerServiceUrl,
-                            idpUrl,
-                            idpIssuer,
-                            certificates,
-                            SamlClient.SamlIdpBinding.POST);
-
-            // Read private key for service provider
-            Resource privateKeyResource = samlConf.getPrivateKey();
-            RSAPrivateKey privateKey = CertificateUtils.readPrivateKey(privateKeyResource);
-
-            // Set service provider keys for the SamlClient
-            samlClient.setSPKeys(certificate, privateKey);
-
-            // Redirect to identity provider for logout
-            samlClient.redirectToIdentityProvider(response, null, nameIdValue);
-        } catch (Exception e) {
-            log.error(nameIdValue, e);
-            getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
-        }
-    }
-
-    // Redirect for OAuth2 authentication logout
-    private void getRedirect_oauth2(
-            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws IOException {
-        String param = "logout=true";
-        String registrationId = null;
-        String issuer = null;
-        String clientId = null;
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
-
-        if (authentication instanceof OAuth2AuthenticationToken) {
-            OAuth2AuthenticationToken oauthToken = (OAuth2AuthenticationToken) authentication;
-            registrationId = oauthToken.getAuthorizedClientRegistrationId();
-
-            try {
-                // Get OAuth2 provider details from configuration
-                Provider provider = oauth.getClient().get(registrationId);
-                issuer = provider.getIssuer();
-                clientId = provider.getClientId();
-            } catch (UnsupportedProviderException e) {
-                log.error(e.getMessage());
-            }
-        } else {
-            registrationId = oauth.getProvider() != null ? oauth.getProvider() : "";
-            issuer = oauth.getIssuer();
-            clientId = oauth.getClientId();
-        }
-        String errorMessage = "";
-        // Handle different error scenarios during logout
-        if (request.getParameter("oauth2AuthenticationErrorWeb") != null) {
-            param = "erroroauth=oauth2AuthenticationErrorWeb";
-        } else if ((errorMessage = request.getParameter("error")) != null) {
-            param = "error=" + sanitizeInput(errorMessage);
-        } else if ((errorMessage = request.getParameter("erroroauth")) != null) {
-            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";
+        if (request.getParameter("userIsDisabled") != null) {
+            getRedirectStrategy()
+                    .sendRedirect(request, response, "/login?erroroauth=userIsDisabled");
+            return;
         }
 
-        String redirect_url = UrlUtils.getOrigin(request) + "/login?" + param;
-
-        // Redirect based on OAuth2 provider
-        switch (registrationId.toLowerCase()) {
-            case "keycloak":
-                // Add Keycloak specific logout URL if needed
-                String logoutUrl =
-                        issuer
-                                + "/protocol/openid-connect/logout"
-                                + "?client_id="
-                                + clientId
-                                + "&post_logout_redirect_uri="
-                                + response.encodeRedirectURL(redirect_url);
-                log.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);
-                response.sendRedirect(githubLogoutUrl);
-                break;
-            case "google":
-                // Add Google specific logout URL if needed
-                // 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");
-                // log.info("Redirecting to Google logout URL: " + googleLogoutUrl);
-                // response.sendRedirect(googleLogoutUrl);
-                // break;
-            default:
-                String defaultRedirectUrl = request.getContextPath() + "/login?" + param;
-                log.info("Redirecting to default logout URL: " + defaultRedirectUrl);
-                response.sendRedirect(defaultRedirectUrl);
-                break;
-        }
-    }
-
-    // Sanitize input to avoid potential security vulnerabilities
-    private String sanitizeInput(String input) {
-        return input.replaceAll("[^a-zA-Z0-9 ]", "");
+        getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
     }
 }

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

@@ -1,8 +1,6 @@
 package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +14,9 @@ import jakarta.servlet.FilterChain;
 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.model.User;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
-@Slf4j
 @Component
 public class FirstLoginFilter extends OncePerRequestFilter {
 
@@ -55,22 +50,6 @@ public class FirstLoginFilter extends OncePerRequestFilter {
                 return;
             }
         }
-
-        if (log.isDebugEnabled()) {
-            HttpSession session = request.getSession(true);
-            SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
-            String creationTime = timeFormat.format(new Date(session.getCreationTime()));
-
-            log.debug(
-                    "Request Info - New: {}, creationTimeSession {}, ID:  {}, IP: {}, User-Agent: {}, Referer: {}, Request URL: {}",
-                    session.isNew(),
-                    creationTime,
-                    session.getId(),
-                    request.getRemoteAddr(),
-                    request.getHeader("User-Agent"),
-                    request.getHeader("Referer"),
-                    request.getRequestURL().toString());
-        }
         filterChain.doFilter(request, response);
     }
 }

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

@@ -1,14 +1,19 @@
 package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.UUID;
 
+import org.simpleyaml.configuration.file.YamlFile;
+import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
+import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
 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.interfaces.DatabaseBackupInterface;
+import stirling.software.SPDF.config.DatabaseBackupInterface;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.Role;
 
@@ -34,6 +39,15 @@ public class InitialSecuritySetup {
         initializeInternalApiUser();
     }
 
+    @PostConstruct
+    public void initSecretKey() throws IOException {
+        String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
+        if (!isValidUUID(secretKey)) {
+            secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
+            saveKeyToConfig(secretKey);
+        }
+    }
+
     private void initializeAdminUser() throws IOException {
         String initialUsername =
                 applicationProperties.getSecurity().getInitialLogin().getUsername();
@@ -75,4 +89,33 @@ public class InitialSecuritySetup {
             log.info("Internal API user created: " + Role.INTERNAL_API_USER.getRoleId());
         }
     }
+
+    private void saveKeyToConfig(String key) throws IOException {
+        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();
+
+        settingsYml
+                .path("AutomaticallyGenerated.key")
+                .set(key)
+                .comment("# Automatically Generated Settings (Do Not Edit Directly)");
+        settingsYml.save();
+    }
+
+    private boolean isValidUUID(String uuid) {
+        if (uuid == null) {
+            return false;
+        }
+        try {
+            UUID.fromString(uuid);
+            return true;
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
 }

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

@@ -1,73 +1,60 @@
 package stirling.software.SPDF.config.security;
 
-import java.security.cert.X509Certificate;
 import java.util.*;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.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.core.io.Resource;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.authentication.ProviderManager;
+import org.springframework.security.config.Customizer;
 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;
 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.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.oauth2.client.registration.ClientRegistration;
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.security.oauth2.client.registration.ClientRegistrations;
-import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
-import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
-import org.springframework.security.saml2.core.Saml2X509Credential;
-import org.springframework.security.saml2.core.Saml2X509Credential.Saml2X509CredentialType;
 import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider;
-import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository;
-import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
-import org.springframework.security.saml2.provider.service.web.authentication.Saml2WebSsoAuthenticationFilter;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
-import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
-import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationFailureHandler;
 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.saml2.CertificateUtils;
-import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticationFailureHandler;
-import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticationSuccessHandler;
-import stirling.software.SPDF.config.security.saml2.CustomSaml2ResponseAuthenticationConverter;
+import stirling.software.SPDF.config.security.saml.CustomSAMLAuthenticationFailureHandler;
+import stirling.software.SPDF.config.security.saml.CustomSAMLAuthenticationSuccessHandler;
+import stirling.software.SPDF.config.security.saml.SAMLLogoutSuccessHandler;
 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;
-import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
-import stirling.software.SPDF.model.User;
-import stirling.software.SPDF.model.provider.GithubProvider;
-import stirling.software.SPDF.model.provider.GoogleProvider;
-import stirling.software.SPDF.model.provider.KeycloakProvider;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 
 @Configuration
 @EnableWebSecurity
 @EnableMethodSecurity
-@Slf4j
 public class SecurityConfiguration {
 
     @Autowired private CustomUserDetailsService userDetailsService;
 
+    @Autowired(required = false)
+    private GrantedAuthoritiesMapper userAuthoritiesMapper;
+
+    @Autowired(required = false)
+    private OpenSaml4AuthenticationProvider samlAuthenticationProvider;
+
+    @Autowired(required = false)
+    private RelyingPartyRegistrationRepository relyingPartyRegistrationRepository;
+
+    private static final Logger logger = LoggerFactory.getLogger(SecurityConfiguration.class);
+
     @Bean
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
@@ -90,48 +77,11 @@ public class SecurityConfiguration {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http.addFilterBefore(userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
 
         if (loginEnabledValue) {
-            http.addFilterBefore(
-                    userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
-            if (applicationProperties.getSecurity().getCsrfDisabled()) {
-                http.csrf(csrf -> csrf.disable());
-            } else {
-                CookieCsrfTokenRepository cookieRepo =
-                        CookieCsrfTokenRepository.withHttpOnlyFalse();
-                CsrfTokenRequestAttributeHandler requestHandler =
-                        new CsrfTokenRequestAttributeHandler();
-                requestHandler.setCsrfRequestAttributeName(null);
-                http.csrf(
-                        csrf ->
-                                csrf.ignoringRequestMatchers(
-                                                request -> {
-                                                    String apiKey = request.getHeader("X-API-Key");
 
-                                                    // If there's no API key, don't ignore CSRF
-                                                    // (return false)
-                                                    if (apiKey == null || apiKey.trim().isEmpty()) {
-                                                        return false;
-                                                    }
-
-                                                    // Validate API key using existing UserService
-                                                    try {
-                                                        Optional<User> user =
-                                                                userService.getUserByApiKey(apiKey);
-                                                        // If API key is valid, ignore CSRF (return
-                                                        // true)
-                                                        // If API key is invalid, don't ignore CSRF
-                                                        // (return false)
-                                                        return user.isPresent();
-                                                    } catch (Exception e) {
-                                                        // If there's any error validating the API
-                                                        // key, don't ignore CSRF
-                                                        return false;
-                                                    }
-                                                })
-                                        .csrfTokenRepository(cookieRepo)
-                                        .csrfTokenRequestHandler(requestHandler));
-            }
+            http.csrf(csrf -> csrf.disable());
             http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class);
             http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class);
             http.sessionManagement(
@@ -143,373 +93,144 @@ public class SecurityConfiguration {
                                     .sessionRegistry(sessionRegistry)
                                     .expiredUrl("/login?logout=true"));
 
-            http.authenticationProvider(daoAuthenticationProvider());
-            http.requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()));
-            http.logout(
-                    logout ->
-                            logout.logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
-                                    .logoutSuccessHandler(
-                                            new CustomLogoutSuccessHandler(applicationProperties))
-                                    .clearAuthentication(true)
-                                    .invalidateHttpSession(true) // Invalidate session
-                                    .deleteCookies("JSESSIONID", "remember-me"));
-            http.rememberMe(
-                    rememberMeConfigurer ->
-                            rememberMeConfigurer // Use the configurator directly
-                                    .key("uniqueAndSecret")
-                                    .tokenRepository(persistentTokenRepository())
-                                    .tokenValiditySeconds(1209600) // 2 weeks
-                    );
-            http.authorizeHttpRequests(
-                    authz ->
-                            authz.requestMatchers(
-                                            req -> {
-                                                String uri = req.getRequestURI();
-                                                String contextPath = req.getContextPath();
+            http.formLogin(
+                            formLogin ->
+                                    formLogin
+                                            .loginPage("/login")
+                                            .successHandler(
+                                                    new CustomAuthenticationSuccessHandler(
+                                                            loginAttemptService, userService))
+                                            .defaultSuccessUrl("/")
+                                            .failureHandler(
+                                                    new CustomAuthenticationFailureHandler(
+                                                            loginAttemptService, userService))
+                                            .permitAll())
+                    .requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()))
+                    .logout(
+                            logout ->
+                                    logout.logoutRequestMatcher(
+                                                    new AntPathRequestMatcher("/logout"))
+                                            .logoutSuccessHandler(new CustomLogoutSuccessHandler())
+                                            .invalidateHttpSession(true) // Invalidate session
+                                            .deleteCookies("JSESSIONID", "remember-me"))
+                    .rememberMe(
+                            rememberMeConfigurer ->
+                                    rememberMeConfigurer // Use the configurator directly
+                                            .key("uniqueAndSecret")
+                                            .tokenRepository(persistentTokenRepository())
+                                            .tokenValiditySeconds(1209600) // 2 weeks
+                            )
+                    .authorizeHttpRequests(
+                            authz ->
+                                    authz.requestMatchers(
+                                                    req -> {
+                                                        String uri = req.getRequestURI();
+                                                        String contextPath = req.getContextPath();
 
-                                                // Remove the context path from the URI
-                                                String trimmedUri =
-                                                        uri.startsWith(contextPath)
-                                                                ? uri.substring(
-                                                                        contextPath.length())
-                                                                : uri;
+                                                        // Remove the context path from the URI
+                                                        String trimmedUri =
+                                                                uri.startsWith(contextPath)
+                                                                        ? uri.substring(
+                                                                                contextPath
+                                                                                        .length())
+                                                                        : uri;
 
-                                                return trimmedUri.startsWith("/login")
-                                                        || trimmedUri.startsWith("/oauth")
-                                                        || trimmedUri.startsWith("/saml2")
-                                                        || trimmedUri.endsWith(".svg")
-                                                        || trimmedUri.startsWith("/register")
-                                                        || trimmedUri.startsWith("/error")
-                                                        || trimmedUri.startsWith("/images/")
-                                                        || trimmedUri.startsWith("/public/")
-                                                        || trimmedUri.startsWith("/css/")
-                                                        || trimmedUri.startsWith("/fonts/")
-                                                        || trimmedUri.startsWith("/js/")
-                                                        || trimmedUri.startsWith(
-                                                                "/api/v1/info/status");
-                                            })
-                                    .permitAll()
-                                    .anyRequest()
-                                    .authenticated());
-
-            // Handle User/Password Logins
-            if (applicationProperties.getSecurity().isUserPass()) {
-                http.formLogin(
-                        formLogin ->
-                                formLogin
-                                        .loginPage("/login")
-                                        .successHandler(
-                                                new CustomAuthenticationSuccessHandler(
-                                                        loginAttemptService, userService))
-                                        .failureHandler(
-                                                new CustomAuthenticationFailureHandler(
-                                                        loginAttemptService, userService))
-                                        .defaultSuccessUrl("/")
-                                        .permitAll());
-            }
+                                                        return trimmedUri.startsWith("/login")
+                                                                || trimmedUri.startsWith("/oauth")
+                                                                || trimmedUri.startsWith("/saml2")
+                                                                || trimmedUri.endsWith(".svg")
+                                                                || trimmedUri.startsWith(
+                                                                        "/register")
+                                                                || trimmedUri.startsWith("/error")
+                                                                || trimmedUri.startsWith("/images/")
+                                                                || trimmedUri.startsWith("/public/")
+                                                                || trimmedUri.startsWith("/css/")
+                                                                || trimmedUri.startsWith("/fonts/")
+                                                                || trimmedUri.startsWith("/js/")
+                                                                || trimmedUri.startsWith(
+                                                                        "/api/v1/info/status");
+                                                    })
+                                            .permitAll()
+                                            .anyRequest()
+                                            .authenticated());
 
             // Handle OAUTH2 Logins
-            if (applicationProperties.getSecurity().isOauth2Activ()) {
+            if (applicationProperties.getSecurity().getOAUTH2() != null
+                    && applicationProperties.getSecurity().getOAUTH2().getEnabled()
+                    && !applicationProperties
+                            .getSecurity()
+                            .getLoginMethod()
+                            .equalsIgnoreCase("normal")) {
 
                 http.oauth2Login(
-                        oauth2 ->
-                                oauth2.loginPage("/oauth2")
-                                        /*
-                                        This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database.
-                                        If user exists, login proceeds as usual. If user does not exist, then it is autocreated but only if 'OAUTH2AutoCreateUser'
-                                        is set as true, else login fails with an error message advising the same.
-                                         */
-                                        .successHandler(
-                                                new CustomOAuth2AuthenticationSuccessHandler(
-                                                        loginAttemptService,
-                                                        applicationProperties,
-                                                        userService))
-                                        .failureHandler(
-                                                new CustomOAuth2AuthenticationFailureHandler())
-                                        // Add existing Authorities from the database
-                                        .userInfoEndpoint(
-                                                userInfoEndpoint ->
-                                                        userInfoEndpoint
-                                                                .oidcUserService(
-                                                                        new CustomOAuth2UserService(
-                                                                                applicationProperties,
-                                                                                userService,
-                                                                                loginAttemptService))
-                                                                .userAuthoritiesMapper(
-                                                                        userAuthoritiesMapper()))
-                                        .permitAll());
-            }
-
-            // Handle SAML
-            if (applicationProperties.getSecurity().isSaml2Activ()
-                    && applicationProperties.getSystem().getEnableAlphaFunctionality()) {
-                http.authenticationProvider(samlAuthenticationProvider());
-                http.saml2Login(
-                                saml2 ->
-                                        saml2.loginPage("/saml2")
+                                oauth2 ->
+                                        oauth2.loginPage("/oauth2")
+                                                /*
+                                                This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database.
+                                                If user exists, login proceeds as usual. If user does not exist, then it is autocreated but only if 'OAUTH2AutoCreateUser'
+                                                is set as true, else login fails with an error message advising the same.
+                                                 */
                                                 .successHandler(
-                                                        new CustomSaml2AuthenticationSuccessHandler(
+                                                        new CustomOAuth2AuthenticationSuccessHandler(
                                                                 loginAttemptService,
                                                                 applicationProperties,
                                                                 userService))
                                                 .failureHandler(
-                                                        new CustomSaml2AuthenticationFailureHandler())
-                                                .permitAll())
-                        .addFilterBefore(
-                                userAuthenticationFilter, Saml2WebSsoAuthenticationFilter.class);
+                                                        new CustomOAuth2AuthenticationFailureHandler())
+                                                // Add existing Authorities from the database
+                                                .userInfoEndpoint(
+                                                        userInfoEndpoint ->
+                                                                userInfoEndpoint
+                                                                        .oidcUserService(
+                                                                                new CustomOAuth2UserService(
+                                                                                        applicationProperties,
+                                                                                        userService,
+                                                                                        loginAttemptService))
+                                                                        .userAuthoritiesMapper(
+                                                                                userAuthoritiesMapper)))
+                        .logout(
+                                logout ->
+                                        logout.logoutSuccessHandler(
+                                                new CustomOAuth2LogoutSuccessHandler(
+                                                        applicationProperties)));
+            }
+
+            // Handle SAML Logins
+            if (applicationProperties.getSecurity().getSAML() != null
+                    && applicationProperties.getSecurity().getSAML().getEnabled()
+                    && !applicationProperties
+                            .getSecurity()
+                            .getLoginMethod()
+                            .equalsIgnoreCase("normal")) {
+
+                http.saml2Login(
+                                saml2 ->
+                                        saml2.relyingPartyRegistrationRepository(
+                                                        relyingPartyRegistrationRepository)
+                                                .loginProcessingUrl("/login/saml2/sso/stirling")
+                                                .loginPage("/saml2")
+                                                .authenticationManager(
+                                                        new ProviderManager(
+                                                                samlAuthenticationProvider))
+                                                .successHandler(
+                                                        new CustomSAMLAuthenticationSuccessHandler(
+                                                                loginAttemptService, userService))
+                                                .failureHandler(
+                                                        new CustomSAMLAuthenticationFailureHandler()))
+                        .saml2Metadata(Customizer.withDefaults())
+                        .logout(
+                                logout ->
+                                        logout.logoutSuccessHandler(
+                                                new SAMLLogoutSuccessHandler()));
             }
         } else {
-            if (applicationProperties.getSecurity().getCsrfDisabled()) {
-                http.csrf(csrf -> csrf.disable());
-            } else {
-                CookieCsrfTokenRepository cookieRepo =
-                        CookieCsrfTokenRepository.withHttpOnlyFalse();
-                CsrfTokenRequestAttributeHandler requestHandler =
-                        new CsrfTokenRequestAttributeHandler();
-                requestHandler.setCsrfRequestAttributeName(null);
-                http.csrf(
-                        csrf ->
-                                csrf.csrfTokenRepository(cookieRepo)
-                                        .csrfTokenRequestHandler(requestHandler));
-            }
-            http.authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
+            http.csrf(csrf -> csrf.disable())
+                    .authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
         }
 
         return http.build();
     }
 
-    @Bean
-    @ConditionalOnProperty(
-            name = "security.saml2.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    public AuthenticationProvider samlAuthenticationProvider() {
-        OpenSaml4AuthenticationProvider authenticationProvider =
-                new OpenSaml4AuthenticationProvider();
-        authenticationProvider.setResponseAuthenticationConverter(
-                new CustomSaml2ResponseAuthenticationConverter(userService));
-        return authenticationProvider;
-    }
-
-    // Client Registration Repository for OAUTH2 OIDC Login
-    @Bean
-    @ConditionalOnProperty(
-            value = "security.oauth2.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    public ClientRegistrationRepository clientRegistrationRepository() {
-        List<ClientRegistration> registrations = new ArrayList<>();
-
-        githubClientRegistration().ifPresent(registrations::add);
-        oidcClientRegistration().ifPresent(registrations::add);
-        googleClientRegistration().ifPresent(registrations::add);
-        keycloakClientRegistration().ifPresent(registrations::add);
-
-        if (registrations.isEmpty()) {
-            log.error("At least one OAuth2 provider must be configured");
-            System.exit(1);
-        }
-
-        return new InMemoryClientRegistrationRepository(registrations);
-    }
-
-    private Optional<ClientRegistration> googleClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
-        if (oauth == null || !oauth.getEnabled()) {
-            return Optional.empty();
-        }
-        Client client = oauth.getClient();
-        if (client == null) {
-            return Optional.empty();
-        }
-        GoogleProvider google = client.getGoogle();
-        return google != null && google.isSettingsValid()
-                ? Optional.of(
-                        ClientRegistration.withRegistrationId(google.getName())
-                                .clientId(google.getClientId())
-                                .clientSecret(google.getClientSecret())
-                                .scope(google.getScopes())
-                                .authorizationUri(google.getAuthorizationuri())
-                                .tokenUri(google.getTokenuri())
-                                .userInfoUri(google.getUserinfouri())
-                                .userNameAttributeName(google.getUseAsUsername())
-                                .clientName(google.getClientName())
-                                .redirectUri("{baseUrl}/login/oauth2/code/" + google.getName())
-                                .authorizationGrantType(
-                                        org.springframework.security.oauth2.core
-                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
-                                .build())
-                : Optional.empty();
-    }
-
-    private Optional<ClientRegistration> keycloakClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
-        if (oauth == null || !oauth.getEnabled()) {
-            return Optional.empty();
-        }
-        Client client = oauth.getClient();
-        if (client == null) {
-            return Optional.empty();
-        }
-        KeycloakProvider keycloak = client.getKeycloak();
-
-        return keycloak != null && keycloak.isSettingsValid()
-                ? Optional.of(
-                        ClientRegistrations.fromIssuerLocation(keycloak.getIssuer())
-                                .registrationId(keycloak.getName())
-                                .clientId(keycloak.getClientId())
-                                .clientSecret(keycloak.getClientSecret())
-                                .scope(keycloak.getScopes())
-                                .userNameAttributeName(keycloak.getUseAsUsername())
-                                .clientName(keycloak.getClientName())
-                                .build())
-                : Optional.empty();
-    }
-
-    private Optional<ClientRegistration> githubClientRegistration() {
-
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
-        if (oauth == null || !oauth.getEnabled()) {
-            return Optional.empty();
-        }
-        Client client = oauth.getClient();
-        if (client == null) {
-            return Optional.empty();
-        }
-        GithubProvider github = client.getGithub();
-        return github != null && github.isSettingsValid()
-                ? Optional.of(
-                        ClientRegistration.withRegistrationId(github.getName())
-                                .clientId(github.getClientId())
-                                .clientSecret(github.getClientSecret())
-                                .scope(github.getScopes())
-                                .authorizationUri(github.getAuthorizationuri())
-                                .tokenUri(github.getTokenuri())
-                                .userInfoUri(github.getUserinfouri())
-                                .userNameAttributeName(github.getUseAsUsername())
-                                .clientName(github.getClientName())
-                                .redirectUri("{baseUrl}/login/oauth2/code/" + github.getName())
-                                .authorizationGrantType(
-                                        org.springframework.security.oauth2.core
-                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
-                                .build())
-                : Optional.empty();
-    }
-
-    private Optional<ClientRegistration> oidcClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
-        if (oauth == null
-                || oauth.getIssuer() == null
-                || oauth.getIssuer().isEmpty()
-                || oauth.getClientId() == null
-                || oauth.getClientId().isEmpty()
-                || oauth.getClientSecret() == null
-                || oauth.getClientSecret().isEmpty()
-                || oauth.getScopes() == null
-                || oauth.getScopes().isEmpty()
-                || oauth.getUseAsUsername() == null
-                || oauth.getUseAsUsername().isEmpty()) {
-            return Optional.empty();
-        }
-        return Optional.of(
-                ClientRegistrations.fromIssuerLocation(oauth.getIssuer())
-                        .registrationId("oidc")
-                        .clientId(oauth.getClientId())
-                        .clientSecret(oauth.getClientSecret())
-                        .scope(oauth.getScopes())
-                        .userNameAttributeName(oauth.getUseAsUsername())
-                        .clientName("OIDC")
-                        .build());
-    }
-
-    @Bean
-    @ConditionalOnProperty(
-            name = "security.saml2.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    public RelyingPartyRegistrationRepository relyingPartyRegistrations() throws Exception {
-
-        SAML2 samlConf = applicationProperties.getSecurity().getSaml2();
-
-        Resource privateKeyResource = samlConf.getPrivateKey();
-
-        Resource certificateResource = samlConf.getSpCert();
-
-        Saml2X509Credential signingCredential =
-                new Saml2X509Credential(
-                        CertificateUtils.readPrivateKey(privateKeyResource),
-                        CertificateUtils.readCertificate(certificateResource),
-                        Saml2X509CredentialType.SIGNING);
-
-        X509Certificate idpCert = CertificateUtils.readCertificate(samlConf.getidpCert());
-
-        Saml2X509Credential verificationCredential = Saml2X509Credential.verification(idpCert);
-
-        RelyingPartyRegistration rp =
-                RelyingPartyRegistration.withRegistrationId(samlConf.getRegistrationId())
-                        .signingX509Credentials((c) -> c.add(signingCredential))
-                        .assertingPartyDetails(
-                                (details) ->
-                                        details.entityId(samlConf.getIdpIssuer())
-                                                .singleSignOnServiceLocation(
-                                                        samlConf.getIdpSingleLoginUrl())
-                                                .verificationX509Credentials(
-                                                        (c) -> c.add(verificationCredential))
-                                                .wantAuthnRequestsSigned(true))
-                        .build();
-        return new InMemoryRelyingPartyRegistrationRepository(rp);
-    }
-
-    @Bean
-    public DaoAuthenticationProvider daoAuthenticationProvider() {
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(userDetailsService);
-        provider.setPasswordEncoder(passwordEncoder());
-        return provider;
-    }
-
-    /*
-    This following function is to grant Authorities to the OAUTH2 user from the values stored in the database.
-    This is required for the internal; 'hasRole()' function to give out the correct role.
-     */
-    @Bean
-    @ConditionalOnProperty(
-            value = "security.oauth2.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    GrantedAuthoritiesMapper userAuthoritiesMapper() {
-        return (authorities) -> {
-            Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
-
-            authorities.forEach(
-                    authority -> {
-                        // Add existing OAUTH2 Authorities
-                        mappedAuthorities.add(new SimpleGrantedAuthority(authority.getAuthority()));
-
-                        // Add Authorities from database for existing user, if user is present.
-                        if (authority instanceof OAuth2UserAuthority oauth2Auth) {
-                            String useAsUsername =
-                                    applicationProperties
-                                            .getSecurity()
-                                            .getOauth2()
-                                            .getUseAsUsername();
-                            Optional<User> userOpt =
-                                    userService.findByUsernameIgnoreCase(
-                                            (String) oauth2Auth.getAttributes().get(useAsUsername));
-                            if (userOpt.isPresent()) {
-                                User user = userOpt.get();
-                                if (user != null) {
-                                    mappedAuthorities.add(
-                                            new SimpleGrantedAuthority(
-                                                    userService.findRole(user).getAuthority()));
-                                }
-                            }
-                        }
-                    });
-            return mappedAuthorities;
-        };
-    }
-
     @Bean
     public IPRateLimitingFilter rateLimitingFilter() {
         int maxRequestsPerIp = 1000000; // Example limit TODO add config level
@@ -525,14 +246,4 @@ public class SecurityConfiguration {
     public boolean activSecurity() {
         return true;
     }
-
-    //    // Only Dev test
-    //    @Bean
-    //    public WebSecurityCustomizer webSecurityCustomizer() {
-    //        return (web) ->
-    //                web.ignoring()
-    //                        .requestMatchers(
-    //                                "/css/**", "/images/**", "/js/**", "/**.svg",
-    // "/pdfjs-legacy/**");
-    //    }
 }

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

@@ -5,6 +5,7 @@ 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;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
@@ -22,7 +23,6 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApiKeyAuthenticationToken;
 import stirling.software.SPDF.model.User;
@@ -30,18 +30,13 @@ import stirling.software.SPDF.model.User;
 @Component
 public class UserAuthenticationFilter extends OncePerRequestFilter {
 
-    private final UserService userService;
-    private final SessionPersistentRegistry sessionPersistentRegistry;
-    private final boolean loginEnabledValue;
+    @Autowired @Lazy private UserService userService;
 
-    public UserAuthenticationFilter(
-            @Lazy UserService userService,
-            SessionPersistentRegistry sessionPersistentRegistry,
-            @Qualifier("loginEnabled") boolean loginEnabledValue) {
-        this.userService = userService;
-        this.sessionPersistentRegistry = sessionPersistentRegistry;
-        this.loginEnabledValue = loginEnabledValue;
-    }
+    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
+
+    @Autowired
+    @Qualifier("loginEnabled")
+    public boolean loginEnabledValue;
 
     @Override
     protected void doFilterInternal(
@@ -56,19 +51,6 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
         String requestURI = request.getRequestURI();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
-        // Check for session expiration (unsure if needed)
-        //        if (authentication != null && authentication.isAuthenticated()) {
-        //            String sessionId = request.getSession().getId();
-        //            SessionInformation sessionInfo =
-        //                    sessionPersistentRegistry.getSessionInformation(sessionId);
-        //
-        //            if (sessionInfo != null && sessionInfo.isExpired()) {
-        //                SecurityContextHolder.clearContext();
-        //                response.sendRedirect(request.getContextPath() + "/login?expired=true");
-        //                return;
-        //            }
-        //        }
-
         // Check for API key in the request headers if no authentication exists
         if (authentication == null || !authentication.isAuthenticated()) {
             String apiKey = request.getHeader("X-API-Key");
@@ -112,9 +94,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
                 response.setStatus(HttpStatus.UNAUTHORIZED.value());
                 response.getWriter()
                         .write(
-                                "Authentication required. Please provide a X-API-KEY in request header.\n"
-                                        + "This is found in Settings -> Account Settings -> API Key\n"
-                                        + "Alternatively you can disable authentication if this is unexpected");
+                                "Authentication required. Please provide a X-API-KEY in request header.\nThis is found in Settings -> Account Settings -> API Key\nAlternatively you can disable authentication if this is unexpected");
                 return;
             }
         }
@@ -127,8 +107,6 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
                 username = ((UserDetails) principal).getUsername();
             } else if (principal instanceof OAuth2User) {
                 username = ((OAuth2User) principal).getName();
-            } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
-                username = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
             } else if (principal instanceof String) {
                 username = (String) principal;
             }
@@ -181,10 +159,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
         };
 
         for (String pattern : permitAllPatterns) {
-            if (uri.startsWith(pattern)
-                    || uri.endsWith(".svg")
-                    || uri.endsWith(".png")
-                    || uri.endsWith(".ico")) {
+            if (uri.startsWith(pattern) || uri.endsWith(".svg")) {
                 return true;
             }
         }

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

@@ -11,7 +11,6 @@ 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;
@@ -19,8 +18,7 @@ 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.interfaces.DatabaseBackupInterface;
-import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
+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;
@@ -335,10 +333,6 @@ public class UserService implements UserServiceInterface {
                 } else if (principal instanceof OAuth2User) {
                     OAuth2User oAuth2User = (OAuth2User) principal;
                     usernameP = oAuth2User.getName();
-                } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
-                    CustomSaml2AuthenticatedPrincipal saml2User =
-                            (CustomSaml2AuthenticatedPrincipal) principal;
-                    usernameP = saml2User.getName();
                 } else if (principal instanceof String) {
                     usernameP = (String) principal;
                 }
@@ -348,19 +342,4 @@ public class UserService implements UserServiceInterface {
             }
         }
     }
-
-    public String getCurrentUsername() {
-        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-
-        if (principal instanceof UserDetails) {
-            return ((UserDetails) principal).getUsername();
-        } else {
-            return principal.toString();
-        }
-    }
-
-    @Override
-    public long getTotalUsersCount() {
-        return userRepository.count();
-    }
 }

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

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
 import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.interfaces.DatabaseBackupInterface;
+import stirling.software.SPDF.config.DatabaseBackupInterface;
 import stirling.software.SPDF.utils.FileInfo;
 
 @Slf4j

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

@@ -51,7 +51,8 @@ public class CustomOAuth2AuthenticationFailureHandler
             }
             log.error("OAuth2 Authentication error: " + errorCode);
             log.error("OAuth2AuthenticationException", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/login?erroroauth=" + errorCode);
+            getRedirectStrategy()
+                    .sendRedirect(request, response, "/logout?erroroauth=" + errorCode);
             return;
         }
         log.error("Unhandled authentication exception", exception);

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

@@ -66,7 +66,7 @@ public class CustomOAuth2AuthenticationSuccessHandler
             // Redirect to the original destination
             super.onAuthenticationSuccess(request, response, authentication);
         } else {
-            OAUTH2 oAuth = applicationProperties.getSecurity().getOauth2();
+            OAUTH2 oAuth = applicationProperties.getSecurity().getOAUTH2();
 
             if (loginAttemptService.isBlocked(username)) {
                 if (session != null) {
@@ -75,11 +75,6 @@ public class CustomOAuth2AuthenticationSuccessHandler
                 throw new LockedException(
                         "Your account has been locked due to too many failed login attempts.");
             }
-            if (userService.isUserDisabled(username)) {
-                getRedirectStrategy()
-                        .sendRedirect(request, response, "/logout?userIsDisabled=true");
-                return;
-            }
             if (userService.usernameExistsIgnoreCase(username)
                     && userService.hasPassword(username)
                     && !userService.isAuthenticationTypeByUsername(

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

@@ -0,0 +1,122 @@
+package stirling.software.SPDF.config.security.oauth2;
+
+import java.io.IOException;
+
+import org.springframework.security.core.Authentication;
+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 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 final ApplicationProperties applicationProperties;
+
+    public CustomOAuth2LogoutSuccessHandler(ApplicationProperties applicationProperties) {
+        this.applicationProperties = applicationProperties;
+    }
+
+    @Override
+    public void onLogoutSuccess(
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws IOException, ServletException {
+        String param = "logout=true";
+        String registrationId = null;
+        String issuer = null;
+        String clientId = null;
+
+        if (authentication == null) {
+            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;
+            registrationId = oauthToken.getAuthorizedClientRegistrationId();
+
+            try {
+                Provider provider = oauth.getClient().get(registrationId);
+                issuer = provider.getIssuer();
+                clientId = provider.getClientId();
+            } catch (UnsupportedProviderException e) {
+                log.error(e.getMessage());
+            }
+        } else {
+            registrationId = oauth.getProvider() != null ? oauth.getProvider() : "";
+            issuer = oauth.getIssuer();
+            clientId = oauth.getClientId();
+        }
+        String errorMessage = "";
+        if (request.getParameter("oauth2AuthenticationErrorWeb") != null) {
+            param = "erroroauth=oauth2AuthenticationErrorWeb";
+        } else if ((errorMessage = request.getParameter("error")) != null) {
+            param = "error=" + sanitizeInput(errorMessage);
+        } else if ((errorMessage = request.getParameter("erroroauth")) != null) {
+            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;
+
+        switch (registrationId.toLowerCase()) {
+            case "keycloak":
+                // Add Keycloak specific logout URL if needed
+                String logoutUrl =
+                        issuer
+                                + "/protocol/openid-connect/logout"
+                                + "?client_id="
+                                + clientId
+                                + "&post_logout_redirect_uri="
+                                + response.encodeRedirectURL(redirect_url);
+                log.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);
+                response.sendRedirect(githubLogoutUrl);
+                break;
+            case "google":
+                // Add Google specific logout URL if needed
+                // 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");
+                // log.info("Redirecting to Google logout URL: " + googleLogoutUrl);
+                // response.sendRedirect(googleLogoutUrl);
+                // break;
+            default:
+                String defaultRedirectUrl = request.getContextPath() + "/login?" + param;
+                log.info("Redirecting to default logout URL: " + defaultRedirectUrl);
+                response.sendRedirect(defaultRedirectUrl);
+                break;
+        }
+    }
+
+    private String sanitizeInput(String input) {
+        return input.replaceAll("[^a-zA-Z0-9 ]", "");
+    }
+}

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/oauth2/OAuth2Config.java

@@ -0,0 +1,211 @@
+package stirling.software.SPDF.config.security.oauth2;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.client.registration.ClientRegistrations;
+import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
+import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
+
+import lombok.extern.slf4j.Slf4j;
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.model.provider.GithubProvider;
+import stirling.software.SPDF.model.provider.GoogleProvider;
+import stirling.software.SPDF.model.provider.KeycloakProvider;
+
+@Configuration
+@Slf4j
+public class OAuth2Config {
+    @Autowired ApplicationProperties applicationProperties;
+
+    @Autowired @Lazy private UserService userService;
+
+    // Client Registration Repository for OAUTH2 OIDC Login
+    @Bean
+    @ConditionalOnProperty(
+            value = "security.oauth2.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    public ClientRegistrationRepository clientRegistrationRepository() {
+        List<ClientRegistration> registrations = new ArrayList<>();
+
+        githubClientRegistration().ifPresent(registrations::add);
+        oidcClientRegistration().ifPresent(registrations::add);
+        googleClientRegistration().ifPresent(registrations::add);
+        keycloakClientRegistration().ifPresent(registrations::add);
+
+        if (registrations.isEmpty()) {
+            log.error("At least one OAuth2 provider must be configured");
+            System.exit(1);
+        }
+
+        return new InMemoryClientRegistrationRepository(registrations);
+    }
+
+    private Optional<ClientRegistration> googleClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null || !oauth.getEnabled()) {
+            return Optional.empty();
+        }
+        Client client = oauth.getClient();
+        if (client == null) {
+            return Optional.empty();
+        }
+        GoogleProvider google = client.getGoogle();
+        return google != null && google.isSettingsValid()
+                ? Optional.of(
+                        ClientRegistration.withRegistrationId(google.getName())
+                                .clientId(google.getClientId())
+                                .clientSecret(google.getClientSecret())
+                                .scope(google.getScopes())
+                                .authorizationUri(google.getAuthorizationuri())
+                                .tokenUri(google.getTokenuri())
+                                .userInfoUri(google.getUserinfouri())
+                                .userNameAttributeName(google.getUseAsUsername())
+                                .clientName(google.getClientName())
+                                .redirectUri("{baseUrl}/login/oauth2/code/" + google.getName())
+                                .authorizationGrantType(
+                                        org.springframework.security.oauth2.core
+                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
+                                .build())
+                : Optional.empty();
+    }
+
+    private Optional<ClientRegistration> keycloakClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null || !oauth.getEnabled()) {
+            return Optional.empty();
+        }
+        Client client = oauth.getClient();
+        if (client == null) {
+            return Optional.empty();
+        }
+        KeycloakProvider keycloak = client.getKeycloak();
+
+        return keycloak != null && keycloak.isSettingsValid()
+                ? Optional.of(
+                        ClientRegistrations.fromIssuerLocation(keycloak.getIssuer())
+                                .registrationId(keycloak.getName())
+                                .clientId(keycloak.getClientId())
+                                .clientSecret(keycloak.getClientSecret())
+                                .scope(keycloak.getScopes())
+                                .userNameAttributeName(keycloak.getUseAsUsername())
+                                .clientName(keycloak.getClientName())
+                                .build())
+                : Optional.empty();
+    }
+
+    private Optional<ClientRegistration> githubClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null || !oauth.getEnabled()) {
+            return Optional.empty();
+        }
+        Client client = oauth.getClient();
+        if (client == null) {
+            return Optional.empty();
+        }
+        GithubProvider github = client.getGithub();
+        return github != null && github.isSettingsValid()
+                ? Optional.of(
+                        ClientRegistration.withRegistrationId(github.getName())
+                                .clientId(github.getClientId())
+                                .clientSecret(github.getClientSecret())
+                                .scope(github.getScopes())
+                                .authorizationUri(github.getAuthorizationuri())
+                                .tokenUri(github.getTokenuri())
+                                .userInfoUri(github.getUserinfouri())
+                                .userNameAttributeName(github.getUseAsUsername())
+                                .clientName(github.getClientName())
+                                .redirectUri("{baseUrl}/login/oauth2/code/" + github.getName())
+                                .authorizationGrantType(
+                                        org.springframework.security.oauth2.core
+                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
+                                .build())
+                : Optional.empty();
+    }
+
+    private Optional<ClientRegistration> oidcClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null
+                || oauth.getIssuer() == null
+                || oauth.getIssuer().isEmpty()
+                || oauth.getClientId() == null
+                || oauth.getClientId().isEmpty()
+                || oauth.getClientSecret() == null
+                || oauth.getClientSecret().isEmpty()
+                || oauth.getScopes() == null
+                || oauth.getScopes().isEmpty()
+                || oauth.getUseAsUsername() == null
+                || oauth.getUseAsUsername().isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(
+                ClientRegistrations.fromIssuerLocation(oauth.getIssuer())
+                        .registrationId("oidc")
+                        .clientId(oauth.getClientId())
+                        .clientSecret(oauth.getClientSecret())
+                        .scope(oauth.getScopes())
+                        .userNameAttributeName(oauth.getUseAsUsername())
+                        .clientName("OIDC")
+                        .build());
+    }
+
+    /*
+    This following function is to grant Authorities to the OAUTH2 user from the values stored in the database.
+    This is required for the internal; 'hasRole()' function to give out the correct role.
+     */
+    @Bean
+    @ConditionalOnProperty(
+            value = "security.oauth2.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    GrantedAuthoritiesMapper userAuthoritiesMapper() {
+        return (authorities) -> {
+            Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
+
+            authorities.forEach(
+                    authority -> {
+                        // Add existing OAUTH2 Authorities
+                        mappedAuthorities.add(new SimpleGrantedAuthority(authority.getAuthority()));
+
+                        // Add Authorities from database for existing user, if user is present.
+                        if (authority instanceof OAuth2UserAuthority oauth2Auth) {
+                            String useAsUsername =
+                                    applicationProperties
+                                            .getSecurity()
+                                            .getOAUTH2()
+                                            .getUseAsUsername();
+                            Optional<User> userOpt =
+                                    userService.findByUsernameIgnoreCase(
+                                            (String) oauth2Auth.getAttributes().get(useAsUsername));
+                            if (userOpt.isPresent()) {
+                                User user = userOpt.get();
+                                if (user != null) {
+                                    mappedAuthorities.add(
+                                            new SimpleGrantedAuthority(
+                                                    userService.findRole(user).getAuthority()));
+                                }
+                            }
+                        }
+                    });
+            return mappedAuthorities;
+        };
+    }
+}

src/main/java/stirling/software/SPDF/config/security/saml/CustomSAMLAuthenticationFailureHandler.java

@@ -0,0 +1,51 @@
+package stirling.software.SPDF.config.security.saml;
+
+import java.io.IOException;
+
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class CustomSAMLAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
+
+    @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 Saml2AuthenticationException) {
+            log.error("SAML2 Authentication error: ", exception);
+            getRedirectStrategy()
+                    .sendRedirect(request, response, "/logout?error=saml2AuthenticationError");
+            return;
+        }
+        log.error("Unhandled authentication exception", exception);
+        super.onAuthenticationFailure(request, response, exception);
+    }
+}

src/main/java/stirling/software/SPDF/config/security/saml/CustomSAMLAuthenticationSuccessHandler.java

@@ -0,0 +1,60 @@
+package stirling.software.SPDF.config.security.saml;
+
+import java.io.IOException;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.savedrequest.SavedRequest;
+
+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.config.security.LoginAttemptService;
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.utils.RequestUriUtils;
+
+@Slf4j
+public class CustomSAMLAuthenticationSuccessHandler
+        extends SavedRequestAwareAuthenticationSuccessHandler {
+
+    private LoginAttemptService loginAttemptService;
+    private UserService userService;
+
+    public CustomSAMLAuthenticationSuccessHandler(
+            LoginAttemptService loginAttemptService, UserService userService) {
+        this.loginAttemptService = loginAttemptService;
+        this.userService = userService;
+    }
+
+    @Override
+    public void onAuthenticationSuccess(
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            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
+        HttpSession session = request.getSession(false);
+        SavedRequest savedRequest =
+                (session != null)
+                        ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
+                        : null;
+
+        if (savedRequest != null
+                && !RequestUriUtils.isStaticResource(
+                        request.getContextPath(), savedRequest.getRedirectUrl())) {
+            // Redirect to the original destination
+            super.onAuthenticationSuccess(request, response, authentication);
+        } else {
+            // Redirect to the root URL (considering context path)
+            getRedirectStrategy().sendRedirect(request, response, "/");
+        }
+    }
+}

src/main/java/stirling/software/SPDF/config/security/saml/SAMLLogoutSuccessHandler.java

@@ -0,0 +1,38 @@
+package stirling.software.SPDF.config.security.saml;
+
+import java.io.IOException;
+
+import org.springframework.security.core.Authentication;
+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;
+
+@Slf4j
+public class SAMLLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
+
+    @Override
+    public void onLogoutSuccess(
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws IOException, ServletException {
+
+        String redirectUrl = determineTargetUrl(request, response, authentication);
+
+        if (response.isCommitted()) {
+            log.debug("Response has already been committed. Unable to redirect to " + redirectUrl);
+            return;
+        }
+
+        getRedirectStrategy().sendRedirect(request, response, redirectUrl);
+    }
+
+    protected String determineTargetUrl(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            Authentication authentication) {
+        // Default to the root URL
+        return "/";
+    }
+}

src/main/java/stirling/software/SPDF/config/security/saml/SamlConfig.java

@@ -0,0 +1,216 @@
+package stirling.software.SPDF.config.security.saml;
+
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.*;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
+import org.springframework.security.saml2.core.Saml2X509Credential;
+import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider;
+import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationToken;
+import org.springframework.security.saml2.provider.service.metadata.OpenSamlMetadataResolver;
+import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository;
+import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
+import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
+import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
+import org.springframework.security.saml2.provider.service.web.Saml2MetadataFilter;
+
+import lombok.extern.slf4j.Slf4j;
+import stirling.software.SPDF.model.ApplicationProperties;
+
+@Configuration
+@Slf4j
+public class SamlConfig {
+
+    @Autowired ApplicationProperties applicationProperties;
+
+    @Bean
+    public OpenSaml4AuthenticationProvider openSaml4AuthenticationProvider() {
+        OpenSaml4AuthenticationProvider provider = new OpenSaml4AuthenticationProvider();
+        provider.setResponseAuthenticationConverter(
+                responseToken -> {
+                    Saml2AuthenticationToken token = responseToken.getToken();
+                    log.info("Received SAML response: {}", token.getSaml2Response());
+                    // Your custom conversion logic here
+                    // For now, we'll just return the token as is
+                    return token;
+                });
+        return provider;
+    }
+
+    @Bean
+    @ConditionalOnProperty(
+            value = "security.saml.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    public RelyingPartyRegistrationRepository relyingPartyRegistrationRepository() {
+        RelyingPartyRegistration registration =
+                RelyingPartyRegistration.withRegistrationId(
+                                applicationProperties.getSecurity().getSAML().getRegistrationId())
+                        .entityId(applicationProperties.getSecurity().getSAML().getEntityId())
+                        .assertionConsumerServiceLocation(
+                                applicationProperties.getSecurity().getSAML().getSpBaseUrl()
+                                        + "/login/saml2/sso/stirling")
+                        .singleLogoutServiceLocation(
+                                applicationProperties.getSecurity().getSAML().getSpBaseUrl()
+                                        + "/logout/saml2/slo")
+                        .singleLogoutServiceResponseLocation(
+                                applicationProperties.getSecurity().getSAML().getSpBaseUrl()
+                                        + "/logout/saml2/slo")
+                        .signingX509Credentials(credentials -> credentials.add(signingCredential()))
+                        .assertingPartyDetails(
+                                party ->
+                                        party.entityId(
+                                                        applicationProperties
+                                                                .getSecurity()
+                                                                .getSAML()
+                                                                .getEntityId())
+                                                .singleSignOnServiceLocation(
+                                                        applicationProperties
+                                                                .getSecurity()
+                                                                .getSAML()
+                                                                .getIdpMetadataLocation())
+                                                .wantAuthnRequestsSigned(true)
+                                                .verificationX509Credentials(
+                                                        c -> c.add(this.realmCertificate())))
+                        .build();
+        return new InMemoryRelyingPartyRegistrationRepository(registration);
+    }
+
+    private Saml2X509Credential signingCredential() {
+        log.info("Starting to load signing credential");
+        try {
+            Resource storeResource =
+                    applicationProperties
+                            .getSecurity()
+                            .getSAML()
+                            .getKeystore()
+                            .getKeystoreResource();
+            log.info("Keystore resource: {}", storeResource.getDescription());
+
+            KeyStore keyStore = KeyStore.getInstance("JKS");
+            try (InputStream is = storeResource.getInputStream()) {
+                keyStore.load(
+                        is,
+                        applicationProperties
+                                .getSecurity()
+                                .getSAML()
+                                .getKeystore()
+                                .getKeystorePassword()
+                                .toCharArray());
+                log.info("Keystore loaded successfully");
+            }
+
+            String keyAlias =
+                    applicationProperties.getSecurity().getSAML().getKeystore().getKeyAlias();
+            log.info("Attempting to retrieve private key with alias: {}", keyAlias);
+
+            PrivateKey privateKey =
+                    (PrivateKey)
+                            keyStore.getKey(
+                                    keyAlias,
+                                    applicationProperties
+                                            .getSecurity()
+                                            .getSAML()
+                                            .getKeystore()
+                                            .getKeyPassword()
+                                            .toCharArray());
+
+            if (privateKey == null) {
+                log.error("Private key not found for alias: {}", keyAlias);
+                throw new RuntimeException("Private key not found in keystore");
+            }
+
+            log.info("Private key retrieved successfully");
+
+            X509Certificate certificate = (X509Certificate) keyStore.getCertificate(keyAlias);
+
+            if (certificate == null) {
+                log.info("Certificate not found for alias: {}", keyAlias);
+                throw new RuntimeException("Certificate not found in keystore");
+            }
+
+            log.info(
+                    "Certificate retrieved successfully. Subject: {}",
+                    certificate.getSubjectX500Principal());
+
+            log.info("Signing credential created successfully");
+            return Saml2X509Credential.signing(privateKey, certificate);
+        } catch (Exception e) {
+            log.error("Error loading signing credential", e);
+            throw new RuntimeException("Error loading signing credential", e);
+        }
+    }
+
+    private Saml2X509Credential realmCertificate() {
+        log.info("Starting to load realm certificate");
+        try {
+            Resource storeResource =
+                    applicationProperties
+                            .getSecurity()
+                            .getSAML()
+                            .getKeystore()
+                            .getKeystoreResource();
+            log.info("Keystore resource: {}", storeResource.getDescription());
+
+            KeyStore keyStore = KeyStore.getInstance("JKS");
+            try (InputStream is = storeResource.getInputStream()) {
+                keyStore.load(
+                        is,
+                        applicationProperties
+                                .getSecurity()
+                                .getSAML()
+                                .getKeystore()
+                                .getKeystorePassword()
+                                .toCharArray());
+                log.info("Keystore loaded successfully");
+            }
+
+            String realmCertificateAlias =
+                    applicationProperties
+                            .getSecurity()
+                            .getSAML()
+                            .getKeystore()
+                            .getRealmCertificateAlias();
+            log.info(
+                    "Attempting to retrieve realm certificate with alias: {}",
+                    realmCertificateAlias);
+
+            X509Certificate certificate =
+                    (X509Certificate) keyStore.getCertificate(realmCertificateAlias);
+
+            if (certificate == null) {
+                log.error("Realm certificate not found for alias: {}", realmCertificateAlias);
+                throw new RuntimeException("Realm certificate not found in keystore");
+            }
+
+            log.info(
+                    "Realm certificate retrieved successfully. Subject: {}",
+                    certificate.getSubjectX500Principal());
+
+            log.info("Realm certificate credential created successfully");
+            return Saml2X509Credential.verification(certificate);
+        } catch (Exception e) {
+            log.error("Error loading realm certificate", e);
+            throw new RuntimeException("Error loading realm certificate", e);
+        }
+    }
+
+    @Bean
+    @ConditionalOnProperty(
+            value = "security.saml.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    public Saml2MetadataFilter metadataFilter(RelyingPartyRegistrationRepository registrations) {
+        DefaultRelyingPartyRegistrationResolver registrationResolver =
+                new DefaultRelyingPartyRegistrationResolver(registrations);
+        OpenSamlMetadataResolver metadataResolver = new OpenSamlMetadataResolver();
+        return new Saml2MetadataFilter(registrationResolver, metadataResolver);
+    }
+}

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

@@ -1,42 +0,0 @@
-package stirling.software.SPDF.config.security.saml2;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyFactory;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.spec.PKCS8EncodedKeySpec;
-
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemReader;
-import org.springframework.core.io.Resource;
-
-public class CertificateUtils {
-
-    public static X509Certificate readCertificate(Resource certificateResource) throws Exception {
-        try (PemReader pemReader =
-                new PemReader(
-                        new InputStreamReader(
-                                certificateResource.getInputStream(), StandardCharsets.UTF_8))) {
-            PemObject pemObject = pemReader.readPemObject();
-            byte[] decodedCert = pemObject.getContent();
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            return (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(decodedCert));
-        }
-    }
-
-    public static RSAPrivateKey readPrivateKey(Resource privateKeyResource) throws Exception {
-        try (PemReader pemReader =
-                new PemReader(
-                        new InputStreamReader(
-                                privateKeyResource.getInputStream(), StandardCharsets.UTF_8))) {
-            PemObject pemObject = pemReader.readPemObject();
-            byte[] decodedKey = pemObject.getContent();
-            return (RSAPrivateKey)
-                    KeyFactory.getInstance("RSA")
-                            .generatePrivate(new PKCS8EncodedKeySpec(decodedKey));
-        }
-    }
-}

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

@@ -1,45 +0,0 @@
-package stirling.software.SPDF.config.security.saml2;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal;
-
-public class CustomSaml2AuthenticatedPrincipal
-        implements Saml2AuthenticatedPrincipal, Serializable {
-
-    private final String name;
-    private final Map<String, List<Object>> attributes;
-    private final String nameId;
-    private final List<String> sessionIndexes;
-
-    public CustomSaml2AuthenticatedPrincipal(
-            String name,
-            Map<String, List<Object>> attributes,
-            String nameId,
-            List<String> sessionIndexes) {
-        this.name = name;
-        this.attributes = attributes;
-        this.nameId = nameId;
-        this.sessionIndexes = sessionIndexes;
-    }
-
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    @Override
-    public Map<String, List<Object>> getAttributes() {
-        return this.attributes;
-    }
-
-    public String getNameId() {
-        return this.nameId;
-    }
-
-    public List<String> getSessionIndexes() {
-        return this.sessionIndexes;
-    }
-}

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

@@ -1,38 +0,0 @@
-package stirling.software.SPDF.config.security.saml2;
-
-import java.io.IOException;
-
-import org.springframework.security.authentication.ProviderNotFoundException;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.saml2.core.Saml2Error;
-import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
-import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class CustomSaml2AuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
-
-    @Override
-    public void onAuthenticationFailure(
-            HttpServletRequest request,
-            HttpServletResponse response,
-            AuthenticationException exception)
-            throws IOException, ServletException {
-        if (exception instanceof Saml2AuthenticationException) {
-            Saml2Error error = ((Saml2AuthenticationException) exception).getSaml2Error();
-            getRedirectStrategy()
-                    .sendRedirect(request, response, "/login?erroroauth=" + error.getErrorCode());
-        } else if (exception instanceof ProviderNotFoundException) {
-            getRedirectStrategy()
-                    .sendRedirect(
-                            request,
-                            response,
-                            "/login?erroroauth=not_authentication_provider_found");
-        }
-        log.error("AuthenticationException: " + exception);
-    }
-}

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

@@ -1,91 +0,0 @@
-package stirling.software.SPDF.config.security.saml2;
-
-import java.io.IOException;
-
-import org.springframework.security.authentication.LockedException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
-import org.springframework.security.web.savedrequest.SavedRequest;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-import lombok.AllArgsConstructor;
-import stirling.software.SPDF.config.security.LoginAttemptService;
-import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
-import stirling.software.SPDF.model.AuthenticationType;
-import stirling.software.SPDF.utils.RequestUriUtils;
-
-@AllArgsConstructor
-public class CustomSaml2AuthenticationSuccessHandler
-        extends SavedRequestAwareAuthenticationSuccessHandler {
-
-    private LoginAttemptService loginAttemptService;
-
-    private ApplicationProperties applicationProperties;
-    private UserService userService;
-
-    @Override
-    public void onAuthenticationSuccess(
-            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws ServletException, IOException {
-
-        Object principal = authentication.getPrincipal();
-
-        if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
-            String username = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
-            // Get the saved request
-            HttpSession session = request.getSession(false);
-            String contextPath = request.getContextPath();
-            SavedRequest savedRequest =
-                    (session != null)
-                            ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
-                            : null;
-
-            if (savedRequest != null
-                    && !RequestUriUtils.isStaticResource(
-                            contextPath, savedRequest.getRedirectUrl())) {
-                // Redirect to the original destination
-                super.onAuthenticationSuccess(request, response, authentication);
-            } else {
-                SAML2 saml2 = applicationProperties.getSecurity().getSaml2();
-
-                if (loginAttemptService.isBlocked(username)) {
-                    if (session != null) {
-                        session.removeAttribute("SPRING_SECURITY_SAVED_REQUEST");
-                    }
-                    throw new LockedException(
-                            "Your account has been locked due to too many failed login attempts.");
-                }
-                if (userService.usernameExistsIgnoreCase(username)
-                        && userService.hasPassword(username)
-                        && !userService.isAuthenticationTypeByUsername(
-                                username, AuthenticationType.OAUTH2)
-                        && saml2.getAutoCreateUser()) {
-                    response.sendRedirect(
-                            contextPath + "/logout?oauth2AuthenticationErrorWeb=true");
-                    return;
-                }
-                try {
-                    if (saml2.getBlockRegistration()
-                            && !userService.usernameExistsIgnoreCase(username)) {
-                        response.sendRedirect(
-                                contextPath + "/login?erroroauth=oauth2_admin_blocked_user");
-                        return;
-                    }
-                    userService.processOAuth2PostLogin(username, saml2.getAutoCreateUser());
-                    response.sendRedirect(contextPath + "/");
-                    return;
-                } catch (IllegalArgumentException e) {
-                    response.sendRedirect(contextPath + "/logout?invalidUsername=true");
-                    return;
-                }
-            }
-        } else {
-            super.onAuthenticationSuccess(request, response, authentication);
-        }
-    }
-}

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

@@ -1,86 +0,0 @@
-package stirling.software.SPDF.config.security.saml2;
-
-import java.util.*;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.schema.XSBoolean;
-import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.saml.saml2.core.Assertion;
-import org.opensaml.saml.saml2.core.Attribute;
-import org.opensaml.saml.saml2.core.AttributeStatement;
-import org.opensaml.saml.saml2.core.AuthnStatement;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider.ResponseToken;
-import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication;
-import org.springframework.stereotype.Component;
-
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.model.User;
-
-@Component
-@Slf4j
-public class CustomSaml2ResponseAuthenticationConverter
-        implements Converter<ResponseToken, Saml2Authentication> {
-
-    private UserService userService;
-
-    public CustomSaml2ResponseAuthenticationConverter(UserService userService) {
-        this.userService = userService;
-    }
-
-    @Override
-    public Saml2Authentication convert(ResponseToken responseToken) {
-        // Extract the assertion from the response
-        Assertion assertion = responseToken.getResponse().getAssertions().get(0);
-
-        // Extract the NameID
-        String nameId = assertion.getSubject().getNameID().getValue();
-
-        Optional<User> userOpt = userService.findByUsernameIgnoreCase(nameId);
-        SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority("ROLE_USER");
-        if (userOpt.isPresent()) {
-            User user = userOpt.get();
-            if (user != null) {
-                simpleGrantedAuthority =
-                        new SimpleGrantedAuthority(userService.findRole(user).getAuthority());
-            }
-        }
-
-        // Extract the SessionIndexes
-        List<String> sessionIndexes = new ArrayList<>();
-        for (AuthnStatement authnStatement : assertion.getAuthnStatements()) {
-            sessionIndexes.add(authnStatement.getSessionIndex());
-        }
-
-        // Extract the Attributes
-        Map<String, List<Object>> attributes = extractAttributes(assertion);
-
-        // Create the custom principal
-        CustomSaml2AuthenticatedPrincipal principal =
-                new CustomSaml2AuthenticatedPrincipal(nameId, attributes, nameId, sessionIndexes);
-
-        // Create the Saml2Authentication
-        return new Saml2Authentication(
-                principal,
-                responseToken.getToken().getSaml2Response(),
-                Collections.singletonList(simpleGrantedAuthority));
-    }
-
-    private Map<String, List<Object>> extractAttributes(Assertion assertion) {
-        Map<String, List<Object>> attributes = new HashMap<>();
-        for (AttributeStatement attributeStatement : assertion.getAttributeStatements()) {
-            for (Attribute attribute : attributeStatement.getAttributes()) {
-                String attributeName = attribute.getName();
-                List<Object> values = new ArrayList<>();
-                for (XMLObject xmlObject : attribute.getAttributeValues()) {
-                    log.info("BOOL: " + ((XSBoolean) xmlObject).getValue());
-                    values.add(((XSString) xmlObject).getValue());
-                }
-                attributes.put(attributeName, values);
-            }
-        }
-        return attributes;
-    }
-}

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

@@ -11,19 +11,16 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class CustomHttpSessionListener implements HttpSessionListener {
 
-    private SessionPersistentRegistry sessionPersistentRegistry;
-
-    @Autowired
-    public CustomHttpSessionListener(SessionPersistentRegistry sessionPersistentRegistry) {
-        super();
-        this.sessionPersistentRegistry = sessionPersistentRegistry;
-    }
+    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
 
     @Override
-    public void sessionCreated(HttpSessionEvent se) {}
+    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

@@ -16,7 +16,6 @@ import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Component;
 
 import jakarta.transaction.Transactional;
-import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.model.SessionEntity;
 
 @Component
@@ -51,8 +50,6 @@ public class SessionPersistentRegistry implements SessionRegistry {
             principalName = ((UserDetails) principal).getUsername();
         } else if (principal instanceof OAuth2User) {
             principalName = ((OAuth2User) principal).getName();
-        } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
-            principalName = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
         } else if (principal instanceof String) {
             principalName = (String) principal;
         }
@@ -82,21 +79,11 @@ public class SessionPersistentRegistry implements SessionRegistry {
             principalName = ((UserDetails) principal).getUsername();
         } else if (principal instanceof OAuth2User) {
             principalName = ((OAuth2User) principal).getName();
-        } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
-            principalName = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
         } else if (principal instanceof String) {
             principalName = (String) principal;
         }
 
         if (principalName != null) {
-            // Clear old sessions for the principal (unsure if needed)
-            //            List<SessionEntity> existingSessions =
-            //                    sessionRepository.findByPrincipalName(principalName);
-            //            for (SessionEntity session : existingSessions) {
-            //                session.setExpired(true);
-            //                sessionRepository.save(session);
-            //            }
-
             SessionEntity sessionEntity = new SessionEntity();
             sessionEntity.setSessionId(sessionId);
             sessionEntity.setPrincipalName(principalName);

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,8 +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.service.PostHogService;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -35,17 +32,6 @@ public class CropController {
 
     private static final Logger logger = LoggerFactory.getLogger(CropController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    private final PostHogService postHogService;
-
-    @Autowired
-    public CropController(
-            CustomPDDocumentFactory pdfDocumentFactory, PostHogService postHogService) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-        this.postHogService = postHogService;
-    }
-
     @PostMapping(value = "/crop", consumes = "multipart/form-data")
     @Operation(
             summary = "Crops a PDF document",
@@ -54,8 +40,7 @@ public class CropController {
     public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm form) throws IOException {
         PDDocument sourceDocument = Loader.loadPDF(form.getFileInput().getBytes());
 
-        PDDocument newDocument =
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
+        PDDocument newDocument = new PDDocument();
 
         int totalPages = sourceDocument.getNumberOfPages();
 

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 =
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
+        PDDocument newDocument = new PDDocument();
         PDPage newPage = new PDPage(PDRectangle.A4);
         newDocument.addPage(newPage);
 

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

@@ -3,16 +3,16 @@ package stirling.software.SPDF.controller.api;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import org.apache.pdfbox.Loader;
 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 org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.service.PdfImageRemovalService;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -22,25 +22,18 @@ import stirling.software.SPDF.utils.WebResponseUtils;
  */
 @RestController
 @RequestMapping("/api/v1/general")
-@Tag(name = "General", description = "General APIs")
 public class PdfImageRemovalController {
 
     // Service for removing images from PDFs
-    private final PdfImageRemovalService pdfImageRemovalService;
-
-    private final CustomPDDocumentFactory pdfDocumentFactory;
+    @Autowired private PdfImageRemovalService pdfImageRemovalService;
 
     /**
      * Constructor for dependency injection of PdfImageRemovalService.
      *
      * @param pdfImageRemovalService The service used for removing images from PDFs.
      */
-    @Autowired
-    public PdfImageRemovalController(
-            PdfImageRemovalService pdfImageRemovalService,
-            CustomPDDocumentFactory pdfDocumentFactory) {
+    public PdfImageRemovalController(PdfImageRemovalService pdfImageRemovalService) {
         this.pdfImageRemovalService = pdfImageRemovalService;
-        this.pdfDocumentFactory = pdfDocumentFactory;
     }
 
     /**
@@ -60,8 +53,14 @@ public class PdfImageRemovalController {
             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);
+
+        MultipartFile pdf = file.getFileInput();
+
+        // Convert the MultipartFile to a byte array
+        byte[] pdfBytes = pdf.getBytes();
+
+        // Load the PDF document from the byte array
+        PDDocument document = Loader.loadPDF(pdfBytes);
 
         // Remove images from the PDF document using the service
         PDDocument modifiedDocument = pdfImageRemovalService.removeImagesFromPdf(document);
@@ -75,8 +74,7 @@ public class PdfImageRemovalController {
 
         // Generate a new filename for the modified PDF
         String mergedFileName =
-                file.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
-                        + "_removed_images.pdf";
+                pdf.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());
-        PDDocument outputDocument =
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
+        Map<String, PDRectangle> sizeMap = new HashMap<>();
+        // Add A0 - A10
+        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 ("KEEP".equals(targetPDRectangle)) {
-            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/SettingsController.java

@@ -1,38 +0,0 @@
-package stirling.software.SPDF.controller.api;
-
-import java.io.IOException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.GeneralUtils;
-
-@Controller
-@Tag(name = "Settings", description = "Settings APIs")
-@RequestMapping("/api/v1/settings")
-@Hidden
-public class SettingsController {
-
-    @Autowired ApplicationProperties applicationProperties;
-
-    @PostMapping("/update-enable-analytics")
-    @Hidden
-    public ResponseEntity<String> updateApiKey(@RequestBody Boolean enabled) throws IOException {
-        if (!"undefined".equals(applicationProperties.getSystem().getEnableAnalytics())) {
-            return ResponseEntity.status(HttpStatus.ALREADY_REPORTED)
-                    .body(
-                            "Setting has already been set, To adjust please edit /config/settings.yml");
-        }
-        GeneralUtils.saveKeyToConfig("system.enableAnalytics", String.valueOf(enabled), false);
-        applicationProperties.getSystem().setEnableAnalytics(String.valueOf(enabled));
-
-        return ResponseEntity.ok("Updated");
-    }
-}

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,9 +51,11 @@ 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(
+                pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
         if (!pageNumbers.contains(totalPages - 1)) {
             // Create a mutable ArrayList so we can add to it
             pageNumbers = new ArrayList<>(pageNumbers);
@@ -74,8 +70,7 @@ public class SplitPDFController {
         List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
         int previousPageNumber = 0;
         for (int splitPoint : pageNumbers) {
-            try (PDDocument splitDocument =
-                    pdfDocumentFactory.createNewDocumentBasedOnOldDocument(document)) {
+            try (PDDocument splitDocument = new PDDocument()) {
                 for (int i = previousPageNumber; i <= splitPoint; i++) {
                     PDPage page = document.getPage(i);
                     splitDocument.addPage(page);
@@ -84,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,298 +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.model.PdfMetadata;
-import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
-import stirling.software.SPDF.service.PdfMetadataService;
-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());
-
-        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 =
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
+        PDDocument currentDoc = new PDDocument();
         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 =
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
+        PDDocument currentDoc = new PDDocument();
         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 =
-                    pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
+            PDDocument currentDoc = new PDDocument();
             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 =
-                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
+        PDDocument newDocument = new PDDocument();
         PDPage newPage = new PDPage(new PDRectangle(maxWidth, totalHeight));
         newDocument.addPage(newPage);
 

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

@@ -30,9 +30,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.model.Role;
@@ -42,7 +40,6 @@ import stirling.software.SPDF.model.api.user.UsernameAndPass;
 @Controller
 @Tag(name = "User", description = "User APIs")
 @RequestMapping("/api/v1/user")
-@Slf4j
 public class UserController {
 
     @Autowired private UserService userService;
@@ -194,11 +191,13 @@ public class UserController {
         Map<String, String[]> paramMap = request.getParameterMap();
         Map<String, String> updates = new HashMap<>();
 
+        System.out.println("Received parameter map: " + paramMap);
+
         for (Map.Entry<String, String[]> entry : paramMap.entrySet()) {
             updates.put(entry.getKey(), entry.getValue()[0]);
         }
 
-        log.debug("Processed updates: " + updates);
+        System.out.println("Processed updates: " + updates);
 
         // Assuming you have a method in userService to update the settings for a user
         userService.updateUserSettings(principal.getName(), updates);
@@ -209,7 +208,7 @@ public class UserController {
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/saveUser")
     public RedirectView saveUser(
-            @RequestParam(name = "username", required = true) String username,
+            @RequestParam String username,
             @RequestParam(name = "password", required = false) String password,
             @RequestParam(name = "role") String role,
             @RequestParam(name = "authType") String authType,
@@ -337,8 +336,6 @@ public class UserController {
                     userNameP = ((UserDetails) principal).getUsername();
                 } else if (principal instanceof OAuth2User) {
                     userNameP = ((OAuth2User) principal).getName();
-                } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
-                    userNameP = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
                 } else if (principal instanceof String) {
                     userNameP = (String) principal;
                 }

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

@@ -5,32 +5,26 @@ import org.springframework.beans.factory.annotation.Qualifier;
 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 stirling.software.SPDF.model.api.GeneralFile;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.FileToPdf;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
-// @RestController
-// @Tag(name = "Convert", description = "Convert APIs")
-// @RequestMapping("/api/v1/convert")
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 public class ConvertBookToPDFController {
 
-    private final boolean bookAndHtmlFormatsInstalled;
-
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
     @Autowired
-    public ConvertBookToPDFController(
-            CustomPDDocumentFactory pdfDocumentFactory,
-            @Qualifier("bookAndHtmlFormatsInstalled") boolean bookAndHtmlFormatsInstalled) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-        this.bookAndHtmlFormatsInstalled = bookAndHtmlFormatsInstalled;
-    }
+    @Qualifier("bookAndHtmlFormatsInstalled")
+    private boolean bookAndHtmlFormatsInstalled;
 
     @PostMapping(consumes = "multipart/form-data", value = "/book/pdf")
     @Operation(
@@ -66,8 +60,6 @@ public class ConvertBookToPDFController {
         }
         byte[] pdfBytes = FileToPdf.convertBookTypeToPdf(fileInput.getBytes(), originalFilename);
 
-        pdfBytes = pdfDocumentFactory.createNewBytesBasedOnOldDocument(pdfBytes);
-
         String outputFilename =
                 originalFilename.replaceFirst("[.][^.]+$", "")
                         + ".pdf"; // Remove file extension and append .pdf

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

@@ -14,7 +14,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.converters.HTMLToPdfRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.FileToPdf;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -23,17 +22,9 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertHtmlToPDF {
 
-    private final boolean bookAndHtmlFormatsInstalled;
-
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
     @Autowired
-    public ConvertHtmlToPDF(
-            CustomPDDocumentFactory pdfDocumentFactory,
-            @Qualifier("bookAndHtmlFormatsInstalled") boolean bookAndHtmlFormatsInstalled) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-        this.bookAndHtmlFormatsInstalled = bookAndHtmlFormatsInstalled;
-    }
+    @Qualifier("bookAndHtmlFormatsInstalled")
+    private boolean bookAndHtmlFormatsInstalled;
 
     @PostMapping(consumes = "multipart/form-data", value = "/html/pdf")
     @Operation(
@@ -61,8 +52,6 @@ public class ConvertHtmlToPDF {
                         originalFilename,
                         bookAndHtmlFormatsInstalled);
 
-        pdfBytes = pdfDocumentFactory.createNewBytesBasedOnOldDocument(pdfBytes);
-
         String outputFilename =
                 originalFilename.replaceFirst("[.][^.]+$", "")
                         + ".pdf"; // Remove file extension and append .pdf

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

@@ -16,7 +16,6 @@ import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.rendering.ImageType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -31,7 +30,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.CheckProgramInstall;
 import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
@@ -45,13 +43,6 @@ public class ConvertImgPDFController {
 
     private static final Logger logger = LoggerFactory.getLogger(ConvertImgPDFController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public ConvertImgPDFController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/pdf/img")
     @Operation(
             summary = "Convert PDF to image(s)",
@@ -82,7 +73,7 @@ public class ConvertImgPDFController {
         result =
                 PdfUtils.convertFromPdf(
                         pdfBytes,
-                        "webp".equalsIgnoreCase(imageFormat) ? "png" : imageFormat.toUpperCase(),
+                        imageFormat.equalsIgnoreCase("webp") ? "png" : imageFormat.toUpperCase(),
                         colorTypeResult,
                         singleImage,
                         Integer.valueOf(dpi),
@@ -90,9 +81,9 @@ public class ConvertImgPDFController {
         if (result == null || result.length == 0) {
             logger.error("resultant bytes for {} is null, error converting ", filename);
         }
-        if ("webp".equalsIgnoreCase(imageFormat) && !CheckProgramInstall.isPythonAvailable()) {
+        if (imageFormat.equalsIgnoreCase("webp") && !CheckProgramInstall.isPythonAvailable()) {
             throw new IOException("Python is not installed. Required for WebP conversion.");
-        } else if ("webp".equalsIgnoreCase(imageFormat)
+        } else if (imageFormat.equalsIgnoreCase("webp")
                 && CheckProgramInstall.isPythonAvailable()) {
             // Write the output stream to a temp file
             Path tempFile = Files.createTempFile("temp_png", ".png");
@@ -187,8 +178,7 @@ public class ConvertImgPDFController {
         boolean autoRotate = request.isAutoRotate();
 
         // Convert the file to PDF and get the resulting bytes
-        byte[] bytes =
-                PdfUtils.imageToPdf(file, fitOption, autoRotate, colorType, pdfDocumentFactory);
+        byte[] bytes = PdfUtils.imageToPdf(file, fitOption, autoRotate, colorType);
         return WebResponseUtils.bytesToWebResponse(
                 bytes,
                 file[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_converted.pdf");

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

@@ -24,7 +24,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.GeneralFile;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.FileToPdf;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -33,17 +32,9 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertMarkdownToPdf {
 
-    private final boolean bookAndHtmlFormatsInstalled;
-
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
     @Autowired
-    public ConvertMarkdownToPdf(
-            CustomPDDocumentFactory pdfDocumentFactory,
-            @Qualifier("bookAndHtmlFormatsInstalled") boolean bookAndHtmlFormatsInstalled) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-        this.bookAndHtmlFormatsInstalled = bookAndHtmlFormatsInstalled;
-    }
+    @Qualifier("bookAndHtmlFormatsInstalled")
+    private boolean bookAndHtmlFormatsInstalled;
 
     @PostMapping(consumes = "multipart/form-data", value = "/markdown/pdf")
     @Operation(
@@ -82,7 +73,7 @@ public class ConvertMarkdownToPdf {
                         htmlContent.getBytes(),
                         "converted.html",
                         bookAndHtmlFormatsInstalled);
-        pdfBytes = pdfDocumentFactory.createNewBytesBasedOnOldDocument(pdfBytes);
+
         String outputFilename =
                 originalFilename.replaceFirst("[.][^.]+$", "")
                         + ".pdf"; // Remove file extension and append .pdf

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

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.controller.api.converters;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -9,8 +8,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-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;
@@ -23,7 +20,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.GeneralFile;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -33,7 +29,7 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertOfficeController {
 
-    public File convertToPdf(MultipartFile inputFile) throws IOException, InterruptedException {
+    public byte[] convertToPdf(MultipartFile inputFile) throws IOException, InterruptedException {
         // Check for valid file extension
         String originalFilename = Filenames.toSimpleFileName(inputFile.getOriginalFilename());
         if (originalFilename == null
@@ -66,10 +62,12 @@ public class ConvertOfficeController {
                             .runCommandWithOutputHandling(command);
 
             // Read the converted PDF file
-            return tempOutputFile.toFile();
+            byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
+            return pdfBytes;
         } finally {
             // Clean up the temporary files
             if (tempInputFile != null) Files.deleteIfExists(tempInputFile);
+            Files.deleteIfExists(tempOutputFile);
         }
     }
 
@@ -78,13 +76,6 @@ public class ConvertOfficeController {
         return fileExtension.matches(extensionPattern);
     }
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public ConvertOfficeController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/file/pdf")
     @Operation(
             summary = "Convert a file to a PDF using LibreOffice",
@@ -95,18 +86,12 @@ public class ConvertOfficeController {
         MultipartFile inputFile = request.getFileInput();
         // unused but can start server instance if startup time is to long
         // LibreOfficeListener.getInstance().start();
-        File file = null;
-        try {
-            file = convertToPdf(inputFile);
 
-            PDDocument doc = pdfDocumentFactory.load(file);
-            return WebResponseUtils.pdfDocToWebResponse(
-                    doc,
-                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                    .replaceFirst("[.][^.]+$", "")
-                            + "_convertedToPDF.pdf");
-        } finally {
-            if (file != null) file.delete();
-        }
+        byte[] pdfByteArray = convertToPdf(inputFile);
+        return WebResponseUtils.bytesToWebResponse(
+                pdfByteArray,
+                Filenames.toSimpleFileName(inputFile.getOriginalFilename())
+                                .replaceFirst("[.][^.]+$", "")
+                        + "_convertedToPDF.pdf");
     }
 }

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

@@ -11,19 +11,22 @@ import org.springframework.beans.factory.annotation.Qualifier;
 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 stirling.software.SPDF.model.api.converters.PdfToBookRequest;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
-// @RestController
-// @Tag(name = "Convert", description = "Convert APIs")
-// @RequestMapping("/api/v1/convert")
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 public class ConvertPDFToBookController {
 
     @Autowired

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

@@ -1,15 +1,22 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.apache.pdfbox.pdmodel.interactive.form.PDField;
+import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -46,7 +53,32 @@ public class ConvertPDFToPDFA {
         // Convert MultipartFile to byte[]
         byte[] pdfBytes = inputFile.getBytes();
 
-        // Save the uploaded file to a temporary location
+        // Load the PDF document
+        PDDocument document = Loader.loadPDF(pdfBytes);
+
+        // Get the document catalog
+        PDDocumentCatalog catalog = document.getDocumentCatalog();
+
+        // Get the AcroForm
+        PDAcroForm acroForm = catalog.getAcroForm();
+        if (acroForm != null) {
+            // Remove signature fields safely
+            List<PDField> fieldsToRemove =
+                    acroForm.getFields().stream()
+                            .filter(field -> field instanceof PDSignatureField)
+                            .collect(Collectors.toList());
+
+            if (!fieldsToRemove.isEmpty()) {
+                acroForm.flatten(fieldsToRemove, false);
+
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                document.save(baos);
+                pdfBytes = baos.toByteArray();
+            }
+        }
+        document.close();
+
+        // Save the uploaded (and possibly modified) file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
         try (OutputStream outputStream = new FileOutputStream(tempInputFile.toFile())) {
             outputStream.write(pdfBytes);
@@ -55,41 +87,32 @@ public class ConvertPDFToPDFA {
         // Prepare the output file path
         Path tempOutputFile = Files.createTempFile("output_", ".pdf");
 
-        // Prepare the ghostscript command
+        // Prepare the OCRmyPDF command
         List<String> command = new ArrayList<>();
-        command.add("gs");
-        command.add("-dPDFA=" + ("pdfa".equals(outputFormat) ? "2" : "1"));
-        command.add("-dNOPAUSE");
-        command.add("-dBATCH");
-        command.add("-sColorConversionStrategy=sRGB");
-        command.add("-sDEVICE=pdfwrite");
-        command.add("-dPDFACompatibilityPolicy=2");
-        command.add("-o");
-        command.add(tempOutputFile.toString());
+        command.add("ocrmypdf");
+        command.add("--skip-text");
+        command.add("--tesseract-timeout=0");
+        command.add("--output-type");
+        command.add(outputFormat.toString());
         command.add(tempInputFile.toString());
+        command.add(tempOutputFile.toString());
 
         ProcessExecutorResult returnCode =
-                ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
                         .runCommandWithOutputHandling(command);
 
-        if (returnCode.getRc() != 0) {
-            logger.info(
-                    outputFormat + " conversion failed with return code: " + returnCode.getRc());
-        }
+        // Read the optimized PDF file
+        byte[] optimizedPdfBytes = Files.readAllBytes(tempOutputFile);
 
-        try {
-            byte[] pdfBytesOutput = Files.readAllBytes(tempOutputFile);
-            // Return the optimized PDF as a response
-            String outputFilename =
-                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                    .replaceFirst("[.][^.]+$", "")
-                            + "_PDFA.pdf";
-            return WebResponseUtils.bytesToWebResponse(
-                    pdfBytesOutput, outputFilename, MediaType.APPLICATION_PDF);
-        } finally {
-            // Clean up the temporary files
-            Files.deleteIfExists(tempInputFile);
-            Files.deleteIfExists(tempOutputFile);
-        }
+        // Clean up the temporary files
+        Files.deleteIfExists(tempInputFile);
+        Files.deleteIfExists(tempOutputFile);
+
+        // Return the optimized PDF as a response
+        String outputFilename =
+                Filenames.toSimpleFileName(inputFile.getOriginalFilename())
+                                .replaceFirst("[.][^.]+$", "")
+                        + "_PDFA.pdf";
+        return WebResponseUtils.bytesToWebResponse(optimizedPdfBytes, outputFilename);
     }
 }

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

@@ -6,10 +6,6 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +16,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
@@ -31,15 +26,6 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertWebsiteToPDF {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConvertWebsiteToPDF.class);
-
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public ConvertWebsiteToPDF(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/url/pdf")
     @Operation(
             summary = "Convert a URL to a PDF",
@@ -60,12 +46,12 @@ public class ConvertWebsiteToPDF {
         }
 
         Path tempOutputFile = null;
-        PDDocument doc = null;
+        byte[] pdfBytes;
         try {
             // Prepare the output file path
             tempOutputFile = Files.createTempFile("output_", ".pdf");
 
-            // Prepare the WeasyPrint command
+            // Prepare the OCRmyPDF command
             List<String> command = new ArrayList<>();
             command.add("weasyprint");
             command.add(URL);
@@ -75,23 +61,16 @@ public class ConvertWebsiteToPDF {
                     ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT)
                             .runCommandWithOutputHandling(command);
 
-            // Load the PDF using pdfDocumentFactory
-            doc = pdfDocumentFactory.load(tempOutputFile.toFile());
-
-            // Convert URL to a safe filename
-            String outputFilename = convertURLToFileName(URL);
-
-            return WebResponseUtils.pdfDocToWebResponse(doc, outputFilename);
+            // Read the optimized PDF file
+            pdfBytes = Files.readAllBytes(tempOutputFile);
         } finally {
-
-            if (tempOutputFile != null) {
-                try {
-                    Files.deleteIfExists(tempOutputFile);
-                } catch (IOException e) {
-                    logger.error("Error deleting temporary output file", e);
-                }
-            }
+            // Clean up the temporary files
+            Files.deleteIfExists(tempOutputFile);
         }
+        // Convert URL to a safe filename
+        String outputFilename = convertURLToFileName(URL);
+
+        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
     }
 
     private String convertURLToFileName(String url) {

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

@@ -30,13 +30,13 @@ import stirling.software.SPDF.model.api.extract.PDFFilePage;
 @RestController
 @RequestMapping("/api/v1/convert")
 @Tag(name = "Convert", description = "Convert APIs")
-public class ExtractCSVController {
+public class ExtractController {
 
     private static final Logger logger = LoggerFactory.getLogger(CropController.class);
 
     @PostMapping(value = "/pdf/csv", consumes = "multipart/form-data")
     @Operation(
-            summary = "Extracts a CSV document from a PDF",
+            summary = "Extracts a PDF document to csv",
             description =
                     "This operation takes an input PDF file and returns CSV file of whole page. Input:PDF Output:CSV Type:SISO")
     public ResponseEntity<String> PdfToCsv(@ModelAttribute PDFFilePage form) throws Exception {

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

@@ -12,11 +12,11 @@ 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.rendering.PDFRenderer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -38,7 +38,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.misc.AutoSplitPdfRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -50,13 +49,6 @@ public class AutoSplitPdfController {
     private static final String QR_CONTENT = "https://github.com/Stirling-Tools/Stirling-PDF";
     private static final String QR_CONTENT_OLD = "https://github.com/Frooodle/Stirling-PDF";
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public AutoSplitPdfController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(value = "/auto-split-pdf", consumes = "multipart/form-data")
     @Operation(
             summary = "Auto split PDF pages into separate documents",
@@ -67,93 +59,73 @@ public class AutoSplitPdfController {
         MultipartFile file = request.getFileInput();
         boolean duplexMode = request.isDuplexMode();
 
-        PDDocument document = null;
+        PDDocument document = Loader.loadPDF(file.getBytes());
+        PDFRenderer pdfRenderer = new PDFRenderer(document);
+        pdfRenderer.setSubsamplingAllowed(true);
         List<PDDocument> splitDocuments = new ArrayList<>();
-        Path zipFile = null;
-        byte[] data = null;
+        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
 
-        try {
-            document = pdfDocumentFactory.load(file.getInputStream());
-            PDFRenderer pdfRenderer = new PDFRenderer(document);
-            pdfRenderer.setSubsamplingAllowed(true);
-
-            for (int page = 0; page < document.getNumberOfPages(); ++page) {
-                BufferedImage bim = pdfRenderer.renderImageWithDPI(page, 150);
-                String result = decodeQRCode(bim);
-                if ((QR_CONTENT.equals(result) || QR_CONTENT_OLD.equals(result)) && page != 0) {
-                    splitDocuments.add(new PDDocument());
-                }
-
-                if (!splitDocuments.isEmpty()
-                        && !QR_CONTENT.equals(result)
-                        && !QR_CONTENT_OLD.equals(result)) {
-                    splitDocuments.get(splitDocuments.size() - 1).addPage(document.getPage(page));
-                } else if (page == 0) {
-                    PDDocument firstDocument = new PDDocument();
-                    firstDocument.addPage(document.getPage(page));
-                    splitDocuments.add(firstDocument);
-                }
-
-                // If duplexMode is true and current page is a divider, then skip next page
-                if (duplexMode && (QR_CONTENT.equals(result) || QR_CONTENT_OLD.equals(result))) {
-                    page++;
-                }
+        for (int page = 0; page < document.getNumberOfPages(); ++page) {
+            BufferedImage bim = pdfRenderer.renderImageWithDPI(page, 150);
+            String result = decodeQRCode(bim);
+            if ((QR_CONTENT.equals(result) || QR_CONTENT_OLD.equals(result)) && page != 0) {
+                splitDocuments.add(new PDDocument());
             }
 
-            // Remove split documents that have no pages
-            splitDocuments.removeIf(pdDocument -> pdDocument.getNumberOfPages() == 0);
-
-            zipFile = Files.createTempFile("split_documents", ".zip");
-            String filename =
-                    Filenames.toSimpleFileName(file.getOriginalFilename())
-                            .replaceFirst("[.][^.]+$", "");
-
-            try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
-                for (int i = 0; i < splitDocuments.size(); i++) {
-                    String fileName = filename + "_" + (i + 1) + ".pdf";
-                    PDDocument splitDocument = splitDocuments.get(i);
-
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    splitDocument.save(baos);
-                    byte[] pdf = baos.toByteArray();
-
-                    ZipEntry pdfEntry = new ZipEntry(fileName);
-                    zipOut.putNextEntry(pdfEntry);
-                    zipOut.write(pdf);
-                    zipOut.closeEntry();
-                }
+            if (!splitDocuments.isEmpty()
+                    && !QR_CONTENT.equals(result)
+                    && !QR_CONTENT_OLD.equals(result)) {
+                splitDocuments.get(splitDocuments.size() - 1).addPage(document.getPage(page));
+            } else if (page == 0) {
+                PDDocument firstDocument = new PDDocument();
+                firstDocument.addPage(document.getPage(page));
+                splitDocuments.add(firstDocument);
             }
 
-            data = Files.readAllBytes(zipFile);
-
-            return WebResponseUtils.bytesToWebResponse(
-                    data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
-        } finally {
-            // Clean up resources
-            if (document != null) {
-                try {
-                    document.close();
-                } catch (IOException e) {
-                    logger.error("Error closing main PDDocument", e);
-                }
-            }
-
-            for (PDDocument splitDoc : splitDocuments) {
-                try {
-                    splitDoc.close();
-                } catch (IOException e) {
-                    logger.error("Error closing split PDDocument", e);
-                }
-            }
-
-            if (zipFile != null) {
-                try {
-                    Files.deleteIfExists(zipFile);
-                } catch (IOException e) {
-                    logger.error("Error deleting temporary zip file", e);
-                }
+            // If duplexMode is true and current page is a divider, then skip next page
+            if (duplexMode && (QR_CONTENT.equals(result) || QR_CONTENT_OLD.equals(result))) {
+                page++;
             }
         }
+
+        // Remove split documents that have no pages
+        splitDocuments.removeIf(pdDocument -> pdDocument.getNumberOfPages() == 0);
+
+        for (PDDocument splitDocument : splitDocuments) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            splitDocument.save(baos);
+            splitDocumentsBoas.add(baos);
+            splitDocument.close();
+        }
+
+        document.close();
+
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
+        byte[] data;
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+                String fileName = filename + "_" + (i + 1) + ".pdf";
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                byte[] pdf = baos.toByteArray();
+
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+            }
+        } catch (Exception e) {
+            logger.error("exception", e);
+        } finally {
+            data = Files.readAllBytes(zipFile);
+            Files.deleteIfExists(zipFile);
+        }
+
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
     }
 
     private static String decodeQRCode(BufferedImage bufferedImage) {

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

@@ -16,7 +16,6 @@ import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -31,7 +30,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.misc.RemoveBlankPagesRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -42,13 +40,6 @@ public class BlankPageController {
 
     private static final Logger logger = LoggerFactory.getLogger(BlankPageController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public BlankPageController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/remove-blanks")
     @Operation(
             summary = "Remove blank pages from a PDF file",
@@ -133,7 +124,7 @@ public class BlankPageController {
 
     public void createZipEntry(ZipOutputStream zos, List<PDPage> pages, String entryName)
             throws IOException {
-        try (PDDocument document = pdfDocumentFactory.createNewDocument()) {
+        try (PDDocument document = new PDDocument()) {
 
             for (PDPage page : pages) {
                 document.addPage(page);

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

@@ -20,7 +20,6 @@ import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,7 +32,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
@@ -46,13 +44,6 @@ public class CompressController {
 
     private static final Logger logger = LoggerFactory.getLogger(CompressController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public CompressController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/compress-pdf")
     @Operation(
             summary = "Optimize PDF file",
@@ -267,7 +258,7 @@ public class CompressController {
             }
             // Read the optimized PDF file
             pdfBytes = Files.readAllBytes(tempOutputFile);
-            Path finalFile = tempOutputFile;
+
             // Check if optimized file is larger than the original
             if (pdfBytes.length > inputFileSize) {
                 // Log the occurrence
@@ -275,15 +266,14 @@ public class CompressController {
                         "Optimized file is larger than the original. Returning the original file instead.");
 
                 // Read the original file again
-                finalFile = tempInputFile;
+                pdfBytes = Files.readAllBytes(tempInputFile);
             }
             // Return the optimized PDF as a response
             String outputFilename =
                     Filenames.toSimpleFileName(inputFile.getOriginalFilename())
                                     .replaceFirst("[.][^.]+$", "")
                             + "_Optimized.pdf";
-            return WebResponseUtils.pdfDocToWebResponse(
-                    pdfDocumentFactory.load(finalFile.toFile()), outputFilename);
+            return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
 
         } finally {
             // Clean up the temporary files

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

@@ -60,6 +60,8 @@ public class ExtractImagesController {
         MultipartFile file = request.getFileInput();
         String format = request.getFormat();
         boolean allowDuplicates = request.isAllowDuplicates();
+        System.out.println(
+                System.currentTimeMillis() + " file=" + file.getName() + ", format=" + format);
         PDDocument document = Loader.loadPDF(file.getBytes());
 
         // Determine if multithreading should be used based on PDF size or number of pages
@@ -88,35 +90,22 @@ public class ExtractImagesController {
             // Iterate over each page
             for (int pgNum = 0; pgNum < document.getPages().getCount(); pgNum++) {
                 PDPage page = document.getPage(pgNum);
+                int pageNum = document.getPages().indexOf(page) + 1;
+                // Submit a task for processing each page
                 Future<Void> future =
                         executor.submit(
                                 () -> {
-                                    // Use the page number directly from the iterator, so no need to
-                                    // calculate manually
-                                    int pageNum = document.getPages().indexOf(page) + 1;
-
-                                    try {
-                                        // Call the image extraction method for each page
-                                        extractImagesFromPage(
-                                                page,
-                                                format,
-                                                filename,
-                                                pageNum,
-                                                processedImages,
-                                                zos,
-                                                allowDuplicates);
-                                    } catch (IOException e) {
-                                        // Log the error and continue processing other pages
-                                        logger.error(
-                                                "Error extracting images from page {}: {}",
-                                                pageNum,
-                                                e.getMessage());
-                                    }
-
-                                    return null; // Callable requires a return type
+                                    extractImagesFromPage(
+                                            page,
+                                            format,
+                                            filename,
+                                            pageNum,
+                                            processedImages,
+                                            zos,
+                                            allowDuplicates);
+                                    return null;
                                 });
 
-                // Add the Future object to the list to track completion
                 futures.add(future);
             }
 

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

@@ -14,7 +14,6 @@ import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,8 +25,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.misc.FlattenRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
+import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -37,13 +37,6 @@ public class FlattenController {
 
     private static final Logger logger = LoggerFactory.getLogger(FlattenController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public FlattenController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/flatten")
     @Operation(
             summary = "Flatten PDF form fields or full page",
@@ -53,6 +46,7 @@ public class FlattenController {
         MultipartFile file = request.getFileInput();
 
         PDDocument document = Loader.loadPDF(file.getBytes());
+        PdfMetadata metadata = PdfUtils.extractMetadataFromPdf(document);
         Boolean flattenOnlyForms = request.getFlattenOnlyForms();
 
         if (Boolean.TRUE.equals(flattenOnlyForms)) {
@@ -66,8 +60,7 @@ public class FlattenController {
             // flatten whole page aka convert each page to image and readd it (making text
             // unselectable)
             PDFRenderer pdfRenderer = new PDFRenderer(document);
-            PDDocument newDocument =
-                    pdfDocumentFactory.createNewDocumentBasedOnOldDocument(document);
+            PDDocument newDocument = new PDDocument();
             int numPages = document.getNumberOfPages();
             for (int i = 0; i < numPages; i++) {
                 try {
@@ -87,6 +80,7 @@ public class FlattenController {
                     logger.error("exception", e);
                 }
             }
+            PdfUtils.setMetadataToPdf(newDocument, metadata);
             return WebResponseUtils.pdfDocToWebResponse(
                     newDocument, Filenames.toSimpleFileName(file.getOriginalFilename()));
         }

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

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.controller.api.misc;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -29,7 +28,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.api.misc.ProcessPdfWithOcrRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -54,13 +52,6 @@ public class OCRController {
                 .collect(Collectors.toList());
     }
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public OCRController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/ocr-pdf")
     @Operation(
             summary = "Process a PDF file with OCR",
@@ -184,7 +175,7 @@ public class OCRController {
                 tempOutputFile = tempPdfWithoutImages;
             }
             // Read the OCR processed PDF file
-            byte[] pdfBytes = pdfDocumentFactory.loadToBytes(tempOutputFile.toFile());
+            byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
 
             // Return the OCR processed PDF as a response
             String outputFilename =
@@ -205,13 +196,7 @@ public class OCRController {
                     // Add PDF file to the zip
                     ZipEntry pdfEntry = new ZipEntry(outputFilename);
                     zipOut.putNextEntry(pdfEntry);
-                    try (ByteArrayInputStream pdfInputStream = new ByteArrayInputStream(pdfBytes)) {
-                        byte[] buffer = new byte[1024];
-                        int length;
-                        while ((length = pdfInputStream.read(buffer)) != -1) {
-                            zipOut.write(buffer, 0, length);
-                        }
-                    }
+                    Files.copy(tempOutputFile, zipOut);
                     zipOut.closeEntry();
 
                     // Add text file to the zip

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

@@ -4,7 +4,6 @@ import java.io.IOException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -18,7 +17,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.misc.OverlayImageRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -29,13 +27,6 @@ public class OverlayImageController {
 
     private static final Logger logger = LoggerFactory.getLogger(OverlayImageController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public OverlayImageController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/add-image")
     @Operation(
             summary = "Overlay image onto a PDF file",
@@ -50,9 +41,7 @@ public class OverlayImageController {
         try {
             byte[] pdfBytes = pdfFile.getBytes();
             byte[] imageBytes = imageFile.getBytes();
-            byte[] result =
-                    PdfUtils.overlayImage(
-                            pdfDocumentFactory, pdfBytes, imageBytes, x, y, everyPage);
+            byte[] result = PdfUtils.overlayImage(pdfBytes, imageBytes, x, y, everyPage);
 
             return WebResponseUtils.bytesToWebResponse(
                     result,

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

@@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -12,7 +13,6 @@ import org.apache.pdfbox.pdmodel.font.PDType1Font;
 import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -26,7 +26,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.misc.AddPageNumbersRequest;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -37,13 +36,6 @@ public class PageNumbersController {
 
     private static final Logger logger = LoggerFactory.getLogger(PageNumbersController.class);
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public PageNumbersController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(value = "/add-page-numbers", consumes = "multipart/form-data")
     @Operation(
             summary = "Add page numbers to a PDF document",
@@ -51,7 +43,6 @@ public class PageNumbersController {
                     "This operation takes an input PDF file and adds page numbers to it. Input:PDF Output:PDF Type:SISO")
     public ResponseEntity<byte[]> addPageNumbers(@ModelAttribute AddPageNumbersRequest request)
             throws IOException {
-
         MultipartFile file = request.getFileInput();
         String customMargin = request.getCustomMargin();
         int position = request.getPosition();
@@ -60,9 +51,8 @@ public class PageNumbersController {
         String customText = request.getCustomText();
         int pageNumber = startingNumber;
         byte[] fileBytes = file.getBytes();
-        PDDocument document = pdfDocumentFactory.load(fileBytes);
-        float font_size = request.getFontSize();
-        String font_type = request.getFontType();
+        PDDocument document = Loader.loadPDF(fileBytes);
+
         float marginFactor;
         switch (customMargin.toLowerCase()) {
             case "small":
@@ -83,7 +73,7 @@ public class PageNumbersController {
                 break;
         }
 
-        float fontSize = font_size;
+        float fontSize = 12.0f;
         if (pagesToNumber == null || pagesToNumber.length() == 0) {
             pagesToNumber = "all";
         }
@@ -141,20 +131,7 @@ public class PageNumbersController {
                     new PDPageContentStream(
                             document, page, PDPageContentStream.AppendMode.APPEND, true, true);
             contentStream.beginText();
-            switch (font_type.toLowerCase()) {
-                case "helvetica":
-                    contentStream.setFont(
-                            new PDType1Font(Standard14Fonts.FontName.HELVETICA), fontSize);
-                    break;
-                case "courier":
-                    contentStream.setFont(
-                            new PDType1Font(Standard14Fonts.FontName.COURIER), fontSize);
-                    break;
-                case "times":
-                    contentStream.setFont(
-                            new PDType1Font(Standard14Fonts.FontName.TIMES_ROMAN), fontSize);
-                    break;
-            }
+            contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), fontSize);
             contentStream.newLineAtOffset(x, y);
             contentStream.showText(text);
             contentStream.endText();