Update 3rd Party Licenses

Signed-off-by: stirlingbot[bot] <stirlingbot[bot]@users.noreply.github.com>

.github/config/.files.yaml

@@ -30,3 +30,9 @@ project: &project
   - frontend/**
   - docker/**
   - testing/**
+
+frontend: &frontend
+  - frontend/**
+  - .github/workflows/testdriver.yml
+  - testing/**
+  - docker/**

.github/workflows/testdriver.yml

@@ -116,8 +116,25 @@ jobs:
             docker-compose up -d
           EOF
 
+  files-changed:
+    if: always()
+    name: detect what files changed
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    outputs:
+      frontend: ${{ steps.changes.outputs.frontend }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Check for file changes
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        id: changes
+        with:
+          filters: ".github/config/.files.yaml"
+
   test:
-    needs: deploy
+    if: needs.files-changed.outputs.frontend == 'true'
+    needs: [deploy, files-changed]
     runs-on: ubuntu-latest
 
     steps:
@@ -132,12 +149,14 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           cache: 'npm'
+          cache-dependency-path: frontend/package-lock.json
 
       - name: Run TestDriver.ai
         uses: testdriverai/action@f0d0f45fdd684db628baa843fe9313f3ca3a8aa8 #1.1.3
         with:
           key: ${{secrets.TESTDRIVER_API_KEY}}
           prerun: |
+            cd frontend
             npm install
             npm run build
             npm install dashcam-chrome --save
@@ -167,6 +186,7 @@ jobs:
           sudo chmod 600 ../private.key
 
       - name: Cleanup deployment
+        if: always()
         run: |
           ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << EOF
             cd /stirling/test-${{ github.sha }}
@@ -174,3 +194,4 @@ jobs:
             cd /stirling
             rm -rf test-${{ github.sha }}
           EOF
+        continue-on-error: true # Ensure cleanup runs even if previous steps fail

.gitignore

@@ -200,3 +200,6 @@ id_ed25519.pub
 
 # node_modules
 node_modules/
+
+# weasyPrint
+**/LOCAL_APPDATA_FONTCONFIG_CACHE/**

DATABASE.md

@@ -5,7 +5,7 @@
 The newly introduced feature enhances the application with robust database backup and import capabilities. This feature is designed to ensure data integrity and provide a straightforward way to manage database backups. Here's how it works:
 
 1. Automatic Backup Creation
-   - The system automatically creates a database backup every day at midnight. This ensures that there is always a recent backup available, minimizing the risk of data loss.
+   - The system automatically creates a database backup on a configurable schedule (default: daily at midnight via `system.databaseBackup.cron`). This ensures that there is always a recent backup available, minimizing the risk of data loss.
 2. Manual Backup Export
    - Admin actions that modify the user database trigger a manual export of the database. This keeps the backup up-to-date with the latest changes and provides an extra layer of data security.
 3. Importing Database Backups

README.md

@@ -120,14 +120,14 @@ Stirling-PDF currently supports 40 languages!
 | Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![62%](https://geps.dev/progress/62)   |
 | Basque (Euskara) (eu_ES)                     | ![36%](https://geps.dev/progress/36)   |
 | Bulgarian (Български) (bg_BG)                | ![68%](https://geps.dev/progress/68)   |
-| Catalan (Català) (ca_CA)                     | ![68%](https://geps.dev/progress/68)   |
+| Catalan (Català) (ca_CA)                     | ![67%](https://geps.dev/progress/67)   |
 | Croatian (Hrvatski) (hr_HR)                  | ![60%](https://geps.dev/progress/60)   |
 | Czech (Česky) (cs_CZ)                        | ![70%](https://geps.dev/progress/70)   |
 | Danish (Dansk) (da_DK)                       | ![61%](https://geps.dev/progress/61)   |
 | Dutch (Nederlands) (nl_NL)                   | ![60%](https://geps.dev/progress/60)   |
 | 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)                    | ![89%](https://geps.dev/progress/89)   |
+| French (Français) (fr_FR)                    | ![88%](https://geps.dev/progress/88)   |
 | German (Deutsch) (de_DE)                     | ![98%](https://geps.dev/progress/98)   |
 | Greek (Ελληνικά) (el_GR)                     | ![67%](https://geps.dev/progress/67)   |
 | Hindi (हिंदी) (hi_IN)                          | ![67%](https://geps.dev/progress/67)   |
@@ -135,12 +135,12 @@ Stirling-PDF currently supports 40 languages!
 | Indonesian (Bahasa Indonesia) (id_ID)        | ![62%](https://geps.dev/progress/62)   |
 | Irish (Gaeilge) (ga_IE)                      | ![68%](https://geps.dev/progress/68)   |
 | Italian (Italiano) (it_IT)                   | ![98%](https://geps.dev/progress/98)   |
-| Japanese (日本語) (ja_JP)                    | ![93%](https://geps.dev/progress/93)   |
+| Japanese (日本語) (ja_JP)                    | ![92%](https://geps.dev/progress/92)   |
 | Korean (한국어) (ko_KR)                      | ![67%](https://geps.dev/progress/67)   |
 | Norwegian (Norsk) (no_NB)                    | ![66%](https://geps.dev/progress/66)   |
 | Persian (فارسی) (fa_IR)                      | ![64%](https://geps.dev/progress/64)   |
 | Polish (Polski) (pl_PL)                      | ![72%](https://geps.dev/progress/72)   |
-| Portuguese (Português) (pt_PT)               | ![69%](https://geps.dev/progress/69)   |
+| Portuguese (Português) (pt_PT)               | ![68%](https://geps.dev/progress/68)   |
 | Portuguese Brazilian (Português) (pt_BR)     | ![76%](https://geps.dev/progress/76)   |
 | Romanian (Română) (ro_RO)                    | ![57%](https://geps.dev/progress/57)   |
 | Russian (Русский) (ru_RU)                    | ![88%](https://geps.dev/progress/88)   |
@@ -152,9 +152,9 @@ Stirling-PDF currently supports 40 languages!
 | Swedish (Svenska) (sv_SE)                    | ![65%](https://geps.dev/progress/65)   |
 | Thai (ไทย) (th_TH)                           | ![59%](https://geps.dev/progress/59)   |
 | Tibetan (བོད་ཡིག་) (bo_CN)                     | ![65%](https://geps.dev/progress/65) |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![97%](https://geps.dev/progress/97)   |
-| Turkish (Türkçe) (tr_TR)                     | ![80%](https://geps.dev/progress/80)   |
-| Ukrainian (Українська) (uk_UA)               | ![71%](https://geps.dev/progress/71)   |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![99%](https://geps.dev/progress/99)   |
+| Turkish (Türkçe) (tr_TR)                     | ![99%](https://geps.dev/progress/99)   |
+| Ukrainian (Українська) (uk_UA)               | ![70%](https://geps.dev/progress/70)   |
 | Vietnamese (Tiếng Việt) (vi_VN)              | ![57%](https://geps.dev/progress/57)   |
 | Malayalam (മലയാളം) (ml_IN)              | ![73%](https://geps.dev/progress/73)   |
 

app/common/build.gradle

@@ -40,6 +40,6 @@ dependencies {
     api 'jakarta.servlet:jakarta.servlet-api:6.1.0'
     api 'org.snakeyaml:snakeyaml-engine:2.10'
     api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.12"
-    api 'jakarta.mail:jakarta.mail-api:2.1.3'
+    api 'jakarta.mail:jakarta.mail-api:2.1.4'
     runtimeOnly 'org.eclipse.angus:angus-mail:2.0.4'
 }

app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java

@@ -41,6 +41,7 @@ import stirling.software.common.model.oauth2.GitHubProvider;
 import stirling.software.common.model.oauth2.GoogleProvider;
 import stirling.software.common.model.oauth2.KeycloakProvider;
 import stirling.software.common.model.oauth2.Provider;
+import stirling.software.common.service.SsrfProtectionService.SsrfProtectionLevel;
 import stirling.software.common.util.ValidationUtils;
 
 @Data
@@ -328,12 +329,18 @@ public class ApplicationProperties {
         private CustomPaths customPaths = new CustomPaths();
         private String fileUploadLimit;
         private TempFileManagement tempFileManagement = new TempFileManagement();
+        private DatabaseBackup databaseBackup = new DatabaseBackup();
 
         public boolean isAnalyticsEnabled() {
             return this.getEnableAnalytics() != null && this.getEnableAnalytics();
         }
     }
 
+    @Data
+    public static class DatabaseBackup {
+        private String cron = "0 0 0 * * ?"; // daily at midnight
+    }
+
     @Data
     public static class CustomPaths {
         private Pipeline pipeline = new Pipeline();
@@ -390,7 +397,7 @@ public class ApplicationProperties {
         @Data
         public static class UrlSecurity {
             private boolean enabled = true;
-            private String level = "MEDIUM"; // MAX, MEDIUM, OFF
+            private SsrfProtectionLevel level = SsrfProtectionLevel.MEDIUM; // MAX, MEDIUM, OFF
             private List<String> allowedDomains = new ArrayList<>();
             private List<String> blockedDomains = new ArrayList<>();
             private List<String> internalTlds =

app/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java

@@ -7,14 +7,14 @@ import java.io.Reader;
 
 import org.thymeleaf.templateresource.ITemplateResource;
 
-public class InputStreamTemplateResource implements ITemplateResource {
-    private InputStream inputStream;
-    private String characterEncoding;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
-    public InputStreamTemplateResource(InputStream inputStream, String characterEncoding) {
-        this.inputStream = inputStream;
-        this.characterEncoding = characterEncoding;
-    }
+@RequiredArgsConstructor
+@Getter
+public class InputStreamTemplateResource implements ITemplateResource {
+    private final InputStream inputStream;
+    private final String characterEncoding;
 
     @Override
     public Reader reader() throws IOException {

app/common/src/main/java/stirling/software/common/service/SsrfProtectionService.java

@@ -61,9 +61,9 @@ public class SsrfProtectionService {
         };
     }
 
-    private SsrfProtectionLevel parseProtectionLevel(String level) {
+    private SsrfProtectionLevel parseProtectionLevel(SsrfProtectionLevel level) {
         try {
-            return SsrfProtectionLevel.valueOf(level.toUpperCase());
+            return SsrfProtectionLevel.valueOf(level.name());
         } catch (IllegalArgumentException e) {
             log.warn("Invalid SSRF protection level '{}', defaulting to MEDIUM", level);
             return SsrfProtectionLevel.MEDIUM;
@@ -215,7 +215,8 @@ public class SsrfProtectionService {
                 return false;
             }
         }
-        // For IPv4-mapped IPv6 addresses, bytes 10 and 11 must be 0xff (i.e., address is ::ffff:w.x.y.z)
+        // For IPv4-mapped IPv6 addresses, bytes 10 and 11 must be 0xff (i.e., address is
+        // ::ffff:w.x.y.z)
         return addr[10] == (byte) 0xff && addr[11] == (byte) 0xff;
     }
 

app/common/src/main/java/stirling/software/common/util/ChecksumUtils.java

@@ -0,0 +1,301 @@
+package stirling.software.common.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.zip.Adler32;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class ChecksumUtils {
+
+    /** Shared buffer size for streaming I/O. */
+    private static final int BUFFER_SIZE = 8192;
+
+    /** Mask to extract the lower 32 bits of a long value (unsigned int). */
+    private static final long UNSIGNED_32_BIT_MASK = 0xFFFFFFFFL;
+
+    /**
+     * Computes a checksum for the given file using the chosen algorithm and returns a lowercase hex
+     * string.
+     *
+     * <p>For digest algorithms (e.g., SHA-256, SHA-1, MD5), this returns the digest as hex. For
+     * 32-bit {@link Checksum} algorithms ("CRC32", "ADLER32"), this returns an 8-character
+     * lowercase hex string of the unsigned 32-bit value.
+     *
+     * @param path file to read
+     * @param algorithm algorithm name (case-insensitive). Special values: "CRC32", "ADLER32".
+     * @return hex string of the checksum
+     * @throws IOException if the file cannot be read
+     */
+    public static String checksum(Path path, String algorithm) throws IOException {
+        try (InputStream is = Files.newInputStream(path)) {
+            return checksum(is, algorithm);
+        }
+    }
+
+    /**
+     * Computes a checksum for the given stream using the chosen algorithm and returns a lowercase
+     * hex string.
+     *
+     * <p><strong>Note:</strong> This method does <em>not</em> close the provided stream.
+     *
+     * @param is input stream (not closed by this method)
+     * @param algorithm algorithm name (case-insensitive). Special values: "CRC32", "ADLER32".
+     * @return hex string of the checksum
+     * @throws IOException if reading from the stream fails
+     */
+    public static String checksum(InputStream is, String algorithm) throws IOException {
+        switch (algorithm.toUpperCase(Locale.ROOT)) {
+            case "CRC32":
+                return checksumChecksum(is, new CRC32());
+            case "ADLER32":
+                return checksumChecksum(is, new Adler32());
+            default:
+                return toHex(checksumBytes(is, algorithm));
+        }
+    }
+
+    /**
+     * Computes a checksum for the given file using the chosen algorithm and returns a Base64
+     * encoded string.
+     *
+     * <p>For digest algorithms this is the Base64 of the raw digest bytes. For 32-bit checksum
+     * algorithms ("CRC32", "ADLER32"), this is the Base64 of the 4-byte big-endian unsigned value.
+     *
+     * @param path file to read
+     * @param algorithm algorithm name (case-insensitive). Special values: "CRC32", "ADLER32".
+     * @return Base64-encoded checksum bytes
+     * @throws IOException if the file cannot be read
+     */
+    public static String checksumBase64(Path path, String algorithm) throws IOException {
+        try (InputStream is = Files.newInputStream(path)) {
+            return checksumBase64(is, algorithm);
+        }
+    }
+
+    /**
+     * Computes a checksum for the given stream using the chosen algorithm and returns a Base64
+     * encoded string.
+     *
+     * <p><strong>Note:</strong> This method does <em>not</em> close the provided stream.
+     *
+     * @param is input stream (not closed by this method)
+     * @param algorithm algorithm name (case-insensitive). Special values: "CRC32", "ADLER32".
+     * @return Base64-encoded checksum bytes
+     * @throws IOException if reading from the stream fails
+     */
+    public static String checksumBase64(InputStream is, String algorithm) throws IOException {
+        switch (algorithm.toUpperCase(Locale.ROOT)) {
+            case "CRC32":
+                return Base64.getEncoder().encodeToString(checksumChecksumBytes(is, new CRC32()));
+            case "ADLER32":
+                return Base64.getEncoder().encodeToString(checksumChecksumBytes(is, new Adler32()));
+            default:
+                return Base64.getEncoder().encodeToString(checksumBytes(is, algorithm));
+        }
+    }
+
+    /**
+     * Computes multiple checksums for the given file in a single pass over the data.
+     *
+     * <p>Returns a map from algorithm name to lowercase hex string. Order of results follows the
+     * order of the provided {@code algorithms}.
+     *
+     * @param path file to read
+     * @param algorithms algorithm names (case-insensitive). Special: "CRC32", "ADLER32".
+     * @return map of algorithm → hex string
+     * @throws IOException if the file cannot be read
+     */
+    public static Map<String, String> checksums(Path path, String... algorithms)
+            throws IOException {
+        try (InputStream is = Files.newInputStream(path)) {
+            return checksums(is, algorithms);
+        }
+    }
+
+    /**
+     * Computes multiple checksums for the given stream in a single pass over the data.
+     *
+     * <p><strong>Note:</strong> This method does <em>not</em> close the provided stream.
+     *
+     * @param is input stream (not closed by this method)
+     * @param algorithms algorithm names (case-insensitive). Special: "CRC32", "ADLER32".
+     * @return map of algorithm → hex string
+     * @throws IOException if reading from the stream fails
+     */
+    public static Map<String, String> checksums(InputStream is, String... algorithms)
+            throws IOException {
+        // Use LinkedHashMap to preserve the order of requested algorithms in the result.
+        Map<String, MessageDigest> digests = new LinkedHashMap<>();
+        Map<String, Checksum> checksums = new LinkedHashMap<>();
+
+        for (String algorithm : algorithms) {
+            String key = algorithm; // keep original key for output
+            switch (algorithm.toUpperCase(Locale.ROOT)) {
+                case "CRC32":
+                    checksums.put(key, new CRC32());
+                    break;
+                case "ADLER32":
+                    checksums.put(key, new Adler32());
+                    break;
+                default:
+                    try {
+                        // For MessageDigest, pass the original name (case-insensitive per JCA)
+                        digests.put(key, MessageDigest.getInstance(algorithm));
+                    } catch (NoSuchAlgorithmException e) {
+                        throw new IllegalStateException("Unsupported algorithm: " + algorithm, e);
+                    }
+            }
+        }
+
+        byte[] buffer = new byte[BUFFER_SIZE];
+        int read;
+        while ((read = is.read(buffer)) != -1) {
+            for (MessageDigest digest : digests.values()) {
+                digest.update(buffer, 0, read);
+            }
+            for (Checksum cs : checksums.values()) {
+                cs.update(buffer, 0, read);
+            }
+        }
+
+        Map<String, String> results = new LinkedHashMap<>();
+        for (Map.Entry<String, MessageDigest> entry : digests.entrySet()) {
+            results.put(entry.getKey(), toHex(entry.getValue().digest()));
+        }
+        for (Map.Entry<String, Checksum> entry : checksums.entrySet()) {
+            // Keep value as long and mask to ensure unsigned hex formatting.
+            long unsigned32 = entry.getValue().getValue() & UNSIGNED_32_BIT_MASK;
+            results.put(entry.getKey(), String.format("%08x", unsigned32));
+        }
+        return results;
+    }
+
+    /**
+     * Compares the checksum of a file with an expected hex string (case-insensitive).
+     *
+     * @param path file to read
+     * @param algorithm algorithm name (case-insensitive). Special: "CRC32", "ADLER32".
+     * @param expected expected hex string (case-insensitive)
+     * @return {@code true} if they match, otherwise {@code false}
+     * @throws IOException if the file cannot be read
+     */
+    public static boolean matches(Path path, String algorithm, String expected) throws IOException {
+        try (InputStream is = Files.newInputStream(path)) {
+            return matches(is, algorithm, expected);
+        }
+    }
+
+    /**
+     * Compares the checksum of a stream with an expected hex string (case-insensitive).
+     *
+     * <p><strong>Note:</strong> This method does <em>not</em> close the provided stream.
+     *
+     * @param is input stream (not closed by this method)
+     * @param algorithm algorithm name (case-insensitive). Special: "CRC32", "ADLER32".
+     * @param expected expected hex string (case-insensitive)
+     * @return {@code true} if they match, otherwise {@code false}
+     * @throws IOException if reading from the stream fails
+     */
+    public static boolean matches(InputStream is, String algorithm, String expected)
+            throws IOException {
+        return checksum(is, algorithm).equalsIgnoreCase(expected);
+    }
+
+    // ---------- Internal helpers ----------
+
+    /**
+     * Computes a MessageDigest over a stream and returns the raw digest bytes.
+     *
+     * @param is input stream (not closed)
+     * @param algorithm JCA MessageDigest algorithm (e.g., "SHA-256")
+     * @return raw digest bytes
+     * @throws IOException if reading fails
+     * @throws IllegalStateException if the algorithm is unsupported
+     */
+    private static byte[] checksumBytes(InputStream is, String algorithm) throws IOException {
+        try {
+            MessageDigest digest = MessageDigest.getInstance(algorithm);
+            byte[] buffer = new byte[BUFFER_SIZE];
+            int read;
+            while ((read = is.read(buffer)) != -1) {
+                digest.update(buffer, 0, read);
+            }
+            return digest.digest();
+        } catch (NoSuchAlgorithmException e) {
+            // Keep the message explicit to aid debugging
+            throw new IllegalStateException("Unsupported algorithm: " + algorithm, e);
+        }
+    }
+
+    /**
+     * Computes a 32-bit {@link Checksum} over a stream and returns the lowercase 8-char hex of the
+     * unsigned 32-bit value.
+     *
+     * @param is input stream (not closed)
+     * @param checksum checksum implementation (CRC32, Adler32, etc.)
+     * @return 8-character lowercase hex (big-endian representation)
+     * @throws IOException if reading fails
+     */
+    private static String checksumChecksum(InputStream is, Checksum checksum) throws IOException {
+        byte[] buffer = new byte[BUFFER_SIZE];
+        int read;
+        while ((read = is.read(buffer)) != -1) {
+            checksum.update(buffer, 0, read);
+        }
+        // Keep as long and mask to ensure correct unsigned representation.
+        long unsigned32 = checksum.getValue() & UNSIGNED_32_BIT_MASK;
+        return String.format("%08x", unsigned32);
+    }
+
+    /**
+     * Computes a 32-bit {@link Checksum} over a stream and returns the raw 4-byte big-endian
+     * representation of the unsigned 32-bit value.
+     *
+     * <p>Cast to int already truncates to the lower 32 bits; the sign is irrelevant because we
+     * serialize the bit pattern directly into 4 bytes.
+     *
+     * @param is input stream (not closed)
+     * @param checksum checksum implementation (CRC32, Adler32, etc.)
+     * @return 4 bytes (big-endian)
+     * @throws IOException if reading fails
+     */
+    private static byte[] checksumChecksumBytes(InputStream is, Checksum checksum)
+            throws IOException {
+        byte[] buffer = new byte[BUFFER_SIZE];
+        int read;
+        while ((read = is.read(buffer)) != -1) {
+            checksum.update(buffer, 0, read);
+        }
+        // Cast keeps only the lower 32 bits; mask is unnecessary here.
+        int v = (int) checksum.getValue();
+        return ByteBuffer.allocate(4).order(ByteOrder.BIG_ENDIAN).putInt(v).array();
+    }
+
+    /**
+     * Converts bytes to a lowercase hex string.
+     *
+     * @param hash the byte array to convert
+     * @return the lowercase hex string
+     */
+    private static String toHex(byte[] hash) {
+        StringBuilder sb = new StringBuilder(hash.length * 2);
+        for (byte b : hash) {
+            sb.append(String.format("%02x", b));
+        }
+        return sb.toString();
+    }
+}

