Merge branch 'Stirling-Tools:main' into scan-filter

.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

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"
@@ -527,7 +527,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.6"
+    implementation "io.micrometer:micrometer-core:1.14.7"
     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"

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

@@ -73,7 +73,7 @@ public class InitialSetup {
         // Initialize Terms and Conditions
         String termsUrl = applicationProperties.getLegal().getTermsAndConditions();
         if (StringUtils.isEmpty(termsUrl)) {
-            String defaultTermsUrl = "https://www.stirlingpdf.com/terms-and-conditions";
+            String defaultTermsUrl = "https://www.stirlingpdf.com/terms";
             GeneralUtils.saveKeyToSettings("legal.termsAndConditions", defaultTermsUrl);
             applicationProperties.getLegal().setTermsAndConditions(defaultTermsUrl);
         }

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

@@ -15,7 +15,7 @@ public class MetricsConfig {
         return new MeterFilter() {
             @Override
             public MeterFilterReply accept(Meter.Id id) {
-                if (id.getName().equals("http.requests")) {
+                if ("http.requests".equals(id.getName())) {
                     return MeterFilterReply.NEUTRAL;
                 }
                 return MeterFilterReply.DENY;

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

@@ -5,7 +5,9 @@ import org.springframework.context.annotation.Configuration;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 
@@ -31,14 +33,25 @@ public class OpenApiConfig {
             // default version if all else fails
             version = "1.0.0";
         }
-        if (!applicationProperties.getSecurity().getEnableLogin()) {
+        Info info =
-            return new OpenAPI()
-                    .components(new Components())
-                    .info(
                 new Info()
                         .title(DEFAULT_TITLE)
                         .version(version)
-                                    .description(DEFAULT_DESCRIPTION));
+                        .license(
+                                new License()
+                                        .name("MIT")
+                                        .url(
+                                                "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/refs/heads/main/LICENSE")
+                                        .identifier("MIT"))
+                        .termsOfService("https://www.stirlingpdf.com/terms")
+                        .contact(
+                                new Contact()
+                                        .name("Stirling Software")
+                                        .url("https://www.stirlingpdf.com")
+                                        .email("contact@stirlingpdf.com"))
+                        .description(DEFAULT_DESCRIPTION);
+        if (!applicationProperties.getSecurity().getEnableLogin()) {
+            return new OpenAPI().components(new Components()).info(info);
         } else {
             SecurityScheme apiKeyScheme =
                     new SecurityScheme()
@@ -47,11 +60,7 @@ public class OpenApiConfig {
                             .name("X-API-KEY");
             return new OpenAPI()
                     .components(new Components().addSecuritySchemes("apiKey", apiKeyScheme))
-                    .info(
+                    .info(info)
-                            new Info()
-                                    .title(DEFAULT_TITLE)
-                                    .version(version)
-                                    .description(DEFAULT_DESCRIPTION))
                     .addSecurityItem(new SecurityRequirement().addList("apiKey"));
         }
     }

src/main/resources/settings.yml.template

@@ -77,7 +77,7 @@ premium:
       appId: ''
 
 mail:
-  enabled: true # set to 'true' to enable sending emails
+  enabled: false # set to 'true' to enable sending emails
   host: smtp.example.com # SMTP server hostname
   port: 587 # SMTP server port
   username: '' # SMTP server username
@@ -85,7 +85,7 @@ mail:
   from: '' # sender email address
 
 legal:
-  termsAndConditions: https://www.stirlingpdf.com/terms-and-conditions # URL to the terms and conditions of your application (e.g. https://example.com/terms). Empty string to disable or filename to load from local file in static folder
+  termsAndConditions: https://www.stirlingpdf.com/terms # URL to the terms and conditions of your application (e.g. https://example.com/terms). Empty string to disable or filename to load from local file in static folder
   privacyPolicy: https://www.stirlingpdf.com/privacy-policy # URL to the privacy policy of your application (e.g. https://example.com/privacy). Empty string to disable or filename to load from local file in static folder
   accessibilityStatement: '' # URL to the accessibility statement of your application (e.g. https://example.com/accessibility). Empty string to disable or filename to load from local file in static folder
   cookiePolicy: '' # URL to the cookie policy of your application (e.g. https://example.com/cookie). Empty string to disable or filename to load from local file in static folder

testing/allEndpointsRemovedSettings.yml

@@ -11,7 +11,6 @@
 # If you want to override with environment parameter follow parameter naming SECURITY_INITIALLOGIN_USERNAME #
 #############################################################################################################
 
-
 security:
   enableLogin: false # set to 'true' to enable login
   csrfDisabled: false # set to 'true' to disable CSRF protection (not recommended for production)
@@ -62,18 +61,32 @@ security:
     privateKey: classpath:saml-private-key.key # Your private key. Generated from your keypair
     spCert: classpath:saml-public-cert.crt # Your signing certificate. Generated from your keypair
 
-enterpriseEdition:
+premium:
-  enabled: false # set to 'true' to enable enterprise edition
   key: 00000000-0000-0000-0000-000000000000
-  SSOAutoLogin: false # Enable to auto login to first provided SSO
+  enabled: false # Enable license key checks for pro/enterprise features
+  proFeatures:
+    SSOAutoLogin: false
     CustomMetadata:
       autoUpdateMetadata: false # set to 'true' to automatically update metadata with below values
       author: username # supports text such as 'John Doe' or types such as username to autopopulate with user's username
       creator: Stirling-PDF # supports text such as 'Company-PDF'
       producer: Stirling-PDF # supports text such as 'Company-PDF'
+    googleDrive:
+      enabled: false
+      clientId: ''
+      apiKey: ''
+      appId: ''
+
+mail:
+  enabled: false # set to 'true' to enable sending emails
+  host: smtp.example.com # SMTP server hostname
+  port: 587 # SMTP server port
+  username: '' # SMTP server username
+  password: '' # SMTP server password
+  from: '' # sender email address
 
 legal:
-  termsAndConditions: https://www.stirlingpdf.com/terms-and-conditions # URL to the terms and conditions of your application (e.g. https://example.com/terms). Empty string to disable or filename to load from local file in static folder
+  termsAndConditions: https://www.stirlingpdf.com/terms # URL to the terms and conditions of your application (e.g. https://example.com/terms). Empty string to disable or filename to load from local file in static folder
   privacyPolicy: https://www.stirlingpdf.com/privacy-policy # URL to the privacy policy of your application (e.g. https://example.com/privacy). Empty string to disable or filename to load from local file in static folder
   accessibilityStatement: '' # URL to the accessibility statement of your application (e.g. https://example.com/accessibility). Empty string to disable or filename to load from local file in static folder
   cookiePolicy: '' # URL to the cookie policy of your application (e.g. https://example.com/cookie). Empty string to disable or filename to load from local file in static folder
@@ -88,6 +101,7 @@ system:
   customHTMLFiles: false # enable to have files placed in /customFiles/templates override the existing template HTML files
   tessdataDir: /usr/share/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored.
   enableAnalytics: true # set to 'true' to enable analytics, set to 'false' to disable analytics; for enterprise users, this is set to true
+  enableUrlToPDF: false # Set to 'true' to enable URL to PDF, INTERNAL ONLY, known security issues, should not be used externally
   disableSanitize: false # set to true to disable Sanitize HTML; (can lead to injections in HTML)
   datasource:
     enableCustomDatabase: false # Enterprise users ONLY, set this property to 'true' if you would like to use your own custom database configuration
@@ -100,13 +114,12 @@ system:
     name: postgres # set the name of your database. Should match the name of the database you create
   customPaths:
     pipeline:
-      watchedFoldersDir: "" #Defaults to /pipeline/watchedFolders
+      watchedFoldersDir: '' # Defaults to /pipeline/watchedFolders
-      finishedFoldersDir: "" #Defaults to /pipeline/finishedFolders
+      finishedFoldersDir: '' # Defaults to /pipeline/finishedFolders
     operations:
-      weasyprint: "" #Defaults to /opt/venv/bin/weasyprint
+      weasyprint: '' # Defaults to /opt/venv/bin/weasyprint
-      unoconvert: "" #Defaults to /opt/venv/bin/unoconvert
+      unoconvert: '' # Defaults to /opt/venv/bin/unoconvert
-
+  fileUploadLimit: '' # Defaults to "". No limit when string is empty. Set a number, between 0 and 999, followed by one of the following strings to set a limit. "KB", "MB", "GB".
-
 
 ui:
   appName: '' # application's visible name