From c66dc984c0221544346971e96cbc28f374fb2529 Mon Sep 17 00:00:00 2001 From: Ludy87 Date: Fri, 2 May 2025 19:29:40 +0200 Subject: [PATCH 1/2] cert-sign --- .../api/security/CertSignController.java | 34 +++++++++++++++---- .../api/security/SignPDFWithCertRequest.java | 12 ++++--- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java b/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java index 7e1f2601fb9..785be0b15c9 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java +++ b/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java @@ -1,6 +1,7 @@ package stirling.software.SPDF.controller.api.security; import java.awt.*; +import java.beans.PropertyEditorSupport; import java.io.*; import java.nio.file.Files; import java.security.*; @@ -53,7 +54,10 @@ import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo; import org.bouncycastle.pkcs.PKCSException; import org.springframework.core.io.ClassPathResource; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -82,6 +86,18 @@ public class CertSignController { Security.addProvider(new BouncyCastleProvider()); } + @InitBinder + public void initBinder(WebDataBinder binder) { + binder.registerCustomEditor( + MultipartFile.class, + new PropertyEditorSupport() { + @Override + public void setAsText(String text) throws IllegalArgumentException { + setValue(null); + } + }); + } + private final CustomPDFDocumentFactory pdfDocumentFactory; private static void sign( @@ -103,8 +119,7 @@ private static void sign( signature.setLocation(location); signature.setReason(reason); signature.setSignDate(Calendar.getInstance()); - - if (showSignature) { + if (Boolean.TRUE.equals(showSignature)) { SignatureOptions signatureOptions = new SignatureOptions(); signatureOptions.setVisualSignature( instance.createVisibleSignature(doc, signature, pageNumber, showLogo)); @@ -121,7 +136,12 @@ private static void sign( } } - @PostMapping(consumes = "multipart/form-data", value = "/cert-sign") + @PostMapping( + consumes = { + MediaType.MULTIPART_FORM_DATA_VALUE, + MediaType.APPLICATION_FORM_URLENCODED_VALUE + }, + value = "/cert-sign") @Operation( summary = "Sign PDF with a Digital Certificate", description = @@ -137,12 +157,12 @@ public ResponseEntity signPDFWithCert(@ModelAttribute SignPDFWithCertReq MultipartFile p12File = request.getP12File(); MultipartFile jksfile = request.getJksFile(); String password = request.getPassword(); - Boolean showSignature = request.isShowSignature(); + Boolean showSignature = request.getShowSignature(); String reason = request.getReason(); String location = request.getLocation(); String name = request.getName(); - Integer pageNumber = request.getPageNumber() - 1; - Boolean showLogo = request.isShowLogo(); + Integer pageNumber = request.getPageNumber() != null ? (request.getPageNumber() - 1) : null; + Boolean showLogo = request.getShowLogo(); if (certType == null) { throw new IllegalArgumentException("Cert type must be provided"); @@ -279,7 +299,7 @@ public InputStream createVisibleSignature( widget.setAppearance(appearance); try (PDPageContentStream cs = new PDPageContentStream(doc, appearanceStream)) { - if (showLogo) { + if (Boolean.TRUE.equals(showLogo)) { cs.saveGraphicsState(); PDExtendedGraphicsState extState = new PDExtendedGraphicsState(); extState.setBlendMode(BlendMode.MULTIPLY); diff --git a/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java b/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java index b0266f307a2..d9fe92def50 100644 --- a/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java +++ b/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java @@ -20,7 +20,8 @@ public class SignPDFWithCertRequest extends PDFFile { @Schema( description = - "The private key for the digital certificate (required for PEM type certificates)") + "The private key for the digital certificate (required for PEM type" + + " certificates)") private MultipartFile privateKeyFile; @Schema(description = "The digital certificate (required for PEM type certificates)") @@ -32,11 +33,11 @@ public class SignPDFWithCertRequest extends PDFFile { @Schema(description = "The JKS keystore file (Java Key Store)") private MultipartFile jksFile; - @Schema(description = "The password for the keystore or the private key") + @Schema(description = "The password for the keystore or the private key", format = "password") private String password; @Schema(description = "Whether to visually show the signature in the PDF file") - private boolean showSignature; + private Boolean showSignature; @Schema(description = "The reason for signing the PDF") private String reason; @@ -49,9 +50,10 @@ public class SignPDFWithCertRequest extends PDFFile { @Schema( description = - "The page number where the signature should be visible. This is required if showSignature is set to true") + "The page number where the signature should be visible. This is required if" + + " showSignature is set to true") private Integer pageNumber; @Schema(description = "Whether to visually show a signature logo along with the signature") - private boolean showLogo; + private Boolean showLogo; } From 89ddcd68d4a07069f2e6889023bb6e3b81913cb3 Mon Sep 17 00:00:00 2001 From: Ludy87 Date: Fri, 2 May 2025 19:36:29 +0200 Subject: [PATCH 2/2] Update CertSignController.java --- .../SPDF/controller/api/security/CertSignController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java b/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java index 785be0b15c9..58e5b848cce 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java +++ b/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java @@ -146,8 +146,8 @@ private static void sign( summary = "Sign PDF with a Digital Certificate", description = "This endpoint accepts a PDF file, a digital certificate and related" - + " information to sign the PDF. It then returns the digitally signed PDF" - + " file. Input:PDF Output:PDF Type:SISO") + + " information to sign the PDF. It then returns the digitally signed PDF" + + " file. Input:PDF Output:PDF Type:SISO") public ResponseEntity signPDFWithCert(@ModelAttribute SignPDFWithCertRequest request) throws Exception { MultipartFile pdf = request.getFileInput(); @@ -161,6 +161,7 @@ public ResponseEntity signPDFWithCert(@ModelAttribute SignPDFWithCertReq String reason = request.getReason(); String location = request.getLocation(); String name = request.getName(); + // Convert 1-indexed page number (user input) to 0-indexed page number (API requirement) Integer pageNumber = request.getPageNumber() != null ? (request.getPageNumber() - 1) : null; Boolean showLogo = request.getShowLogo();