app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java

@@ -15,6 +15,8 @@ import java.util.concurrent.TimeUnit;
 
 import io.github.pixee.security.BoundedLineReader;
 
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.ApplicationProperties;
@@ -303,6 +305,8 @@ public class ProcessExecutor {
         OCR_MY_PDF
     }
 
+    @Setter
+    @Getter
     public class ProcessExecutorResult {
         int rc;
         String messages;
@@ -312,20 +316,5 @@ public class ProcessExecutor {
             this.messages = messages;
         }
 
-        public int getRc() {
-            return rc;
-        }
-
-        public void setRc(int rc) {
-            this.rc = rc;
-        }
-
-        public String getMessages() {
-            return messages;
-        }
-
-        public void setMessages(String messages) {
-            this.messages = messages;
-        }
     }
 }

app/common/src/main/java/stirling/software/common/util/TempFile.java

@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -14,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 public class TempFile implements AutoCloseable {
 
     private final TempFileManager manager;
+    @Getter
     private final File file;
 
     public TempFile(TempFileManager manager, String suffix) throws IOException {
@@ -21,10 +23,6 @@ public class TempFile implements AutoCloseable {
         this.file = manager.createTempFile(suffix);
     }
 
-    public File getFile() {
-        return file;
-    }
-
     public Path getPath() {
         return file.toPath();
     }

app/common/src/main/java/stirling/software/common/util/TempFileRegistry.java

@@ -11,6 +11,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 
+import lombok.Getter;
 import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
@@ -24,8 +25,22 @@ import lombok.extern.slf4j.Slf4j;
 public class TempFileRegistry {
 
     private final ConcurrentMap<Path, Instant> registeredFiles = new ConcurrentHashMap<>();
+    /**
+     * -- GETTER --
+     *  Get all registered third-party temporary files.
+     *
+     * @return Set of third-party file paths
+     */
+    @Getter
     private final Set<Path> thirdPartyTempFiles =
             Collections.newSetFromMap(new ConcurrentHashMap<>());
+    /**
+     * -- GETTER --
+     *  Get all registered temporary directories.
+     *
+     * @return Set of temporary directory paths
+     */
+    @Getter
     private final Set<Path> tempDirectories = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
     /**
@@ -133,24 +148,6 @@ public class TempFileRegistry {
                 .collect(Collectors.toSet());
     }
 
-    /**
-     * Get all registered third-party temporary files.
-     *
-     * @return Set of third-party file paths
-     */
-    public Set<Path> getThirdPartyTempFiles() {
-        return thirdPartyTempFiles;
-    }
-
-    /**
-     * Get all registered temporary directories.
-     *
-     * @return Set of temporary directory paths
-     */
-    public Set<Path> getTempDirectories() {
-        return tempDirectories;
-    }
-
     /**
      * Check if a file is registered in the registry.
      *

app/common/src/test/java/stirling/software/common/model/FileInfoTest.java

@@ -0,0 +1,111 @@
+package stirling.software.common.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.File;
+import java.time.LocalDateTime;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+public class FileInfoTest {
+
+    @ParameterizedTest(name = "{index}: fileSize={0}")
+    @CsvSource({
+        "0, '0 Bytes'",
+        "1023, '1023 Bytes'",
+        "1024, '1.00 KB'",
+        "1048575, '1024.00 KB'", // Do we really want this as result?
+        "1048576, '1.00 MB'",
+        "1073741823, '1024.00 MB'", // Do we really want this as result?
+        "1073741824, '1.00 GB'"
+    })
+    void testGetFormattedFileSize(long fileSize, String expectedFormattedSize) {
+        FileInfo fileInfo =
+                new FileInfo(
+                        "example.txt",
+                        File.separator
+                                + "path"
+                                + File.separator
+                                + "to"
+                                + File.separator
+                                + "example.txt",
+                        LocalDateTime.now(),
+                        fileSize,
+                        LocalDateTime.now().minusDays(1));
+
+        assertEquals(expectedFormattedSize, fileInfo.getFormattedFileSize());
+    }
+
+    @Test
+    void testGetFilePathAsPath() {
+        FileInfo fileInfo =
+                new FileInfo(
+                        "test.pdf",
+                        File.separator + "tmp" + File.separator + "test.pdf",
+                        LocalDateTime.now(),
+                        1234,
+                        LocalDateTime.now().minusDays(2));
+        assertEquals(
+                File.separator + "tmp" + File.separator + "test.pdf",
+                fileInfo.getFilePathAsPath().toString());
+    }
+
+    @Test
+    void testGetFormattedModificationDate() {
+        LocalDateTime modDate = LocalDateTime.of(2024, 6, 1, 15, 30, 45);
+        FileInfo fileInfo =
+                new FileInfo(
+                        "file.txt",
+                        File.separator + "file.txt",
+                        modDate,
+                        100,
+                        LocalDateTime.of(2024, 5, 31, 10, 0, 0));
+        assertEquals("2024-06-01 15:30:45", fileInfo.getFormattedModificationDate());
+    }
+
+    @Test
+    void testGetFormattedCreationDate() {
+        LocalDateTime creationDate = LocalDateTime.of(2023, 12, 25, 8, 15, 0);
+        FileInfo fileInfo =
+                new FileInfo(
+                        "holiday.txt",
+                        File.separator + "holiday.txt",
+                        LocalDateTime.of(2024, 1, 1, 0, 0, 0),
+                        500,
+                        creationDate);
+        assertEquals("2023-12-25 08:15:00", fileInfo.getFormattedCreationDate());
+    }
+
+    @Test
+    void testGettersAndSetters() {
+        LocalDateTime now = LocalDateTime.now();
+        FileInfo fileInfo =
+                new FileInfo(
+                        "doc.pdf",
+                        File.separator + "docs" + File.separator + "doc.pdf",
+                        now,
+                        2048,
+                        now.minusDays(1));
+        // Test getters
+        assertEquals("doc.pdf", fileInfo.getFileName());
+        assertEquals(File.separator + "docs" + File.separator + "doc.pdf", fileInfo.getFilePath());
+        assertEquals(now, fileInfo.getModificationDate());
+        assertEquals(2048, fileInfo.getFileSize());
+        assertEquals(now.minusDays(1), fileInfo.getCreationDate());
+
+        // Test setters
+        fileInfo.setFileName("new.pdf");
+        fileInfo.setFilePath(File.separator + "new" + File.separator + "new.pdf");
+        fileInfo.setModificationDate(now.plusDays(1));
+        fileInfo.setFileSize(4096);
+        fileInfo.setCreationDate(now.minusDays(2));
+
+        assertEquals("new.pdf", fileInfo.getFileName());
+        assertEquals(File.separator + "new" + File.separator + "new.pdf", fileInfo.getFilePath());
+        assertEquals(now.plusDays(1), fileInfo.getModificationDate());
+        assertEquals(4096, fileInfo.getFileSize());
+        assertEquals(now.minusDays(2), fileInfo.getCreationDate());
+    }
+}

app/common/src/test/java/stirling/software/common/model/InputStreamTemplateResourceTest.java

@@ -0,0 +1,94 @@
+package stirling.software.common.model;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.Reader;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+public class InputStreamTemplateResourceTest {
+
+    @Test
+    void gettersReturnProvidedFields() {
+        byte[] data = {1, 2, 3};
+        InputStream is = new ByteArrayInputStream(data);
+        String encoding = "UTF-8";
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, encoding);
+
+        assertSame(is, resource.getInputStream());
+        assertEquals(encoding, resource.getCharacterEncoding());
+    }
+
+    @Test
+    void fieldsAreFinal() throws NoSuchFieldException {
+        Field inputStreamField = InputStreamTemplateResource.class.getDeclaredField("inputStream");
+        Field characterEncodingField =
+                InputStreamTemplateResource.class.getDeclaredField("characterEncoding");
+
+        assertTrue(Modifier.isFinal(inputStreamField.getModifiers()));
+        assertTrue(Modifier.isFinal(characterEncodingField.getModifiers()));
+    }
+
+    @Test
+    void noSetterMethodsPresent() {
+        long setterCount =
+                Arrays.stream(InputStreamTemplateResource.class.getDeclaredMethods())
+                        .filter(method -> method.getName().startsWith("set"))
+                        .count();
+
+        assertEquals(0, setterCount, "InputStreamTemplateResource should not have setter methods");
+    }
+
+    @Test
+    void readerReturnsCorrectContent() throws Exception {
+        String content = "Hello, world!";
+        InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+
+        try (Reader reader = resource.reader()) {
+            char[] buffer = new char[content.length()];
+            int read = reader.read(buffer);
+            assertEquals(content.length(), read);
+            assertEquals(content, new String(buffer));
+        }
+    }
+
+    @Test
+    void relativeThrowsUnsupportedOperationException() {
+        InputStream is = new ByteArrayInputStream(new byte[0]);
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+        assertThrows(UnsupportedOperationException.class, () -> resource.relative("other"));
+    }
+
+    @Test
+    void getDescriptionReturnsExpectedString() {
+        InputStream is = new ByteArrayInputStream(new byte[0]);
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+        assertEquals("InputStream resource [Stream]", resource.getDescription());
+    }
+
+    @Test
+    void getBaseNameReturnsExpectedString() {
+        InputStream is = new ByteArrayInputStream(new byte[0]);
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+        assertEquals("streamResource", resource.getBaseName());
+    }
+
+    @Test
+    void existsReturnsTrueWhenInputStreamNotNull() {
+        InputStream is = new ByteArrayInputStream(new byte[0]);
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+        assertTrue(resource.exists());
+    }
+
+    @Test
+    void existsReturnsFalseWhenInputStreamIsNull() {
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(null, "UTF-8");
+        assertFalse(resource.exists());
+    }
+}

app/common/src/test/java/stirling/software/common/util/ChecksumUtilsTest.java

@@ -0,0 +1,66 @@
+package stirling.software.common.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+public class ChecksumUtilsTest {
+
+    @Test
+    void computeChecksums_basic() throws Exception {
+        byte[] data = "hello".getBytes(StandardCharsets.UTF_8);
+
+        // MD5 (hex)
+        try (InputStream is = new ByteArrayInputStream(data)) {
+            assertEquals("5d41402abc4b2a76b9719d911017c592", ChecksumUtils.checksum(is, "MD5"));
+        }
+
+        // MD5 (Base64)
+        try (InputStream is = new ByteArrayInputStream(data)) {
+            assertEquals("XUFAKrxLKna5cZ2REBfFkg==", ChecksumUtils.checksumBase64(is, "MD5"));
+        }
+
+        // MD5 + CRC32 (hex map)
+        try (InputStream is = new ByteArrayInputStream(data)) {
+            Map<String, String> map = ChecksumUtils.checksums(is, "MD5", "CRC32");
+            assertEquals("5d41402abc4b2a76b9719d911017c592", map.get("MD5"));
+            assertEquals("3610a686", map.get("CRC32"));
+        }
+    }
+
+    @Test
+    void crc32_base64_bigEndianBytes_forHello() throws Exception {
+        // CRC32("hello") = 0x3610A686 → bytes: 36 10 A6 86 → Base64: "NhCmhg=="
+        byte[] data = "hello".getBytes(StandardCharsets.UTF_8);
+        try (InputStream is = new ByteArrayInputStream(data)) {
+            assertEquals("NhCmhg==", ChecksumUtils.checksumBase64(is, "CRC32"));
+        }
+    }
+
+    @Test
+    void crc32_unsignedFormatting_highBitSet() throws Exception {
+        // CRC32 of single zero byte (0x00) is 0xD202EF8D (>= 0x8000_0000)
+        byte[] data = new byte[] {0x00};
+
+        // Hex (unsigned, 8 chars, lowercase)
+        try (InputStream is = new ByteArrayInputStream(data)) {
+            assertEquals("d202ef8d", ChecksumUtils.checksum(is, "CRC32"));
+        }
+
+        // Base64 of the 4-byte big-endian representation
+        try (InputStream is = new ByteArrayInputStream(data)) {
+            assertEquals("0gLvjQ==", ChecksumUtils.checksumBase64(is, "CRC32"));
+        }
+
+        // matches(..) must be case-insensitive for hex
+        try (InputStream is = new ByteArrayInputStream("hello".getBytes(StandardCharsets.UTF_8))) {
+            assertTrue(ChecksumUtils.matches(is, "CRC32", "3610A686")); // uppercase expected
+        }
+    }
+}

app/common/src/test/java/stirling/software/common/util/FileInfoTest.java

@@ -1,35 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.time.LocalDateTime;
-
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-import stirling.software.common.model.FileInfo;
-
-public class FileInfoTest {
-
-    @ParameterizedTest(name = "{index}: fileSize={0}")
-    @CsvSource({
-        "0, '0 Bytes'",
-        "1023, '1023 Bytes'",
-        "1024, '1.00 KB'",
-        "1048575, '1024.00 KB'", // Do we really want this as result?
-        "1048576, '1.00 MB'",
-        "1073741823, '1024.00 MB'", // Do we really want this as result?
-        "1073741824, '1.00 GB'"
-    })
-    void testGetFormattedFileSize(long fileSize, String expectedFormattedSize) {
-        FileInfo fileInfo =
-                new FileInfo(
-                        "example.txt",
-                        "/path/to/example.txt",
-                        LocalDateTime.now(),
-                        fileSize,
-                        LocalDateTime.now().minusDays(1));
-
-        assertEquals(expectedFormattedSize, fileInfo.getFormattedFileSize());
-    }
-}

app/core/.gitignore

@@ -170,6 +170,10 @@ out/
 *.jks
 *.asc
 
+# test-cert
+!**/test/resources/certs/test-cert.*
+!**/test/resources/certs/test-key.*
+
 # SSH Keys
 *.pub
 *.priv

app/core/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java

@@ -31,6 +31,8 @@ import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Enumeration;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureInterface;
 import org.bouncycastle.cert.jcajce.JcaCertStore;
 import org.bouncycastle.cms.CMSException;
@@ -44,8 +46,21 @@ import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
 
 public abstract class CreateSignatureBase implements SignatureInterface {
     private PrivateKey privateKey;
+    @Getter
     private Certificate[] certificateChain;
+    @Setter
     private String tsaUrl;
+    /**
+     * Specifies whether the external signing scenario should be used.
+     * If set to {@code true}, external signing will be performed and
+     * {@link SignatureInterface} will be used for signing.
+     * If set to {@code false}, internal signing will be performed.
+     * <p>Default: {@code false}
+     *
+     * @param externalSigning {@code true} if external signing should be performed; {@code false} for internal signing
+     */
+    @Setter
+    @Getter
     private boolean externalSigning;
 
     /**
@@ -97,18 +112,10 @@ public abstract class CreateSignatureBase implements SignatureInterface {
         this.privateKey = privateKey;
     }
 
-    public Certificate[] getCertificateChain() {
-        return certificateChain;
-    }
-
     public final void setCertificateChain(final Certificate[] certificateChain) {
         this.certificateChain = certificateChain;
     }
 
-    public void setTsaUrl(String tsaUrl) {
-        this.tsaUrl = tsaUrl;
-    }
-
     /**
      * SignatureInterface sample implementation.
      *
@@ -152,19 +159,4 @@ public abstract class CreateSignatureBase implements SignatureInterface {
         }
     }
 
-    public boolean isExternalSigning() {
-        return externalSigning;
-    }
-
-    /**
-     * Set if external signing scenario should be used. If {@code false}, SignatureInterface would
-     * be used for signing.
-     *
-     * <p>Default: {@code false}
-     *
-     * @param externalSigning {@code true} if external signing should be performed
-     */
-    public void setExternalSigning(boolean externalSigning) {
-        this.externalSigning = externalSigning;
-    }
 }

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

@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import lombok.Getter;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@ public class EndpointConfiguration {
 
     private static final String REMOVE_BLANKS = "remove-blanks";
     private final ApplicationProperties applicationProperties;
+    @Getter
     private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
     private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
     private Set<String> disabledGroups = new HashSet<>();
@@ -46,10 +48,6 @@ public class EndpointConfiguration {
         endpointStatuses.put(endpoint, false);
     }
 
-    public Map<String, Boolean> getEndpointStatuses() {
-        return endpointStatuses;
-    }
-
     public boolean isEndpointEnabled(String endpoint) {
         String original = endpoint;
         if (endpoint.startsWith("/")) {

app/core/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java

@@ -6,6 +6,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
@@ -234,33 +236,12 @@ public class EditTableOfContentsController {
     }
 
     // Inner class to represent bookmarks in JSON
+    @Setter
+    @Getter
     public static class BookmarkItem {
         private String title;
         private int pageNumber;
         private List<BookmarkItem> children = new ArrayList<>();
 
-        public String getTitle() {
-            return title;
-        }
-
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public int getPageNumber() {
-            return pageNumber;
-        }
-
-        public void setPageNumber(int pageNumber) {
-            this.pageNumber = pageNumber;
-        }
-
-        public List<BookmarkItem> getChildren() {
-            return children;
-        }
-
-        public void setChildren(List<BookmarkItem> children) {
-            this.children = children;
-        }
     }
 }

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

@@ -5,10 +5,11 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.ResponseEntity;
@@ -23,7 +24,9 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.GeneralFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -36,59 +39,130 @@ import stirling.software.common.util.WebResponseUtils;
 @Tag(name = "Convert", description = "Convert APIs")
 @RequestMapping("/api/v1/convert")
 @RequiredArgsConstructor
+@Slf4j
 public class ConvertOfficeController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
     private final RuntimePathConfig runtimePathConfig;
     private final CustomHtmlSanitizer customHtmlSanitizer;
+    private final EndpointConfiguration endpointConfiguration;
+
+    private boolean isUnoconvertAvailable() {
+        return endpointConfiguration.isGroupEnabled("Unoconvert")
+                || endpointConfiguration.isGroupEnabled("Python");
+    }
 
     public File convertToPdf(MultipartFile inputFile) throws IOException, InterruptedException {
-        // Check for valid file extension
+        // Check for valid file extension and sanitize filename
         String originalFilename = Filenames.toSimpleFileName(inputFile.getOriginalFilename());
-        if (originalFilename == null
-                || !isValidFileExtension(FilenameUtils.getExtension(originalFilename))) {
-            throw new IllegalArgumentException("Invalid file extension");
+        if (originalFilename == null || originalFilename.isBlank()) {
+            throw new IllegalArgumentException("Missing original filename");
         }
 
-        // Save the uploaded file to a temporary location
-        Path tempInputFile =
-                Files.createTempFile("input_", "." + FilenameUtils.getExtension(originalFilename));
+        // Check for valid file extension
+        String extension = FilenameUtils.getExtension(originalFilename);
+        if (extension == null || !isValidFileExtension(extension)) {
+            throw new IllegalArgumentException("Invalid file extension");
+        }
+        String extensionLower = extension.toLowerCase();
+
+        String baseName = FilenameUtils.getBaseName(originalFilename);
+        if (baseName == null || baseName.isBlank()) {
+            baseName = "input";
+        }
+
+        // create temporary working directory
+        Path workDir = Files.createTempDirectory("office2pdf_");
+        Path inputPath = workDir.resolve(baseName + "." + extensionLower);
+        Path outputPath = workDir.resolve(baseName + ".pdf");
 
         // Check if the file is HTML and apply sanitization if needed
-        String fileExtension = FilenameUtils.getExtension(originalFilename).toLowerCase();
-        if ("html".equals(fileExtension) || "htm".equals(fileExtension)) {
+        if ("html".equals(extensionLower) || "htm".equals(extensionLower)) {
             // Read and sanitize HTML content
             String htmlContent = new String(inputFile.getBytes(), StandardCharsets.UTF_8);
             String sanitizedHtml = customHtmlSanitizer.sanitize(htmlContent);
-            Files.write(tempInputFile, sanitizedHtml.getBytes(StandardCharsets.UTF_8));
+            Files.writeString(inputPath, sanitizedHtml, StandardCharsets.UTF_8);
         } else {
-            inputFile.transferTo(tempInputFile);
+            // copy file content
+            Files.copy(inputFile.getInputStream(), inputPath, StandardCopyOption.REPLACE_EXISTING);
         }
 
-        // Prepare the output file path
-        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-
         try {
-            // Run the LibreOffice command
-            List<String> command =
-                    new ArrayList<>(
-                            Arrays.asList(
-                                    runtimePathConfig.getUnoConvertPath(),
-                                    "--port",
-                                    "2003",
-                                    "--convert-to",
-                                    "pdf",
-                                    tempInputFile.toString(),
-                                    tempOutputFile.toString()));
-            ProcessExecutorResult returnCode =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
-                            .runCommandWithOutputHandling(command);
+            ProcessExecutorResult result;
+            // Run Unoconvert command
+            if (isUnoconvertAvailable()) {
+                // Unoconvert: schreibe direkt in outputPath innerhalb des workDir
+                List<String> command = new ArrayList<>();
+                command.add(runtimePathConfig.getUnoConvertPath());
+                command.add("--port");
+                command.add("2003");
+                command.add("--convert-to");
+                command.add("pdf");
+                command.add(inputPath.toString());
+                command.add(outputPath.toString());
 
-            // Read the converted PDF file
-            return tempOutputFile.toFile();
+                result =
+                        ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
+                                .runCommandWithOutputHandling(command);
+            } // Run soffice command
+            else {
+                List<String> command = new ArrayList<>();
+                command.add("soffice");
+                command.add("--headless");
+                command.add("--nologo");
+                command.add("--convert-to");
+                command.add("pdf:writer_pdf_Export");
+                command.add("--outdir");
+                command.add(workDir.toString());
+                command.add(inputPath.toString());
+
+                result =
+                        ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
+                                .runCommandWithOutputHandling(command);
+            }
+
+            // Check the result
+            if (result == null) {
+                throw new IllegalStateException("Converter returned no result");
+            }
+            if (result.getRc() != 0) {
+                throw new IllegalStateException("Conversion failed (exit " + result.getRc() + ")");
+            }
+
+            if (!Files.exists(outputPath)) {
+                // Some LibreOffice versions may deviate with exotic names – as a fallback, we try
+                // to find any .pdf in the workDir
+                try (var stream = Files.list(workDir)) {
+                    Path fallback =
+                            stream.filter(
+                                            p ->
+                                                    p.getFileName()
+                                                            .toString()
+                                                            .toLowerCase()
+                                                            .endsWith(".pdf"))
+                                    .findFirst()
+                                    .orElse(null);
+                    if (fallback == null) {
+                        throw new IllegalStateException("No PDF produced.");
+                    }
+                    // Move the found PDF to the expected outputPath
+                    Files.move(fallback, outputPath, StandardCopyOption.REPLACE_EXISTING);
+                }
+            }
+
+            // Check if the output file is empty
+            if (Files.size(outputPath) == 0L) {
+                throw new IllegalStateException("Produced PDF is empty");
+            }
+
+            return outputPath.toFile();
         } finally {
             // Clean up the temporary files
-            if (tempInputFile != null) Files.deleteIfExists(tempInputFile);
+            try {
+                Files.deleteIfExists(inputPath);
+            } catch (IOException e) {
+                log.warn("Failed to delete temp input file: {}", inputPath, e);
+            }
         }
     }
 
@@ -119,7 +193,9 @@ public class ConvertOfficeController {
                                     .replaceFirst("[.][^.]+$", "")
                             + "_convertedToPDF.pdf");
         } finally {
-            if (file != null) file.delete();
+            if (file != null && file.getParent() != null) {
+                FileUtils.deleteDirectory(file.getParentFile());
+            }
         }
     }
 }

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

@@ -1,17 +1,21 @@
 package stirling.software.SPDF.controller.api.converters;
 
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.http.HttpStatus;
 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.servlet.support.ServletUriComponentsBuilder;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,7 +27,6 @@ import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;
-import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
@@ -46,24 +49,43 @@ public class ConvertWebsiteToPDF {
             description =
                     "This endpoint fetches content from a URL and converts it to a PDF format."
                             + " Input:N/A Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> urlToPdf(@ModelAttribute UrlToPdfRequest request)
+    public ResponseEntity<?> urlToPdf(@ModelAttribute UrlToPdfRequest request)
             throws IOException, InterruptedException {
         String URL = request.getUrlInput();
+        UriComponentsBuilder uriComponentsBuilder =
+                ServletUriComponentsBuilder.fromCurrentContextPath().path("/url-to-pdf");
+        URI location = null;
+        HttpStatus status = HttpStatus.SEE_OTHER;
 
         if (!applicationProperties.getSystem().getEnableUrlToPDF()) {
-            throw ExceptionUtils.createIllegalArgumentException(
-                    "error.endpointDisabled", "This endpoint has been disabled by the admin");
-        }
+            location =
+                    uriComponentsBuilder
+                            .queryParam("error", "error.endpointDisabled")
+                            .build()
+                            .toUri();
+        } else
+
         // Validate the URL format
         if (!URL.matches("^https?://.*") || !GeneralUtils.isValidURL(URL)) {
-            throw ExceptionUtils.createInvalidArgumentException(
-                    "URL", "provided format is invalid");
-        }
+            location =
+                    uriComponentsBuilder
+                            .queryParam("error", "error.invalidUrlFormat")
+                            .build()
+                            .toUri();
+        } else
 
         // validate the URL is reachable
         if (!GeneralUtils.isURLReachable(URL)) {
-            throw ExceptionUtils.createIllegalArgumentException(
-                    "error.urlNotReachable", "URL is not reachable, please provide a valid URL");
+            location =
+                    uriComponentsBuilder
+                            .queryParam("error", "error.urlNotReachable")
+                            .build()
+                            .toUri();
+        }
+
+        if (location != null) {
+            log.info("Redirecting to: {}", location.toString());
+            return ResponseEntity.status(status).location(location).build();
         }
 
         Path tempOutputFile = null;

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

@@ -1,8 +1,10 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -54,24 +56,27 @@ public class PageNumbersController {
         String customText = request.getCustomText();
         float fontSize = request.getFontSize();
         String fontType = request.getFontType();
+        String fontColor = request.getFontColor();
+
+        Color color = Color.BLACK;
+        if (fontColor != null && !fontColor.trim().isEmpty()) {
+            try {
+                color = Color.decode(fontColor);
+            } catch (NumberFormatException e) {
+                color = Color.BLACK;
+            }
+        }
 
         PDDocument document = pdfDocumentFactory.load(file);
-        float marginFactor;
-        switch (customMargin.toLowerCase()) {
-            case "small":
-                marginFactor = 0.02f;
-                break;
-            case "large":
-                marginFactor = 0.05f;
-                break;
-            case "x-large":
-                marginFactor = 0.075f;
-                break;
-            case "medium":
-            default:
-                marginFactor = 0.035f;
-                break;
-        }
+
+        float marginFactor =
+                switch (customMargin == null ? "" : customMargin.toLowerCase(Locale.ROOT)) {
+                    case "small" -> 0.02f;
+                    case "large" -> 0.05f;
+                    case "x-large" -> 0.075f;
+                    case "medium" -> 0.035f;
+                    default -> 0.035f;
+                };
 
         if (pagesToNumber == null || pagesToNumber.isEmpty()) {
             pagesToNumber = "all";
@@ -79,9 +84,17 @@ public class PageNumbersController {
         if (customText == null || customText.isEmpty()) {
             customText = "{n}";
         }
+
+        final String baseFilename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
+
         List<Integer> pagesToNumberList =
                 GeneralUtils.parsePageList(pagesToNumber.split(","), document.getNumberOfPages());
 
+        // Clamp position to 1..9 (1 = top-left, 9 = bottom-right)
+        int pos = Math.max(1, Math.min(9, position));
+
         for (int i : pagesToNumberList) {
             PDPage page = document.getPage(i);
             PDRectangle pageSize = page.getMediaBox();
@@ -90,70 +103,62 @@ public class PageNumbersController {
                     customText
                             .replace("{n}", String.valueOf(pageNumber))
                             .replace("{total}", String.valueOf(document.getNumberOfPages()))
-                            .replace(
-                                    "{filename}",
-                                    Filenames.toSimpleFileName(file.getOriginalFilename())
-                                            .replaceFirst("[.][^.]+$", ""));
+                            .replace("{filename}", baseFilename);
 
             PDType1Font currentFont =
-                    switch (fontType.toLowerCase()) {
+                    switch (fontType == null ? "" : fontType.toLowerCase(Locale.ROOT)) {
                         case "courier" -> new PDType1Font(Standard14Fonts.FontName.COURIER);
                         case "times" -> new PDType1Font(Standard14Fonts.FontName.TIMES_ROMAN);
                         default -> new PDType1Font(Standard14Fonts.FontName.HELVETICA);
                     };
 
-            float x, y;
+            // Text dimensions and font metrics
+            float textWidth = currentFont.getStringWidth(text) / 1000f * fontSize;
+            float ascent = currentFont.getFontDescriptor().getAscent() / 1000f * fontSize;
+            float descent = currentFont.getFontDescriptor().getDescent() / 1000f * fontSize;
 
-            if (position == 5) {
-                // Calculate text width and font metrics
-                float textWidth = currentFont.getStringWidth(text) / 1000 * fontSize;
+            // Derive column/row in range 1..3 (1 = left/top, 2 = center/middle, 3 = right/bottom)
+            int col = ((pos - 1) % 3) + 1; // 1 = left, 2 = center, 3 = right
+            int row = ((pos - 1) / 3) + 1; // 1 = top, 2 = middle, 3 = bottom
 
-                float ascent = currentFont.getFontDescriptor().getAscent() / 1000 * fontSize;
-                float descent = currentFont.getFontDescriptor().getDescent() / 1000 * fontSize;
+            // Anchor coordinates with margin
+            float leftX = pageSize.getLowerLeftX() + marginFactor * pageSize.getWidth();
+            float midX = pageSize.getLowerLeftX() + pageSize.getWidth() / 2f;
+            float rightX = pageSize.getUpperRightX() - marginFactor * pageSize.getWidth();
 
-                float centerX = pageSize.getLowerLeftX() + (pageSize.getWidth() / 2);
-                float centerY = pageSize.getLowerLeftY() + (pageSize.getHeight() / 2);
+            float botY = pageSize.getLowerLeftY() + marginFactor * pageSize.getHeight();
+            float midY = pageSize.getLowerLeftY() + pageSize.getHeight() / 2f;
+            float topY = pageSize.getUpperRightY() - marginFactor * pageSize.getHeight();
 
-                x = centerX - (textWidth / 2);
-                y = centerY - (ascent + descent) / 2;
-            } else {
-                int xGroup = (position - 1) % 3;
-                int yGroup = 2 - (position - 1) / 3;
+            // Horizontal alignment: left = anchor, center = centered, right = right-aligned
+            float x =
+                    switch (col) {
+                        case 1 -> leftX;
+                        case 2 -> midX - textWidth / 2f;
+                        default -> rightX - textWidth;
+                    };
 
-                x =
-                        switch (xGroup) {
-                            case 0 ->
-                                    pageSize.getLowerLeftX()
-                                            + marginFactor * pageSize.getWidth(); // left
-                            case 1 ->
-                                    pageSize.getLowerLeftX() + (pageSize.getWidth() / 2); // center
-                            default ->
-                                    pageSize.getUpperRightX()
-                                            - marginFactor * pageSize.getWidth(); // right
-                        };
+            // Vertical alignment (baseline!):
+            // top    = align text top at topY,
+            // middle = optical middle using ascent/descent,
+            // bottom = baseline at botY
+            float y =
+                    switch (row) {
+                        case 1 -> topY - ascent;
+                        case 2 -> midY - (ascent + descent) / 2f;
+                        default -> botY;
+                    };
 
-                y =
-                        switch (yGroup) {
-                            case 0 ->
-                                    pageSize.getLowerLeftY()
-                                            + marginFactor * pageSize.getHeight(); // bottom
-                            case 1 ->
-                                    pageSize.getLowerLeftY() + (pageSize.getHeight() / 2); // middle
-                            default ->
-                                    pageSize.getUpperRightY()
-                                            - marginFactor * pageSize.getHeight(); // top
-                        };
-            }
-
-            PDPageContentStream contentStream =
+            try (PDPageContentStream contentStream =
                     new PDPageContentStream(
-                            document, page, PDPageContentStream.AppendMode.APPEND, true, true);
-            contentStream.beginText();
-            contentStream.setFont(currentFont, fontSize);
-            contentStream.newLineAtOffset(x, y);
-            contentStream.showText(text);
-            contentStream.endText();
-            contentStream.close();
+                            document, page, PDPageContentStream.AppendMode.APPEND, true, true)) {
+                contentStream.beginText();
+                contentStream.setFont(currentFont, fontSize);
+                contentStream.setNonStrokingColor(color);
+                contentStream.newLineAtOffset(x, y);
+                contentStream.showText(text);
+                contentStream.endText();
+            }
 
             pageNumber++;
         }

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

@@ -2,6 +2,7 @@ package stirling.software.SPDF.controller.api.misc;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.beans.PropertyEditorSupport;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -25,6 +26,8 @@ import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
 import org.apache.pdfbox.util.Matrix;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,6 +55,24 @@ public class StampController {
     private final CustomPDFDocumentFactory pdfDocumentFactory;
     private final TempFileManager tempFileManager;
 
+    /**
+     * Initialize data binder for multipart file uploads.
+     * This method registers a custom editor for MultipartFile to handle file uploads.
+     * It sets the MultipartFile to null if the uploaded file is empty.
+     * This is necessary to avoid binding errors when the file is not present.
+     */
+    @InitBinder
+    public void initBinder(WebDataBinder binder) {
+        binder.registerCustomEditor(
+                MultipartFile.class,
+                new PropertyEditorSupport() {
+                    @Override
+                    public void setAsText(String text) throws IllegalArgumentException {
+                        setValue(null);
+                    }
+                });
+    }
+
     @PostMapping(consumes = "multipart/form-data", value = "/add-stamp")
     @Operation(
             summary = "Add stamp to a PDF file",
@@ -91,25 +112,14 @@ public class StampController {
         float overrideY = request.getOverrideY(); // New field for Y override
 
         String customColor = request.getCustomColor();
-        float marginFactor;
-
-        switch (request.getCustomMargin().toLowerCase()) {
-            case "small":
-                marginFactor = 0.02f;
-                break;
-            case "medium":
-                marginFactor = 0.035f;
-                break;
-            case "large":
-                marginFactor = 0.05f;
-                break;
-            case "x-large":
-                marginFactor = 0.075f;
-                break;
-            default:
-                marginFactor = 0.035f;
-                break;
-        }
+        float marginFactor =
+                switch (request.getCustomMargin().toLowerCase()) {
+                    case "small" -> 0.02f;
+                    case "medium" -> 0.035f;
+                    case "large" -> 0.05f;
+                    case "x-large" -> 0.075f;
+                    default -> 0.035f;
+                };
 
         // Load the input PDF
         PDDocument document = pdfDocumentFactory.load(pdfFile);
@@ -185,27 +195,16 @@ public class StampController {
             throws IOException {
         String resourceDir = "";
         PDFont font = new PDType1Font(Standard14Fonts.FontName.HELVETICA);
-        switch (alphabet) {
-            case "arabic":
-                resourceDir = "static/fonts/NotoSansArabic-Regular.ttf";
-                break;
-            case "japanese":
-                resourceDir = "static/fonts/Meiryo.ttf";
-                break;
-            case "korean":
-                resourceDir = "static/fonts/malgun.ttf";
-                break;
-            case "chinese":
-                resourceDir = "static/fonts/SimSun.ttf";
-                break;
-            case "thai":
-                resourceDir = "static/fonts/NotoSansThai-Regular.ttf";
-                break;
-            case "roman":
-            default:
-                resourceDir = "static/fonts/NotoSans-Regular.ttf";
-                break;
-        }
+        resourceDir =
+                switch (alphabet) {
+                    case "arabic" -> "static/fonts/NotoSansArabic-Regular.ttf";
+                    case "japanese" -> "static/fonts/Meiryo.ttf";
+                    case "korean" -> "static/fonts/malgun.ttf";
+                    case "chinese" -> "static/fonts/SimSun.ttf";
+                    case "thai" -> "static/fonts/NotoSansThai-Regular.ttf";
+                    case "roman" -> "static/fonts/NotoSans-Regular.ttf";
+                    default -> "static/fonts/NotoSans-Regular.ttf";
+                };
 
         if (!"".equals(resourceDir)) {
             ClassPathResource classPathResource = new ClassPathResource(resourceDir);
@@ -327,30 +326,30 @@ public class StampController {
             throws IOException {
         float actualWidth =
                 (text != null) ? calculateTextWidth(text, font, fontSize) : contentWidth;
-        switch (position % 3) {
+        return switch (position % 3) {
             case 1: // Left
-                return pageSize.getLowerLeftX() + margin;
+                yield pageSize.getLowerLeftX() + margin;
             case 2: // Center
-                return (pageSize.getWidth() - actualWidth) / 2;
+                yield (pageSize.getWidth() - actualWidth) / 2;
             case 0: // Right
-                return pageSize.getUpperRightX() - actualWidth - margin;
+                yield pageSize.getUpperRightX() - actualWidth - margin;
             default:
-                return 0;
-        }
+                yield 0;
+        };
     }
 
     private float calculatePositionY(
             PDRectangle pageSize, int position, float height, float margin) {
-        switch ((position - 1) / 3) {
+        return switch ((position - 1) / 3) {
             case 0: // Top
-                return pageSize.getUpperRightY() - height - margin;
+                yield pageSize.getUpperRightY() - height - margin;
             case 1: // Middle
-                return (pageSize.getHeight() - height) / 2;
+                yield (pageSize.getHeight() - height) / 2;
             case 2: // Bottom
-                return pageSize.getLowerLeftY() + margin;
+                yield pageSize.getLowerLeftY() + margin;
             default:
-                return 0;
-        }
+                yield 0;
+        };
     }
 
     private float calculateTextWidth(String text, PDFont font, float fontSize) throws IOException {

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

@@ -7,7 +7,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -106,7 +105,7 @@ public class PipelineProcessor {
             Map<String, Object> parameters = pipelineOperation.getParameters();
             List<String> inputFileTypes = apiDocService.getExtensionTypes(false, operation);
             if (inputFileTypes == null) {
-                inputFileTypes = new ArrayList<String>(Arrays.asList("ALL"));
+                inputFileTypes = new ArrayList<>(List.of("ALL"));
             }
 
             if (!apiDocService.isValidOperation(operation, parameters)) {

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

@@ -186,6 +186,7 @@ public class CertSignController {
                         "alias", privateKey, password.toCharArray(), new Certificate[] {cert});
                 break;
             case "PKCS12":
+            case "PFX":
                 ks = KeyStore.getInstance("PKCS12");
                 ks.load(p12File.getInputStream(), password.toCharArray());
                 break;

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

@@ -9,6 +9,8 @@ import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Stream;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -317,6 +319,8 @@ public class GeneralWebController {
         return "remove-image-pdf";
     }
 
+    @Setter
+    @Getter
     public class FontResource {
 
         private String name;
@@ -331,28 +335,5 @@ public class GeneralWebController {
             this.type = getFormatFromExtension(extension);
         }
 
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getExtension() {
-            return extension;
-        }
-
-        public void setExtension(String extension) {
-            this.extension = extension;
-        }
-
-        public String getType() {
-            return type;
-        }
-
-        public void setType(String type) {
-            this.type = type;
-        }
     }
 }

app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java

@@ -4,6 +4,8 @@ import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -362,6 +364,8 @@ public class MetricsController {
         return String.format("%dd %dh %dm %ds", days, hours, minutes, seconds);
     }
 
+    @Setter
+    @Getter
     public static class EndpointCount {
 
         private String endpoint;
@@ -373,20 +377,5 @@ public class MetricsController {
             this.count = count;
         }
 
-        public String getEndpoint() {
-            return endpoint;
-        }
-
-        public void setEndpoint(String endpoint) {
-            this.endpoint = endpoint;
-        }
-
-        public double getCount() {
-            return count;
-        }
-
-        public void setCount(double count) {
-            this.count = count;
-        }
     }
 }

app/core/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java

@@ -4,10 +4,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Getter;
 
 public class ApiEndpoint {
     private final String name;
     private Map<String, JsonNode> parameters;
+    @Getter
     private final String description;
 
     public ApiEndpoint(String name, JsonNode postNode) {
@@ -31,10 +33,6 @@ public class ApiEndpoint {
         return true;
     }
 
-    public String getDescription() {
-        return description;
-    }
-
     @Override
     public String toString() {
         return "ApiEndpoint [name=" + name + ", parameters=" + parameters + "]";

app/core/src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java

@@ -32,6 +32,13 @@ public class AddPageNumbersRequest extends PDFWithPageNums {
             requiredMode = RequiredMode.REQUIRED)
     private String fontType;
 
+    @Schema(
+            description = "Hex colour for page numbers (e.g. #FF0000)",
+            example = "#000000",
+            defaultValue = "#000000",
+            requiredMode = RequiredMode.NOT_REQUIRED)
+    private String fontColor;
+
     @Schema(
             description =
                     "Position: 1-9 representing positions on the page (1=top-left, 2=top-center,"

app/core/src/main/java/stirling/software/SPDF/model/api/misc/ScannerEffectRequest.java

@@ -79,10 +79,6 @@ public class ScannerEffectRequest {
     @Schema(description = "Whether advanced settings are enabled", example = "false")
     private boolean advancedEnabled = false;
 
-    public boolean isAdvancedEnabled() {
-        return advancedEnabled;
-    }
-
     public int getQualityValue() {
         return switch (quality) {
             case low -> 30;

app/core/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java

@@ -15,20 +15,25 @@ public class SignPDFWithCertRequest extends PDFFile {
 
     @Schema(
             description = "The type of the digital certificate",
-            allowableValues = {"PEM", "PKCS12", "JKS"},
+            allowableValues = {"PEM", "PKCS12", "PFX", "JKS"},
             requiredMode = Schema.RequiredMode.REQUIRED)
     private String certType;
 
     @Schema(
             description =
                     "The private key for the digital certificate (required for PEM type"
-                            + " certificates)")
+                            + " certificates, supports .pem, .der, or .key files)")
     private MultipartFile privateKeyFile;
 
-    @Schema(description = "The digital certificate (required for PEM type certificates)")
+    @Schema(
+            description =
+                    "The digital certificate (required for PEM type certificates, supports"
+                            + " .pem, .der, .crt, or .cer files)")
     private MultipartFile certFile;
 
-    @Schema(description = "The PKCS12 keystore file (required for PKCS12 type certificates)")
+    @Schema(
+            description =
+                    "The PKCS12/PFX keystore file (required for PKCS12 or PFX type certificates)")
     private MultipartFile p12File;
 
     @Schema(description = "The JKS keystore file (Java Key Store)")

app/core/src/main/java/stirling/software/SPDF/pdf/TextFinder.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import lombok.Getter;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
@@ -20,6 +21,7 @@ public class TextFinder extends PDFTextStripper {
     private final String searchTerm;
     private final boolean useRegex;
     private final boolean wholeWordSearch;
+    @Getter
     private final List<PDFText> foundTexts = new ArrayList<>();
 
     private final List<TextPosition> pageTextPositions = new ArrayList<>();
@@ -187,10 +189,6 @@ public class TextFinder extends PDFTextStripper {
         super.endPage(page);
     }
 
-    public List<PDFText> getFoundTexts() {
-        return foundTexts;
-    }
-
     public String getDebugInfo() {
         StringBuilder debug = new StringBuilder();
         debug.append("Extracted text length: ").append(pageTextBuilder.length()).append("\n");

app/core/src/main/java/stirling/software/SPDF/service/ApiDocService.java

@@ -53,7 +53,7 @@ public class ApiDocService {
 
     public List<String> getExtensionTypes(boolean output, String operationName) {
         if (outputToFileTypes.size() == 0) {
-            outputToFileTypes.put("PDF", Arrays.asList("pdf"));
+            outputToFileTypes.put("PDF", List.of("pdf"));
             outputToFileTypes.put(
                     "IMAGE",
                     Arrays.asList(
@@ -63,10 +63,10 @@ public class ApiDocService {
                     "ZIP",
                     Arrays.asList("zip", "rar", "7z", "tar", "gz", "bz2", "xz", "lz", "lzma", "z"));
             outputToFileTypes.put("WORD", Arrays.asList("doc", "docx", "odt", "rtf"));
-            outputToFileTypes.put("CSV", Arrays.asList("csv"));
+            outputToFileTypes.put("CSV", List.of("csv"));
             outputToFileTypes.put("JS", Arrays.asList("js", "jsx"));
             outputToFileTypes.put("HTML", Arrays.asList("html", "htm", "xhtml"));
-            outputToFileTypes.put("JSON", Arrays.asList("json"));
+            outputToFileTypes.put("JSON", List.of("json"));
             outputToFileTypes.put("TXT", Arrays.asList("txt", "text", "md", "markdown"));
             outputToFileTypes.put("PPT", Arrays.asList("ppt", "pptx", "odp"));
             outputToFileTypes.put("XML", Arrays.asList("xml", "xsd", "xsl"));

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

@@ -77,7 +77,7 @@ public class CertificateValidationService {
         try {
             CertPathValidator validator = CertPathValidator.getInstance("PKIX");
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            List<X509Certificate> certList = Arrays.asList(cert);
+            List<X509Certificate> certList = Collections.singletonList(cert);
             CertPath certPath = cf.generateCertPath(certList);
 
             Set<TrustAnchor> anchors = new HashSet<>();

app/core/src/main/resources/messages_ar_AR.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=تحويل
 pdfToImage.info=Python غير مثبت. مطلوب لتحويل WebP.
 pdfToImage.placeholder=(مثال: 1,2,8 أو 4,7,12-16 أو 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_az_AZ.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Çevir
 pdfToImage.info=Python Yüklü Deyil.WebP Çevirməsi Üçün Vacibdir
 pdfToImage.placeholder=(məsələn, 1,2,8 və ya 4,7,12-16 və ya 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_bg_BG.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Преобразуване
 pdfToImage.info=Python не е инсталиран. Изисква се за конвертиране на WebP.
 pdfToImage.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_bo_CN.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=བསྒྱུར་བ།
 pdfToImage.info=Python སྒྲིག་འཇུག་བྱས་མི་འདུག WebP བསྒྱུར་བར་དགོས་མཁོ་ཡིན།
 pdfToImage.placeholder=(དཔེར་ན། 1,2,8 ཡང་ན་ 4,7,12-16 ཡང་ན་ 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_ca_CA.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Converteix
 pdfToImage.info=Python no està instal·lat. És necessari per a la conversió a WebP.
 pdfToImage.placeholder=(p. ex. 1,2,8 o 4,7,12-16 o 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_cs_CZ.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Převést
 pdfToImage.info=Python není nainstalován. Vyžadován pro konverzi do WebP.
 pdfToImage.placeholder=(např. 1,2,8 nebo 4,7,12-16 nebo 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_da_DK.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Konvertér
 pdfToImage.info=Python er ikke installeret. Påkrævet for WebP-konvertering.
 pdfToImage.placeholder=(f.eks. 1,2,8 eller 4,7,12-16 eller 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_de_DE.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=Die Datei muss im Format {0} vorliegen.
 error.invalidFormat=Ungültiges {0}-Format: {1}
 error.endpointDisabled=Dieser Endpunkt wurde vom Administrator deaktiviert.
 error.urlNotReachable=Die URL ist nicht erreichbar, bitte geben Sie eine gültige URL an.
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Umwandeln
 pdfToImage.info=Python ist nicht installiert. Erforderlich für die WebP-Konvertierung.
 pdfToImage.placeholder=(z.B. 1,2,8 oder 4,7,12-16 oder 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_el_GR.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Μετατροπή
 pdfToImage.info=Η Python δεν είναι εγκατεστημένη. Απαιτείται για μετατροπή WebP.
 pdfToImage.placeholder=(π.χ. 1,2,8 ή 4,7,12-16 ή 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_en_GB.properties

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Font Size
 addPageNumbers.fontName=Font Name
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Select PDF(s)
 multiPdfPrompt=Select PDFs (2+)
 multiPdfDropPrompt=Select (or drag & drop) all PDFs you require
@@ -193,6 +194,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message

app/core/src/main/resources/messages_en_US.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Convert
 pdfToImage.info=Python is not installed. Required for WebP conversion.
 pdfToImage.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_es_ES.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Convertir
 pdfToImage.info=Python no está instalado. Se requiere para la conversión WebP.
 pdfToImage.placeholder=(por ejemplo 1,2,8 o 4,7,12-16 o 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_eu_ES.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Bihurtu
 pdfToImage.info=Python is not installed. Required for WebP conversion.
 pdfToImage.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_fa_IR.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=تبدیل
 pdfToImage.info=پایتون نصب نشده است. برای تبدیل WebP لازم است.
 pdfToImage.placeholder=(مثال: 1,2,8 یا 4,7,12-16 یا 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_fr_FR.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=Le fichier doit être au format {0}
 error.invalidFormat=Format {0} invalide : {1}
 error.endpointDisabled=Ce point de terminaison a été désactivé par l'administrateur
 error.urlNotReachable=L'URL est inaccessible, veuillez fournir une URL valide
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Convertir
 pdfToImage.info=Python n'est pas installé. Nécessaire pour la conversion WebP.
 pdfToImage.placeholder=(par exemple : 1,2,8 ou 4,7,12-16 ou 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_ga_IE.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Tiontaigh
 pdfToImage.info=Níl Python suiteáilte. Ag teastáil le haghaidh comhshó WebP.
 pdfToImage.placeholder=(m.sh. 1,2,8 nó 4,7,12-16 nó 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_hi_IN.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=बदलें
 pdfToImage.info=Python स्थापित नहीं है। WebP रूपांतरण के लिए आवश्यक है।
 pdfToImage.placeholder=(जैसे 1,2,8 या 4,7,12-16 या 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_hr_HR.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Pretvori
 pdfToImage.info=Python nije instaliran. Treba je za konverziju na WebP.
 pdfToImage.placeholder=(t.j. 1,2,8 ili 4,7,12-16 ili 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_hu_HU.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=A fájlnak {0} formátumúnak kell lennie
 error.invalidFormat=Érvénytelen {0} formátum: {1}
 error.endpointDisabled=Ezt a végpontot a rendszergazda letiltotta
 error.urlNotReachable=Az URL nem érhető el, kérjük, adjon meg érvényes URL-t
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Konvertálás
 pdfToImage.info=Python nincs telepítve. WebP konverzióhoz szükséges.
 pdfToImage.placeholder=(pl. 1,2,8 vagy 4,7,12-16 vagy 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_id_ID.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Konversi
 pdfToImage.info=Python tidak terinstal. Diperlukan untuk konversi WebP.
 pdfToImage.placeholder=(misalnya 1,2,8 atau 4,7,12-16 atau 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_it_IT.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=Il file deve essere nel formato {0}
 error.invalidFormat=Formato {0} non valido:{1}
 error.endpointDisabled=Questo endpoint è stato disabilitato dall'amministratore
 error.urlNotReachable=L'URL non è raggiungibile, inserisci un URL valido
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -908,7 +909,7 @@ login.alreadyLoggedIn=Hai già effettuato l'accesso a
 login.alreadyLoggedIn2=dispositivi. Esci dai dispositivi e riprova.
 login.toManySessions=Hai troppe sessioni attive
 login.logoutMessage=Sei stato disconnesso.
-login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator.
+login.invalidInResponseTo=La risposta SAML richiesta non è valida o è scaduta. Contattare l'amministratore.
 
 #auto-redact
 autoRedact.title=Redazione automatica
@@ -1435,10 +1436,11 @@ pdfToImage.colorType=Tipo di colore
 pdfToImage.color=A colori
 pdfToImage.grey=Scala di grigi
 pdfToImage.blackwhite=Bianco e Nero (potresti perdere dettagli!)
-pdfToImage.dpi=DPI (The server limit is {0} dpi)
+pdfToImage.dpi=DPI (Il limite del server è {0} dpi)
 pdfToImage.submit=Converti
 pdfToImage.info=Python non è installato.È richiesto per la conversione WebP.
 pdfToImage.placeholder=(es. 1,2,8 o 4,7,12-16 o 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_ja_JP.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=ファイルは{0}形式である必要があります
 error.invalidFormat=無効な{0}形式: {1}
 error.endpointDisabled=このエンドポイントは管理者によって無効になっています
 error.urlNotReachable=URLにアクセスできません。有効なURLを入力してください
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=変換
 pdfToImage.info=Pythonがインストールされていません。WebPの変換に必要です。
 pdfToImage.placeholder=(例:1,2,8、4,7,12-16、2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_ko_KR.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=변환
 pdfToImage.info=WebP 변환에는 Python이 필요합니다. Python이 설치되지 않았습니다.
 pdfToImage.placeholder=(예: 1,2,8 또는 4,7,12-16 또는 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_ml_IN.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=പരിവർത്തനം ചെയ്യുക
 pdfToImage.info=പൈത്തൺ ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല. WebP പരിവർത്തനത്തിന് ആവശ്യമാണ്.
 pdfToImage.placeholder=(ഉദാ. 1,2,8 അല്ലെങ്കിൽ 4,7,12-16 അല്ലെങ്കിൽ 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_nl_NL.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Omzetten
 pdfToImage.info=Python is niet geïnstalleerd. Vereist voor WebP-conversie.
 pdfToImage.placeholder=(bijv. 1,2,8 of 4,7,12-16 of 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_no_NB.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Konverter
 pdfToImage.info=Python is not installed. Required for WebP conversion.
 pdfToImage.placeholder=(f.eks. 1,2,8 eller 4,7,12-16 eller 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_pl_PL.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Konwertuj
 pdfToImage.info=Python nie został zainstalowany. Jest wymagany do konwersji WebP.
 pdfToImage.placeholder=(przykład 1,2,8 lub 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_pt_BR.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Converter
 pdfToImage.info=Python não está instalado. Necessário para conversão WebP.
 pdfToImage.placeholder=(por exemplo 1,2,8 ou 4,7,12-16 ou 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_pt_PT.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Converter
 pdfToImage.info=Python não está instalado. Necessário para conversão WebP.
 pdfToImage.placeholder=(ex. 1,2,8 ou 4,7,12-16 ou 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_ro_RO.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Convertește
 pdfToImage.info=Python nu este instalat. Necesar pentru conversia WebP.
 pdfToImage.placeholder=(ex. 1,2,8 sau 4,7,12-16 sau 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_ru_RU.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=Файл должен быть в формате {0}
 error.invalidFormat=Недопустимый формат {0}: {1}
 error.endpointDisabled=Эта конечная точка была отключена администратором
 error.urlNotReachable=URL-адрес недоступен, пожалуйста, укажите действительный URL-адрес
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Преобразовать
 pdfToImage.info=Python не установлен. Требуется для конвертации в WebP.
 pdfToImage.placeholder=(например, 1,2,8 или 4,7,12-16 или 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_sk_SK.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Konvertovať
 pdfToImage.info=Python is not installed. Required for WebP conversion.
 pdfToImage.placeholder=(napr. 1,2,8 alebo 4,7,12-16 alebo 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_sl_SI.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Pretvori
 pdfToImage.info=Python ni nameščen. Zahtevano za pretvorbo WebP.
 pdfToImage.placeholder=(npr. 1,2,8 ali 4,7,12-16 ali 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_sr_LATN_RS.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Konvertuj
 pdfToImage.info=Python nije instaliran. Neophodan je za WebP konverziju.
 pdfToImage.placeholder=(npr. 1,2,8 ili 4,7,12-16 ili 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_sv_SE.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Konvertera
 pdfToImage.info=Python är inte installerat. Krävs för WebP-konvertering.
 pdfToImage.placeholder=(t.ex. 1,2,8 eller 4,7,12-16 eller 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_th_TH.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=แปลง
 pdfToImage.info=Python ไม่มีการติดตั้ง จำเป็นสำหรับการแปลง WebP
 pdfToImage.placeholder=(เช่น 1,2,8 หรือ 4,7,12-16 หรือ 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_tr_TR.properties

@@ -1,138 +1,138 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl=right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
 
 # Language names for reuse throughout the application
-lang.afr=Afrikaanca  
-lang.amh=Amharca  
-lang.ara=Arapça  
-lang.asm=Assamca  
-lang.aze=Azerice  
-lang.aze_cyrl=Azerice (Kiril)  
-lang.bel=Beyaz Rusça (Belarusça)  
-lang.ben=Bengalce  
-lang.bod=Tibetçe  
-lang.bos=Boşnakça  
-lang.bre=Bretonca  
-lang.bul=Bulgarca  
-lang.cat=Katalanca  
-lang.ceb=Cebuano  
-lang.ces=Çekçe  
-lang.chi_sim=Çince (Basitleştirilmiş)  
-lang.chi_sim_vert=Çince (Basitleştirilmiş, Dikey)  
-lang.chi_tra=Çince (Geleneksel)  
-lang.chi_tra_vert=Çince (Geleneksel, Dikey)  
-lang.chr=Çerokice  
-lang.cos=Korsikaca  
-lang.cym=Gallerce (Galce)  
-lang.dan=Danca  
-lang.dan_frak=Danca (Fraktur)  
-lang.deu=Almanca  
-lang.deu_frak=Almanca (Fraktur)  
-lang.div=Maldivce (Divehi)  
-lang.dzo=Dzongkha  
-lang.ell=Yunanca  
-lang.eng=İngilizce  
-lang.enm=İngilizce, Orta Çağ (1100-1500)  
-lang.epo=Esperanto  
-lang.equ=Matematik / denklem tanıma modülü  
-lang.est=Estonca  
-lang.eus=Baskça  
-lang.fao=Faroece  
-lang.fas=Farsça  
-lang.fil=Filipince  
-lang.fin=Fince  
-lang.fra=Fransızca  
-lang.frk=Frankça  
-lang.frm=Fransızca, Orta Çağ (yaklaşık 1400-1600)  
-lang.fry=Batı Frizce  
-lang.gla=İskoç Galcesi  
-lang.gle=İrlandaca  
-lang.glg=Galiçyaca  
-lang.grc=Antik Yunanca  
-lang.guj=Gujaratça  
-lang.hat=Haiti Creole  
-lang.heb=İbranice  
-lang.hin=Hintçe  
-lang.hrv=Hırvatça  
-lang.hun=Macarca  
-lang.hye=Ermenice  
-lang.iku=İnuktitut  
-lang.ind=Endonezce  
-lang.isl=İzlandaca  
-lang.ita=İtalyanca  
-lang.ita_old=İtalyanca (Eski)  
-lang.jav=Cava dili  
-lang.jpn=Japonca  
-lang.jpn_vert=Japonca (Dikey)  
-lang.kan=Kannada  
-lang.kat=Gürcüce  
-lang.kat_old=Gürcüce (Eski)  
-lang.kaz=Kazakça  
-lang.khm=Merkez Khmer dili  
-lang.kir=Kırgızca  
-lang.kmr=Kuzey Kürtçesi  
-lang.kor=Korece  
-lang.kor_vert=Korece (Dikey)  
-lang.lao=Laosça  
-lang.lat=Latince  
-lang.lav=Letonca  
-lang.lit=Litvanca  
-lang.ltz=Lüksemburgca  
-lang.mal=Malayalamca  
-lang.mar=Marathi  
-lang.mkd=Makedonca  
-lang.mlt=Maltaca  
-lang.mon=Moğolca  
-lang.mri=Maorice  
-lang.msa=Malayca  
-lang.mya=Birmanca (Burma)  
-lang.nep=Nepalce  
-lang.nld=Hollandaca; Flamanca  
-lang.nor=Norveççe  
-lang.oci=Oksitanca (1500 sonrası)  
-lang.ori=Oriya  
-lang.osd=Yönlendirme ve yazı tipi algılama modülü  
-lang.pan=Pencapça  
-lang.pol=Lehçe (Polonyaca)  
-lang.por=Portekizce  
-lang.pus=Peştuca  
-lang.que=Keçuva dili  
-lang.ron=Rumence, Moldovca  
-lang.rus=Rusça  
-lang.san=Sanskritçe  
-lang.sin=Seylanca (Sinhala)  
-lang.slk=Slovakça  
-lang.slk_frak=Slovakça (Fraktur)  
-lang.slv=Slovence  
-lang.snd=Sindhice  
-lang.spa=İspanyolca  
-lang.spa_old=İspanyolca (Eski)  
-lang.sqi=Arnavutça  
-lang.srp=Sırpça  
-lang.srp_latn=Sırpça (Latin alfabesiyle)  
-lang.sun=Sundaca  
-lang.swa=Svahili dili  
-lang.swe=İsveççe  
-lang.syr=Süryanice  
-lang.tam=Tamilce  
-lang.tat=Tatarca  
-lang.tel=Telugu  
-lang.tgk=Tacikçe  
-lang.tgl=Tagalog  
-lang.tha=Tayca  
-lang.tir=Tigrinya  
-lang.ton=Tonga dili (Tonga Adaları)  
-lang.tur=Türkçe  
-lang.uig=Uygurca  
-lang.ukr=Ukraynaca  
-lang.urd=Urduca  
-lang.uzb=Özbekçe  
-lang.uzb_cyrl=Özbekçe (Kiril)  
-lang.vie=Vietnamca  
-lang.yid=Yidiş  
+lang.afr=Afrikaanca
+lang.amh=Amharca
+lang.ara=Arapça
+lang.asm=Assamca
+lang.aze=Azerice
+lang.aze_cyrl=Azerice (Kiril)
+lang.bel=Beyaz Rusça (Belarusça)
+lang.ben=Bengalce
+lang.bod=Tibetçe
+lang.bos=Boşnakça
+lang.bre=Bretonca
+lang.bul=Bulgarca
+lang.cat=Katalanca
+lang.ceb=Cebuano
+lang.ces=Çekçe
+lang.chi_sim=Çince (Basitleştirilmiş)
+lang.chi_sim_vert=Çince (Basitleştirilmiş, Dikey)
+lang.chi_tra=Çince (Geleneksel)
+lang.chi_tra_vert=Çince (Geleneksel, Dikey)
+lang.chr=Çerokice
+lang.cos=Korsikaca
+lang.cym=Gallerce (Galce)
+lang.dan=Danca
+lang.dan_frak=Danca (Fraktur)
+lang.deu=Almanca
+lang.deu_frak=Almanca (Fraktur)
+lang.div=Maldivce (Divehi)
+lang.dzo=Dzongkha
+lang.ell=Yunanca
+lang.eng=İngilizce
+lang.enm=İngilizce, Orta Çağ (1100-1500)
+lang.epo=Esperanto
+lang.equ=Matematik / denklem tanıma modülü
+lang.est=Estonca
+lang.eus=Baskça
+lang.fao=Faroece
+lang.fas=Farsça
+lang.fil=Filipince
+lang.fin=Fince
+lang.fra=Fransızca
+lang.frk=Frankça
+lang.frm=Fransızca, Orta Çağ (yaklaşık 1400-1600)
+lang.fry=Batı Frizce
+lang.gla=İskoç Galcesi
+lang.gle=İrlandaca
+lang.glg=Galiçyaca
+lang.grc=Antik Yunanca
+lang.guj=Gujaratça
+lang.hat=Haiti Creole
+lang.heb=İbranice
+lang.hin=Hintçe
+lang.hrv=Hırvatça
+lang.hun=Macarca
+lang.hye=Ermenice
+lang.iku=İnuktitut
+lang.ind=Endonezce
+lang.isl=İzlandaca
+lang.ita=İtalyanca
+lang.ita_old=İtalyanca (Eski)
+lang.jav=Cava dili
+lang.jpn=Japonca
+lang.jpn_vert=Japonca (Dikey)
+lang.kan=Kannada
+lang.kat=Gürcüce
+lang.kat_old=Gürcüce (Eski)
+lang.kaz=Kazakça
+lang.khm=Merkez Khmer dili
+lang.kir=Kırgızca
+lang.kmr=Kuzey Kürtçesi
+lang.kor=Korece
+lang.kor_vert=Korece (Dikey)
+lang.lao=Laosça
+lang.lat=Latince
+lang.lav=Letonca
+lang.lit=Litvanca
+lang.ltz=Lüksemburgca
+lang.mal=Malayalamca
+lang.mar=Marathi
+lang.mkd=Makedonca
+lang.mlt=Maltaca
+lang.mon=Moğolca
+lang.mri=Maorice
+lang.msa=Malayca
+lang.mya=Birmanca (Burma)
+lang.nep=Nepalce
+lang.nld=Hollandaca; Flamanca
+lang.nor=Norveççe
+lang.oci=Oksitanca (1500 sonrası)
+lang.ori=Oriya
+lang.osd=Yönlendirme ve yazı tipi algılama modülü
+lang.pan=Pencapça
+lang.pol=Lehçe (Polonyaca)
+lang.por=Portekizce
+lang.pus=Peştuca
+lang.que=Keçuva dili
+lang.ron=Rumence, Moldovca
+lang.rus=Rusça
+lang.san=Sanskritçe
+lang.sin=Seylanca (Sinhala)
+lang.slk=Slovakça
+lang.slk_frak=Slovakça (Fraktur)
+lang.slv=Slovence
+lang.snd=Sindhice
+lang.spa=İspanyolca
+lang.spa_old=İspanyolca (Eski)
+lang.sqi=Arnavutça
+lang.srp=Sırpça
+lang.srp_latn=Sırpça (Latin alfabesiyle)
+lang.sun=Sundaca
+lang.swa=Svahili dili
+lang.swe=İsveççe
+lang.syr=Süryanice
+lang.tam=Tamilce
+lang.tat=Tatarca
+lang.tel=Telugu
+lang.tgk=Tacikçe
+lang.tgl=Tagalog
+lang.tha=Tayca
+lang.tir=Tigrinya
+lang.ton=Tonga dili (Tonga Adaları)
+lang.tur=Türkçe
+lang.uig=Uygurca
+lang.ukr=Ukraynaca
+lang.urd=Urduca
+lang.uzb=Özbekçe
+lang.uzb_cyrl=Özbekçe (Kiril)
+lang.vie=Vietnamca
+lang.yid=Yidiş
 lang.yor=Yoruba
 
 addPageNumbers.fontSize=Font Büyüklüğü
@@ -193,6 +193,7 @@ error.fileFormatRequired=Dosya {0} formatında olmalıdır
 error.invalidFormat=Geçersiz {0} formatı: {1}
 error.endpointDisabled=Bu uç nokta yönetici tarafından devre dışı bırakılmıştır
 error.urlNotReachable=URL erişilebilir değil, lütfen geçerli bir URL sağlayın
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (Sunucu limiti {0} dpi)
 pdfToImage.submit=Dönüştür
 pdfToImage.info=Python kurulu değil. WebP dönüşümü için gereklidir.
 pdfToImage.placeholder=(örneğin 1,2,8 veya 4,7,12-16 ya da 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_uk_UA.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Конвертувати
 pdfToImage.info=Python не встановлено. Необхідно для конвертації WebP.
 pdfToImage.placeholder=(наприклад 1,2,8 або 4,7,12-16 або 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_vi_VN.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=This endpoint has been disabled by the admin
 error.urlNotReachable=URL is not reachable, please provide a valid URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=Chuyển đổi
 pdfToImage.info=Python is not installed. Required for WebP conversion.
 pdfToImage.placeholder=(ví dụ: 1,2,8 hoặc 4,7,12-16 hoặc 2n-1)
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_zh_CN.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=File must be in {0} format
 error.invalidFormat=Invalid {0} format: {1}
 error.endpointDisabled=该端点被管理员禁用
 error.urlNotReachable=URL无法访问，请提供有效的URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=转换
 pdfToImage.info=WebP 转换需要安装 Python
 pdfToImage.placeholder=（例如：1,2,8 或 4,7,12-16 或 2n-1）
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/messages_zh_TW.properties

@@ -193,6 +193,7 @@ error.fileFormatRequired=檔案必須為 {0} 格式
 error.invalidFormat=無效的 {0} 格式：{1}
 error.endpointDisabled=此端點已被管理員停用
 error.urlNotReachable=無法連線至 URL，請提供有效的 URL
+error.invalidUrlFormat=Invalid URL format provided. The provided format is invalid.
 
 # DPI and image rendering messages - used by frontend for dynamic translation
 # Backend sends: [TRANSLATE:messageKey:arg1,arg2] English message
@@ -1439,6 +1440,7 @@ pdfToImage.dpi=DPI (The server limit is {0} dpi)
 pdfToImage.submit=轉換
 pdfToImage.info=尚未安裝 Python。需要安裝 Python 才能進行 WebP 轉換。
 pdfToImage.placeholder=（例如 1,2,8 或 4,7,12-16 或 2n-1）
+pdfToImage.includeAnnotations=Include annotations (comments, highlights etc.)
 
 
 #addPassword

app/core/src/main/resources/settings.yml.template

@@ -151,6 +151,8 @@ system:
     cleanupIntervalMinutes: 30 # How often to run cleanup (in minutes)
     startupCleanup: true # Clean up old temp files on startup
     cleanupSystemTemp: false # Whether to clean broader system temp directory
+  databaseBackup:
+    cron: '0 0 0 * * ?' # Cron expression for automatic database backups "0 0 0 * * ?" daily at midnight
 
 ui:
   appName: '' # application's visible name

app/core/src/main/resources/static/3rdPartyLicenses.json

@@ -24,7 +24,7 @@
         {
             "moduleName": "com.bucket4j:bucket4j_jdk17-core",
             "moduleUrl": "http://github.com/bucket4j/bucket4j/bucket4j_jdk17-core",
-            "moduleVersion": "8.14.0",
+            "moduleVersion": "8.15.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0"
         },
@@ -536,6 +536,13 @@
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
+        {
+            "moduleName": "commons-io:commons-io",
+            "moduleUrl": "https://commons.apache.org/proper/commons-io/",
+            "moduleVersion": "2.19.0",
+            "moduleLicense": "Apache-2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
         {
             "moduleName": "commons-io:commons-io",
             "moduleUrl": "https://commons.apache.org/proper/commons-io/",
@@ -559,21 +566,21 @@
         {
             "moduleName": "io.jsonwebtoken:jjwt-api",
             "moduleUrl": "https://github.com/jwtk/jjwt",
-            "moduleVersion": "0.12.7",
+            "moduleVersion": "0.13.0",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "io.jsonwebtoken:jjwt-impl",
             "moduleUrl": "https://github.com/jwtk/jjwt",
-            "moduleVersion": "0.12.7",
+            "moduleVersion": "0.13.0",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "io.jsonwebtoken:jjwt-jackson",
             "moduleUrl": "https://github.com/jwtk/jjwt",
-            "moduleVersion": "0.12.7",
+            "moduleVersion": "0.13.0",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
@@ -724,6 +731,13 @@
             "moduleLicense": "GPL2 w/ CPE",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
+        {
+            "moduleName": "jakarta.mail:jakarta.mail-api",
+            "moduleUrl": "https://www.eclipse.org",
+            "moduleVersion": "2.1.4",
+            "moduleLicense": "GPL2 w/ CPE",
+            "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
+        },
         {
             "moduleName": "jakarta.persistence:jakarta.persistence-api",
             "moduleUrl": "https://www.eclipse.org",
@@ -738,6 +752,13 @@
             "moduleLicense": "GPL2 w/ CPE",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
+        {
+            "moduleName": "jakarta.servlet:jakarta.servlet-api",
+            "moduleUrl": "https://www.eclipse.org",
+            "moduleVersion": "6.1.0",
+            "moduleLicense": "GPL2 w/ CPE",
+            "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
+        },
         {
             "moduleName": "jakarta.transaction:jakarta.transaction-api",
             "moduleUrl": "https://projects.eclipse.org/projects/ee4j.jta",
@@ -862,6 +883,20 @@
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
+        {
+            "moduleName": "org.apache.commons:commons-lang3",
+            "moduleUrl": "https://commons.apache.org/proper/commons-lang/",
+            "moduleVersion": "3.18.0",
+            "moduleLicense": "Apache-2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
+        {
+            "moduleName": "org.apache.commons:commons-text",
+            "moduleUrl": "https://commons.apache.org/proper/commons-text",
+            "moduleVersion": "1.10.0",
+            "moduleLicense": "Apache License, Version 2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
         {
             "moduleName": "org.apache.commons:commons-text",
             "moduleUrl": "https://commons.apache.org/proper/commons-text",
@@ -984,6 +1019,13 @@
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
+        {
+            "moduleName": "org.bouncycastle:bcpkix-jdk18on",
+            "moduleUrl": "https://www.bouncycastle.org/java.html",
+            "moduleVersion": "1.72",
+            "moduleLicense": "Bouncy Castle Licence",
+            "moduleLicenseUrl": "https://www.bouncycastle.org/licence.html"
+        },
         {
             "moduleName": "org.bouncycastle:bcpkix-jdk18on",
             "moduleUrl": "https://www.bouncycastle.org/download/bouncy-castle-java/",
@@ -998,6 +1040,13 @@
             "moduleLicense": "Bouncy Castle Licence",
             "moduleLicenseUrl": "https://www.bouncycastle.org/licence.html"
         },
+        {
+            "moduleName": "org.bouncycastle:bcutil-jdk18on",
+            "moduleUrl": "https://www.bouncycastle.org/java.html",
+            "moduleVersion": "1.72",
+            "moduleLicense": "Bouncy Castle Licence",
+            "moduleLicenseUrl": "https://www.bouncycastle.org/licence.html"
+        },
         {
             "moduleName": "org.bouncycastle:bcutil-jdk18on",
             "moduleUrl": "https://www.bouncycastle.org/download/bouncy-castle-java/",
@@ -1471,19 +1520,19 @@
         },
         {
             "moduleName": "org.springdoc:springdoc-openapi-starter-common",
-            "moduleVersion": "2.8.11",
+            "moduleVersion": "2.8.12",
             "moduleLicense": "The Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.springdoc:springdoc-openapi-starter-webmvc-api",
-            "moduleVersion": "2.8.11",
+            "moduleVersion": "2.8.12",
             "moduleLicense": "The Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.springdoc:springdoc-openapi-starter-webmvc-ui",
-            "moduleVersion": "2.8.11",
+            "moduleVersion": "2.8.12",
             "moduleLicense": "The Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -1515,6 +1564,13 @@
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
+        {
+            "moduleName": "org.springframework.boot:spring-boot-devtools",
+            "moduleUrl": "https://spring.io/projects/spring-boot",
+            "moduleVersion": "3.5.5",
+            "moduleLicense": "Apache License, Version 2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+        },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter",
             "moduleUrl": "https://spring.io/projects/spring-boot",
@@ -1822,7 +1878,7 @@
         {
             "moduleName": "org.webjars:swagger-ui",
             "moduleUrl": "https://www.webjars.org",
-            "moduleVersion": "5.27.1",
+            "moduleVersion": "5.28.0",
             "moduleLicense": "Apache-2.0"
         },
         {

app/core/src/main/resources/templates/convert/url-to-pdf.html

@@ -19,6 +19,7 @@
               <span class="material-symbols-rounded tool-header-icon convertto">link</span>
               <span class="tool-header-text" th:text="#{URLToPDF.header}"></span>
             </div>
+            <p th:if="${not #lists.isEmpty(param.error)}" th:text="#{${param.error[0]}}" class="alert alert-danger text-center"></p>
             <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/url/pdf'}">
               <input type="text" class="form-control" id="urlInput" name="urlInput" placeholder="http://">
               <br>

app/core/src/main/resources/templates/misc/add-page-numbers.html

@@ -99,6 +99,24 @@
                 <option value="Courier">Courier New</option>
               </select>
             </div>
+            <div class="mb-3">
+              <label for="fontColor" th:text="#{addPageNumbers.fontColor}"></label>
+              <div class="form-control form-control-color" style="background-color: #000000;">
+                <input type="color" id="fontColor" name="fontColor" value="#000000">
+              </div>
+                <script>
+                  let colorInput = document.getElementById("fontColor");
+                  if (colorInput) {
+                    let colorInputContainer = colorInput.parentElement;
+                    if (colorInputContainer) {
+                      colorInput.onchange = function() {
+                        colorInputContainer.style.backgroundColor = colorInput.value;
+                      }
+                      colorInputContainer.style.backgroundColor = colorInput.value;
+                    }
+                  }
+                </script>
+            </div>
             <div class="mb-3">
               <label for="startingNumber" th:text="#{addPageNumbers.selectText.4}"></label>
               <input type="number" class="form-control" id="startingNumber" name="startingNumber" min="1" required value="1">

app/core/src/main/resources/templates/security/cert-sign.html

@@ -31,17 +31,18 @@
                     <option value="" th:text="#{selectFilter}"></option>
                     <option value="PEM">PEM</option>
                     <option value="PKCS12">PKCS12</option>
+                    <option value="PFX">PFX</option>
                     <option value="JKS">JKS</option>
                   </select>
                 </div>
                 <div id="pemGroup" style="display: none;">
                   <div class="mb-3">
                     <label th:text="#{certSign.selectKey}"></label>
-                    <div th:replace="~{fragments/common :: fileSelector(name='privateKeyFile', multipleInputsForSingleRequest=false, notRequired=true, accept='.pem,.der')}"></div>
+                    <div th:replace="~{fragments/common :: fileSelector(name='privateKeyFile', multipleInputsForSingleRequest=false, notRequired=true, accept='.pem,.der,.key')}"></div>
                   </div>
                   <div class="mb-3">
                     <label th:text="#{certSign.selectCert}"></label>
-                    <div th:replace="~{fragments/common :: fileSelector(name='certFile', multipleInputsForSingleRequest=false, notRequired=true, accept='.pem,.der')}"></div>
+                    <div th:replace="~{fragments/common :: fileSelector(name='certFile', multipleInputsForSingleRequest=false, notRequired=true, accept='.pem,.der,.crt,.cer')}"></div>
                   </div>
                 </div>
                 <div class="mb-3" id="p12Group" style="display: none;">
@@ -96,6 +97,7 @@
         var valueToGroupMap = {
           'PEM': pemGroup,
           'PKCS12': p12Group,
+          'PFX': p12Group,
           'JKS': jksGroup
         };
         for (var key in valueToGroupMap) {

app/core/src/test/java/stirling/software/SPDF/controller/api/MergeControllerTest.java

@@ -1,12 +1,14 @@
 package stirling.software.SPDF.controller.api;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -266,8 +268,8 @@ class MergeControllerTest {
         when(pdfDocumentFactory.createNewDocument()).thenReturn(mockMergedDocument);
         when(doc1.getPages()).thenReturn(pages1);
         when(doc2.getPages()).thenReturn(pages2);
-        when(pages1.iterator()).thenReturn(Arrays.asList(page1).iterator());
-        when(pages2.iterator()).thenReturn(Arrays.asList(page2).iterator());
+        when(pages1.iterator()).thenReturn(Collections.singletonList(page1).iterator());
+        when(pages2.iterator()).thenReturn(Collections.singletonList(page2).iterator());
 
         // When
         PDDocument result = mergeController.mergeDocuments(documents);
@@ -282,7 +284,7 @@ class MergeControllerTest {
     @Test
     void testMergeDocuments_EmptyList_ReturnsEmptyDocument() throws IOException {
         // Given
-        List<PDDocument> documents = Arrays.asList();
+        List<PDDocument> documents = List.of();
 
         when(pdfDocumentFactory.createNewDocument()).thenReturn(mockMergedDocument);
 

app/core/src/test/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPdfTest.java

@@ -1,71 +1,264 @@
 package stirling.software.SPDF.controller.api.converters;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
 
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.ProcessExecutor.Processes;
+import stirling.software.common.util.WebResponseUtils;
 
 public class ConvertWebsiteToPdfTest {
 
-    @Mock private CustomPDFDocumentFactory mockPdfDocumentFactory;
-
+    @Mock private CustomPDFDocumentFactory pdfDocumentFactory;
     @Mock private RuntimePathConfig runtimePathConfig;
 
     private ApplicationProperties applicationProperties;
-
-    private ConvertWebsiteToPDF convertWebsiteToPDF;
+    private ConvertWebsiteToPDF sut;
+    private AutoCloseable mocks;
 
     @BeforeEach
-    void setUp() {
-        MockitoAnnotations.openMocks(this);
+    void setUp() throws Exception {
+        mocks = MockitoAnnotations.openMocks(this);
+
+        // Feature einschalten (ggf. Struktur an dein Projekt anpassen)
         applicationProperties = new ApplicationProperties();
         applicationProperties.getSystem().setEnableUrlToPDF(true);
-        convertWebsiteToPDF =
-                new ConvertWebsiteToPDF(
-                        mockPdfDocumentFactory, runtimePathConfig, applicationProperties);
+
+        // Stubs, falls der Code weiterlaufen sollte
+        when(runtimePathConfig.getWeasyPrintPath()).thenReturn("/usr/bin/weasyprint");
+        when(pdfDocumentFactory.load(any(File.class))).thenReturn(new PDDocument());
+
+        // SUT bauen
+        sut = new ConvertWebsiteToPDF(pdfDocumentFactory, runtimePathConfig, applicationProperties);
+
+        // RequestContext für ServletUriComponentsBuilder bereitstellen
+        MockHttpServletRequest req = new MockHttpServletRequest();
+        req.setScheme("http");
+        req.setServerName("localhost");
+        req.setServerPort(8080);
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(req));
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        RequestContextHolder.resetRequestAttributes();
+        if (mocks != null) mocks.close();
     }
 
     @Test
-    public void test_exemption_is_thrown_when_invalid_url_format_provided() {
+    void redirect_with_error_when_invalid_url_format_provided() throws Exception {
+        UrlToPdfRequest request = new UrlToPdfRequest();
+        request.setUrlInput("not-a-url");
 
-        String invalid_format_Url = "invalid-url";
+        ResponseEntity<?> resp = sut.urlToPdf(request);
+
+        assertEquals(HttpStatus.SEE_OTHER, resp.getStatusCode());
+        URI location = resp.getHeaders().getLocation();
+        assertNotNull(location, "Location header expected");
+        assertTrue(
+                location.getQuery() != null
+                        && location.getQuery().contains("error=error.invalidUrlFormat"));
+    }
+
+    @Test
+    void redirect_with_error_when_url_is_not_reachable() throws Exception {
+        UrlToPdfRequest request = new UrlToPdfRequest();
+        // .invalid ist per RFC reserviert und nicht auflösbar
+        request.setUrlInput("https://nonexistent.invalid/");
+
+        ResponseEntity<?> resp = sut.urlToPdf(request);
+
+        assertEquals(HttpStatus.SEE_OTHER, resp.getStatusCode());
+        URI location = resp.getHeaders().getLocation();
+        assertNotNull(location, "Location header expected");
+        assertTrue(
+                location.getQuery() != null
+                        && location.getQuery().contains("error=error.urlNotReachable"));
+    }
+
+    @Test
+    void redirect_with_error_when_endpoint_disabled() throws Exception {
+        // Feature deaktivieren
+        applicationProperties.getSystem().setEnableUrlToPDF(false);
 
         UrlToPdfRequest request = new UrlToPdfRequest();
-        request.setUrlInput(invalid_format_Url);
-        // Act
-        IllegalArgumentException thrown =
-                assertThrows(
-                        IllegalArgumentException.class,
-                        () -> {
-                            convertWebsiteToPDF.urlToPdf(request);
-                        });
-        // Assert
-        assertEquals("Invalid URL format: provided format is invalid", thrown.getMessage());
+        request.setUrlInput("https://example.com/");
+
+        ResponseEntity<?> resp = sut.urlToPdf(request);
+
+        assertEquals(HttpStatus.SEE_OTHER, resp.getStatusCode());
+        URI location = resp.getHeaders().getLocation();
+        assertNotNull(location, "Location header expected");
+        assertTrue(
+                location.getQuery() != null
+                        && location.getQuery().contains("error=error.endpointDisabled"));
     }
 
     @Test
-    public void test_exemption_is_thrown_when_url_is_not_reachable() {
+    void convertURLToFileName_sanitizes_and_appends_pdf() throws Exception {
+        Method m =
+                ConvertWebsiteToPDF.class.getDeclaredMethod("convertURLToFileName", String.class);
+        m.setAccessible(true);
 
-        String unreachable_Url = "https://www.googleeeexyz.com";
+        String in = "https://ex-ample.com/path?q=1&x=y#frag";
+        String out = (String) m.invoke(sut, in);
+
+        assertTrue(out.endsWith(".pdf"));
+        // Nur A–Z, a–z, 0–9, Unterstrich und Punkt erlaubt
+        assertTrue(out.matches("[A-Za-z0-9_]+\\.pdf"));
+        // keine Truncation hier (Quelle ist nicht so lang)
+        assertTrue(out.length() <= 54);
+    }
+
+    @Test
+    void convertURLToFileName_truncates_to_50_chars_before_pdf_suffix() throws Exception {
+        Method m =
+                ConvertWebsiteToPDF.class.getDeclaredMethod("convertURLToFileName", String.class);
+        m.setAccessible(true);
+
+        // Sehr lange URL → löst Truncation aus
+        String longUrl =
+                "https://very-very-long-domain.example.com/some/really/long/path/with?many=params&and=chars";
+        String out = (String) m.invoke(sut, longUrl);
+
+        assertTrue(out.endsWith(".pdf"));
+        assertTrue(out.matches("[A-Za-z0-9_]+\\.pdf"));
+        // safeName ist auf 50 begrenzt → total max 54 inkl. ".pdf"
+        assertTrue(out.length() <= 54, "Filename should be truncated to 50 + '.pdf'");
+    }
+
+    @Test
+    void happy_path_executes_weasyprint_loads_pdf_and_returns_response() throws Exception {
+        UrlToPdfRequest request = new UrlToPdfRequest();
+        request.setUrlInput("https://example.com");
+
+        try (MockedStatic<ProcessExecutor> pe = Mockito.mockStatic(ProcessExecutor.class);
+                MockedStatic<WebResponseUtils> wr = Mockito.mockStatic(WebResponseUtils.class);
+                MockedStatic<GeneralUtils> gu = Mockito.mockStatic(GeneralUtils.class)) {
+
+            // URL-Checks positiv erzwingen
+            gu.when(() -> GeneralUtils.isValidURL("https://example.com")).thenReturn(true);
+            gu.when(() -> GeneralUtils.isURLReachable("https://example.com")).thenReturn(true);
+
+            // richtiger ProcessExecutor!
+            ProcessExecutor mockExec = Mockito.mock(ProcessExecutor.class);
+            pe.when(() -> ProcessExecutor.getInstance(Processes.WEASYPRINT)).thenReturn(mockExec);
+
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<List<String>> cmdCaptor = ArgumentCaptor.forClass(List.class);
+
+            // Rückgabewert typgerecht
+            ProcessExecutorResult dummyResult = Mockito.mock(ProcessExecutorResult.class);
+            when(mockExec.runCommandWithOutputHandling(cmdCaptor.capture()))
+                    .thenReturn(dummyResult);
+
+            // WebResponseUtils mocken
+            ResponseEntity<byte[]> fakeResponse = ResponseEntity.ok(new byte[0]);
+            wr.when(() -> WebResponseUtils.pdfDocToWebResponse(any(PDDocument.class), anyString()))
+                    .thenReturn(fakeResponse);
+
+            // Act
+            ResponseEntity<?> resp = sut.urlToPdf(request);
+
+            // Assert – Response OK
+            assertEquals(HttpStatus.OK, resp.getStatusCode());
+
+            // Assert – WeasyPrint-Kommando korrekt
+            List<String> cmd = cmdCaptor.getValue();
+            assertNotNull(cmd);
+            assertEquals("/usr/bin/weasyprint", cmd.get(0));
+            assertEquals("https://example.com", cmd.get(1));
+            assertEquals("--pdf-forms", cmd.get(2));
+            assertTrue(cmd.size() >= 4, "WeasyPrint sollte einen Output-Pfad erhalten");
+            String outPathStr = cmd.get(3);
+            assertNotNull(outPathStr);
+
+            // Temp-Datei muss im finally gelöscht sein
+            Path outPath = Path.of(outPathStr);
+            assertFalse(
+                    Files.exists(outPath), "Temp-Output-Datei sollte nach dem Call gelöscht sein");
+        }
+    }
+
+    @Test
+    void finally_block_logs_and_swallows_ioexception_on_delete() throws Exception {
         // Arrange
         UrlToPdfRequest request = new UrlToPdfRequest();
-        request.setUrlInput(unreachable_Url);
-        // Act
-        IllegalArgumentException thrown =
-                assertThrows(
-                        IllegalArgumentException.class,
-                        () -> {
-                            convertWebsiteToPDF.urlToPdf(request);
-                        });
-        // Assert
-        assertEquals("URL is not reachable, please provide a valid URL", thrown.getMessage());
+        request.setUrlInput("https://example.com");
+
+        Path preCreatedTemp = java.nio.file.Files.createTempFile("test_output_", ".pdf");
+
+        try (MockedStatic<GeneralUtils> gu = Mockito.mockStatic(GeneralUtils.class);
+                MockedStatic<ProcessExecutor> pe = Mockito.mockStatic(ProcessExecutor.class);
+                MockedStatic<WebResponseUtils> wr = Mockito.mockStatic(WebResponseUtils.class);
+                MockedStatic<Files> files = Mockito.mockStatic(Files.class)) {
+
+            // URL-Checks positiv
+            gu.when(() -> GeneralUtils.isValidURL("https://example.com")).thenReturn(true);
+            gu.when(() -> GeneralUtils.isURLReachable("https://example.com")).thenReturn(true);
+
+            // Temp-Datei erzwingen + Delete-Fehler provozieren
+            files.when(() -> Files.createTempFile("output_", ".pdf")).thenReturn(preCreatedTemp);
+            files.when(() -> Files.deleteIfExists(preCreatedTemp))
+                    .thenThrow(new IOException("fail delete"));
+            files.when(() -> Files.exists(preCreatedTemp)).thenReturn(true); // für den Assert
+
+            // ProcessExecutor
+            ProcessExecutor mockExec = Mockito.mock(ProcessExecutor.class);
+            pe.when(() -> ProcessExecutor.getInstance(Processes.WEASYPRINT)).thenReturn(mockExec);
+            ProcessExecutorResult dummy = Mockito.mock(ProcessExecutorResult.class);
+            when(mockExec.runCommandWithOutputHandling(Mockito.<List>any())).thenReturn(dummy);
+
+            // WebResponseUtils
+            ResponseEntity<byte[]> fakeResponse = ResponseEntity.ok(new byte[0]);
+            wr.when(() -> WebResponseUtils.pdfDocToWebResponse(any(PDDocument.class), anyString()))
+                    .thenReturn(fakeResponse);
+
+            // Act: darf keine Exception werfen und soll eine Response liefern
+            ResponseEntity<?> resp = assertDoesNotThrow(() -> sut.urlToPdf(request));
+
+            // Assert
+            assertNotNull(resp, "Response should not be null");
+            assertEquals(HttpStatus.OK, resp.getStatusCode());
+            assertTrue(
+                    java.nio.file.Files.exists(preCreatedTemp),
+                    "Temp-Datei sollte trotz Lösch-IOException noch existieren");
+        } finally {
+            try {
+                java.nio.file.Files.deleteIfExists(preCreatedTemp);
+            } catch (IOException ignore) {
+            }
+        }
     }
 }

app/core/src/test/java/stirling/software/SPDF/controller/api/security/CertSignControllerTest.java

@@ -0,0 +1,312 @@
+package stirling.software.SPDF.controller.api.security;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.http.ResponseEntity;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import stirling.software.SPDF.model.api.security.SignPDFWithCertRequest;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+
+@ExtendWith(MockitoExtension.class)
+class CertSignControllerTest {
+
+    @Mock private CustomPDFDocumentFactory pdfDocumentFactory;
+
+    @InjectMocks private CertSignController certSignController;
+
+    private byte[] pdfBytes;
+    private byte[] pfxBytes;
+    private byte[] p12Bytes;
+    private byte[] jksBytes;
+    private byte[] pemKeyBytes;
+    private byte[] pemCertBytes;
+    private byte[] keyBytes;
+    private byte[] crtCertBytes;
+    private byte[] cerCertBytes;
+    private byte[] derCertBytes;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        try (PDDocument doc = new PDDocument()) {
+            doc.addPage(new PDPage());
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            doc.save(baos);
+            pdfBytes = baos.toByteArray();
+        }
+        ClassPathResource pfxResource = new ClassPathResource("certs/test-cert.pfx");
+        try (InputStream is = pfxResource.getInputStream();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            is.transferTo(baos);
+            pfxBytes = baos.toByteArray();
+        }
+        ClassPathResource p12Resource = new ClassPathResource("certs/test-cert.p12");
+        try (InputStream is = p12Resource.getInputStream();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            is.transferTo(baos);
+            p12Bytes = baos.toByteArray();
+        }
+        ClassPathResource jksResource = new ClassPathResource("certs/test-cert.jks");
+        try (InputStream is = jksResource.getInputStream();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            is.transferTo(baos);
+            jksBytes = baos.toByteArray();
+        }
+        ClassPathResource pemKeyResource = new ClassPathResource("certs/test-key.pem");
+        try (InputStream is = pemKeyResource.getInputStream();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            is.transferTo(baos);
+            pemKeyBytes = baos.toByteArray();
+        }
+        ClassPathResource pemCertResource = new ClassPathResource("certs/test-cert.pem");
+        try (InputStream is = pemCertResource.getInputStream();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            is.transferTo(baos);
+            pemCertBytes = baos.toByteArray();
+        }
+        ClassPathResource keyResource = new ClassPathResource("certs/test-key.key");
+        try (InputStream is = keyResource.getInputStream();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            is.transferTo(baos);
+            keyBytes = baos.toByteArray();
+        }
+        ClassPathResource crtResource = new ClassPathResource("certs/test-cert.crt");
+        try (InputStream is = crtResource.getInputStream();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            is.transferTo(baos);
+            crtCertBytes = baos.toByteArray();
+        }
+        ClassPathResource cerResource = new ClassPathResource("certs/test-cert.cer");
+        try (InputStream is = cerResource.getInputStream();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            is.transferTo(baos);
+            cerCertBytes = baos.toByteArray();
+        }
+        ClassPathResource derCertResource = new ClassPathResource("certs/test-cert.der");
+        try (InputStream is = derCertResource.getInputStream();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            is.transferTo(baos);
+            derCertBytes = baos.toByteArray();
+        }
+
+        when(pdfDocumentFactory.load(any(MultipartFile.class)))
+                .thenAnswer(
+                        invocation -> {
+                            MultipartFile file = invocation.getArgument(0);
+                            return Loader.loadPDF(file.getBytes());
+                        });
+    }
+
+    @Test
+    void testSignPdfWithPfx() throws Exception {
+        MockMultipartFile pdfFile =
+                new MockMultipartFile("fileInput", "test.pdf", "application/pdf", pdfBytes);
+        MockMultipartFile pfxFile =
+                new MockMultipartFile("p12File", "test-cert.pfx", "application/x-pkcs12", pfxBytes);
+
+        SignPDFWithCertRequest request = new SignPDFWithCertRequest();
+        request.setFileInput(pdfFile);
+        request.setCertType("PFX");
+        request.setP12File(pfxFile);
+        request.setPassword("password");
+        request.setShowSignature(false);
+        request.setReason("test");
+        request.setLocation("test");
+        request.setName("tester");
+        request.setPageNumber(1);
+        request.setShowLogo(false);
+
+        ResponseEntity<byte[]> response = certSignController.signPDFWithCert(request);
+
+        assertNotNull(response.getBody());
+        assertTrue(response.getBody().length > 0);
+    }
+
+    @Test
+    void testSignPdfWithPkcs12() throws Exception {
+        MockMultipartFile pdfFile =
+                new MockMultipartFile("fileInput", "test.pdf", "application/pdf", pdfBytes);
+        MockMultipartFile p12File =
+                new MockMultipartFile("p12File", "test-cert.p12", "application/x-pkcs12", p12Bytes);
+
+        SignPDFWithCertRequest request = new SignPDFWithCertRequest();
+        request.setFileInput(pdfFile);
+        request.setCertType("PKCS12");
+        request.setP12File(p12File);
+        request.setPassword("password");
+        request.setShowSignature(false);
+        request.setReason("test");
+        request.setLocation("test");
+        request.setName("tester");
+        request.setPageNumber(1);
+        request.setShowLogo(false);
+
+        ResponseEntity<byte[]> response = certSignController.signPDFWithCert(request);
+
+        assertNotNull(response.getBody());
+        assertTrue(response.getBody().length > 0);
+    }
+
+    @Test
+    void testSignPdfWithJks() throws Exception {
+        MockMultipartFile pdfFile =
+                new MockMultipartFile("fileInput", "test.pdf", "application/pdf", pdfBytes);
+        MockMultipartFile jksFile =
+                new MockMultipartFile(
+                        "jksFile", "test-cert.jks", "application/octet-stream", jksBytes);
+
+        SignPDFWithCertRequest request = new SignPDFWithCertRequest();
+        request.setFileInput(pdfFile);
+        request.setCertType("JKS");
+        request.setJksFile(jksFile);
+        request.setPassword("password");
+        request.setShowSignature(false);
+        request.setReason("test");
+        request.setLocation("test");
+        request.setName("tester");
+        request.setPageNumber(1);
+        request.setShowLogo(false);
+
+        ResponseEntity<byte[]> response = certSignController.signPDFWithCert(request);
+
+        assertNotNull(response.getBody());
+        assertTrue(response.getBody().length > 0);
+    }
+
+    @Test
+    void testSignPdfWithPem() throws Exception {
+        MockMultipartFile pdfFile =
+                new MockMultipartFile("fileInput", "test.pdf", "application/pdf", pdfBytes);
+        MockMultipartFile keyFile =
+                new MockMultipartFile(
+                        "privateKeyFile", "test-key.pem", "application/x-pem-file", pemKeyBytes);
+        MockMultipartFile certFile =
+                new MockMultipartFile(
+                        "certFile", "test-cert.pem", "application/x-pem-file", pemCertBytes);
+
+        SignPDFWithCertRequest request = new SignPDFWithCertRequest();
+        request.setFileInput(pdfFile);
+        request.setCertType("PEM");
+        request.setPrivateKeyFile(keyFile);
+        request.setCertFile(certFile);
+        request.setPassword("password");
+        request.setShowSignature(false);
+        request.setReason("test");
+        request.setLocation("test");
+        request.setName("tester");
+        request.setPageNumber(1);
+        request.setShowLogo(false);
+
+        ResponseEntity<byte[]> response = certSignController.signPDFWithCert(request);
+
+        assertNotNull(response.getBody());
+        assertTrue(response.getBody().length > 0);
+    }
+
+    @Test
+    void testSignPdfWithCrt() throws Exception {
+        MockMultipartFile pdfFile =
+                new MockMultipartFile("fileInput", "test.pdf", "application/pdf", pdfBytes);
+        MockMultipartFile keyFile =
+                new MockMultipartFile(
+                        "privateKeyFile", "test-key.key", "application/x-pem-file", keyBytes);
+        MockMultipartFile certFile =
+                new MockMultipartFile(
+                        "certFile", "test-cert.crt", "application/x-x509-ca-cert", crtCertBytes);
+
+        SignPDFWithCertRequest request = new SignPDFWithCertRequest();
+        request.setFileInput(pdfFile);
+        request.setCertType("PEM");
+        request.setPrivateKeyFile(keyFile);
+        request.setCertFile(certFile);
+        request.setPassword("password");
+        request.setShowSignature(false);
+        request.setReason("test");
+        request.setLocation("test");
+        request.setName("tester");
+        request.setPageNumber(1);
+        request.setShowLogo(false);
+
+        ResponseEntity<byte[]> response = certSignController.signPDFWithCert(request);
+
+        assertNotNull(response.getBody());
+        assertTrue(response.getBody().length > 0);
+    }
+
+    @Test
+    void testSignPdfWithCer() throws Exception {
+        MockMultipartFile pdfFile =
+                new MockMultipartFile("fileInput", "test.pdf", "application/pdf", pdfBytes);
+        MockMultipartFile keyFile =
+                new MockMultipartFile(
+                        "privateKeyFile", "test-key.key", "application/x-pem-file", keyBytes);
+        MockMultipartFile certFile =
+                new MockMultipartFile(
+                        "certFile", "test-cert.cer", "application/x-x509-ca-cert", cerCertBytes);
+
+        SignPDFWithCertRequest request = new SignPDFWithCertRequest();
+        request.setFileInput(pdfFile);
+        request.setCertType("PEM");
+        request.setPrivateKeyFile(keyFile);
+        request.setCertFile(certFile);
+        request.setPassword("password");
+        request.setShowSignature(false);
+        request.setReason("test");
+        request.setLocation("test");
+        request.setName("tester");
+        request.setPageNumber(1);
+        request.setShowLogo(false);
+
+        ResponseEntity<byte[]> response = certSignController.signPDFWithCert(request);
+
+        assertNotNull(response.getBody());
+        assertTrue(response.getBody().length > 0);
+    }
+
+    @Test
+    void testSignPdfWithDer() throws Exception {
+        MockMultipartFile pdfFile =
+                new MockMultipartFile("fileInput", "test.pdf", "application/pdf", pdfBytes);
+        MockMultipartFile keyFile =
+                new MockMultipartFile(
+                        "privateKeyFile", "test-key.key", "application/x-pem-file", keyBytes);
+        MockMultipartFile certFile =
+                new MockMultipartFile(
+                        "certFile", "test-cert.der", "application/x-x509-ca-cert", derCertBytes);
+
+        SignPDFWithCertRequest request = new SignPDFWithCertRequest();
+        request.setFileInput(pdfFile);
+        request.setCertType("PEM");
+        request.setPrivateKeyFile(keyFile);
+        request.setCertFile(certFile);
+        request.setPassword("password");
+        request.setShowSignature(false);
+        request.setReason("test");
+        request.setLocation("test");
+        request.setName("tester");
+        request.setPageNumber(1);
+        request.setShowLogo(false);
+
+        ResponseEntity<byte[]> response = certSignController.signPDFWithCert(request);
+
+        assertNotNull(response.getBody());
+        assertTrue(response.getBody().length > 0);
+    }
+}

app/core/src/test/java/stirling/software/SPDF/service/PdfImageRemovalServiceTest.java

@@ -1,17 +1,10 @@
 package stirling.software.SPDF.service;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -42,7 +35,7 @@ class PdfImageRemovalServiceTest {
 
         // Configure page tree to iterate over our single page
         when(document.getPages()).thenReturn(pageTree);
-        Iterator<PDPage> pageIterator = Arrays.asList(page).iterator();
+        Iterator<PDPage> pageIterator = Collections.singletonList(page).iterator();
         when(pageTree.iterator()).thenReturn(pageIterator);
 
         // Set up page resources
@@ -80,7 +73,7 @@ class PdfImageRemovalServiceTest {
 
         // Configure page tree to iterate over our single page
         when(document.getPages()).thenReturn(pageTree);
-        Iterator<PDPage> pageIterator = Arrays.asList(page).iterator();
+        Iterator<PDPage> pageIterator = Collections.singletonList(page).iterator();
         when(pageTree.iterator()).thenReturn(pageIterator);
 
         // Set up page resources
@@ -118,12 +111,12 @@ class PdfImageRemovalServiceTest {
 
         // Set up image XObjects for page 1
         COSName img1 = COSName.getPDFName("Im1");
-        when(resources1.getXObjectNames()).thenReturn(Arrays.asList(img1));
+        when(resources1.getXObjectNames()).thenReturn(Collections.singletonList(img1));
         when(resources1.isImageXObject(img1)).thenReturn(true);
 
         // Set up image XObjects for page 2
         COSName img2 = COSName.getPDFName("Im2");
-        when(resources2.getXObjectNames()).thenReturn(Arrays.asList(img2));
+        when(resources2.getXObjectNames()).thenReturn(Collections.singletonList(img2));
         when(resources2.isImageXObject(img2)).thenReturn(true);
 
         // Execute the method

app/core/src/test/resources/certs/test-cert.cer

@@ -0,0 +1,26 @@
+Bag Attributes
+    friendlyName: alias
+    localKeyID: 43 4A B0 2D D5 03 52 9F 5B 78 50 64 54 22 AB F7 C8 0B 1F 2B
+subject=C = US, ST = CA, L = SF, O = Test, OU = Test, CN = Test
+issuer=C = US, ST = CA, L = SF, O = Test, OU = Test, CN = Test
+-----BEGIN CERTIFICATE-----
+MIIDiTCCAnGgAwIBAgIUdWDUiSWDll+owMQEzypIuChp+bcwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjENMAsG
+A1UECgwEVGVzdDENMAsGA1UECwwEVGVzdDENMAsGA1UEAwwEVGVzdDAeFw0yNTA4
+MjYwNzQxMTBaFw0yNjA4MjYwNzQxMTBaMFQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJDQTELMAkGA1UEBwwCU0YxDTALBgNVBAoMBFRlc3QxDTALBgNVBAsMBFRlc3Qx
+DTALBgNVBAMMBFRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM
+SfspXLx1WAKSo3AfDYIJAyeSrqFcTsPoNBEvT2U1b8w+SCTw4xR5sC3pNenbiEQ7
+4sI60hgURtOMOAt+iKvfI0A/9N8/wYadXUyis4qGZPkM/F6H5cBF9VaYisGptY2w
+ad9X8XcZgZFABYA5O50Jb5nbUM8fPwDYz2fISIejIpW36y+ApFsotJQCaISe4UWb
+K7bwW4UycghYh7AqfH/1OvgR35gGeL7S+SC0F+CZqGECgansFOh/yYL6VoatoggV
+oZxjIQblmuSrLtfwN1S7ngn85k3NFMBHm1ehMOHabx5G58Wg05/0mBK8bIrwjrNp
+Wzomit8BQJ7eIYUikZfVAgMBAAGjUzBRMB0GA1UdDgQWBBRm6hGFGnC1dxipumf/
+6ROdNE6/YDAfBgNVHSMEGDAWgBRm6hGFGnC1dxipumf/6ROdNE6/YDAPBgNVHRMB
+Af8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB66MPy5kZlSlBgsK4HtB1LSr3M
+dmBWbnQQMq9rmD9AIBQV/shiIjMXGRGnt9zaB0Gg9M39iEvISE6ByMpaDQqV0Md5
+9y4XJu0rg/aMXLaHOGDAWJsb7nCGDt12cWdgn1Ni2mmXUHv4SJCRXNQF7mSgIr+p
+Fvd1ljyvzu/iig8qxrcuWoZvY677p3yen4dN8ocgi8Df3KjduGbsTjFAESYqqNQC
+f+bvypQfhHjxdvz5W3Lpk2swUufqOvhO2b6+cshYJX98qLU8mhai/rOnYkHE7haq
+WDH6XEthnVGtk2VJ4XFDbz+FID440DPzy5u/1OZw2Mcoyp6y7rZDKC/D0Uvh
+-----END CERTIFICATE-----

app/core/src/test/resources/certs/test-cert.crt

@@ -0,0 +1,26 @@
+Bag Attributes
+    friendlyName: alias
+    localKeyID: 43 4A B0 2D D5 03 52 9F 5B 78 50 64 54 22 AB F7 C8 0B 1F 2B
+subject=C = US, ST = CA, L = SF, O = Test, OU = Test, CN = Test
+issuer=C = US, ST = CA, L = SF, O = Test, OU = Test, CN = Test
+-----BEGIN CERTIFICATE-----
+MIIDiTCCAnGgAwIBAgIUdWDUiSWDll+owMQEzypIuChp+bcwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjENMAsG
+A1UECgwEVGVzdDENMAsGA1UECwwEVGVzdDENMAsGA1UEAwwEVGVzdDAeFw0yNTA4
+MjYwNzQxMTBaFw0yNjA4MjYwNzQxMTBaMFQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJDQTELMAkGA1UEBwwCU0YxDTALBgNVBAoMBFRlc3QxDTALBgNVBAsMBFRlc3Qx
+DTALBgNVBAMMBFRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM
+SfspXLx1WAKSo3AfDYIJAyeSrqFcTsPoNBEvT2U1b8w+SCTw4xR5sC3pNenbiEQ7
+4sI60hgURtOMOAt+iKvfI0A/9N8/wYadXUyis4qGZPkM/F6H5cBF9VaYisGptY2w
+ad9X8XcZgZFABYA5O50Jb5nbUM8fPwDYz2fISIejIpW36y+ApFsotJQCaISe4UWb
+K7bwW4UycghYh7AqfH/1OvgR35gGeL7S+SC0F+CZqGECgansFOh/yYL6VoatoggV
+oZxjIQblmuSrLtfwN1S7ngn85k3NFMBHm1ehMOHabx5G58Wg05/0mBK8bIrwjrNp
+Wzomit8BQJ7eIYUikZfVAgMBAAGjUzBRMB0GA1UdDgQWBBRm6hGFGnC1dxipumf/
+6ROdNE6/YDAfBgNVHSMEGDAWgBRm6hGFGnC1dxipumf/6ROdNE6/YDAPBgNVHRMB
+Af8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB66MPy5kZlSlBgsK4HtB1LSr3M
+dmBWbnQQMq9rmD9AIBQV/shiIjMXGRGnt9zaB0Gg9M39iEvISE6ByMpaDQqV0Md5
+9y4XJu0rg/aMXLaHOGDAWJsb7nCGDt12cWdgn1Ni2mmXUHv4SJCRXNQF7mSgIr+p
+Fvd1ljyvzu/iig8qxrcuWoZvY677p3yen4dN8ocgi8Df3KjduGbsTjFAESYqqNQC
+f+bvypQfhHjxdvz5W3Lpk2swUufqOvhO2b6+cshYJX98qLU8mhai/rOnYkHE7haq
+WDH6XEthnVGtk2VJ4XFDbz+FID440DPzy5u/1OZw2Mcoyp6y7rZDKC/D0Uvh
+-----END CERTIFICATE-----

app/core/src/test/resources/certs/test-cert.pem

@@ -0,0 +1,26 @@
+Bag Attributes
+    friendlyName: alias
+    localKeyID: 43 4A B0 2D D5 03 52 9F 5B 78 50 64 54 22 AB F7 C8 0B 1F 2B
+subject=C = US, ST = CA, L = SF, O = Test, OU = Test, CN = Test
+issuer=C = US, ST = CA, L = SF, O = Test, OU = Test, CN = Test
+-----BEGIN CERTIFICATE-----
+MIIDiTCCAnGgAwIBAgIUdWDUiSWDll+owMQEzypIuChp+bcwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjENMAsG
+A1UECgwEVGVzdDENMAsGA1UECwwEVGVzdDENMAsGA1UEAwwEVGVzdDAeFw0yNTA4
+MjYwNzQxMTBaFw0yNjA4MjYwNzQxMTBaMFQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJDQTELMAkGA1UEBwwCU0YxDTALBgNVBAoMBFRlc3QxDTALBgNVBAsMBFRlc3Qx
+DTALBgNVBAMMBFRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM
+SfspXLx1WAKSo3AfDYIJAyeSrqFcTsPoNBEvT2U1b8w+SCTw4xR5sC3pNenbiEQ7
+4sI60hgURtOMOAt+iKvfI0A/9N8/wYadXUyis4qGZPkM/F6H5cBF9VaYisGptY2w
+ad9X8XcZgZFABYA5O50Jb5nbUM8fPwDYz2fISIejIpW36y+ApFsotJQCaISe4UWb
+K7bwW4UycghYh7AqfH/1OvgR35gGeL7S+SC0F+CZqGECgansFOh/yYL6VoatoggV
+oZxjIQblmuSrLtfwN1S7ngn85k3NFMBHm1ehMOHabx5G58Wg05/0mBK8bIrwjrNp
+Wzomit8BQJ7eIYUikZfVAgMBAAGjUzBRMB0GA1UdDgQWBBRm6hGFGnC1dxipumf/
+6ROdNE6/YDAfBgNVHSMEGDAWgBRm6hGFGnC1dxipumf/6ROdNE6/YDAPBgNVHRMB
+Af8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB66MPy5kZlSlBgsK4HtB1LSr3M
+dmBWbnQQMq9rmD9AIBQV/shiIjMXGRGnt9zaB0Gg9M39iEvISE6ByMpaDQqV0Md5
+9y4XJu0rg/aMXLaHOGDAWJsb7nCGDt12cWdgn1Ni2mmXUHv4SJCRXNQF7mSgIr+p
+Fvd1ljyvzu/iig8qxrcuWoZvY677p3yen4dN8ocgi8Df3KjduGbsTjFAESYqqNQC
+f+bvypQfhHjxdvz5W3Lpk2swUufqOvhO2b6+cshYJX98qLU8mhai/rOnYkHE7haq
+WDH6XEthnVGtk2VJ4XFDbz+FID440DPzy5u/1OZw2Mcoyp6y7rZDKC/D0Uvh
+-----END CERTIFICATE-----

app/core/src/test/resources/certs/test-key.key

@@ -0,0 +1,34 @@
+Bag Attributes
+    friendlyName: alias
+    localKeyID: 43 4A B0 2D D5 03 52 9F 5B 78 50 64 54 22 AB F7 C8 0B 1F 2B
+Key Attributes: <No Attributes>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIB/3nui1td5QCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDY04ug+QgB6t2TdOWPgdtIBIIE
+0IaMRXXtpzLzSjlpyQpLMWLX9Lu+MauINVQMpan8qspC3RGkGcCQUzTkliM3Ls5Q
+Pwv02iFlKAzUYg/Z5V/kONfDkuxjeZvLFjmzomtWNy6yIxp4ShZinH8AGon16J6E
+s1+xlQBBLZYrRXX7WCpnHKE2OKquOoFWpYcb23py6FlD7Uq6XB0LEHR+C35tgnTQ
+WkTFK/La+cbJ+zmWA11Nrnz5XzuWTrNoNB4ygVON78T9o25Hf4V8rWhSZj2N79+B
+QuCAvuqZyAO12aUI9sxZZyis00JOnX7xbAeOkJk8Hhk4iQRMUUudKb5rqLrh/lcm
+F9zZjpu6PxJh22ztnRik3L3LyZLdEhMJJGWk4Z/3tKO87K4EiluzwZhAfMLpqfxx
+qfRKu6By97pbfJFBKqBTzmli2eeJLOwhERlovIaDiublFU8o8RE92PxUPOr7kqL7
+3cx8Qx5AF2Mnu7ftcLIGgg/lN+haoxpACDkC5ZvTFCrGr7jD1DlkswSMoai9gknx
+IMjID9nq6pVWyBm+wt9cALeK2wNa5RsE9fFvF/DBathV/WNmBwjnTKCeX3uPP1nw
+CUE6d+zicrz79kRWRnmscE3phTTu3/O9TokCMe3rLzC0f+gOpIE7vXDSeRuek/xs
+7uahAAWm94cHdz8QIBR/Ub+fFyrz/VHStAGlZhs0SoVnCl+VnZ9D9OqiyqslOihg
+LMcNwH8QjEv4zRAU/Sf1OdVJItXyKfII5zSUCW/TpD/vWPlG80Ib/bc+H9uZDZsg
+OADQYSyWjxA6OUThbCi6Wr+OxFUuDwVaMXxKjz1xH3HjmjpWZeTJy6BAuqe/OLDg
+VxDdEyL8fgz+QaaM/uqFarVMTir2A5VYNJzTXh02rUn3mXXHbH7uZYSwSg7fJ/hU
+ycSUkr/TFe9ZfqKOg1+ZKDu7Q97/tkL7gBTQbPqitUSinGvBgtMZKTHBznEn8foq
+NL/VaFSR4MxTOxFyE2e+9riNJmR0tavZCSgA7LcJtcT9l62cbmwmMj8DvEw8fiSD
+AYpgwovMtDoVDVQGb7ixLMz8/ta1BB7zPpr2aK8x5pVz5c+9rW/NiWQ68LCpEiAc
+HxExUVR0b9thC5YvG4VepUtmZ768yTYyus9jDiDNwRH/qttmAosn4pq5gGK+IVao
+oJX5jcroYaQnvXDBwve2XXXKSkIWe62r8h7Jv6mxR9yBQdVeWNtCGQ5AYNJNxI0i
+ZbCmCcQJnIuMHLYddaIEmUuUBFOquQC9y/pVbMbmdWOMw5Nama+/q6bke/XGk81I
+/Ov2gNN4Eu2V9N9MzlF0GiAmk1784qITj9iDIiYXPESnQfybFyhi2DaUM+KmeHpB
+I2KHL2KA0EGVhBjvCd7FVAqDJL7Dy3nCiLxNiDKChCP9+DDXB2mEfZafltSWai6p
+FPfGZJImQ6NO4/I/2aeXIwr4urJVFt3mr2b6w+gGRjr4qur0ZcqpvvcA3Es+tMX1
+eY5Or9V8iw/wj0x+CrHvvsRBfvCTSN/yqweMr5p1xSZm3Hfz906/q8HSaHb/sNne
+HCjUiKWJ6WTrjDjf9ewYnXb6Qxs3P0zjuHwSrpbq0Pr3HQveQvO5Tfrwr5+ikK1k
+FyqiU4e4vjpLujkIj2dmH0CkJ6ase1j/rWU8nLr1XZSR
+-----END ENCRYPTED PRIVATE KEY-----

app/core/src/test/resources/certs/test-key.pem

@@ -0,0 +1,34 @@
+Bag Attributes
+    friendlyName: alias
+    localKeyID: 43 4A B0 2D D5 03 52 9F 5B 78 50 64 54 22 AB F7 C8 0B 1F 2B
+Key Attributes: <No Attributes>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIXl98lJJ1MUsCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBAcT6pXTGm0w+LUzlVH0GpJBIIE
+0NfOk8+haqEuGskrV8+JJVQLgqpKiOmXBjkiSHGReF4UTocKiUAwrHbvLj+j1VLM
+TNM/G68+SzGuWxI7gxpzA9u7p4Is5+2Sji9KsMuAh2CQlEuzkFsVaD9KXF2rje7g
+0G+4+ExZtsjlt/UqG2plFuWzJwji4J82Cy5dir1MQOOAweq5zG5/nzVpMmNoc1lo
+B9PO18R3SpY6qIp8Q0+d1QJC8zsXi/KKQ3ODiS83x5BL4KkQfjYDK/Lfr9yk5a3t
+JN8wE5jkDyGCLGGWgwy7Xq5N7m+kvcdeIEqKP9g5k5uZ7LppsDFe9dpHVymTHZGu
+tGrB74vi4D28YNhuG5qkTjp6CEehSjMwgWEo0Y6ZGu4WQvoTmkne88zly5vUFNrw
+JFM57YqE8U0Gzy7c/zeGtPq8U7y/Pd4z3muZe9sLpFoFAC7Aoq5yw662mPEBZRVb
+MDw8fK1OY9fnj9qHwQbYAD5AT9GmpwEP4tWkB6qNiDJBR8Jn3VmQ1uwR7oH+BiwX
+Y0xWjgl39JcpMORhzJim7K788FEjDrxR1ptepowC4EKjSeq92BGpO+Flf+lY/xYS
+3QR64h/wJEx7M3FrD7qxSHguW3h8rSMPHQg3YThyBUYsCc1tNpgmhQXNHXlE6G7o
+vdlDawf0Oybq6KzhdU25/kJyTaM7suiDkwyZf8SIElSD8R2VdYmL2AeowJsi26Qc
+0f7l/cL/Pws0j4vxYY+6DD5uw+bCBvsjE5Y8Fw6t0xgYwnMCALjfKr2p3CW/Ifa/
+uynI7Hd548orqkddc834DO6gcPuXMUgZ75RFYglpnD+DDvOzvqh7mrgDiCURZuXd
+eZkF3sr4Wfn4YsQfM0XdfB0/dmzLnGGIzbW9cuB4VQUswDZ9KCnZVMZOC8AMKvSQ
+eZn8VEYSr+qT5m8yKSmeUUQga6G/jN6yHj2mV8ura3o1NHvQpy82lHX3M+2d+cs1
+PWTcYM3AwPpHAM2HyisPYOeNNiEKvo3mtyw2SgV4P6kavdNXFk/xA7mzDWr0QnNX
+/j4ZZFynhUz46joCC6bew0yyRfL1Jqy+XDvtEOmjhy96nJvUDb5IqsMY5ZHRmGkc
+yO3uVQu7kexLcA8mYA5OK1llWuyHxffTyGuL5C0q7+8mBvPrkCakUjsLGAgIWYTE
+ftJ6q8u8xyDghXhRM0lvcoVLjzzjCIDaGVqeXl6HtgJ4grUaNCjESIfsURFylVxk
+3jNFojsxHPtv+zYAG0otqedSKjZaG0uNivjBt/v21luSs+lqEKbv4122yzC8H6pG
+zrS6OGkKb8fIqz3D5nAezMFuMjd+ORiGf/IUJToCeluqVGwXMXExdDSCDf0hFJny
+6y/eKmA88lu6uHYe4TB7ZR2wPyIGl1HPN3xj7Dc/T3wEhCDycKLN4/fY9ZNw5U6E
+F5yVnZFdcaA6qHiY99xvtOPX/EmxibcV6C84QV3HDmdXgjEIH52I9oK0WEjRb2hd
+U2lCnZDNqthn3zn0DZ/aSe4HDe5SfLnzFFGyD1wvCTRcM25901Op4kgVD/BPwWH+
+4E7KiBh91UueWn7m5h1B8cEnpsHwpQLxq2ZdNYzp3ZFyzvzSUXe3QvPveehAgr0M
+lEXzn1/fJpmRPP5hvt6uYqZ+y90BkiT6UlANFHpoA6x0
+-----END ENCRYPTED PRIVATE KEY-----

app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditEventType.java

@@ -1,6 +1,9 @@
 package stirling.software.proprietary.audit;
 
+import lombok.Getter;
+
 /** Standardized audit event types for the application. */
+@Getter
 public enum AuditEventType {
     // Authentication events - BASIC level
     USER_LOGIN("User login"),
@@ -28,10 +31,6 @@ public enum AuditEventType {
         this.description = description;
     }
 
-    public String getDescription() {
-        return description;
-    }
-
     /**
      * Get the enum value from a string representation. Useful for backward compatibility with
      * string-based event types.

app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditLevel.java

@@ -1,6 +1,9 @@
 package stirling.software.proprietary.audit;
 
+import lombok.Getter;
+
 /** Defines the different levels of audit logging available in the application. */
+@Getter
 public enum AuditLevel {
     /**
      * OFF - No audit logging (level 0) Disables all audit logging except for critical security
@@ -33,10 +36,6 @@ public enum AuditLevel {
         this.level = level;
     }
 
-    public int getLevel() {
-        return level;
-    }
-
     /**
      * Checks if this audit level includes the specified level
      *

app/proprietary/src/main/java/stirling/software/proprietary/controller/api/AuditDashboardController.java

@@ -116,8 +116,12 @@ public class AuditDashboardController {
     @GetMapping("/stats")
     @Operation(summary = "Get audit statistics for the last N days")
     public AuditStatsResponse getAuditStats(
-        @Schema(description = "Number of days to look back for audit events", example = "7", required = true)
-            @RequestParam(value = "days", defaultValue = "7") int days) {
+            @Schema(
+                            description = "Number of days to look back for audit events",
+                            example = "7",
+                            required = true)
+                    @RequestParam(value = "days", defaultValue = "7")
+                    int days) {
 
         // Get events from the last X days
         Instant startDate = Instant.now().minus(java.time.Duration.ofDays(days));

app/proprietary/src/main/java/stirling/software/proprietary/security/database/ScheduledTasks.java

@@ -18,7 +18,7 @@ public class ScheduledTasks {
 
     private final DatabaseServiceInterface databaseService;
 
-    @Scheduled(cron = "0 0 0 * * ?")
+    @Scheduled(cron = "#{applicationProperties.system.databaseBackup.cron}")
     public void performBackup() throws SQLException, UnsupportedProviderException {
         databaseService.exportDatabase();
     }

app/proprietary/src/main/java/stirling/software/proprietary/security/model/AttemptCounter.java

@@ -1,5 +1,8 @@
 package stirling.software.proprietary.security.model;
 
+import lombok.Getter;
+
+@Getter
 public class AttemptCounter {
     private int attemptCount;
     private long lastAttemptTime;
@@ -14,14 +17,6 @@ public class AttemptCounter {
         this.lastAttemptTime = System.currentTimeMillis();
     }
 
-    public int getAttemptCount() {
-        return attemptCount;
-    }
-
-    public long getLastAttemptTime() {
-        return lastAttemptTime;
-    }
-
     public boolean shouldReset(long attemptIncrementTime) {
         return System.currentTimeMillis() - lastAttemptTime > attemptIncrementTime;
     }