From 97b2da1030f56e1c372468bd7b6c3f6912e61e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Sz=C3=BCcs?= <bszucs1209@gmail.com>
Date: Fri, 2 May 2025 11:34:46 +0200
Subject: [PATCH] Update change-permissions, and renamed security endpoints for
 consistency

---
 .../controller/api/AnalysisController.java    | 13 ++++----
 .../controller/api/security/GetInfoOnPDF.java | 17 +++++-----
 .../security/change-permissions.html          | 32 +++++++++----------
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java b/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java
index 75f61e64e..bbd0e3214 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java
@@ -179,14 +179,15 @@ public class AnalysisController {
 
                 // Get permissions
                 Map<String, Boolean> permissions = new HashMap<>();
-                permissions.put("canPrint", document.getCurrentAccessPermission().canPrint());
-                permissions.put("canModify", document.getCurrentAccessPermission().canModify());
+                permissions.put("preventPrint", !document.getCurrentAccessPermission().canPrint());
                 permissions.put(
-                        "canExtractContent",
-                        document.getCurrentAccessPermission().canExtractContent());
+                        "preventModify", !document.getCurrentAccessPermission().canModify());
                 permissions.put(
-                        "canModifyAnnotations",
-                        document.getCurrentAccessPermission().canModifyAnnotations());
+                        "preventExtractContent",
+                        !document.getCurrentAccessPermission().canExtractContent());
+                permissions.put(
+                        "preventModifyAnnotations",
+                        !document.getCurrentAccessPermission().canModifyAnnotations());
 
                 securityInfo.put("permissions", permissions);
             } else {
diff --git a/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java b/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
index ef82a2942..d5b09742b 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
@@ -619,19 +619,20 @@ public class GetInfoOnPDF {
     private void setNodePermissions(PDDocument pdfBoxDoc, ObjectNode permissionsNode) {
         AccessPermission ap = pdfBoxDoc.getCurrentAccessPermission();
 
-        permissionsNode.put("Document Assembly", getPermissionState(ap.canAssembleDocument()));
-        permissionsNode.put("Extracting Content", getPermissionState(ap.canExtractContent()));
+        permissionsNode.put("Document Assembly", getPermissionState(!ap.canAssembleDocument()));
+        permissionsNode.put("Extracting Content", getPermissionState(!ap.canExtractContent()));
         permissionsNode.put(
                 "Extracting for accessibility",
-                getPermissionState(ap.canExtractForAccessibility()));
-        permissionsNode.put("Form Filling", getPermissionState(ap.canFillInForm()));
-        permissionsNode.put("Modifying", getPermissionState(ap.canModify()));
-        permissionsNode.put("Modifying annotations", getPermissionState(ap.canModifyAnnotations()));
-        permissionsNode.put("Printing", getPermissionState(ap.canPrint()));
+                getPermissionState(!ap.canExtractForAccessibility()));
+        permissionsNode.put("Form Filling", getPermissionState(!ap.canFillInForm()));
+        permissionsNode.put("Modifying", getPermissionState(!ap.canModify()));
+        permissionsNode.put(
+                "Modifying annotations", getPermissionState(!ap.canModifyAnnotations()));
+        permissionsNode.put("Printing", getPermissionState(!ap.canPrint()));
     }
 
     private String getPermissionState(boolean state) {
-        return state ? "Allowed" : "Not Allowed";
+        return state ? "Prevented" : "Allowed";
     }
 
     public String getPageOrientation(double width, double height) {
diff --git a/src/main/resources/templates/security/change-permissions.html b/src/main/resources/templates/security/change-permissions.html
index 52d743913..1996df35e 100644
--- a/src/main/resources/templates/security/change-permissions.html
+++ b/src/main/resources/templates/security/change-permissions.html
@@ -25,36 +25,36 @@
                 <div class="mb-3">
                   <label class="mb-2" th:text="#{permissions.selectText.2}"></label>
                   <div class="form-check ms-3">
-                    <input type="checkbox" id="canAssembleDocument" name="canAssembleDocument">
-                    <label for="canAssembleDocument" th:text="#{permissions.selectText.3}"></label>
+                    <input type="checkbox" id="preventAssembly" name="preventAssembly">
+                    <label for="preventAssembly" th:text="#{permissions.selectText.3}"></label>
                   </div>
                   <div class="form-check ms-3">
-                    <input type="checkbox" id="canExtractContent" name="canExtractContent">
-                    <label for="canExtractContent" th:text="#{permissions.selectText.4}"></label>
+                    <input type="checkbox" id="preventExtractContent" name="preventExtractContent">
+                    <label for="preventExtractContent" th:text="#{permissions.selectText.4}"></label>
                   </div>
                   <div class="form-check ms-3">
-                    <input type="checkbox" id="canExtractForAccessibility" name="canExtractForAccessibility">
-                    <label for="canExtractForAccessibility" th:text="#{permissions.selectText.5}"></label>
+                    <input type="checkbox" id="preventExtractForAccessibility" name="preventExtractForAccessibility">
+                    <label for="preventExtractForAccessibility" th:text="#{permissions.selectText.5}"></label>
                   </div>
                   <div class="form-check ms-3">
-                    <input type="checkbox" id="canFillInForm" name="canFillInForm">
-                    <label for="canFillInForm" th:text="#{permissions.selectText.6}"></label>
+                    <input type="checkbox" id="preventFillInForm" name="preventFillInForm">
+                    <label for="preventFillInForm" th:text="#{permissions.selectText.6}"></label>
                   </div>
                   <div class="form-check ms-3">
-                    <input type="checkbox" id="canModify" name="canModify">
-                    <label for="canModify" th:text="#{permissions.selectText.7}"></label>
+                    <input type="checkbox" id="preventModify" name="preventModify">
+                    <label for="preventModify" th:text="#{permissions.selectText.7}"></label>
                   </div>
                   <div class="form-check ms-3">
-                    <input type="checkbox" id="canModifyAnnotations" name="canModifyAnnotations">
-                    <label for="canModifyAnnotations" th:text="#{permissions.selectText.8}"></label>
+                    <input type="checkbox" id="preventModifyAnnotations" name="preventModifyAnnotations">
+                    <label for="preventModifyAnnotations" th:text="#{permissions.selectText.8}"></label>
                   </div>
                   <div class="form-check ms-3">
-                    <input type="checkbox" id="canPrint" name="canPrint">
-                    <label for="canPrint" th:text="#{permissions.selectText.9}"></label>
+                    <input type="checkbox" id="preventPrinting" name="preventPrinting">
+                    <label for="preventPrinting" th:text="#{permissions.selectText.9}"></label>
                   </div>
                   <div class="form-check ms-3">
-                    <input type="checkbox" id="canPrintFaithful" name="canPrintFaithful">
-                    <label for="canPrintFaithful" th:text="#{permissions.selectText.10}"></label>
+                    <input type="checkbox" id="preventPrintingFaithful" name="preventPrintingFaithful">
+                    <label for="preventPrintingFaithful" th:text="#{permissions.selectText.10}"></label>
                   </div>
                 </div>
                 <br>