📝 Sync README.md & scripts/ignore_translation.toml

Co-authored-by: stirlingbot[bot] <195170888+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

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

@@ -122,13 +122,13 @@ Stirling-PDF currently supports 40 languages!
 | Bulgarian (Български) (bg_BG)                | ![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)   |
+| Czech (Česky) (cs_CZ)                        | ![69%](https://geps.dev/progress/69)   |
 | 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)                    | ![88%](https://geps.dev/progress/88)   |
-| German (Deutsch) (de_DE)                     | ![98%](https://geps.dev/progress/98)   |
+| German (Deutsch) (de_DE)                     | ![97%](https://geps.dev/progress/97)   |
 | Greek (Ελληνικά) (el_GR)                     | ![67%](https://geps.dev/progress/67)   |
 | Hindi (हिंदी) (hi_IN)                          | ![67%](https://geps.dev/progress/67)   |
 | Hungarian (Magyar) (hu_HU)                   | ![99%](https://geps.dev/progress/99)   |
@@ -144,7 +144,7 @@ Stirling-PDF currently supports 40 languages!
 | 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)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![95%](https://geps.dev/progress/95)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![94%](https://geps.dev/progress/94)   |
 | Simplified Chinese (简体中文) (zh_CN)         | ![93%](https://geps.dev/progress/93)   |
 | Slovakian (Slovensky) (sk_SK)                | ![51%](https://geps.dev/progress/51)   |
 | Slovenian (Slovenščina) (sl_SI)              | ![71%](https://geps.dev/progress/71)   |

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

@@ -329,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();

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/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/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/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/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/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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=حجم الخط
 addPageNumbers.fontName=اسم الخط
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=اختر PDF
 multiPdfPrompt=اختر ملفات PDF (2+)
 multiPdfDropPrompt=حدد (أو اسحب وأفلت) جميع ملفات PDF التي تحتاجها

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Şrift Ölçüsü
 addPageNumbers.fontName=Şrift Adı
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=PDF(lər)i Seç
 multiPdfPrompt=PDFləri Seç (2+)
 multiPdfDropPrompt=Ehtiyacınız olan bütün PDFləri seçin (və ya sürükləyib buraxın)

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Размер на шрифт
 addPageNumbers.fontName=Име на шрифт
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Изберете PDF(и)
 multiPdfPrompt=Изберете PDF (2+)
 multiPdfDropPrompt=Изберете (или плъзнете и пуснете) всички PDF файлове, от които се нуждаете

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=ཡིག་གཟུགས་ཆེ་ཆུང་
 addPageNumbers.fontName=ཡིག་གཟུགས་མིང་
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=PDF འདེམས་རོགས།
 multiPdfPrompt=PDF གཉིས་ཡན་འདེམས་རོགས།
 multiPdfDropPrompt=དགོས་མཁོ་འདི་ PDF ཡིག་ཆ་ཚང་མ་འདེམས་པའམ་འཐེན་རོགས།

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Mida del tipus de lletra
 addPageNumbers.fontName=Nom del tipus de lletra
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Selecciona PDF(s)
 multiPdfPrompt=Selecciona PDFs (2+)
 multiPdfDropPrompt=Selecciona (o arrossega) els documents PDF

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Velikost písma
 addPageNumbers.fontName=Název písma
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Vyberte PDF soubor(y)
 multiPdfPrompt=Vyberte PDF soubory (2+)
 multiPdfDropPrompt=Vyberte (nebo přetáhněte) všechny požadované PDF soubory

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Skriftstørrelse
 addPageNumbers.fontName=Skriftnavn
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Vælg PDF-fil(er)
 multiPdfPrompt=Vælg PDF-filerne (2+)
 multiPdfDropPrompt=Vælg (eller drag & drop) alle PDF-filerne du skal bruge

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Schriftgröße
 addPageNumbers.fontName=Schriftart
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=PDF(s) auswählen
 multiPdfPrompt=PDFs auswählen (2+)
 multiPdfDropPrompt=Wählen Sie alle gewünschten PDFs aus (oder ziehen Sie sie per Drag & Drop hierhin)

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Μέγεθος γραμματοσειράς
 addPageNumbers.fontName=Όνομα γραμματοσειράς
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Επιλέξτε PDF(s)
 multiPdfPrompt=Επιλέξτε PDFs (2+)
 multiPdfDropPrompt=Επιλέξτε (ή σύρετε & αφήστε) όλα τα PDF που χρειάζεστε

app/core/src/main/resources/messages_en_US.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

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Tamaño de Letra
 addPageNumbers.fontName=Nombre de Letra
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Seleccionar PDF(s)
 multiPdfPrompt=Seleccionar PDFs (2+)
 multiPdfDropPrompt=Seleccione (o arrastre y suelte) todos los PDFs que quiera

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Font Size
 addPageNumbers.fontName=Font Name
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Hautatu PDFa(k)
 multiPdfPrompt=Hautatu PDFak (2+)
 multiPdfDropPrompt=Hautatu (edo arrastatu eta jaregin) nahi dituzun PDFak

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=اندازه فونت
 addPageNumbers.fontName=نام فونت
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=انتخاب فایل(های) PDF
 multiPdfPrompt=انتخاب فایل‌های PDF (دو یا بیشتر)
 multiPdfDropPrompt=انتخاب (یا کشیدن و رها کردن) تمام فایل‌های PDF مورد نیاز

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Taille de Police
 addPageNumbers.fontName=Nom de la Police
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Sélectionnez le(s) PDF
 multiPdfPrompt=Sélectionnez les PDF
 multiPdfDropPrompt=Sélectionnez (ou glissez-déposez) tous les PDF dont vous avez besoin

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Méid an Chló
 addPageNumbers.fontName=Ainm Cló
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Roghnaigh PDF(anna)
 multiPdfPrompt=Roghnaigh PDFs (2+)
 multiPdfDropPrompt=Roghnaigh (nó tarraing & scaoil) gach PDF atá uait

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=फ़ॉन्ट आकार
 addPageNumbers.fontName=फ़ॉन्ट नाम
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=पीडीएफ फ़ाइल(ें) चुनें
 multiPdfPrompt=पीडीएफ फ़ाइलें चुनें (2+)
 multiPdfDropPrompt=आवश्यक सभी पीडीएफ फ़ाइलों को चुनें (या खींच कर छोड़ें)

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Veličina pisma
 addPageNumbers.fontName=Ime pisma
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Odaberi PDF(ove)
 multiPdfPrompt=Odaberi PDF-ove (2+)
 multiPdfDropPrompt=Odaberi (ili povuci i ispusti) sve potrebne PDF-ove

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

@@ -137,6 +137,7 @@ lang.yor=joruba
 
 addPageNumbers.fontSize=Betűméret
 addPageNumbers.fontName=Betűtípus
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=PDF-fájl kiválasztása
 multiPdfPrompt=PDF-fájlok kiválasztása (2+)
 multiPdfDropPrompt=Válassza ki (vagy húzza ide) az összes szükséges PDF-fájlt

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Ukuran Fonta
 addPageNumbers.fontName=Nama Fonta
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Pilih PDF
 multiPdfPrompt=Pilih PDF (2+)
 multiPdfDropPrompt=Pilih (atau seret & letakkan)) semua PDF yang Anda butuhkan

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Dimensione del font
 addPageNumbers.fontName=Nome del font
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Scegli PDF
 multiPdfPrompt=Scegli 2 o più PDF
 multiPdfDropPrompt=Scegli (o trascina e rilascia) uno o più PDF

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

@@ -137,6 +137,7 @@ lang.yor=ヨルバ語
 
 addPageNumbers.fontSize=フォントサイズ
 addPageNumbers.fontName=フォント名
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=PDFを選択
 multiPdfPrompt=PDFを選択（2つ以上）
 multiPdfDropPrompt=PDFを選択（又はドラッグ&ドロップ）

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=글꼴 크기
 addPageNumbers.fontName=글꼴 이름
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=PDF 선택
 multiPdfPrompt=PDF 선택 (2개 이상)
 multiPdfDropPrompt=필요한 모든 PDF를 선택(또는 끌어다 놓기)하세요

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=അക്ഷര വലുപ്പം
 addPageNumbers.fontName=അക്ഷരത്തിന്റെ പേര്
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=PDF(കൾ) തിരഞ്ഞെടുക്കുക
 multiPdfPrompt=PDF-കൾ തിരഞ്ഞെടുക്കുക (2+)
 multiPdfDropPrompt=നിങ്ങൾക്ക് ആവശ്യമുള്ള എല്ലാ PDF-കളും തിരഞ്ഞെടുക്കുക (അല്ലെങ്കിൽ വലിച്ചിടുക)

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Lettertypegrootte
 addPageNumbers.fontName=Lettertypenaam
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Selecteer PDF('s)
 multiPdfPrompt=Selecteer PDF's (2+)
 multiPdfDropPrompt=Selecteer (of sleep & zet neer) alle PDF's die je nodig hebt

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Skriftstørrelse
 addPageNumbers.fontName=Skrifttype
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Velg PDF(er)
 multiPdfPrompt=Velg PDF-filer (2+)
 multiPdfDropPrompt=Velg (eller dra og slipp) alle PDF-ene du trenger

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Rozmiar Czcionki
 addPageNumbers.fontName=Nazwa Czcionki
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Wybierz PDF
 multiPdfPrompt=Wybierz PDF (2+)
 multiPdfDropPrompt=Wybierz (lub przeciągnij i puść) wszystkie dokumenty PDF

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Tamanho da Fonte
 addPageNumbers.fontName=Nome da Fonte
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Selecione o(s) PDF(s)
 multiPdfPrompt=Selecione os PDFs (2+)
 multiPdfDropPrompt=Selecione (ou arraste e solte) todos os PDFs desejados:

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Tamanho da Fonte
 addPageNumbers.fontName=Nome da Fonte
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Selecione PDF(s)
 multiPdfPrompt=Selecione PDFs (2+)
 multiPdfDropPrompt=Selecione (ou arraste e solte) todos os PDFs necessários

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Dimensiune Font
 addPageNumbers.fontName=Nume Font
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Selectează fișiere PDF
 multiPdfPrompt=Selectează mai multe fișiere PDF (2+)
 multiPdfDropPrompt=Selectează (sau trage și plasează) toate fișierele PDF de care ai nevoie

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Размер шрифта
 addPageNumbers.fontName=Название шрифта
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Выберите PDF-файл(ы)
 multiPdfPrompt=Выберите PDF-файлы (2+)
 multiPdfDropPrompt=Выберите (или перетащите) все необходимые PDF-файлы

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Font Size
 addPageNumbers.fontName=Font Name
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Vyberte PDF súbor(y)
 multiPdfPrompt=Vyberte PDF súbory (2+)
 multiPdfDropPrompt=Vyberte (alebo pretiahnite) všetky požadované PDF súbory

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Velikost pisave
 addPageNumbers.fontName=Ime pisave
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Izberi PDF(e)
 multiPdfPrompt=Izberi PDF (2+)
 multiPdfDropPrompt=Izberite (ali povlecite in spustite) vse datoteke PDF, ki jih potrebujete

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

@@ -137,6 +137,7 @@ lang.yor=Joruba
 
 addPageNumbers.fontSize=Veličina fonta
 addPageNumbers.fontName=Naziv fonta
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Odaberi PDF(ove)
 multiPdfPrompt=Odaberi PDF-ove (2+)
 multiPdfDropPrompt=Odaberi (ili prevuci i pusti) sve PDF-ove koji su ti potrebni

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Teckenstorlek
 addPageNumbers.fontName=Typsnitt
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Välj PDF(er)
 multiPdfPrompt=Välj PDF-filer (2+)
 multiPdfDropPrompt=Välj (eller dra och släpp) alla PDF-filer du behöver

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=ขนาดตัวอักษร
 addPageNumbers.fontName=ชื่อฟอนต์
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=เลือก PDF
 multiPdfPrompt=เลือก PDF หลายไฟล์ (2 ขึ้นไป)
 multiPdfDropPrompt=เลือก (หรือลากและวาง) PDF ทั้งหมดที่คุณต้องการ

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

@@ -135,8 +135,9 @@ lang.vie=Vietnamca
 lang.yid=Yidiş
 lang.yor=Yoruba
 
-addPageNumbers.fontSize=Font Büyüklüğü
-addPageNumbers.fontName=Font İsmi
+addPageNumbers.fontSize=Yazı Tipi Büyüklüğü
+addPageNumbers.fontName=Yazı Tipi İsmi
+addPageNumbers.fontColor=Yazı Tipi Rengi
 pdfPrompt=PDF(leri) seçin
 multiPdfPrompt=PDFleri seçin (2+)
 multiPdfDropPrompt=Tüm gerekli PDF'leri seçin (ya da sürükleyip bırakın)
@@ -193,7 +194,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.
+error.invalidUrlFormat=Geçersiz URL biçimi girildi. Girilen biçim geçersiz.
 
 # 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_uk_UA.properties

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Розмір шрифту
 addPageNumbers.fontName=Назва шрифту
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Оберіть PDF(и)
 multiPdfPrompt=Оберіть PDFи (2+)
 multiPdfDropPrompt=Оберіть (або перетягніть) всі необхідні PDFи

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

@@ -137,6 +137,7 @@ lang.yor=Yoruba
 
 addPageNumbers.fontSize=Font Size
 addPageNumbers.fontName=Font Name
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=Chọn (các) tệp PDF
 multiPdfPrompt=Chọn các tệp PDF (2+)
 multiPdfDropPrompt=Chọn (hoặc kéo và thả) tất cả các tệp PDF bạn cần

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

@@ -137,6 +137,7 @@ lang.yor=约鲁巴语
 
 addPageNumbers.fontSize=字体大小
 addPageNumbers.fontName=字体名称
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=选择 PDF
 multiPdfPrompt=选择多个 PDF（2个或更多）
 multiPdfDropPrompt=选择（或拖拽）所需的 PDF

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

@@ -137,6 +137,7 @@ lang.yor=約魯巴語
 
 addPageNumbers.fontSize=字型大小
 addPageNumbers.fontName=字型名稱
+addPageNumbers.fontColor=Font Colour
 pdfPrompt=選擇 PDF 檔案
 multiPdfPrompt=選擇多個 PDF 檔案
 multiPdfDropPrompt=選擇（或拖放）所有需要的 PDF 檔案

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

@@ -731,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",

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/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/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();
     }

build.gradle

@@ -65,7 +65,7 @@ repositories {
 
 allprojects {
     group = 'stirling.software'
-    version = '1.2.0'
+    version = '1.3.0'
 
     configurations.configureEach {
         exclude group: 'commons-logging', module: 'commons-logging'