diff --git a/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java b/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java index 830810628..c0f341782 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java +++ b/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java @@ -63,25 +63,25 @@ public class PasswordController { String ownerPassword = request.getOwnerPassword(); String password = request.getPassword(); int keyLength = request.getKeyLength(); - boolean canAssembleDocument = request.isCanAssembleDocument(); - boolean canExtractContent = request.isCanExtractContent(); - boolean canExtractForAccessibility = request.isCanExtractForAccessibility(); - boolean canFillInForm = request.isCanFillInForm(); - boolean canModify = request.isCanModify(); - boolean canModifyAnnotations = request.isCanModifyAnnotations(); - boolean canPrint = request.isCanPrint(); - boolean canPrintFaithful = request.isCanPrintFaithful(); + boolean preventAssembly = request.isPreventAssembly(); + boolean preventExtractContent = request.isPreventExtractContent(); + boolean preventExtractForAccessibility = request.isPreventExtractForAccessibility(); + boolean preventFillInForm = request.isPreventFillInForm(); + boolean preventModify = request.isPreventModify(); + boolean preventModifyAnnotations = request.isPreventModifyAnnotations(); + boolean preventPrinting = request.isPreventPrinting(); + boolean preventPrintingFaithful = request.isPreventPrintingFaithful(); PDDocument document = pdfDocumentFactory.load(fileInput); AccessPermission ap = new AccessPermission(); - ap.setCanAssembleDocument(!canAssembleDocument); - ap.setCanExtractContent(!canExtractContent); - ap.setCanExtractForAccessibility(!canExtractForAccessibility); - ap.setCanFillInForm(!canFillInForm); - ap.setCanModify(!canModify); - ap.setCanModifyAnnotations(!canModifyAnnotations); - ap.setCanPrint(!canPrint); - ap.setCanPrintFaithful(!canPrintFaithful); + ap.setCanAssembleDocument(!preventAssembly); + ap.setCanExtractContent(!preventExtractContent); + ap.setCanExtractForAccessibility(!preventExtractForAccessibility); + ap.setCanFillInForm(!preventFillInForm); + ap.setCanModify(!preventModify); + ap.setCanModifyAnnotations(!preventModifyAnnotations); + ap.setCanPrint(!preventPrinting); + ap.setCanPrintFaithful(!preventPrintingFaithful); StandardProtectionPolicy spp = new StandardProtectionPolicy(ownerPassword, password, ap); if (!"".equals(ownerPassword) || !"".equals(password)) { diff --git a/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java b/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java index ef85dfead..982a31244 100644 --- a/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java +++ b/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java @@ -29,31 +29,29 @@ public class AddPasswordRequest extends PDFFile { defaultValue = "256") private int keyLength = 256; - @Schema(description = "Whether the document assembly is allowed", example = "false") - private boolean canAssembleDocument; + @Schema(description = "Whether document assembly is prevented", example = "false") + private boolean preventAssembly; + + @Schema(description = "Whether content extraction is prevented", example = "false") + private boolean preventExtractContent; @Schema( - description = "Whether content extraction for accessibility is allowed", + description = "Whether content extraction for accessibility is prevented", example = "false") - private boolean canExtractContent; + private boolean preventExtractForAccessibility; - @Schema( - description = "Whether content extraction for accessibility is allowed", - example = "false") - private boolean canExtractForAccessibility; + @Schema(description = "Whether form filling is prevented", example = "false") + private boolean preventFillInForm; - @Schema(description = "Whether form filling is allowed", example = "false") - private boolean canFillInForm; + @Schema(description = "Whether document modification is prevented", example = "false") + private boolean preventModify; - @Schema(description = "Whether the document modification is allowed", example = "false") - private boolean canModify; + @Schema(description = "Whether modification of annotations is prevented", example = "false") + private boolean preventModifyAnnotations; - @Schema(description = "Whether modification of annotations is allowed", example = "false") - private boolean canModifyAnnotations; + @Schema(description = "Whether printing of the document is prevented", example = "false") + private boolean preventPrinting; - @Schema(description = "Whether printing of the document is allowed", example = "false") - private boolean canPrint; - - @Schema(description = "Whether faithful printing is allowed", example = "false") - private boolean canPrintFaithful; + @Schema(description = "Whether faithful printing is prevented", example = "false") + private boolean preventPrintingFaithful; } diff --git a/src/main/resources/templates/security/add-password.html b/src/main/resources/templates/security/add-password.html index 1283a4268..f55f55fb7 100644 --- a/src/main/resources/templates/security/add-password.html +++ b/src/main/resources/templates/security/add-password.html @@ -41,36 +41,36 @@