Update TempFileCleanupService.java

Bumps io.swagger.core.v3:swagger-core-jakarta from 2.2.34 to 2.2.35.


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=io.swagger.core.v3:swagger-core-jakarta&package-manager=gradle&previous-version=2.2.34&new-version=2.2.35)](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)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

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 <dependency name> 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)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/push-docker.yml

@@ -88,7 +88,7 @@ jobs:
 
       - name: Generate tags
         id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
         if: github.ref != 'refs/heads/main'
         with:
           images: |
@@ -134,7 +134,7 @@ jobs:
 
       - name: Generate tags ultra-lite
         id: meta2
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
         if: github.ref != 'refs/heads/main'
         with:
           images: |
@@ -165,7 +165,7 @@ jobs:
 
       - name: Generate tags fat
         id: meta3
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
         with:
           images: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf

app/common/build.gradle

@@ -41,5 +41,5 @@ dependencies {
     api 'org.snakeyaml:snakeyaml-engine:2.10'
     api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9"
     api 'jakarta.mail:jakarta.mail-api:2.1.3'
-    runtimeOnly 'org.eclipse.angus:angus-mail:2.0.3'
+    runtimeOnly 'org.eclipse.angus:angus-mail:2.0.4'
 }

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

@@ -56,13 +56,20 @@ public class TempFileCleanupService {
                             || fileName.startsWith("pdf-stream-")
                             || fileName.startsWith("PDFBox")
                             || fileName.startsWith("input_")
-                            || fileName.startsWith("overlay-");
+                            || fileName.startsWith("overlay-")
+                            || fileName.startsWith("signature")
+                            || fileName.startsWith("original_")
+                            || fileName.startsWith("preprocessed_")
+                            || fileName.startsWith("temp")
+                            || fileName.startsWith("gs_")
+                            || fileName.startsWith("MultiPart");
 
     // File patterns that identify common system temp files
     private static final Predicate<String> IS_SYSTEM_TEMP_FILE =
             fileName ->
-                    fileName.matches("lu\\d+[a-z0-9]*\\.tmp")
+                    fileName.matches("lu\\d+[a-z0-9]*(\\.tmp)?")
                             || fileName.matches("ocr_process\\d+")
+                            || fileName.contains("ocrmypdf.io.")
                             || (fileName.startsWith("tmp") && !fileName.contains("jetty"))
                             || fileName.startsWith("OSL_PIPE_")
                             || (fileName.endsWith(".tmp") && !fileName.contains("jetty"));
@@ -70,8 +77,9 @@ public class TempFileCleanupService {
     // File patterns that should be excluded from cleanup
     private static final Predicate<String> SHOULD_SKIP =
             fileName ->
-                    fileName.contains("jetty")
-                            || fileName.startsWith("jetty-")
+                    (fileName.contains("jetty")
+                                    && !fileName.startsWith("jetty-0_0_0_0-8080--_-any-"))
+                            || fileName.startsWith("jetty-docbase")
                             || "proc".equals(fileName)
                             || "sys".equals(fileName)
                             || "dev".equals(fileName)
@@ -395,6 +403,18 @@ public class TempFileCleanupService {
             log.debug("Could not check file info, skipping: {}", path);
         }
 
+        // Fallback: if file is in our managed temp directories and older than maxAge, delete it
+        // regardless of filename pattern (this catches any temp files we might have missed)
+        if (!shouldDelete && maxAgeMillis > 0 && lastModified > 0) {
+            boolean isInManagedTempDir = isInManagedTempDirectory(path);
+            boolean isOlderThanMaxAge = (currentTime - lastModified) > maxAgeMillis;
+
+            if (isInManagedTempDir && isOlderThanMaxAge) {
+                shouldDelete = true;
+                log.debug("Deleting old file in managed temp directory: {}", path);
+            }
+        }
+
         // Check file age against maxAgeMillis only if it's not an empty file that we've already
         // decided to delete
         if (!isEmptyFile && shouldDelete && maxAgeMillis > 0) {
@@ -405,6 +425,38 @@ public class TempFileCleanupService {
         return shouldDelete;
     }
 
+    /** Check if a path is within one of our managed temp directories. */
+    private boolean isInManagedTempDirectory(Path path) {
+        try {
+            ApplicationProperties.TempFileManagement tempFiles =
+                    applicationProperties.getSystem().getTempFileManagement();
+
+            String baseTmpDir = tempFiles.getBaseTmpDir();
+            String libreOfficeDir = tempFiles.getLibreofficeDir();
+
+            // Check if path is under our main temp directory
+            if (baseTmpDir != null && !baseTmpDir.isEmpty()) {
+                Path baseTempPath = Path.of(baseTmpDir).toAbsolutePath().normalize();
+                if (path.toAbsolutePath().normalize().startsWith(baseTempPath)) {
+                    return true;
+                }
+            }
+
+            // Check if path is under LibreOffice temp directory
+            if (libreOfficeDir != null && !libreOfficeDir.isEmpty()) {
+                Path libreOfficePath = Path.of(libreOfficeDir).toAbsolutePath().normalize();
+                if (path.toAbsolutePath().normalize().startsWith(libreOfficePath)) {
+                    return true;
+                }
+            }
+
+        } catch (Exception e) {
+            log.debug("Error checking if path is in managed temp directory: {}", path, e);
+        }
+
+        return false;
+    }
+
     /** Clean up LibreOffice temporary files. This method is called after LibreOffice operations. */
     public void cleanupLibreOfficeTempFiles() {
         // Cleanup known LibreOffice temp directories

app/proprietary/build.gradle

@@ -41,7 +41,7 @@ dependencies {
     api 'org.springframework.boot:spring-boot-starter-data-jpa'
     api 'org.springframework.boot:spring-boot-starter-oauth2-client'
     api 'org.springframework.boot:spring-boot-starter-mail'
-    api 'io.swagger.core.v3:swagger-core-jakarta:2.2.34'
+    api 'io.swagger.core.v3:swagger-core-jakarta:2.2.35'
     implementation 'com.bucket4j:bucket4j_jdk17-core:8.14.0'
 
     // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17

build.gradle

@@ -28,7 +28,7 @@ ext {
     bouncycastleVersion = "1.81"
     springSecuritySamlVersion = "6.5.2"
     openSamlVersion = "4.3.2"
-    commonmarkVersion = "0.25.0"
+    commonmarkVersion = "0.25.1"
     googleJavaFormatVersion = "1.28.0"
     tempJrePath = null
 }

scripts/ignore_translation.toml

@@ -1027,4 +1027,6 @@ ignore = [
 [zh_TW]
 ignore = [
     'language.direction',
+    'poweredBy',
+    'showJS.tags',
 ]