From 394ecfb08c9f5d7b121fee9f17924a99636d7176 Mon Sep 17 00:00:00 2001 From: "stirlingbot[bot]" <195170888+stirlingbot[bot]@users.noreply.github.com> Date: Sat, 6 Sep 2025 19:30:54 +0000 Subject: [PATCH] :file_folder: pre-commit Signed-off-by: stirlingbot[bot] --- .../controller/api/misc/ShowJavascript.java | 38 +++++++++++-------- .../service/CustomUserDetailsService.java | 7 +++- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java index 6c413cd36..65888e55d 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java @@ -1,9 +1,8 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; +import java.nio.charset.StandardCharsets; +import java.util.Map; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.common.PDNameTreeNode; import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript; @@ -14,13 +13,17 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; -import java.nio.charset.StandardCharsets; -import java.util.Map; - @RestController @RequestMapping("/api/v1/misc") @Tag(name = "Misc", description = "Miscellaneous APIs") @@ -55,12 +58,14 @@ public class ShowJavascript { if (jsCodeStr != null && !jsCodeStr.trim().isEmpty()) { script.append("// File: ") - .append(Filenames.toSimpleFileName(inputFile.getOriginalFilename())) - .append(", Script: ") - .append(name) - .append("\n") - .append(jsCodeStr) - .append("\n"); + .append( + Filenames.toSimpleFileName( + inputFile.getOriginalFilename())) + .append(", Script: ") + .append(name) + .append("\n") + .append(jsCodeStr) + .append("\n"); foundScript = true; } } @@ -68,9 +73,10 @@ public class ShowJavascript { } if (!foundScript) { - script = new StringBuilder("PDF '") - .append(Filenames.toSimpleFileName(inputFile.getOriginalFilename())) - .append("' does not contain Javascript"); + script = + new StringBuilder("PDF '") + .append(Filenames.toSimpleFileName(inputFile.getOriginalFilename())) + .append("' does not contain Javascript"); } return WebResponseUtils.bytesToWebResponse( diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java index df3934bbd..71cae3f1a 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java @@ -75,8 +75,11 @@ public class CustomUserDetailsService implements UserDetailsService { */ private AuthenticationType determinePreferredSSOType() { // Check what SSO types are enabled and prefer in order: OAUTH2 > SAML2 > fallback to OAUTH2 - boolean oauth2Enabled = securityProperties.getOauth2() != null && securityProperties.getOauth2().getEnabled(); - boolean saml2Enabled = securityProperties.getSaml2() != null && securityProperties.getSaml2().getEnabled(); + boolean oauth2Enabled = + securityProperties.getOauth2() != null + && securityProperties.getOauth2().getEnabled(); + boolean saml2Enabled = + securityProperties.getSaml2() != null && securityProperties.getSaml2().getEnabled(); if (oauth2Enabled) { return AuthenticationType.OAUTH2;