From 78a4c0363a091eb74537ba4cbd45518ba1836b3d Mon Sep 17 00:00:00 2001 From: Dario Ghunney Ware Date: Tue, 2 Dec 2025 13:25:38 +0000 Subject: [PATCH] resolving conflicts --- .../SPDF/controller/web/SignatureImageController.java | 6 +++--- .../security/configuration/SecurityConfiguration.java | 1 + .../security/controller/api/AdminLicenseController.java | 7 ++++++- .../oauth2/CustomOAuth2AuthenticationSuccessHandler.java | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/web/SignatureImageController.java b/app/core/src/main/java/stirling/software/SPDF/controller/web/SignatureImageController.java index 90313af29..5d69d60c8 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/web/SignatureImageController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/web/SignatureImageController.java @@ -19,9 +19,9 @@ import stirling.software.common.service.UserServiceInterface; /** * Unified signature image controller that works for both authenticated and unauthenticated users. - * Uses composition pattern: - Core SharedSignatureService (always available): reads shared signatures - - * PersonalSignatureService (proprietary, optional): reads personal signatures For authenticated - * signature management (save/delete), see proprietary SignatureController. + * Uses composition pattern: - Core SharedSignatureService (always available): reads shared + * signatures - PersonalSignatureService (proprietary, optional): reads personal signatures For + * authenticated signature management (save/delete), see proprietary SignatureController. */ @Slf4j @RestController diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java index 1e606a32c..3e4e8c4aa 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java @@ -59,6 +59,7 @@ import stirling.software.proprietary.security.service.JwtServiceInterface; import stirling.software.proprietary.security.service.LoginAttemptService; import stirling.software.proprietary.security.service.UserService; import stirling.software.proprietary.security.session.SessionPersistentRegistry; +import stirling.software.proprietary.service.UserLicenseSettingsService; @Slf4j @Configuration diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/AdminLicenseController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/AdminLicenseController.java index c75b4d23f..018607e4d 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/AdminLicenseController.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/AdminLicenseController.java @@ -283,7 +283,12 @@ public class AdminLicenseController { // Prevent path traversal and enforce single filename component if (filename.contains("..") || filename.contains("/") || filename.contains("\\")) { return ResponseEntity.badRequest() - .body(Map.of("success", false, "error", "Filename must not contain path separators or '..'")); + .body( + Map.of( + "success", + false, + "error", + "Filename must not contain path separators or '..'")); } // Validate file extension diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java index 1f9f53664..3f3a707ee 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java @@ -38,6 +38,7 @@ import stirling.software.proprietary.security.model.AuthenticationType; import stirling.software.proprietary.security.service.JwtServiceInterface; import stirling.software.proprietary.security.service.LoginAttemptService; import stirling.software.proprietary.security.service.UserService; +import stirling.software.proprietary.service.UserLicenseSettingsService; @RequiredArgsConstructor public class CustomOAuth2AuthenticationSuccessHandler