[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/dependency-review.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 304267160..0cdd47933 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -24,4 +24,4 @@ jobs:
- name: "Checkout Repository"
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: "Dependency Review"
- uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0
+ uses: actions/dependency-review-action@38ecb5b593bf0eb19e335c03f97670f792489a8b # v4.7.0
From 662c2a4dfe39469e04938c560363dd39d15e85f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 May 2025 23:05:06 +0100
Subject: [PATCH 002/195] Bump org.apache.xmlgraphics:batik-all from 1.18 to
1.19 (#3520)
Bumps org.apache.xmlgraphics:batik-all from 1.18 to 1.19.
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 7359d0b6a..412db1b2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -479,7 +479,7 @@ dependencies {
testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
// Batik
- implementation "org.apache.xmlgraphics:batik-all:1.18"
+ implementation "org.apache.xmlgraphics:batik-all:1.19"
// TwelveMonkeys
runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
From 70717813f6df96222a94bffd7d0f32c592c1a175 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 May 2025 23:05:26 +0100
Subject: [PATCH 003/195] Bump io.micrometer:micrometer-core from 1.14.6 to
1.14.7 (#3521)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps
[io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer)
from 1.14.6 to 1.14.7.
Release notes
";
+
+ // Act
+ String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithStyles);
+
+ // Assert
+ // The OWASP HTML Sanitizer might filter some specific styles, so we only check that
+ // the sanitized HTML is not empty and contains a paragraph tag with style
+ assertTrue(sanitizedHtml.contains("Example Link";
+
+ // Act
+ String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithLink);
+
+ // Assert
+ // The most important aspect is that the link content is preserved
+ assertTrue(sanitizedHtml.contains("Example Link"), "Link text should be preserved");
+
+ // Check that the href is present in some form
+ assertTrue(sanitizedHtml.contains("href="), "Link href attribute should be present");
+
+ // Check that the URL is present in some form
+ assertTrue(sanitizedHtml.contains("example.com"), "Link URL should be preserved");
+
+ // OWASP sanitizer may handle title attributes differently depending on version
+ // So we won't make strict assertions about the title attribute
+ }
+
+ @Test
+ void testSanitizeDisallowsJavaScriptLinks() {
+ // Arrange
+ String htmlWithJsLink = "Malicious Link";
+
+ // Act
+ String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithJsLink);
+
+ // Assert
+ assertFalse(sanitizedHtml.contains("javascript:"), "JavaScript URLs should be removed");
+ // The link tag might still be there, but the href should be sanitized
+ assertTrue(sanitizedHtml.contains("Malicious Link"), "Link text should be preserved");
+ }
+
+ @Test
+ void testSanitizeAllowsTables() {
+ // Arrange - Testing Sanitizers.TABLES
+ String htmlWithTable =
+ "
".getBytes());
+ Files.write(
+ Path.of(outputDir.getPath(), "image1.png"),
+ "Fake image data".getBytes());
+
+ return mockExecutorResult;
+ });
+
+ // Execute the method
+ ResponseEntity response = pdfToFile.processPdfToMarkdown(pdfFile);
+
+ // Verify
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertNotNull(response.getBody());
+ assertTrue(response.getBody().length > 0);
+
+ // Verify content disposition indicates a zip file
+ assertTrue(
+ response.getHeaders()
+ .getContentDisposition()
+ .toString()
+ .contains("ToMarkdown.zip"));
+
+ // Verify the content by unzipping it
+ try (ZipInputStream zipStream =
+ ZipSecurity.createHardenedInputStream(new java.io.ByteArrayInputStream(response.getBody()))) {
+ ZipEntry entry;
+ boolean foundMdFiles = false;
+ boolean foundImage = false;
+
+ while ((entry = zipStream.getNextEntry()) != null) {
+ if (entry.getName().endsWith(".md")) {
+ foundMdFiles = true;
+ } else if (entry.getName().endsWith(".png")) {
+ foundImage = true;
+ }
+ zipStream.closeEntry();
+ }
+
+ assertTrue(foundMdFiles, "ZIP should contain Markdown files");
+ assertTrue(foundImage, "ZIP should contain image files");
+ }
+ }
+ }
+
+ @Test
+ void testProcessPdfToHtml() throws IOException, InterruptedException {
+ // Setup mock objects and temp files
+ try (MockedStatic mockedStaticProcessExecutor =
+ mockStatic(ProcessExecutor.class)) {
+ // Create a mock PDF file
+ MultipartFile pdfFile =
+ new MockMultipartFile(
+ "file", "test.pdf", "application/pdf", "Fake PDF content".getBytes());
+
+ // Setup ProcessExecutor mock
+ mockedStaticProcessExecutor
+ .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML))
+ .thenReturn(mockProcessExecutor);
+
+ when(mockProcessExecutor.runCommandWithOutputHandling(any(List.class), any(File.class)))
+ .thenAnswer(
+ invocation -> {
+ // When command is executed, simulate creation of output files
+ File outputDir = invocation.getArgument(1);
+
+ // Create HTML files and assets
+ Files.write(
+ Path.of(outputDir.getPath(), "test.html"),
+ "".getBytes());
+ Files.write(
+ Path.of(outputDir.getPath(), "test_ind.html"),
+ "Index".getBytes());
+ Files.write(
+ Path.of(outputDir.getPath(), "test_img.png"),
+ "Fake image data".getBytes());
+
+ return mockExecutorResult;
+ });
+
+ // Execute the method
+ ResponseEntity response = pdfToFile.processPdfToHtml(pdfFile);
+
+ // Verify
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertNotNull(response.getBody());
+ assertTrue(response.getBody().length > 0);
+
+ // Verify content disposition indicates a zip file
+ assertTrue(
+ response.getHeaders()
+ .getContentDisposition()
+ .toString()
+ .contains("testToHtml.zip"));
+
+ // Verify the content by unzipping it
+ try (ZipInputStream zipStream =
+ ZipSecurity.createHardenedInputStream(new java.io.ByteArrayInputStream(response.getBody()))) {
+ ZipEntry entry;
+ boolean foundMainHtml = false;
+ boolean foundIndexHtml = false;
+ boolean foundImage = false;
+
+ while ((entry = zipStream.getNextEntry()) != null) {
+ if ("test.html".equals(entry.getName())) {
+ foundMainHtml = true;
+ } else if ("test_ind.html".equals(entry.getName())) {
+ foundIndexHtml = true;
+ } else if ("test_img.png".equals(entry.getName())) {
+ foundImage = true;
+ }
+ zipStream.closeEntry();
+ }
+
+ assertTrue(foundMainHtml, "ZIP should contain main HTML file");
+ assertTrue(foundIndexHtml, "ZIP should contain index HTML file");
+ assertTrue(foundImage, "ZIP should contain image files");
+ }
+ }
+ }
+
+ @Test
+ void testProcessPdfToOfficeFormat_SingleOutputFile() throws IOException, InterruptedException {
+ // Setup mock objects and temp files
+ try (MockedStatic mockedStaticProcessExecutor =
+ mockStatic(ProcessExecutor.class)) {
+ // Create a mock PDF file
+ MultipartFile pdfFile =
+ new MockMultipartFile(
+ "file",
+ "document.pdf",
+ "application/pdf",
+ "Fake PDF content".getBytes());
+
+ // Setup ProcessExecutor mock
+ mockedStaticProcessExecutor
+ .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE))
+ .thenReturn(mockProcessExecutor);
+
+ when(mockProcessExecutor.runCommandWithOutputHandling(
+ argThat(
+ args ->
+ args.contains("--convert-to")
+ && args.contains("docx"))))
+ .thenAnswer(
+ invocation -> {
+ // When command is executed, find the output directory argument
+ List args = invocation.getArgument(0);
+ String outDir = null;
+ for (int i = 0; i < args.size(); i++) {
+ if ("--outdir".equals(args.get(i)) && i + 1 < args.size()) {
+ outDir = args.get(i + 1);
+ break;
+ }
+ }
+
+ // Create output file
+ Files.write(
+ Path.of(outDir, "document.docx"),
+ "Fake DOCX content".getBytes());
+
+ return mockExecutorResult;
+ });
+
+ // Execute the method with docx format
+ ResponseEntity response =
+ pdfToFile.processPdfToOfficeFormat(pdfFile, "docx", "draw_pdf_import");
+
+ // Verify
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertNotNull(response.getBody());
+ assertTrue(response.getBody().length > 0);
+
+ // Verify content disposition has correct filename
+ assertTrue(
+ response.getHeaders()
+ .getContentDisposition()
+ .toString()
+ .contains("document.docx"));
+ }
+ }
+
+ @Test
+ void testProcessPdfToOfficeFormat_MultipleOutputFiles()
+ throws IOException, InterruptedException {
+ // Setup mock objects and temp files
+ try (MockedStatic mockedStaticProcessExecutor =
+ mockStatic(ProcessExecutor.class)) {
+ // Create a mock PDF file
+ MultipartFile pdfFile =
+ new MockMultipartFile(
+ "file",
+ "document.pdf",
+ "application/pdf",
+ "Fake PDF content".getBytes());
+
+ // Setup ProcessExecutor mock
+ mockedStaticProcessExecutor
+ .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE))
+ .thenReturn(mockProcessExecutor);
+
+ when(mockProcessExecutor.runCommandWithOutputHandling(
+ argThat(args -> args.contains("--convert-to") && args.contains("odp"))))
+ .thenAnswer(
+ invocation -> {
+ // When command is executed, find the output directory argument
+ List args = invocation.getArgument(0);
+ String outDir = null;
+ for (int i = 0; i < args.size(); i++) {
+ if ("--outdir".equals(args.get(i)) && i + 1 < args.size()) {
+ outDir = args.get(i + 1);
+ break;
+ }
+ }
+
+ // Create multiple output files (simulating a presentation with
+ // multiple files)
+ Files.write(
+ Path.of(outDir, "document.odp"),
+ "Fake ODP content".getBytes());
+ Files.write(
+ Path.of(outDir, "document_media1.png"),
+ "Image 1 content".getBytes());
+ Files.write(
+ Path.of(outDir, "document_media2.png"),
+ "Image 2 content".getBytes());
+
+ return mockExecutorResult;
+ });
+
+ // Execute the method with ODP format
+ ResponseEntity response =
+ pdfToFile.processPdfToOfficeFormat(pdfFile, "odp", "draw_pdf_import");
+
+ // Verify
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertNotNull(response.getBody());
+ assertTrue(response.getBody().length > 0);
+
+ // Verify content disposition for zip file
+ assertTrue(
+ response.getHeaders()
+ .getContentDisposition()
+ .toString()
+ .contains("documentToodp.zip"));
+
+ // Verify the content by unzipping it
+ try (ZipInputStream zipStream =
+ ZipSecurity.createHardenedInputStream(new java.io.ByteArrayInputStream(response.getBody()))) {
+ ZipEntry entry;
+ boolean foundMainFile = false;
+ boolean foundMediaFiles = false;
+
+ while ((entry = zipStream.getNextEntry()) != null) {
+ if ("document.odp".equals(entry.getName())) {
+ foundMainFile = true;
+ } else if (entry.getName().startsWith("document_media")) {
+ foundMediaFiles = true;
+ }
+ zipStream.closeEntry();
+ }
+
+ assertTrue(foundMainFile, "ZIP should contain main ODP file");
+ assertTrue(foundMediaFiles, "ZIP should contain media files");
+ }
+ }
+ }
+
+ @Test
+ void testProcessPdfToOfficeFormat_TextFormat() throws IOException, InterruptedException {
+ // Setup mock objects and temp files
+ try (MockedStatic mockedStaticProcessExecutor =
+ mockStatic(ProcessExecutor.class)) {
+ // Create a mock PDF file
+ MultipartFile pdfFile =
+ new MockMultipartFile(
+ "file",
+ "document.pdf",
+ "application/pdf",
+ "Fake PDF content".getBytes());
+
+ // Setup ProcessExecutor mock
+ mockedStaticProcessExecutor
+ .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE))
+ .thenReturn(mockProcessExecutor);
+
+ when(mockProcessExecutor.runCommandWithOutputHandling(
+ argThat(
+ args ->
+ args.contains("--convert-to")
+ && args.contains("txt:Text"))))
+ .thenAnswer(
+ invocation -> {
+ // When command is executed, find the output directory argument
+ List args = invocation.getArgument(0);
+ String outDir = null;
+ for (int i = 0; i < args.size(); i++) {
+ if ("--outdir".equals(args.get(i)) && i + 1 < args.size()) {
+ outDir = args.get(i + 1);
+ break;
+ }
+ }
+
+ // Create text output file
+ Files.write(
+ Path.of(outDir, "document.txt"),
+ "Extracted text content".getBytes());
+
+ return mockExecutorResult;
+ });
+
+ // Execute the method with text format
+ ResponseEntity response =
+ pdfToFile.processPdfToOfficeFormat(pdfFile, "txt:Text", "draw_pdf_import");
+
+ // Verify
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertNotNull(response.getBody());
+ assertTrue(response.getBody().length > 0);
+
+ // Verify content disposition has txt extension
+ assertTrue(
+ response.getHeaders()
+ .getContentDisposition()
+ .toString()
+ .contains("document.txt"));
+ }
+ }
+
+ @Test
+ void testProcessPdfToOfficeFormat_NoFilename() throws IOException, InterruptedException {
+ // Setup mock objects and temp files
+ try (MockedStatic mockedStaticProcessExecutor =
+ mockStatic(ProcessExecutor.class)) {
+ // Create a mock PDF file with no filename
+ MultipartFile pdfFile =
+ new MockMultipartFile(
+ "file", "", "application/pdf", "Fake PDF content".getBytes());
+
+ // Setup ProcessExecutor mock
+ mockedStaticProcessExecutor
+ .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE))
+ .thenReturn(mockProcessExecutor);
+
+ when(mockProcessExecutor.runCommandWithOutputHandling(any(List.class)))
+ .thenAnswer(
+ invocation -> {
+ // When command is executed, find the output directory argument
+ List args = invocation.getArgument(0);
+ String outDir = null;
+ for (int i = 0; i < args.size(); i++) {
+ if ("--outdir".equals(args.get(i)) && i + 1 < args.size()) {
+ outDir = args.get(i + 1);
+ break;
+ }
+ }
+
+ // Create output file - uses default name
+ Files.write(
+ Path.of(outDir, "output.docx"),
+ "Fake DOCX content".getBytes());
+
+ return mockExecutorResult;
+ });
+
+ // Execute the method
+ ResponseEntity response =
+ pdfToFile.processPdfToOfficeFormat(pdfFile, "docx", "draw_pdf_import");
+
+ // Verify
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertNotNull(response.getBody());
+ assertTrue(response.getBody().length > 0);
+
+ // Verify content disposition contains output.docx
+ assertTrue(
+ response.getHeaders()
+ .getContentDisposition()
+ .toString()
+ .contains("output.docx"));
+ }
+ }
+}
diff --git a/src/test/java/stirling/software/SPDF/utils/ProcessExecutorTest.java b/src/test/java/stirling/software/SPDF/utils/ProcessExecutorTest.java
index 871a1678c..83a37865a 100644
--- a/src/test/java/stirling/software/SPDF/utils/ProcessExecutorTest.java
+++ b/src/test/java/stirling/software/SPDF/utils/ProcessExecutorTest.java
@@ -52,9 +52,6 @@ public class ProcessExecutorTest {
processExecutor.runCommandWithOutputHandling(command);
});
- // Log the actual error message
- System.out.println("Caught IOException: " + thrown.getMessage());
-
// Check the exception message to ensure it indicates the command was not found
String errorMessage = thrown.getMessage();
assertTrue(
diff --git a/src/test/java/stirling/software/SPDF/utils/RequestUriUtilsTest.java b/src/test/java/stirling/software/SPDF/utils/RequestUriUtilsTest.java
index f18196030..87d1bd0a6 100644
--- a/src/test/java/stirling/software/SPDF/utils/RequestUriUtilsTest.java
+++ b/src/test/java/stirling/software/SPDF/utils/RequestUriUtilsTest.java
@@ -4,23 +4,308 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
-public class RequestUriUtilsTest {
+class RequestUriUtilsTest {
@Test
- public void testIsStaticResource() {
- assertTrue(RequestUriUtils.isStaticResource("/css/styles.css"));
- assertTrue(RequestUriUtils.isStaticResource("/js/script.js"));
- assertTrue(RequestUriUtils.isStaticResource("/images/logo.png"));
- assertTrue(RequestUriUtils.isStaticResource("/public/index.html"));
- assertTrue(RequestUriUtils.isStaticResource("/pdfjs/pdf.worker.js"));
- assertTrue(RequestUriUtils.isStaticResource("/api/v1/info/status"));
- assertTrue(RequestUriUtils.isStaticResource("/some-path/icon.svg"));
- assertFalse(RequestUriUtils.isStaticResource("/api/v1/users"));
- assertFalse(RequestUriUtils.isStaticResource("/api/v1/orders"));
- assertFalse(RequestUriUtils.isStaticResource("/"));
- assertTrue(RequestUriUtils.isStaticResource("/login"));
- assertFalse(RequestUriUtils.isStaticResource("/register"));
- assertFalse(RequestUriUtils.isStaticResource("/api/v1/products"));
+ void testIsStaticResource() {
+ // Test static resources without context path
+ assertTrue(
+ RequestUriUtils.isStaticResource("/css/styles.css"), "CSS files should be static");
+ assertTrue(RequestUriUtils.isStaticResource("/js/script.js"), "JS files should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource("/images/logo.png"),
+ "Image files should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource("/public/index.html"),
+ "Public files should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource("/pdfjs/pdf.worker.js"),
+ "PDF.js files should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource("/api/v1/info/status"),
+ "API status should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource("/some-path/icon.svg"),
+ "SVG files should be static");
+ assertTrue(RequestUriUtils.isStaticResource("/login"), "Login page should be static");
+ assertTrue(RequestUriUtils.isStaticResource("/error"), "Error page should be static");
+
+ // Test non-static resources
+ assertFalse(
+ RequestUriUtils.isStaticResource("/api/v1/users"),
+ "API users should not be static");
+ assertFalse(
+ RequestUriUtils.isStaticResource("/api/v1/orders"),
+ "API orders should not be static");
+ assertFalse(RequestUriUtils.isStaticResource("/"), "Root path should not be static");
+ assertFalse(
+ RequestUriUtils.isStaticResource("/register"),
+ "Register page should not be static");
+ assertFalse(
+ RequestUriUtils.isStaticResource("/api/v1/products"),
+ "API products should not be static");
+ }
+
+ @Test
+ void testIsStaticResourceWithContextPath() {
+ String contextPath = "/myapp";
+
+ // Test static resources with context path
+ assertTrue(
+ RequestUriUtils.isStaticResource(contextPath, contextPath + "/css/styles.css"),
+ "CSS with context path should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource(contextPath, contextPath + "/js/script.js"),
+ "JS with context path should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource(contextPath, contextPath + "/images/logo.png"),
+ "Images with context path should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource(contextPath, contextPath + "/login"),
+ "Login with context path should be static");
+
+ // Test non-static resources with context path
+ assertFalse(
+ RequestUriUtils.isStaticResource(contextPath, contextPath + "/api/v1/users"),
+ "API users with context path should not be static");
+ assertFalse(
+ RequestUriUtils.isStaticResource(contextPath, "/"),
+ "Root path with context path should not be static");
+ }
+
+ @ParameterizedTest
+ @ValueSource(
+ strings = {
+ "robots.txt",
+ "/favicon.ico",
+ "/icon.svg",
+ "/image.png",
+ "/site.webmanifest",
+ "/app/logo.svg",
+ "/downloads/document.png",
+ "/assets/brand.ico",
+ "/any/path/with/image.svg",
+ "/deep/nested/folder/icon.png"
+ })
+ void testIsStaticResourceWithFileExtensions(String path) {
+ assertTrue(
+ RequestUriUtils.isStaticResource(path),
+ "Files with specific extensions should be static regardless of path");
+ }
+
+ @Test
+ void testIsTrackableResource() {
+ // Test non-trackable resources (returns false)
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/js/script.js"),
+ "JS files should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/v1/api-docs"),
+ "API docs should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("robots.txt"),
+ "robots.txt should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/images/logo.png"),
+ "Images should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/styles.css"),
+ "CSS files should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/script.js.map"),
+ "Map files should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/icon.svg"),
+ "SVG files should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/popularity.txt"),
+ "Popularity file should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/script.js"),
+ "JS files should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/swagger/index.html"),
+ "Swagger files should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/api/v1/info/status"),
+ "API info should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/site.webmanifest"),
+ "Webmanifest should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/fonts/font.woff"),
+ "Fonts should not be trackable");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/pdfjs/viewer.js"),
+ "PDF.js files should not be trackable");
+
+ // Test trackable resources (returns true)
+ assertTrue(RequestUriUtils.isTrackableResource("/login"), "Login page should be trackable");
+ assertTrue(
+ RequestUriUtils.isTrackableResource("/register"),
+ "Register page should be trackable");
+ assertTrue(
+ RequestUriUtils.isTrackableResource("/api/v1/users"),
+ "API users should be trackable");
+ assertTrue(RequestUriUtils.isTrackableResource("/"), "Root path should be trackable");
+ assertTrue(
+ RequestUriUtils.isTrackableResource("/some-other-path"),
+ "Other paths should be trackable");
+ }
+
+ @Test
+ void testIsTrackableResourceWithContextPath() {
+ String contextPath = "/myapp";
+
+ // Test with context path
+ assertFalse(
+ RequestUriUtils.isTrackableResource(contextPath, "/js/script.js"),
+ "JS files should not be trackable with context path");
+ assertTrue(
+ RequestUriUtils.isTrackableResource(contextPath, "/login"),
+ "Login page should be trackable with context path");
+
+ // Additional tests with context path
+ assertFalse(
+ RequestUriUtils.isTrackableResource(contextPath, "/fonts/custom.woff"),
+ "Font files should not be trackable with context path");
+ assertFalse(
+ RequestUriUtils.isTrackableResource(contextPath, "/images/header.png"),
+ "Images should not be trackable with context path");
+ assertFalse(
+ RequestUriUtils.isTrackableResource(contextPath, "/swagger/ui.html"),
+ "Swagger UI should not be trackable with context path");
+ assertTrue(
+ RequestUriUtils.isTrackableResource(contextPath, "/account/profile"),
+ "Account page should be trackable with context path");
+ assertTrue(
+ RequestUriUtils.isTrackableResource(contextPath, "/pdf/view"),
+ "PDF view page should be trackable with context path");
+ }
+
+ @ParameterizedTest
+ @ValueSource(
+ strings = {
+ "/js/util.js",
+ "/v1/api-docs/swagger.json",
+ "/robots.txt",
+ "/images/header/logo.png",
+ "/styles/theme.css",
+ "/build/app.js.map",
+ "/assets/icon.svg",
+ "/data/popularity.txt",
+ "/bundle.js",
+ "/api/swagger-ui.html",
+ "/api/v1/info/health",
+ "/site.webmanifest",
+ "/fonts/roboto.woff",
+ "/pdfjs/viewer.js"
+ })
+ void testNonTrackableResources(String path) {
+ assertFalse(
+ RequestUriUtils.isTrackableResource(path),
+ "Resources matching patterns should not be trackable: " + path);
+ }
+
+ @ParameterizedTest
+ @ValueSource(
+ strings = {
+ "/",
+ "/home",
+ "/login",
+ "/register",
+ "/pdf/merge",
+ "/pdf/split",
+ "/api/v1/users/1",
+ "/api/v1/documents/process",
+ "/settings",
+ "/account/profile",
+ "/dashboard",
+ "/help",
+ "/about"
+ })
+ void testTrackableResources(String path) {
+ assertTrue(
+ RequestUriUtils.isTrackableResource(path),
+ "App routes should be trackable: " + path);
+ }
+
+ @Test
+ void testEdgeCases() {
+ // Test with empty strings
+ assertFalse(RequestUriUtils.isStaticResource("", ""), "Empty path should not be static");
+ assertTrue(RequestUriUtils.isTrackableResource("", ""), "Empty path should be trackable");
+
+ // Test with null-like behavior (would actually throw NPE in real code)
+ // These are not actual null tests but shows handling of odd cases
+ assertFalse(RequestUriUtils.isStaticResource("null"), "String 'null' should not be static");
+
+ // Test String "null" as a path
+ boolean isTrackable = RequestUriUtils.isTrackableResource("null");
+ assertTrue(isTrackable, "String 'null' should be trackable");
+
+ // Mixed case extensions test - note that Java's endsWith() is case-sensitive
+ // We'll check actual behavior and document it rather than asserting
+
+ // Always test the lowercase versions which should definitely work
+ assertTrue(
+ RequestUriUtils.isStaticResource("/logo.png"), "PNG (lowercase) should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource("/icon.svg"), "SVG (lowercase) should be static");
+
+ // Path with query parameters
+ assertFalse(
+ RequestUriUtils.isStaticResource("/api/users?page=1"),
+ "Path with query params should respect base path");
+ assertTrue(
+ RequestUriUtils.isStaticResource("/images/logo.png?v=123"),
+ "Static resource with query params should still be static");
+
+ // Paths with fragments
+ assertTrue(
+ RequestUriUtils.isStaticResource("/css/styles.css#section1"),
+ "CSS with fragment should be static");
+
+ // Multiple dots in filename
+ assertTrue(
+ RequestUriUtils.isStaticResource("/js/jquery.min.js"),
+ "JS with multiple dots should be static");
+
+ // Special characters in path
+ assertTrue(
+ RequestUriUtils.isStaticResource("/images/user's-photo.png"),
+ "Path with special chars should be handled correctly");
+ }
+
+ @Test
+ void testComplexPaths() {
+ // Test complex static resource paths
+ assertTrue(
+ RequestUriUtils.isStaticResource("/css/theme/dark/styles.css"),
+ "Nested CSS should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource("/fonts/open-sans/bold/font.woff"),
+ "Nested font should be static");
+ assertTrue(
+ RequestUriUtils.isStaticResource("/js/vendor/jquery/3.5.1/jquery.min.js"),
+ "Versioned JS should be static");
+
+ // Test complex paths with context
+ String contextPath = "/app";
+ assertTrue(
+ RequestUriUtils.isStaticResource(
+ contextPath, contextPath + "/css/theme/dark/styles.css"),
+ "Nested CSS with context should be static");
+
+ // Test boundary cases for isTrackableResource
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/js-framework/components"),
+ "Path starting with js- should not be treated as JS resource");
+ assertFalse(
+ RequestUriUtils.isTrackableResource("/fonts-selection"),
+ "Path starting with fonts- should not be treated as font resource");
}
}
diff --git a/src/test/java/stirling/software/SPDF/utils/UIScalingTest.java b/src/test/java/stirling/software/SPDF/utils/UIScalingTest.java
new file mode 100644
index 000000000..e4804b724
--- /dev/null
+++ b/src/test/java/stirling/software/SPDF/utils/UIScalingTest.java
@@ -0,0 +1,345 @@
+package stirling.software.SPDF.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Image;
+import java.awt.Insets;
+import java.awt.Toolkit;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
+class UIScalingTest {
+
+ private MockedStatic mockedToolkit;
+ private Toolkit mockedDefaultToolkit;
+
+ @BeforeEach
+ void setUp() {
+ // Set up mocking of Toolkit
+ mockedToolkit = mockStatic(Toolkit.class);
+ mockedDefaultToolkit = Mockito.mock(Toolkit.class);
+
+ // Return mocked toolkit when Toolkit.getDefaultToolkit() is called
+ mockedToolkit.when(Toolkit::getDefaultToolkit).thenReturn(mockedDefaultToolkit);
+ }
+
+ @AfterEach
+ void tearDown() {
+ if (mockedToolkit != null) {
+ mockedToolkit.close();
+ }
+ }
+
+ @Test
+ void testGetWidthScaleFactor() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ double scaleFactor = UIScaling.getWidthScaleFactor();
+
+ // Assert
+ assertEquals(2.0, scaleFactor, 0.001, "Scale factor should be 2.0 for 4K width");
+ verify(mockedDefaultToolkit, times(1)).getScreenSize();
+ }
+
+ @Test
+ void testGetHeightScaleFactor() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ double scaleFactor = UIScaling.getHeightScaleFactor();
+
+ // Assert
+ assertEquals(2.0, scaleFactor, 0.001, "Scale factor should be 2.0 for 4K height");
+ verify(mockedDefaultToolkit, times(1)).getScreenSize();
+ }
+
+ @Test
+ void testGetWidthScaleFactor_HD() {
+ // Arrange - HD resolution
+ Dimension screenSize = new Dimension(1920, 1080);
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ double scaleFactor = UIScaling.getWidthScaleFactor();
+
+ // Assert
+ assertEquals(1.0, scaleFactor, 0.001, "Scale factor should be 1.0 for HD width");
+ }
+
+ @Test
+ void testGetHeightScaleFactor_HD() {
+ // Arrange - HD resolution
+ Dimension screenSize = new Dimension(1920, 1080);
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ double scaleFactor = UIScaling.getHeightScaleFactor();
+
+ // Assert
+ assertEquals(1.0, scaleFactor, 0.001, "Scale factor should be 1.0 for HD height");
+ }
+
+ @Test
+ void testGetWidthScaleFactor_SmallScreen() {
+ // Arrange - Small screen
+ Dimension screenSize = new Dimension(1366, 768);
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ double scaleFactor = UIScaling.getWidthScaleFactor();
+
+ // Assert
+ assertEquals(0.711, scaleFactor, 0.001, "Scale factor should be ~0.711 for 1366x768 width");
+ }
+
+ @Test
+ void testGetHeightScaleFactor_SmallScreen() {
+ // Arrange - Small screen
+ Dimension screenSize = new Dimension(1366, 768);
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ double scaleFactor = UIScaling.getHeightScaleFactor();
+
+ // Assert
+ assertEquals(
+ 0.711, scaleFactor, 0.001, "Scale factor should be ~0.711 for 1366x768 height");
+ }
+
+ @Test
+ void testScaleWidth() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ int scaledWidth = UIScaling.scaleWidth(100);
+
+ // Assert
+ assertEquals(200, scaledWidth, "Width should be scaled by factor of 2");
+ }
+
+ @Test
+ void testScaleHeight() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ int scaledHeight = UIScaling.scaleHeight(100);
+
+ // Assert
+ assertEquals(200, scaledHeight, "Height should be scaled by factor of 2");
+ }
+
+ @Test
+ void testScaleWidth_SmallScreen() {
+ // Arrange - Small screen
+ Dimension screenSize = new Dimension(960, 540); // Half of HD
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ int scaledWidth = UIScaling.scaleWidth(100);
+
+ // Assert
+ assertEquals(50, scaledWidth, "Width should be scaled by factor of 0.5");
+ }
+
+ @Test
+ void testScaleHeight_SmallScreen() {
+ // Arrange - Small screen
+ Dimension screenSize = new Dimension(960, 540); // Half of HD
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Act
+ int scaledHeight = UIScaling.scaleHeight(100);
+
+ // Assert
+ assertEquals(50, scaledHeight, "Height should be scaled by factor of 0.5");
+ }
+
+ @Test
+ void testScaleDimension() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+ Dimension originalDim = new Dimension(200, 150);
+
+ // Act
+ Dimension scaledDim = UIScaling.scale(originalDim);
+
+ // Assert
+ assertEquals(400, scaledDim.width, "Width should be scaled by factor of 2");
+ assertEquals(300, scaledDim.height, "Height should be scaled by factor of 2");
+ // Verify the original dimension is not modified
+ assertEquals(200, originalDim.width, "Original width should remain unchanged");
+ assertEquals(150, originalDim.height, "Original height should remain unchanged");
+ }
+
+ @Test
+ void testScaleInsets() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+ Insets originalInsets = new Insets(10, 20, 30, 40);
+
+ // Act
+ Insets scaledInsets = UIScaling.scale(originalInsets);
+
+ // Assert
+ assertEquals(20, scaledInsets.top, "Top inset should be scaled by factor of 2");
+ assertEquals(40, scaledInsets.left, "Left inset should be scaled by factor of 2");
+ assertEquals(60, scaledInsets.bottom, "Bottom inset should be scaled by factor of 2");
+ assertEquals(80, scaledInsets.right, "Right inset should be scaled by factor of 2");
+ // Verify the original insets are not modified
+ assertEquals(10, originalInsets.top, "Original top inset should remain unchanged");
+ assertEquals(20, originalInsets.left, "Original left inset should remain unchanged");
+ assertEquals(30, originalInsets.bottom, "Original bottom inset should remain unchanged");
+ assertEquals(40, originalInsets.right, "Original right inset should remain unchanged");
+ }
+
+ @Test
+ void testScaleFont() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+ Font originalFont = new Font("Arial", Font.PLAIN, 12);
+
+ // Act
+ Font scaledFont = UIScaling.scaleFont(originalFont);
+
+ // Assert
+ assertEquals(
+ 24.0f, scaledFont.getSize2D(), 0.001f, "Font size should be scaled by factor of 2");
+ // Font family might be substituted by the system, so we don't test it
+ assertEquals(Font.PLAIN, scaledFont.getStyle(), "Font style should remain unchanged");
+ }
+
+ @Test
+ void testScaleFont_DifferentWidthHeightScales() {
+ // Arrange - Different width and height scaling factors
+ Dimension screenSize =
+ new Dimension(2560, 1440); // 1.33x width, 1.33x height of base resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+ Font originalFont = new Font("Arial", Font.PLAIN, 12);
+
+ // Act
+ Font scaledFont = UIScaling.scaleFont(originalFont);
+
+ // Assert
+ // Should use the smaller of the two scale factors, which is the same in this case
+ assertEquals(
+ 16.0f,
+ scaledFont.getSize2D(),
+ 0.001f,
+ "Font size should be scaled by factor of 1.33");
+ }
+
+ @Test
+ void testScaleFont_UnevenScales() {
+ // Arrange - different width and height scale factors
+ Dimension screenSize = new Dimension(3840, 1080); // 2x width, 1x height
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+ Font originalFont = new Font("Arial", Font.PLAIN, 12);
+
+ // Act
+ Font scaledFont = UIScaling.scaleFont(originalFont);
+
+ // Assert - should use the smaller of the two scale factors (height in this case)
+ assertEquals(
+ 12.0f,
+ scaledFont.getSize2D(),
+ 0.001f,
+ "Font size should be scaled by the smaller factor (1.0)");
+ }
+
+ @Test
+ void testScaleIcon_NullIcon() {
+ // Act
+ Image result = UIScaling.scaleIcon(null, 100, 100);
+
+ // Assert
+ assertNull(result, "Should return null for null input");
+ }
+
+ @Test
+ void testScaleIcon_SquareImage() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Create a mock square image
+ Image mockImage = Mockito.mock(Image.class);
+ when(mockImage.getWidth(null)).thenReturn(100);
+ when(mockImage.getHeight(null)).thenReturn(100);
+ when(mockImage.getScaledInstance(anyInt(), anyInt(), anyInt())).thenReturn(mockImage);
+
+ // Act
+ Image result = UIScaling.scaleIcon(mockImage, 100, 100);
+
+ // Assert
+ assertNotNull(result, "Should return a non-null result");
+ verify(mockImage).getScaledInstance(eq(200), eq(200), eq(Image.SCALE_SMOOTH));
+ }
+
+ @Test
+ void testScaleIcon_WideImage() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Create a mock image with a 2:1 aspect ratio (wide)
+ Image mockImage = Mockito.mock(Image.class);
+ when(mockImage.getWidth(null)).thenReturn(200);
+ when(mockImage.getHeight(null)).thenReturn(100);
+ when(mockImage.getScaledInstance(anyInt(), anyInt(), anyInt())).thenReturn(mockImage);
+
+ // Act
+ Image result = UIScaling.scaleIcon(mockImage, 100, 100);
+
+ // Assert
+ assertNotNull(result, "Should return a non-null result");
+ // For a wide image (2:1), the width should be twice the height to maintain aspect ratio
+ verify(mockImage).getScaledInstance(anyInt(), anyInt(), eq(Image.SCALE_SMOOTH));
+ }
+
+ @Test
+ void testScaleIcon_TallImage() {
+ // Arrange
+ Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
+ when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
+
+ // Create a mock image with a 1:2 aspect ratio (tall)
+ Image mockImage = Mockito.mock(Image.class);
+ when(mockImage.getWidth(null)).thenReturn(100);
+ when(mockImage.getHeight(null)).thenReturn(200);
+ when(mockImage.getScaledInstance(anyInt(), anyInt(), anyInt())).thenReturn(mockImage);
+
+ // Act
+ Image result = UIScaling.scaleIcon(mockImage, 100, 100);
+
+ // Assert
+ assertNotNull(result, "Should return a non-null result");
+ // For a tall image (1:2), the height should be twice the width to maintain aspect ratio
+ verify(mockImage).getScaledInstance(anyInt(), anyInt(), eq(Image.SCALE_SMOOTH));
+ }
+}
diff --git a/src/test/java/stirling/software/SPDF/utils/UrlUtilsTest.java b/src/test/java/stirling/software/SPDF/utils/UrlUtilsTest.java
index c6383accb..e69654ffc 100644
--- a/src/test/java/stirling/software/SPDF/utils/UrlUtilsTest.java
+++ b/src/test/java/stirling/software/SPDF/utils/UrlUtilsTest.java
@@ -1,27 +1,279 @@
package stirling.software.SPDF.utils;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.net.ServerSocket;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
import jakarta.servlet.http.HttpServletRequest;
-public class UrlUtilsTest {
+@ExtendWith(MockitoExtension.class)
+class UrlUtilsTest {
+
+ @Mock private HttpServletRequest request;
@Test
void testGetOrigin() {
- // Mock HttpServletRequest
- HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
- Mockito.when(request.getScheme()).thenReturn("http");
- Mockito.when(request.getServerName()).thenReturn("localhost");
- Mockito.when(request.getServerPort()).thenReturn(8080);
- Mockito.when(request.getContextPath()).thenReturn("/myapp");
+ // Arrange
+ when(request.getScheme()).thenReturn("http");
+ when(request.getServerName()).thenReturn("localhost");
+ when(request.getServerPort()).thenReturn(8080);
+ when(request.getContextPath()).thenReturn("/myapp");
- // Call the method under test
+ // Act
String origin = UrlUtils.getOrigin(request);
- // Assert the result
- assertEquals("http://localhost:8080/myapp", origin);
+ // Assert
+ assertEquals(
+ "http://localhost:8080/myapp", origin, "Origin URL should be correctly formatted");
+ }
+
+ @Test
+ void testGetOriginWithHttps() {
+ // Arrange
+ when(request.getScheme()).thenReturn("https");
+ when(request.getServerName()).thenReturn("example.com");
+ when(request.getServerPort()).thenReturn(443);
+ when(request.getContextPath()).thenReturn("");
+
+ // Act
+ String origin = UrlUtils.getOrigin(request);
+
+ // Assert
+ assertEquals(
+ "https://example.com:443",
+ origin,
+ "HTTPS origin URL should be correctly formatted");
+ }
+
+ @Test
+ void testGetOriginWithEmptyContextPath() {
+ // Arrange
+ when(request.getScheme()).thenReturn("http");
+ when(request.getServerName()).thenReturn("localhost");
+ when(request.getServerPort()).thenReturn(8080);
+ when(request.getContextPath()).thenReturn("");
+
+ // Act
+ String origin = UrlUtils.getOrigin(request);
+
+ // Assert
+ assertEquals(
+ "http://localhost:8080",
+ origin,
+ "Origin URL with empty context path should be correct");
+ }
+
+ @Test
+ void testGetOriginWithSpecialCharacters() {
+ // Arrange - Test with server name containing special characters
+ when(request.getScheme()).thenReturn("https");
+ when(request.getServerName()).thenReturn("internal-server.example-domain.com");
+ when(request.getServerPort()).thenReturn(8443);
+ when(request.getContextPath()).thenReturn("/app-v1.2");
+
+ // Act
+ String origin = UrlUtils.getOrigin(request);
+
+ // Assert
+ assertEquals(
+ "https://internal-server.example-domain.com:8443/app-v1.2",
+ origin,
+ "Origin URL with special characters should be correctly formatted");
+ }
+
+ @Test
+ void testGetOriginWithIPv4Address() {
+ // Arrange
+ when(request.getScheme()).thenReturn("http");
+ when(request.getServerName()).thenReturn("192.168.1.100");
+ when(request.getServerPort()).thenReturn(8080);
+ when(request.getContextPath()).thenReturn("/app");
+
+ // Act
+ String origin = UrlUtils.getOrigin(request);
+
+ // Assert
+ assertEquals(
+ "http://192.168.1.100:8080/app",
+ origin,
+ "Origin URL with IPv4 address should be correctly formatted");
+ }
+
+ @Test
+ void testGetOriginWithNonStandardPort() {
+ // Arrange
+ when(request.getScheme()).thenReturn("https");
+ when(request.getServerName()).thenReturn("example.org");
+ when(request.getServerPort()).thenReturn(8443);
+ when(request.getContextPath()).thenReturn("/api");
+
+ // Act
+ String origin = UrlUtils.getOrigin(request);
+
+ // Assert
+ assertEquals(
+ "https://example.org:8443/api",
+ origin,
+ "Origin URL with non-standard port should be correctly formatted");
+ }
+
+ @Test
+ void testIsPortAvailable() {
+ // We'll use a real server socket for this test
+ ServerSocket socket = null;
+ int port = 12345; // Choose a port unlikely to be in use
+
+ try {
+ // First check the port is available
+ boolean initialAvailability = UrlUtils.isPortAvailable(port);
+
+ // Then occupy the port
+ socket = new ServerSocket(port);
+
+ // Now check the port is no longer available
+ boolean afterSocketCreation = UrlUtils.isPortAvailable(port);
+
+ // Assert
+ assertTrue(initialAvailability, "Port should be available initially");
+ assertFalse(
+ afterSocketCreation, "Port should not be available after socket is created");
+
+ } catch (IOException e) {
+ // This might happen if the port is already in use by another process
+ // We'll just verify the behavior of isPortAvailable matches what we expect
+ assertFalse(
+ UrlUtils.isPortAvailable(port),
+ "Port should not be available if exception is thrown");
+ } finally {
+ if (socket != null && !socket.isClosed()) {
+ try {
+ socket.close();
+ } catch (IOException e) {
+ // Ignore cleanup exceptions
+ }
+ }
+ }
+ }
+
+ @Test
+ void testFindAvailablePort() {
+ // We'll create a socket on a port and ensure findAvailablePort returns a different port
+ ServerSocket socket = null;
+ int startPort = 12346; // Choose a port unlikely to be in use
+
+ try {
+ // Occupy the start port
+ socket = new ServerSocket(startPort);
+
+ // Find an available port
+ String availablePort = UrlUtils.findAvailablePort(startPort);
+
+ // Assert the returned port is not the occupied one
+ assertNotEquals(
+ String.valueOf(startPort),
+ availablePort,
+ "findAvailablePort should not return an occupied port");
+
+ // Verify the returned port is actually available
+ int portNumber = Integer.parseInt(availablePort);
+
+ // Close our test socket before checking the found port
+ socket.close();
+ socket = null;
+
+ // The port should now be available
+ assertTrue(
+ UrlUtils.isPortAvailable(portNumber),
+ "The port returned by findAvailablePort should be available");
+
+ } catch (IOException e) {
+ // If we can't create the socket, skip this assertion
+ } finally {
+ if (socket != null && !socket.isClosed()) {
+ try {
+ socket.close();
+ } catch (IOException e) {
+ // Ignore cleanup exceptions
+ }
+ }
+ }
+ }
+
+ @Test
+ void testFindAvailablePortWithAvailableStartPort() {
+ // Find an available port without occupying any
+ int startPort = 23456; // Choose a different unlikely-to-be-used port
+
+ // Make sure the port is available first
+ if (UrlUtils.isPortAvailable(startPort)) {
+ // Find an available port
+ String availablePort = UrlUtils.findAvailablePort(startPort);
+
+ // Assert the returned port is the start port since it's available
+ assertEquals(
+ String.valueOf(startPort),
+ availablePort,
+ "findAvailablePort should return the start port if it's available");
+ }
+ }
+
+ @Test
+ void testFindAvailablePortWithSequentialUsedPorts() {
+ // This test checks that findAvailablePort correctly skips multiple occupied ports
+ ServerSocket socket1 = null;
+ ServerSocket socket2 = null;
+ int startPort = 34567; // Another unlikely-to-be-used port
+
+ try {
+ // First verify the port is available
+ if (!UrlUtils.isPortAvailable(startPort)) {
+ return;
+ }
+
+ // Occupy two sequential ports
+ socket1 = new ServerSocket(startPort);
+ socket2 = new ServerSocket(startPort + 1);
+
+ // Find an available port starting from our occupied range
+ String availablePort = UrlUtils.findAvailablePort(startPort);
+ int foundPort = Integer.parseInt(availablePort);
+
+ // Should have skipped the two occupied ports
+ assertTrue(
+ foundPort >= startPort + 2,
+ "findAvailablePort should skip sequential occupied ports");
+
+ // Verify the found port is actually available
+ try (ServerSocket testSocket = new ServerSocket(foundPort)) {
+ assertTrue(testSocket.isBound(), "The found port should be bindable");
+ }
+
+ } catch (IOException e) {
+ // Skip test if we encounter IO exceptions
+ } finally {
+ // Clean up resources
+ try {
+ if (socket1 != null && !socket1.isClosed()) socket1.close();
+ if (socket2 != null && !socket2.isClosed()) socket2.close();
+ } catch (IOException e) {
+ // Ignore cleanup exceptions
+ }
+ }
+ }
+
+ @Test
+ void testIsPortAvailableWithPrivilegedPorts() {
+ // Skip tests for privileged ports as they typically require root access
+ // and results are environment-dependent
}
}
diff --git a/src/test/java/stirling/software/SPDF/utils/misc/CustomColorReplaceStrategyTest.java b/src/test/java/stirling/software/SPDF/utils/misc/CustomColorReplaceStrategyTest.java
new file mode 100644
index 000000000..15961ae53
--- /dev/null
+++ b/src/test/java/stirling/software/SPDF/utils/misc/CustomColorReplaceStrategyTest.java
@@ -0,0 +1,108 @@
+package stirling.software.SPDF.utils.misc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import stirling.software.SPDF.model.api.misc.HighContrastColorCombination;
+import stirling.software.SPDF.model.api.misc.ReplaceAndInvert;
+
+class CustomColorReplaceStrategyTest {
+
+ private CustomColorReplaceStrategy strategy;
+ private MultipartFile mockFile;
+
+ @BeforeEach
+ void setUp() {
+ // Create a mock file
+ mockFile =
+ new MockMultipartFile(
+ "file", "test.pdf", "application/pdf", "test pdf content".getBytes());
+
+ // Initialize strategy with custom colors
+ strategy =
+ new CustomColorReplaceStrategy(
+ mockFile,
+ ReplaceAndInvert.CUSTOM_COLOR,
+ "000000", // Black text color
+ "FFFFFF", // White background color
+ null); // Not using high contrast combination for CUSTOM_COLOR
+ }
+
+ @Test
+ void testConstructor() {
+ // Test the constructor sets values correctly
+ assertNotNull(strategy, "Strategy should be initialized");
+ assertEquals(mockFile, strategy.getFileInput(), "File input should be set correctly");
+ assertEquals(
+ ReplaceAndInvert.CUSTOM_COLOR,
+ strategy.getReplaceAndInvert(),
+ "ReplaceAndInvert should be set correctly");
+ }
+
+ @Test
+ void testCheckSupportedFontForCharacter() throws Exception {
+ // Use reflection to access private method
+ Method method =
+ CustomColorReplaceStrategy.class.getDeclaredMethod(
+ "checkSupportedFontForCharacter", String.class);
+ method.setAccessible(true);
+
+ // Test with ASCII character which should be supported by standard fonts
+ Object result = method.invoke(strategy, "A");
+ assertNotNull(result, "Standard font should support ASCII character");
+ }
+
+ @Test
+ void testHighContrastColors() {
+ // Create a new strategy with HIGH_CONTRAST_COLOR setting
+ CustomColorReplaceStrategy highContrastStrategy =
+ new CustomColorReplaceStrategy(
+ mockFile,
+ ReplaceAndInvert.HIGH_CONTRAST_COLOR,
+ null, // These will be overridden by the high contrast settings
+ null,
+ HighContrastColorCombination.BLACK_TEXT_ON_WHITE);
+
+ // Verify the colors after replace() is called
+ try {
+ // Call replace (but we don't need the actual result for this test)
+ // This will throw IOException because we're using a mock file without actual PDF
+ // content
+ // but it will still set the colors according to the high contrast setting
+ try {
+ highContrastStrategy.replace();
+ } catch (IOException e) {
+ // Expected exception due to mock file
+ }
+
+ // Use reflection to access private fields
+ java.lang.reflect.Field textColorField =
+ CustomColorReplaceStrategy.class.getDeclaredField("textColor");
+ textColorField.setAccessible(true);
+ java.lang.reflect.Field backgroundColorField =
+ CustomColorReplaceStrategy.class.getDeclaredField("backgroundColor");
+ backgroundColorField.setAccessible(true);
+
+ String textColor = (String) textColorField.get(highContrastStrategy);
+ String backgroundColor = (String) backgroundColorField.get(highContrastStrategy);
+
+ // For BLACK_TEXT_ON_WHITE, text color should be "0" and background color should be
+ // "16777215"
+ assertEquals("0", textColor, "Text color should be black (0)");
+ assertEquals(
+ "16777215", backgroundColor, "Background color should be white (16777215)");
+
+ } catch (Exception e) {
+ // If we get here, the test failed
+ org.junit.jupiter.api.Assertions.fail("Exception occurred: " + e.getMessage());
+ }
+ }
+}
diff --git a/src/test/java/stirling/software/SPDF/utils/misc/HighContrastColorReplaceDeciderTest.java b/src/test/java/stirling/software/SPDF/utils/misc/HighContrastColorReplaceDeciderTest.java
new file mode 100644
index 000000000..eff5231cc
--- /dev/null
+++ b/src/test/java/stirling/software/SPDF/utils/misc/HighContrastColorReplaceDeciderTest.java
@@ -0,0 +1,111 @@
+package stirling.software.SPDF.utils.misc;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+
+import stirling.software.SPDF.model.api.misc.HighContrastColorCombination;
+import stirling.software.SPDF.model.api.misc.ReplaceAndInvert;
+
+class HighContrastColorReplaceDeciderTest {
+
+ @Test
+ void testGetColors_BlackTextOnWhite() {
+ // Arrange
+ ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
+ HighContrastColorCombination combination = HighContrastColorCombination.BLACK_TEXT_ON_WHITE;
+
+ // Act
+ String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, combination);
+
+ // Assert
+ assertArrayEquals(
+ new String[] {"0", "16777215"},
+ colors,
+ "Should return black (0) for text and white (16777215) for background");
+ }
+
+ @Test
+ void testGetColors_GreenTextOnBlack() {
+ // Arrange
+ ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
+ HighContrastColorCombination combination = HighContrastColorCombination.GREEN_TEXT_ON_BLACK;
+
+ // Act
+ String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, combination);
+
+ // Assert
+ assertArrayEquals(
+ new String[] {"65280", "0"},
+ colors,
+ "Should return green (65280) for text and black (0) for background");
+ }
+
+ @Test
+ void testGetColors_WhiteTextOnBlack() {
+ // Arrange
+ ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
+ HighContrastColorCombination combination = HighContrastColorCombination.WHITE_TEXT_ON_BLACK;
+
+ // Act
+ String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, combination);
+
+ // Assert
+ assertArrayEquals(
+ new String[] {"16777215", "0"},
+ colors,
+ "Should return white (16777215) for text and black (0) for background");
+ }
+
+ @Test
+ void testGetColors_YellowTextOnBlack() {
+ // Arrange
+ ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
+ HighContrastColorCombination combination =
+ HighContrastColorCombination.YELLOW_TEXT_ON_BLACK;
+
+ // Act
+ String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, combination);
+
+ // Assert
+ assertArrayEquals(
+ new String[] {"16776960", "0"},
+ colors,
+ "Should return yellow (16776960) for text and black (0) for background");
+ }
+
+ @Test
+ void testGetColors_NullForInvalidCombination() {
+ // Arrange - use null for combination
+ ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
+
+ // Act
+ String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, null);
+
+ // Assert
+ assertNull(colors, "Should return null for invalid combination");
+ }
+
+ @Test
+ void testGetColors_ReplaceAndInvertParameterIsIgnored() {
+ // Arrange - use different ReplaceAndInvert values with the same combination
+ HighContrastColorCombination combination = HighContrastColorCombination.BLACK_TEXT_ON_WHITE;
+
+ // Act
+ String[] colors1 =
+ HighContrastColorReplaceDecider.getColors(
+ ReplaceAndInvert.HIGH_CONTRAST_COLOR, combination);
+ String[] colors2 =
+ HighContrastColorReplaceDecider.getColors(
+ ReplaceAndInvert.CUSTOM_COLOR, combination);
+ String[] colors3 =
+ HighContrastColorReplaceDecider.getColors(
+ ReplaceAndInvert.FULL_INVERSION, combination);
+
+ // Assert - all should return the same colors, showing that the ReplaceAndInvert parameter
+ // isn't used
+ assertArrayEquals(colors1, colors2, "ReplaceAndInvert parameter should be ignored");
+ assertArrayEquals(colors1, colors3, "ReplaceAndInvert parameter should be ignored");
+ }
+}
diff --git a/src/test/java/stirling/software/SPDF/utils/misc/InvertFullColorStrategyTest.java b/src/test/java/stirling/software/SPDF/utils/misc/InvertFullColorStrategyTest.java
new file mode 100644
index 000000000..b222e0a53
--- /dev/null
+++ b/src/test/java/stirling/software/SPDF/utils/misc/InvertFullColorStrategyTest.java
@@ -0,0 +1,153 @@
+package stirling.software.SPDF.utils.misc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+
+import javax.imageio.ImageIO;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import stirling.software.SPDF.model.api.misc.ReplaceAndInvert;
+
+class InvertFullColorStrategyTest {
+
+ private InvertFullColorStrategy strategy;
+ private MultipartFile mockPdfFile;
+
+ @BeforeEach
+ void setUp() throws Exception {
+ // Create a simple PDF document for testing
+ byte[] pdfBytes = createSimplePdfWithRectangle();
+ mockPdfFile = new MockMultipartFile("file", "test.pdf", "application/pdf", pdfBytes);
+
+ // Create the strategy instance
+ strategy = new InvertFullColorStrategy(mockPdfFile, ReplaceAndInvert.FULL_INVERSION);
+ }
+
+ /** Helper method to create a simple PDF with a colored rectangle for testing */
+ private byte[] createSimplePdfWithRectangle() throws IOException {
+ PDDocument document = new PDDocument();
+ PDPage page = new PDPage(PDRectangle.A4);
+ document.addPage(page);
+
+ // Add a filled rectangle with a specific color
+ PDPageContentStream contentStream = new PDPageContentStream(document, page);
+ contentStream.setNonStrokingColor(
+ new PDColor(new float[] {0.8f, 0.2f, 0.2f}, PDDeviceRGB.INSTANCE));
+ contentStream.addRect(100, 100, 400, 400);
+ contentStream.fill();
+ contentStream.close();
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ document.save(baos);
+ document.close();
+
+ return baos.toByteArray();
+ }
+
+ @Test
+ void testReplace() throws IOException {
+ // Test the replace method
+ InputStreamResource result = strategy.replace();
+
+ // Verify that the result is not null
+ assertNotNull(result, "The result should not be null");
+ }
+
+ @Test
+ void testInvertImageColors()
+ throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ // Create a test image with known colors
+ BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
+ java.awt.Graphics graphics = image.getGraphics();
+ graphics.setColor(new Color(200, 100, 50)); // RGB color to be inverted
+ graphics.fillRect(0, 0, 10, 10);
+ graphics.dispose();
+
+ // Get the color of a pixel before inversion
+ Color originalColor = new Color(image.getRGB(5, 5), true);
+
+ // Access private method using reflection
+ Method invertMethodRef =
+ InvertFullColorStrategy.class.getDeclaredMethod(
+ "invertImageColors", BufferedImage.class);
+ invertMethodRef.setAccessible(true);
+
+ // Invoke the private method
+ invertMethodRef.invoke(strategy, image);
+
+ // Get the color of the same pixel after inversion
+ Color invertedColor = new Color(image.getRGB(5, 5), true);
+
+ // Assert that the inversion worked correctly
+ assertEquals(
+ 255 - originalColor.getRed(),
+ invertedColor.getRed(),
+ "Red channel should be inverted");
+ assertEquals(
+ 255 - originalColor.getGreen(),
+ invertedColor.getGreen(),
+ "Green channel should be inverted");
+ assertEquals(
+ 255 - originalColor.getBlue(),
+ invertedColor.getBlue(),
+ "Blue channel should be inverted");
+ }
+
+ @Test
+ void testConvertToBufferedImageTpFile()
+ throws NoSuchMethodException,
+ InvocationTargetException,
+ IllegalAccessException,
+ IOException {
+ // Create a test image
+ BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
+
+ // Access private method using reflection
+ Method convertMethodRef =
+ InvertFullColorStrategy.class.getDeclaredMethod(
+ "convertToBufferedImageTpFile", BufferedImage.class);
+ convertMethodRef.setAccessible(true);
+
+ // Invoke the private method
+ File result = (File) convertMethodRef.invoke(strategy, image);
+
+ try {
+ // Assert that the file exists and is not empty
+ assertNotNull(result, "Result should not be null");
+ assertTrue(result.exists(), "File should exist");
+ assertTrue(result.length() > 0, "File should not be empty");
+
+ // Check that the file can be read back as an image
+ BufferedImage readBack = ImageIO.read(result);
+ assertNotNull(readBack, "Should be able to read back the image");
+ assertEquals(10, readBack.getWidth(), "Image width should match");
+ assertEquals(10, readBack.getHeight(), "Image height should match");
+ } finally {
+ // Clean up
+ if (result != null && result.exists()) {
+ Files.delete(result.toPath());
+ }
+ }
+ }
+}
diff --git a/src/test/java/stirling/software/SPDF/utils/misc/PdfTextStripperCustomTest.java b/src/test/java/stirling/software/SPDF/utils/misc/PdfTextStripperCustomTest.java
new file mode 100644
index 000000000..c25683aff
--- /dev/null
+++ b/src/test/java/stirling/software/SPDF/utils/misc/PdfTextStripperCustomTest.java
@@ -0,0 +1,56 @@
+package stirling.software.SPDF.utils.misc;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class PdfTextStripperCustomTest {
+
+ private PdfTextStripperCustom stripper;
+ private PDPage mockPage;
+ private PDRectangle mockMediaBox;
+
+ @BeforeEach
+ void setUp() throws IOException {
+ // Create the stripper instance
+ stripper = new PdfTextStripperCustom();
+
+ // Create mock objects
+ mockPage = mock(PDPage.class);
+ mockMediaBox = mock(PDRectangle.class);
+
+ // Configure mock behavior
+ when(mockPage.getMediaBox()).thenReturn(mockMediaBox);
+ when(mockMediaBox.getLowerLeftX()).thenReturn(0f);
+ when(mockMediaBox.getLowerLeftY()).thenReturn(0f);
+ when(mockMediaBox.getWidth()).thenReturn(612f);
+ when(mockMediaBox.getHeight()).thenReturn(792f);
+ }
+
+ @Test
+ void testConstructor() throws IOException {
+ // Verify that constructor doesn't throw an exception
+ PdfTextStripperCustom newStripper = new PdfTextStripperCustom();
+ assertNotNull(newStripper, "Constructor should create a non-null instance");
+ }
+
+ @Test
+ void testBasicFunctionality() throws IOException {
+ // Simply test that the method runs without exceptions
+ try {
+ stripper.addRegion("testRegion", new java.awt.geom.Rectangle2D.Float(0, 0, 100, 100));
+ stripper.extractRegions(mockPage);
+ assertTrue(true, "Should execute without errors");
+ } catch (Exception e) {
+ assertTrue(false, "Method should not throw exception: " + e.getMessage());
+ }
+ }
+}
diff --git a/src/test/java/stirling/software/SPDF/utils/misc/ReplaceAndInvertColorStrategyTest.java b/src/test/java/stirling/software/SPDF/utils/misc/ReplaceAndInvertColorStrategyTest.java
new file mode 100644
index 000000000..0aff8d4c3
--- /dev/null
+++ b/src/test/java/stirling/software/SPDF/utils/misc/ReplaceAndInvertColorStrategyTest.java
@@ -0,0 +1,98 @@
+package stirling.software.SPDF.utils.misc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import stirling.software.SPDF.model.api.misc.ReplaceAndInvert;
+
+class ReplaceAndInvertColorStrategyTest {
+
+ // A concrete implementation of the abstract class for testing
+ private static class ConcreteReplaceAndInvertColorStrategy
+ extends ReplaceAndInvertColorStrategy {
+
+ public ConcreteReplaceAndInvertColorStrategy(
+ MultipartFile file, ReplaceAndInvert replaceAndInvert) {
+ super(file, replaceAndInvert);
+ }
+
+ @Override
+ public InputStreamResource replace() throws IOException {
+ // Simple implementation for testing purposes
+ return new InputStreamResource(getFileInput().getInputStream());
+ }
+ }
+
+ @Test
+ void testConstructor() {
+ // Arrange
+ MultipartFile mockFile =
+ new MockMultipartFile(
+ "file", "test.pdf", "application/pdf", "test content".getBytes());
+ ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.CUSTOM_COLOR;
+
+ // Act
+ ReplaceAndInvertColorStrategy strategy =
+ new ConcreteReplaceAndInvertColorStrategy(mockFile, replaceAndInvert);
+
+ // Assert
+ assertNotNull(strategy, "Strategy should be initialized");
+ assertEquals(mockFile, strategy.getFileInput(), "File input should be set correctly");
+ assertEquals(
+ replaceAndInvert,
+ strategy.getReplaceAndInvert(),
+ "ReplaceAndInvert option should be set correctly");
+ }
+
+ @Test
+ void testReplace() throws IOException {
+ // Arrange
+ byte[] content = "test pdf content".getBytes();
+ MultipartFile mockFile =
+ new MockMultipartFile("file", "test.pdf", "application/pdf", content);
+ ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.CUSTOM_COLOR;
+
+ ReplaceAndInvertColorStrategy strategy =
+ new ConcreteReplaceAndInvertColorStrategy(mockFile, replaceAndInvert);
+
+ // Act
+ InputStreamResource result = strategy.replace();
+
+ // Assert
+ assertNotNull(result, "Result should not be null");
+ }
+
+ @Test
+ void testGettersAndSetters() {
+ // Arrange
+ MultipartFile mockFile1 =
+ new MockMultipartFile(
+ "file1", "test1.pdf", "application/pdf", "content1".getBytes());
+ MultipartFile mockFile2 =
+ new MockMultipartFile(
+ "file2", "test2.pdf", "application/pdf", "content2".getBytes());
+
+ // Act
+ ReplaceAndInvertColorStrategy strategy =
+ new ConcreteReplaceAndInvertColorStrategy(mockFile1, ReplaceAndInvert.CUSTOM_COLOR);
+
+ // Test initial values
+ assertEquals(mockFile1, strategy.getFileInput());
+ assertEquals(ReplaceAndInvert.CUSTOM_COLOR, strategy.getReplaceAndInvert());
+
+ // Test setters
+ strategy.setFileInput(mockFile2);
+ strategy.setReplaceAndInvert(ReplaceAndInvert.FULL_INVERSION);
+
+ // Assert new values
+ assertEquals(mockFile2, strategy.getFileInput());
+ assertEquals(ReplaceAndInvert.FULL_INVERSION, strategy.getReplaceAndInvert());
+ }
+}
diff --git a/src/test/java/stirling/software/SPDF/utils/propertyeditor/StringToArrayListPropertyEditorTest.java b/src/test/java/stirling/software/SPDF/utils/propertyeditor/StringToArrayListPropertyEditorTest.java
new file mode 100644
index 000000000..29f7ca923
--- /dev/null
+++ b/src/test/java/stirling/software/SPDF/utils/propertyeditor/StringToArrayListPropertyEditorTest.java
@@ -0,0 +1,156 @@
+package stirling.software.SPDF.utils.propertyeditor;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import stirling.software.SPDF.model.api.security.RedactionArea;
+
+class StringToArrayListPropertyEditorTest {
+
+ private StringToArrayListPropertyEditor editor;
+
+ @BeforeEach
+ void setUp() {
+ editor = new StringToArrayListPropertyEditor();
+ }
+
+ @Test
+ void testSetAsText_ValidJson() {
+ // Arrange
+ String json =
+ "[{\"x\":10.5,\"y\":20.5,\"width\":100.0,\"height\":50.0,\"page\":1,\"color\":\"#FF0000\"}]";
+
+ // Act
+ editor.setAsText(json);
+ Object value = editor.getValue();
+
+ // Assert
+ assertNotNull(value, "Value should not be null");
+ assertTrue(value instanceof List, "Value should be a List");
+
+ @SuppressWarnings("unchecked")
+ List list = (List) value;
+ assertEquals(1, list.size(), "List should have 1 entry");
+
+ RedactionArea area = list.get(0);
+ assertEquals(10.5, area.getX(), "X should be 10.5");
+ assertEquals(20.5, area.getY(), "Y should be 20.5");
+ assertEquals(100.0, area.getWidth(), "Width should be 100.0");
+ assertEquals(50.0, area.getHeight(), "Height should be 50.0");
+ assertEquals(1, area.getPage(), "Page should be 1");
+ assertEquals("#FF0000", area.getColor(), "Color should be #FF0000");
+ }
+
+ @Test
+ void testSetAsText_MultipleItems() {
+ // Arrange
+ String json =
+ "["
+ + "{\"x\":10.0,\"y\":20.0,\"width\":100.0,\"height\":50.0,\"page\":1,\"color\":\"#FF0000\"},"
+ + "{\"x\":30.0,\"y\":40.0,\"width\":200.0,\"height\":150.0,\"page\":2,\"color\":\"#00FF00\"}"
+ + "]";
+
+ // Act
+ editor.setAsText(json);
+ Object value = editor.getValue();
+
+ // Assert
+ assertNotNull(value, "Value should not be null");
+ assertTrue(value instanceof List, "Value should be a List");
+
+ @SuppressWarnings("unchecked")
+ List list = (List) value;
+ assertEquals(2, list.size(), "List should have 2 entries");
+
+ RedactionArea area1 = list.get(0);
+ assertEquals(10.0, area1.getX(), "X should be 10.0");
+ assertEquals(20.0, area1.getY(), "Y should be 20.0");
+ assertEquals(1, area1.getPage(), "Page should be 1");
+
+ RedactionArea area2 = list.get(1);
+ assertEquals(30.0, area2.getX(), "X should be 30.0");
+ assertEquals(40.0, area2.getY(), "Y should be 40.0");
+ assertEquals(2, area2.getPage(), "Page should be 2");
+ }
+
+ @Test
+ void testSetAsText_EmptyString() {
+ // Arrange
+ String json = "";
+
+ // Act
+ editor.setAsText(json);
+ Object value = editor.getValue();
+
+ // Assert
+ assertNotNull(value, "Value should not be null");
+ assertTrue(value instanceof List, "Value should be a List");
+
+ @SuppressWarnings("unchecked")
+ List list = (List) value;
+ assertTrue(list.isEmpty(), "List should be empty");
+ }
+
+ @Test
+ void testSetAsText_NullString() {
+ // Act
+ editor.setAsText(null);
+ Object value = editor.getValue();
+
+ // Assert
+ assertNotNull(value, "Value should not be null");
+ assertTrue(value instanceof List, "Value should be a List");
+
+ @SuppressWarnings("unchecked")
+ List list = (List) value;
+ assertTrue(list.isEmpty(), "List should be empty");
+ }
+
+ @Test
+ void testSetAsText_SingleItemAsArray() {
+ // Arrange - note this is a single object, not an array
+ String json =
+ "{\"x\":10.0,\"y\":20.0,\"width\":100.0,\"height\":50.0,\"page\":1,\"color\":\"#FF0000\"}";
+
+ // Act
+ editor.setAsText(json);
+ Object value = editor.getValue();
+
+ // Assert
+ assertNotNull(value, "Value should not be null");
+ assertTrue(value instanceof List, "Value should be a List");
+
+ @SuppressWarnings("unchecked")
+ List list = (List) value;
+ assertEquals(1, list.size(), "List should have 1 entry");
+
+ RedactionArea area = list.get(0);
+ assertEquals(10.0, area.getX(), "X should be 10.0");
+ assertEquals(20.0, area.getY(), "Y should be 20.0");
+ }
+
+ @Test
+ void testSetAsText_InvalidJson() {
+ // Arrange
+ String json = "invalid json";
+
+ // Act & Assert
+ assertThrows(IllegalArgumentException.class, () -> editor.setAsText(json));
+ }
+
+ @Test
+ void testSetAsText_InvalidStructure() {
+ // Arrange - this JSON doesn't match RedactionArea structure
+ String json = "[{\"invalid\":\"structure\"}]";
+
+ // Act & Assert
+ assertThrows(IllegalArgumentException.class, () -> editor.setAsText(json));
+ }
+}
diff --git a/src/test/java/stirling/software/SPDF/utils/propertyeditor/StringToMapPropertyEditorTest.java b/src/test/java/stirling/software/SPDF/utils/propertyeditor/StringToMapPropertyEditorTest.java
new file mode 100644
index 000000000..b7b65b480
--- /dev/null
+++ b/src/test/java/stirling/software/SPDF/utils/propertyeditor/StringToMapPropertyEditorTest.java
@@ -0,0 +1,122 @@
+package stirling.software.SPDF.utils.propertyeditor;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class StringToMapPropertyEditorTest {
+
+ private StringToMapPropertyEditor editor;
+
+ @BeforeEach
+ void setUp() {
+ editor = new StringToMapPropertyEditor();
+ }
+
+ @Test
+ void testSetAsText_ValidJson() {
+ // Arrange
+ String json = "{\"key1\":\"value1\",\"key2\":\"value2\"}";
+
+ // Act
+ editor.setAsText(json);
+ Object value = editor.getValue();
+
+ // Assert
+ assertNotNull(value, "Value should not be null");
+ assertTrue(value instanceof Map, "Value should be a Map");
+
+ @SuppressWarnings("unchecked")
+ Map map = (Map) value;
+ assertEquals(2, map.size(), "Map should have 2 entries");
+ assertEquals("value1", map.get("key1"), "First entry should be key1=value1");
+ assertEquals("value2", map.get("key2"), "Second entry should be key2=value2");
+ }
+
+ @Test
+ void testSetAsText_EmptyJson() {
+ // Arrange
+ String json = "{}";
+
+ // Act
+ editor.setAsText(json);
+ Object value = editor.getValue();
+
+ // Assert
+ assertNotNull(value, "Value should not be null");
+ assertTrue(value instanceof Map, "Value should be a Map");
+
+ @SuppressWarnings("unchecked")
+ Map map = (Map) value;
+ assertTrue(map.isEmpty(), "Map should be empty");
+ }
+
+ @Test
+ void testSetAsText_WhitespaceJson() {
+ // Arrange
+ String json = " { \"key1\" : \"value1\" } ";
+
+ // Act
+ editor.setAsText(json);
+ Object value = editor.getValue();
+
+ // Assert
+ assertNotNull(value, "Value should not be null");
+ assertTrue(value instanceof Map, "Value should be a Map");
+
+ @SuppressWarnings("unchecked")
+ Map map = (Map) value;
+ assertEquals(1, map.size(), "Map should have 1 entry");
+ assertEquals("value1", map.get("key1"), "Entry should be key1=value1");
+ }
+
+ @Test
+ void testSetAsText_NestedJson() {
+ // Arrange
+ String json = "{\"key1\":\"value1\",\"key2\":\"{\\\"nestedKey\\\":\\\"nestedValue\\\"}\"}";
+
+ // Act
+ editor.setAsText(json);
+ Object value = editor.getValue();
+
+ // Assert
+ assertNotNull(value, "Value should not be null");
+ assertTrue(value instanceof Map, "Value should be a Map");
+
+ @SuppressWarnings("unchecked")
+ Map map = (Map) value;
+ assertEquals(2, map.size(), "Map should have 2 entries");
+ assertEquals("value1", map.get("key1"), "First entry should be key1=value1");
+ assertEquals(
+ "{\"nestedKey\":\"nestedValue\"}",
+ map.get("key2"),
+ "Second entry should be the nested JSON as a string");
+ }
+
+ @Test
+ void testSetAsText_InvalidJson() {
+ // Arrange
+ String json = "{invalid json}";
+
+ // Act & Assert
+ IllegalArgumentException exception =
+ assertThrows(IllegalArgumentException.class, () -> editor.setAsText(json));
+
+ assertEquals(
+ "Failed to convert java.lang.String to java.util.Map",
+ exception.getMessage(),
+ "Exception message should match expected error");
+ }
+
+ @Test
+ void testSetAsText_Null() {
+ // Act & Assert
+ assertThrows(IllegalArgumentException.class, () -> editor.setAsText(null));
+ }
+}
diff --git a/src/test/resources/example.pdf b/src/test/resources/example.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..7f14bb68b59bba60534fc9433e2a5a88eedadf20
GIT binary patch
literal 1755
zcmai#c~nzJ6o*L-+Y_mQR2C5*lvJd|Qfi8>j03lSm8vzM0Pr?(5V*myNKt%k-^t6AJ@k2y0l3gH;
z>IUfY3nfURu8xo=LD)#Nn2#*3N|GcZy!d56%HT=)t>7Ud)@z1-bcOSvzQ-1(yfy=E
z;3ygV%3iE>Yes)yg=G7!
zR&|oMeSohFW^=4sC$t;-bv>$qVZw8Y^pe0up>-%z?pIAF2g%N>{tPH&G^^3G
zdW}uTY_^$gXfwl`$TWEEGGzmOP4thAC{qKPsPb9d3!0tQ&{-W&Z!uZqmwDRKUxqt(
ztG(K2YBIqP9a}k?V&hz)=zd)-I=2^H9N}c?zdX`01{$53`D}xwZ(SFvpPB2|ou1H=
zm|WA>YY^0YlOB5%Jpfo%4ZyO-)ytnx2bcLUf_Mkp#hZK6mKWAS$%7Jvtzqy+S&&f4NdM#GsCZr
zp?ZDail5z?Ae`uz)zCG$2Ue9AloyGE%`FBsuzoqZZ0e3s;3>1aS)nD2OmTlyXK}E4
zpDY!9+}?04HKmx66^6Ax3*fP=7Up+X*D4x1@IJX7M~khUFL?JojkD|AA7*2{jX5C4
z#G>mo4@v6+EN8EWnty@n^;qRu#Ay&H!vx0BM#cKR7`Qz3N+Z_(N!H`;g%iTYrN~cC
z2761ew<4d|Uv|JQS>YH0O;n|FE2{C>yP_LLs90Q?bZx}h!;S|Z&P2p{INfv*9ge%1
zf6@DdacBC^m!QY{RU=P7-NGz)A^NylxZ^H6kRLTY8S4%{P<|?7N8zw-R@MA(N}+O2
z6D@PlrkXI-4>GDO7VJY3N^-ue!5l}uz4o%R_E^nCc19jL^A}h9%?iP*0$LY_r#8&o
zQT4+FZ%P$UNm`ahjK6&7>*tZVy@Be7b9J@D-FvJ7{q(n1&L@obhDFTAD3tA>rX?G6
z8a}g&>toA39kgKb#ZcZpz-ZfH=3LgL{G4!eKrjBr9d<@SOPc*cV_>;$p#Mb4#Iu1V
zifQ_vuak09dbCS_W!?bwkvme|`SjDrSAOU|`nXOt*^lqJpHie~_5L!exHc)p>qT1z
zlfLow-8bg*hN*d$v}KEsz9a5$Tp{9rc_k4^fAbv>B?ytk0|bAN@_vMMTqh<;Ko{44
z!CZ79_ikJ}ae3EU*>wD=l1=yad;@2Mt;x4LZc5E@A9$5xawePl(agxS*(!$0*5FX@
z@PV1{PP19|UE8zKK8QDFqp=7x6JlZz#pjGIXVE8>ZR>abVK%*-q?F_iEqRdV8_U%E
zA(XS5FHH{-Ms}dTb*vwVq|py&e>`T*N3}I8LMo%{%e(56RRX#HR_myaVvl{LKb^S_
z`8o?YRXsfXiZSEr(j!OCraiCHVmDUMUWPv!FZ|HSJ?GfG_U9qh=Ug&&&+#>b8r5%C
zpN#L>!lEns!v}?S+&U@oB*P+H)1{x&?RkA5y~%ri_3qG+(OSw_J7)dZK3tenSb@sh
zNA}QL+BvcQ`+)oM(6XAuYmcDsCszvy`?T(P`Y1kOCZ>Ka+HmC@N)TFV{=T+A?`aDS
zAZ!xt6oXXVoKAs*#bOD#sOma<6C32v*_JxNcRD_g1Tn|=|Z=FoW=2?`G5Le6df5kd%L5xQ?Da?Lm#@MZ$n>uPwVa0p1`iw
jp3<9odQRV>X5MoXNfKV7BqdR|8Hh}!0XUpzfEVx=8I9;1
literal 0
HcmV?d00001
From 5bf2fed2358c01ff226c6bcb88b046d1b8c47620 Mon Sep 17 00:00:00 2001
From: "stirlingbot[bot]" <195170888+stirlingbot[bot]@users.noreply.github.com>
Date: Mon, 19 May 2025 14:42:18 +0100
Subject: [PATCH 010/195] Update 3rd Party Licenses (#3523)
Auto-generated by StirlingBot
Signed-off-by: stirlingbot[bot] <1113334+stirlingbot[bot]@users.noreply.github.com>
Co-authored-by: stirlingbot[bot] <195170888+stirlingbot[bot]@users.noreply.github.com>
---
src/main/resources/static/3rdPartyLicenses.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/static/3rdPartyLicenses.json b/src/main/resources/static/3rdPartyLicenses.json
index da8718489..e8f6942a9 100644
--- a/src/main/resources/static/3rdPartyLicenses.json
+++ b/src/main/resources/static/3rdPartyLicenses.json
@@ -553,7 +553,7 @@
{
"moduleName": "io.micrometer:micrometer-core",
"moduleUrl": "https://github.com/micrometer-metrics/micrometer",
- "moduleVersion": "1.14.6",
+ "moduleVersion": "1.14.7",
"moduleLicense": "The Apache Software License, Version 2.0",
"moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
@@ -932,14 +932,14 @@
},
{
"moduleName": "org.apache.xmlgraphics:batik-all",
- "moduleVersion": "1.18",
+ "moduleVersion": "1.19",
"moduleLicense": "The Apache Software License, Version 2.0",
"moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
{
"moduleName": "org.apache.xmlgraphics:xmlgraphics-commons",
"moduleUrl": "http://xmlgraphics.apache.org/commons/",
- "moduleVersion": "2.10",
+ "moduleVersion": "2.11",
"moduleLicense": "The Apache Software License, Version 2.0",
"moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
From e6a9e7a5847e738f8b154a2589962400c46fadb4 Mon Sep 17 00:00:00 2001
From: "stirlingbot[bot]" <195170888+stirlingbot[bot]@users.noreply.github.com>
Date: Mon, 19 May 2025 16:46:54 +0100
Subject: [PATCH 011/195] :globe_with_meridians: Sync Translations + Update
README Progress Table (#3531)
### Description of Changes
This Pull Request was automatically generated to synchronize updates to
translation files and documentation. Below are the details of the
changes made:
#### **1. Synchronization of Translation Files**
- Updated translation files (`messages_*.properties`) to reflect changes
in the reference file `messages_en_GB.properties`.
- Ensured consistency and synchronization across all supported language
files.
- Highlighted any missing or incomplete translations.
#### **2. Update README.md**
- Generated the translation progress table in `README.md`.
- Added a summary of the current translation status for all supported
languages.
- Included up-to-date statistics on translation coverage.
#### **Why these changes are necessary**
- Keeps translation files aligned with the latest reference updates.
- Ensures the documentation reflects the current translation progress.
---
Auto-generated by [create-pull-request][1].
[1]: https://github.com/peter-evans/create-pull-request
Co-authored-by: stirlingbot[bot] <195170888+stirlingbot[bot]@users.noreply.github.com>
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a0d941343..988781097 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ Stirling-PDF currently supports 40 languages!
| Simplified Chinese (简体中文) (zh_CN) |  |
| Slovakian (Slovensky) (sk_SK) |  |
| Slovenian (Slovenščina) (sl_SI) |  |
-| Spanish (Español) (es_ES) |  |
+| Spanish (Español) (es_ES) |  |
| Swedish (Svenska) (sv_SE) |  |
| Thai (ไทย) (th_TH) |  |
| Tibetan (བོད་ཡིག་) (zh_BO) |  |
From 523240554f29068c2b70a1738951e735ecb031a4 Mon Sep 17 00:00:00 2001
From: Ludy
Date: Tue, 20 May 2025 08:58:27 +0200
Subject: [PATCH 012/195] Fix empty-parameter issue in `updateUserSettings` by
using `@RequestBody` map (#3536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
# Description of Changes
Please provide a summary of the changes, including:
- **What was changed:**
- Refactored the `updateUserSettings` method in `UserController` to
accept a `@RequestBody Map` named `updates` instead of
pulling parameters from `HttpServletRequest`.
- Removed the now-unused `HashMap` import and the manual
parameter-extraction loop.
- **Why the change was made:**
- **Bug Fix:** The previous implementation relied on
`request.getParameterMap()`, which was consistently empty, so no
settings were ever applied.
- Simplifies controller logic by leveraging Spring’s request-body
binding.
- Improves readability and maintainability, removing boilerplate and
error-prone code.
---
## Checklist
### General
- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have read the [Stirling-PDF Developer
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md)
(if applicable)
- [ ] I have read the [How to add new languages to
Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md)
(if applicable)
- [x] I have performed a self-review of my own code
- [x] My changes generate no new warnings
### Documentation
- [ ] I have updated relevant docs on [Stirling-PDF's doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
(if functionality has heavily changed)
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)
### UI Changes (if applicable)
- [ ] Screenshots or videos demonstrating the UI changes are attached
(e.g., as comments or direct attachments in the PR)
### Testing (if applicable)
- [ ] I have tested my changes locally. Refer to the [Testing
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing)
for more details.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
.../SPDF/controller/api/UserController.java | 23 +++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/stirling/software/SPDF/controller/api/UserController.java b/src/main/java/stirling/software/SPDF/controller/api/UserController.java
index ce4770499..aa4ae9a00 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/UserController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/UserController.java
@@ -3,7 +3,6 @@ package stirling.software.SPDF.controller.api;
import java.io.IOException;
import java.security.Principal;
import java.sql.SQLException;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -168,13 +167,23 @@ public class UserController {
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@PostMapping("/updateUserSettings")
- public String updateUserSettings(HttpServletRequest request, Principal principal)
+ /**
+ * Updates the user settings based on the provided JSON payload.
+ *
+ * @param updates A map containing the settings to update. The expected structure is:
+ *
+ *
emailNotifications (optional): "true" or "false" - Enable or disable email notifications.
+ *
theme (optional): "light" or "dark" - Set the user's preferred theme.
+ *
language (optional): A string representing the preferred language (e.g., "en", "fr").
+ *
+ * Keys not listed above will be ignored.
+ * @param principal The currently authenticated user.
+ * @return A redirect string to the account page after updating the settings.
+ * @throws SQLException If a database error occurs.
+ * @throws UnsupportedProviderException If the operation is not supported for the user's provider.
+ */
+ public String updateUserSettings(@RequestBody Map updates, Principal principal)
throws SQLException, UnsupportedProviderException {
- Map paramMap = request.getParameterMap();
- Map updates = new HashMap<>();
- for (Map.Entry entry : paramMap.entrySet()) {
- updates.put(entry.getKey(), entry.getValue()[0]);
- }
log.debug("Processed updates: {}", updates);
// Assuming you have a method in userService to update the settings for a user
userService.updateUserSettings(principal.getName(), updates);
From 1346abf0e5187976a80a0842208058ee77d40a5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:50:59 +0100
Subject: [PATCH 013/195] Bump docker/build-push-action from 6.16.0 to 6.17.0
(#3541)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps
[docker/build-push-action](https://github.com/docker/build-push-action)
from 6.16.0 to 6.17.0.
Release notes
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/PR-Demo-Comment-with-react.yml | 2 +-
.github/workflows/push-docker.yml | 6 +++---
.github/workflows/testdriver.yml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/PR-Demo-Comment-with-react.yml b/.github/workflows/PR-Demo-Comment-with-react.yml
index adb3e33cf..14566855b 100644
--- a/.github/workflows/PR-Demo-Comment-with-react.yml
+++ b/.github/workflows/PR-Demo-Comment-with-react.yml
@@ -180,7 +180,7 @@ jobs:
password: ${{ secrets.DOCKER_HUB_API }}
- name: Build and push PR-specific image
- uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
+ uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
with:
context: .
file: ./Dockerfile
diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml
index e4532ff59..410c294d0 100644
--- a/.github/workflows/push-docker.yml
+++ b/.github/workflows/push-docker.yml
@@ -90,7 +90,7 @@ jobs:
- name: Build and push main Dockerfile
id: build-push-regular
- uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
+ uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
@@ -135,7 +135,7 @@ jobs:
- name: Build and push Dockerfile-ultra-lite
id: build-push-lite
- uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
+ uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
if: github.ref != 'refs/heads/main'
with:
context: .
@@ -166,7 +166,7 @@ jobs:
- name: Build and push main Dockerfile fat
id: build-push-fat
- uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
+ uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
if: github.ref != 'refs/heads/main'
with:
builder: ${{ steps.buildx.outputs.name }}
diff --git a/.github/workflows/testdriver.yml b/.github/workflows/testdriver.yml
index 68c4fabb2..07a23defe 100644
--- a/.github/workflows/testdriver.yml
+++ b/.github/workflows/testdriver.yml
@@ -46,7 +46,7 @@ jobs:
password: ${{ secrets.DOCKER_HUB_API }}
- name: Build and push test image
- uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
+ uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
with:
context: .
file: ./Dockerfile
From 74fcf01d033140d0dfd8bab2850cbea0d1fc6ab6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:51:13 +0100
Subject: [PATCH 014/195] Bump github/codeql-action from 3.28.17 to 3.28.18
(#3542)
Bumps [github/codeql-action](https://github.com/github/codeql-action)
from 3.28.17 to 3.28.18.
Release notes
See the releases
page for the relevant changes to the CodeQL CLI and language
packs.
3.28.18 - 16 May 2025
Update default CodeQL bundle version to 2.21.3. #2893
Skip validating SARIF produced by CodeQL for improved performance.
#2894
The number of threads and amount of RAM used by CodeQL can now be
set via the CODEQL_THREADS and CODEQL_RAM
runner environment variables. If set, these environment variables
override the threads and ram inputs
respectively. #2891
See the releases
page for the relevant changes to the CodeQL CLI and language
packs.
[UNRELEASED]
No user facing changes.
3.28.18 - 16 May 2025
Update default CodeQL bundle version to 2.21.3. #2893
Skip validating SARIF produced by CodeQL for improved performance.
#2894
The number of threads and amount of RAM used by CodeQL can now be
set via the CODEQL_THREADS and CODEQL_RAM
runner environment variables. If set, these environment variables
override the threads and ram inputs
respectively. #2891
3.28.17 - 02 May 2025
Update default CodeQL bundle version to 2.21.2. #2872
3.28.16 - 23 Apr 2025
Update default CodeQL bundle version to 2.21.1. #2863
3.28.15 - 07 Apr 2025
Fix bug where the action would fail if it tried to produce a debug
artifact with more than 65535 files. #2842
3.28.14 - 07 Apr 2025
Update default CodeQL bundle version to 2.21.0. #2838
3.28.13 - 24 Mar 2025
No user facing changes.
3.28.12 - 19 Mar 2025
Dependency caching should now cache more dependencies for Java
build-mode: none extractions. This should speed up
workflows and avoid inconsistent alerts in some cases.
Update default CodeQL bundle version to 2.20.7. #2810
3.28.11 - 07 Mar 2025
Update default CodeQL bundle version to 2.20.6. #2793
3.28.10 - 21 Feb 2025
Update default CodeQL bundle version to 2.20.5. #2772
Address an issue where the CodeQL Bundle would occasionally fail to
decompress on macOS. #2768
3.28.9 - 07 Feb 2025
... (truncated)
Commits
ff0a06e
Merge pull request #2896
from github/update-v3.28.18-b86edfc27
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/scorecards.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 3c2d59e3e..8c6485b7b 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -74,6 +74,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+ uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
with:
sarif_file: results.sarif
From f290f62e2328b9bf32470664eaea24c1153b3711 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:51:32 +0100
Subject: [PATCH 015/195] Bump actions/dependency-review-action from 4.7.0 to
4.7.1 (#3543)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[//]: # (dependabot-start)
⚠️ **Dependabot is rebasing this PR** ⚠️
Rebasing might not happen immediately, so don't worry if this takes some
time.
Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps
[actions/dependency-review-action](https://github.com/actions/dependency-review-action)
from 4.7.0 to 4.7.1.
Release notes
Packages added to allow-dependencies-licenses will be
allowed even if the package in question has no license information #889
License expressions (e.g. Ruby OR GPL-2.0) in the allow
list are automatically discarded so that they don't invalidate the whole
allow list, which should just be license identifier (e.g.
Ruby)
Commits
da24556
Merge pull request #933
from actions/dangoor/471-release
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/dependency-review.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 0cdd47933..5a662f423 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -24,4 +24,4 @@ jobs:
- name: "Checkout Repository"
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: "Dependency Review"
- uses: actions/dependency-review-action@38ecb5b593bf0eb19e335c03f97670f792489a8b # v4.7.0
+ uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
From 1f56ccfc99ddf4a677063aa59f0159efaaec2d93 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:51:52 +0100
Subject: [PATCH 016/195] Bump gradle/actions from 4.3.1 to 4.4.0 (#3544)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[//]: # (dependabot-start)
⚠️ **Dependabot is rebasing this PR** ⚠️
Rebasing might not happen immediately, so don't worry if this takes some
time.
Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps [gradle/actions](https://github.com/gradle/actions) from 4.3.1 to
4.4.0.
Release notes
Some environment variables related to Develocity injection have been
renamed. All vars now being with DEVELOCITY_INJECTION_.
Check the
docs for more details.
Dependency-graph plugin has been updated to v1.4.0
The 'detector' values included in the generated graph can now be
configured via environment variables.
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/licenses-update.yml | 2 +-
.github/workflows/multiOSReleases.yml | 4 ++--
.github/workflows/push-docker.yml | 2 +-
.github/workflows/releaseArtifacts.yml | 2 +-
.github/workflows/sonarqube.yml | 2 +-
.github/workflows/swagger.yml | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/licenses-update.yml b/.github/workflows/licenses-update.yml
index f2ab49f88..a810dbeb0 100644
--- a/.github/workflows/licenses-update.yml
+++ b/.github/workflows/licenses-update.yml
@@ -38,7 +38,7 @@ jobs:
java-version: "17"
distribution: "adopt"
- - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+ - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
- name: check the licenses for compatibility
run: ./gradlew clean checkLicense
diff --git a/.github/workflows/multiOSReleases.yml b/.github/workflows/multiOSReleases.yml
index b078e4015..dd8f54a9b 100644
--- a/.github/workflows/multiOSReleases.yml
+++ b/.github/workflows/multiOSReleases.yml
@@ -68,7 +68,7 @@ jobs:
java-version: "21"
distribution: "temurin"
- - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+ - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
with:
gradle-version: 8.14
@@ -156,7 +156,7 @@ jobs:
java-version: "21"
distribution: "temurin"
- - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+ - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
with:
gradle-version: 8.14
diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml
index 410c294d0..ab45d3a52 100644
--- a/.github/workflows/push-docker.yml
+++ b/.github/workflows/push-docker.yml
@@ -30,7 +30,7 @@ jobs:
java-version: "17"
distribution: "temurin"
- - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+ - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
with:
gradle-version: 8.14
diff --git a/.github/workflows/releaseArtifacts.yml b/.github/workflows/releaseArtifacts.yml
index c0d23ce19..71be7b03a 100644
--- a/.github/workflows/releaseArtifacts.yml
+++ b/.github/workflows/releaseArtifacts.yml
@@ -35,7 +35,7 @@ jobs:
java-version: "17"
distribution: "temurin"
- - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+ - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
with:
gradle-version: 8.14
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index ddf0980ab..f9ab27ecc 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -27,7 +27,7 @@ jobs:
fetch-depth: 0
- name: Setup Gradle
- uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+ uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
- name: Build and analyze with Gradle
env:
diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml
index 19c0aaa89..0e06cb1ee 100644
--- a/.github/workflows/swagger.yml
+++ b/.github/workflows/swagger.yml
@@ -26,7 +26,7 @@ jobs:
java-version: "17"
distribution: "temurin"
- - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+ - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
- name: Generate Swagger documentation
run: ./gradlew generateOpenApiDocs
From 89992fe6436230398ac759619e2dff4673e7563f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:52:04 +0100
Subject: [PATCH 017/195] Bump org.springframework:spring-jdbc from 6.2.6 to
6.2.7 (#3545)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps
[org.springframework:spring-jdbc](https://github.com/spring-projects/spring-framework)
from 6.2.6 to 6.2.7.
Release notes
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 3bea0bd14..37f364cd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -459,7 +459,7 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-mail:$springBootVersion"
implementation "org.springframework.session:spring-session-core:3.4.3"
- implementation "org.springframework:spring-jdbc:6.2.6"
+ implementation "org.springframework:spring-jdbc:6.2.7"
implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
// Don't upgrade h2database
From 9aa692674f7b5b6e42c18b574497def1e3ef734a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:52:15 +0100
Subject: [PATCH 018/195] Bump org.sonarqube from 6.1.0.5360 to 6.2.0.5505
(#3546)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[//]: # (dependabot-start)
⚠️ **Dependabot is rebasing this PR** ⚠️
Rebasing might not happen immediately, so don't worry if this takes some
time.
Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps org.sonarqube from 6.1.0.5360 to 6.2.0.5505.
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 37f364cd9..6cbd823e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
id "com.github.jk1.dependency-license-report" version "2.9"
//id "nebula.lint" version "19.0.3"
id("org.panteleyev.jpackageplugin") version "1.6.1"
- id "org.sonarqube" version "6.1.0.5360"
+ id "org.sonarqube" version "6.2.0.5505"
}
import com.github.jk1.license.render.*
From 8ecd4e9c361ec8de46229d30bb932088032f8a65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:52:38 +0100
Subject: [PATCH 019/195] Bump org.springframework:spring-webmvc from 6.2.6 to
6.2.7 (#3547)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[//]: # (dependabot-start)
⚠️ **Dependabot is rebasing this PR** ⚠️
Rebasing might not happen immediately, so don't worry if this takes some
time.
Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps
[org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework)
from 6.2.6 to 6.2.7.
Release notes
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 6cbd823e2..2725c73cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -434,7 +434,7 @@ dependencies {
}
//security updates
- implementation "org.springframework:spring-webmvc:6.2.6"
+ implementation "org.springframework:spring-webmvc:6.2.7"
implementation("io.github.pixee:java-security-toolkit:1.2.1")
From f50f7230d01a126e356e6c9f0f12ce039958ad92 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:52:50 +0100
Subject: [PATCH 020/195] Bump
org.springframework.security:spring-security-saml2-service-provider from
6.4.5 to 6.5.0 (#3549)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[//]: # (dependabot-start)
⚠️ **Dependabot is rebasing this PR** ⚠️
Rebasing might not happen immediately, so don't worry if this takes some
time.
Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps
[org.springframework.security:spring-security-saml2-service-provider](https://github.com/spring-projects/spring-security)
from 6.4.5 to 6.5.0.
Release notes
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 2725c73cd..f7a086a64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ ext {
imageioVersion = "3.12.0"
lombokVersion = "1.18.38"
bouncycastleVersion = "1.80"
- springSecuritySamlVersion = "6.4.5"
+ springSecuritySamlVersion = "6.5.0"
openSamlVersion = "4.3.2"
tempJrePath = null
}
From b9dd78ced6335e2aadf94fa21bc8f9ba87a9ccd6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:53:02 +0100
Subject: [PATCH 021/195] Bump io.micrometer:micrometer-core from 1.14.7 to
1.15.0 (#3550)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[//]: # (dependabot-start)
⚠️ **Dependabot is rebasing this PR** ⚠️
Rebasing might not happen immediately, so don't worry if this takes some
time.
Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps
[io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer)
from 1.14.7 to 1.15.0.
Release notes
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index f7a086a64..0c9279795 100644
--- a/build.gradle
+++ b/build.gradle
@@ -528,7 +528,7 @@ dependencies {
implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
- implementation "io.micrometer:micrometer-core:1.14.7"
+ implementation "io.micrometer:micrometer-core:1.15.0"
implementation group: "com.google.zxing", name: "core", version: "3.5.3"
// https://mvnrepository.com/artifact/org.commonmark/commonmark
implementation "org.commonmark:commonmark:0.24.0"
From 9514370cc3cd89c56923995399257736a84d94d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 11:58:23 +0100
Subject: [PATCH 022/195] Bump org.gradle.toolchains.foojay-resolver-convention
from 0.10.0 to 1.0.0 (#3552)
Bumps org.gradle.toolchains.foojay-resolver-convention from 0.10.0 to
1.0.0.
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
settings.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings.gradle b/settings.gradle
index 6f039dc93..49d1c98ad 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
plugins {
// Apply the foojay-resolver plugin to allow automatic download of JDKs
- id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+ id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
}
rootProject.name = 'Stirling-PDF'
From d59e39b4b61112d6569b6b1f39b330045dd759c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 12:00:31 +0100
Subject: [PATCH 023/195] Bump org.mockito:mockito-core from 5.11.0 to 5.17.0
(#3551)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito)
from 5.11.0 to 5.17.0.
Release notes
If you're using Stirling PDF at work, we'd love to speak to you. We're offering free technical support in exchange for a 15 minute user discovery session.
-
This is a chance to:
-
🛠️Get help with deployment, integrations, or troubleshooting
-
📢Provide direct feedback on performance, edge cases, and feature gaps
-
🔍Help us refine Stirling PDF for real-world enterprise use
-
If you're interested, you can book time with our team directly.
-
Looking forward to digging into your use cases and making Stirling PDF even better!
![\"An](\"image.jpg\")
";
+
+ // Act
+ String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithImage);
+
+ // Assert
+ assertTrue(sanitizedHtml.contains("