mirror of
https://github.com/Stirling-Tools/Stirling-PDF.git
synced 2025-05-13 17:55:56 +00:00
Refactor permission variable names (#3457)
## Refactor: Improve clarity of permission variable names Renamed confusing `can[Action]` boolean variables to `prevent[Action]` (e.g., `canPrint` -> `preventPrinting`) in `PasswordController.java`, `AddPasswordRequest.java`, and `add-password.html`. The previous `can[Action]` convention was misleading, as `true` meant the action was *disallowed*. The new `prevent[Action]` naming directly reflects the intent (`true` = prevented), improving code clarity. **Changes:** * Updated variable names in controller logic * Updated `@Schema` descriptions in `AddPasswordRequest.java` * Updated corresponding HTML element attributes (`id`, `name`, `for`) in `add-password.html` **Important Notes:** * The underlying logic still inverts the boolean when setting permissions (e.g., `AccessPermission.setCanPrint(!preventPrinting)`). * User-facing UI text remains unchanged per request of @Frooodle in #3420. **Why not invert the API logic** * Inverting API (to can[action] logic) would either invalidate the UI * Inverting API AND changing UI would warrant bigger translation effort to change it in all languages * This version is consistent (meaning what the UI says is actually done) and preserve the UI language (meaning no translations needed) however it is inconsistent with PDFBox methods naming scheme **PDFBox** * **PDFBox Interaction:** This refactor addresses the naming *within* Stirling-PDF's API and Front-end layers only. The controller logic intentionally inverts the `prevent[Action]` boolean (`ap.setCanPrint(!preventPrinting)`) to correctly interact with the underlying PDFBox methods. No further renaming related to these permissions is necessary as the PDFBox methods themselves retain the `can[Action]` names. Underlying logic is not changed so it should work but just in case I tested locally on an Adobe PDF that contained form in Chrome. ## New variable names in API  **Related Issues:** Closes #3427 Closes #3420 --- ## Checklist ### General - [x] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [x] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [x] I have performed a self-review of my own code - [x] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [x] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details.
This commit is contained in:
Balázs Szücs
GitHub
parent
e5e7935456
commit
9ffc0037b7
@ -180,14 +180,15 @@ public class AnalysisController {
|
|||||||
|
|
||||||
// Get permissions
|
// Get permissions
|
||||||
Map<String, Boolean> permissions = new HashMap<>();
|
Map<String, Boolean> permissions = new HashMap<>();
|
||||||
permissions.put("canPrint", document.getCurrentAccessPermission().canPrint());
|
permissions.put("preventPrinting", !document.getCurrentAccessPermission().canPrint());
|
||||||
permissions.put("canModify", document.getCurrentAccessPermission().canModify());
|
|
||||||
permissions.put(
|
permissions.put(
|
||||||
"canExtractContent",
|
"preventModify", !document.getCurrentAccessPermission().canModify());
|
||||||
document.getCurrentAccessPermission().canExtractContent());
|
|
||||||
permissions.put(
|
permissions.put(
|
||||||
"canModifyAnnotations",
|
"preventExtractContent",
|
||||||
document.getCurrentAccessPermission().canModifyAnnotations());
|
!document.getCurrentAccessPermission().canExtractContent());
|
||||||
|
permissions.put(
|
||||||
|
"preventModifyAnnotations",
|
||||||
|
!document.getCurrentAccessPermission().canModifyAnnotations());
|
||||||
|
|
||||||
securityInfo.put("permissions", permissions);
|
securityInfo.put("permissions", permissions);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -63,25 +63,25 @@ public class PasswordController {
|
|||||||
String ownerPassword = request.getOwnerPassword();
|
String ownerPassword = request.getOwnerPassword();
|
||||||
String password = request.getPassword();
|
String password = request.getPassword();
|
||||||
int keyLength = request.getKeyLength();
|
int keyLength = request.getKeyLength();
|
||||||
boolean canAssembleDocument = request.isCanAssembleDocument();
|
boolean preventAssembly = request.isPreventAssembly();
|
||||||
boolean canExtractContent = request.isCanExtractContent();
|
boolean preventExtractContent = request.isPreventExtractContent();
|
||||||
boolean canExtractForAccessibility = request.isCanExtractForAccessibility();
|
boolean preventExtractForAccessibility = request.isPreventExtractForAccessibility();
|
||||||
boolean canFillInForm = request.isCanFillInForm();
|
boolean preventFillInForm = request.isPreventFillInForm();
|
||||||
boolean canModify = request.isCanModify();
|
boolean preventModify = request.isPreventModify();
|
||||||
boolean canModifyAnnotations = request.isCanModifyAnnotations();
|
boolean preventModifyAnnotations = request.isPreventModifyAnnotations();
|
||||||
boolean canPrint = request.isCanPrint();
|
boolean preventPrinting = request.isPreventPrinting();
|
||||||
boolean canPrintFaithful = request.isCanPrintFaithful();
|
boolean preventPrintingFaithful = request.isPreventPrintingFaithful();
|
||||||
|
|
||||||
PDDocument document = pdfDocumentFactory.load(fileInput);
|
PDDocument document = pdfDocumentFactory.load(fileInput);
|
||||||
AccessPermission ap = new AccessPermission();
|
AccessPermission ap = new AccessPermission();
|
||||||
ap.setCanAssembleDocument(!canAssembleDocument);
|
ap.setCanAssembleDocument(!preventAssembly);
|
||||||
ap.setCanExtractContent(!canExtractContent);
|
ap.setCanExtractContent(!preventExtractContent);
|
||||||
ap.setCanExtractForAccessibility(!canExtractForAccessibility);
|
ap.setCanExtractForAccessibility(!preventExtractForAccessibility);
|
||||||
ap.setCanFillInForm(!canFillInForm);
|
ap.setCanFillInForm(!preventFillInForm);
|
||||||
ap.setCanModify(!canModify);
|
ap.setCanModify(!preventModify);
|
||||||
ap.setCanModifyAnnotations(!canModifyAnnotations);
|
ap.setCanModifyAnnotations(!preventModifyAnnotations);
|
||||||
ap.setCanPrint(!canPrint);
|
ap.setCanPrint(!preventPrinting);
|
||||||
ap.setCanPrintFaithful(!canPrintFaithful);
|
ap.setCanPrintFaithful(!preventPrintingFaithful);
|
||||||
StandardProtectionPolicy spp = new StandardProtectionPolicy(ownerPassword, password, ap);
|
StandardProtectionPolicy spp = new StandardProtectionPolicy(ownerPassword, password, ap);
|
||||||
|
|
||||||
if (!"".equals(ownerPassword) || !"".equals(password)) {
|
if (!"".equals(ownerPassword) || !"".equals(password)) {
|
||||||
|
|||||||
@ -29,31 +29,29 @@ public class AddPasswordRequest extends PDFFile {
|
|||||||
defaultValue = "256")
|
defaultValue = "256")
|
||||||
private int keyLength = 256;
|
private int keyLength = 256;
|
||||||
|
|
||||||
@Schema(description = "Whether the document assembly is allowed", example = "false")
|
@Schema(description = "Whether document assembly is prevented", example = "false")
|
||||||
private boolean canAssembleDocument;
|
private boolean preventAssembly;
|
||||||
|
|
||||||
|
@Schema(description = "Whether content extraction is prevented", example = "false")
|
||||||
|
private boolean preventExtractContent;
|
||||||
|
|
||||||
@Schema(
|
@Schema(
|
||||||
description = "Whether content extraction for accessibility is allowed",
|
description = "Whether content extraction for accessibility is prevented",
|
||||||
example = "false")
|
example = "false")
|
||||||
private boolean canExtractContent;
|
private boolean preventExtractForAccessibility;
|
||||||
|
|
||||||
@Schema(
|
@Schema(description = "Whether form filling is prevented", example = "false")
|
||||||
description = "Whether content extraction for accessibility is allowed",
|
private boolean preventFillInForm;
|
||||||
example = "false")
|
|
||||||
private boolean canExtractForAccessibility;
|
|
||||||
|
|
||||||
@Schema(description = "Whether form filling is allowed", example = "false")
|
@Schema(description = "Whether document modification is prevented", example = "false")
|
||||||
private boolean canFillInForm;
|
private boolean preventModify;
|
||||||
|
|
||||||
@Schema(description = "Whether the document modification is allowed", example = "false")
|
@Schema(description = "Whether modification of annotations is prevented", example = "false")
|
||||||
private boolean canModify;
|
private boolean preventModifyAnnotations;
|
||||||
|
|
||||||
@Schema(description = "Whether modification of annotations is allowed", example = "false")
|
@Schema(description = "Whether printing of the document is prevented", example = "false")
|
||||||
private boolean canModifyAnnotations;
|
private boolean preventPrinting;
|
||||||
|
|
||||||
@Schema(description = "Whether printing of the document is allowed", example = "false")
|
@Schema(description = "Whether faithful printing is prevented", example = "false")
|
||||||
private boolean canPrint;
|
private boolean preventPrintingFaithful;
|
||||||
|
|
||||||
@Schema(description = "Whether faithful printing is allowed", example = "false")
|
|
||||||
private boolean canPrintFaithful;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -41,36 +41,36 @@
|
|||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label class="mb-2" th:text="#{addPassword.selectText.5}"></label>
|
<label class="mb-2" th:text="#{addPassword.selectText.5}"></label>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canAssembleDocument" name="canAssembleDocument">
|
<input type="checkbox" id="preventAssembly" name="preventAssembly">
|
||||||
<label for="canAssembleDocument" th:text="#{addPassword.selectText.6}"></label>
|
<label for="preventAssembly" th:text="#{addPassword.selectText.6}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canExtractContent" name="canExtractContent">
|
<input type="checkbox" id="preventExtractContent" name="preventExtractContent">
|
||||||
<label for="canExtractContent" th:text="#{addPassword.selectText.7}"></label>
|
<label for="preventExtractContent" th:text="#{addPassword.selectText.7}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canExtractForAccessibility" name="canExtractForAccessibility">
|
<input type="checkbox" id="preventExtractForAccessibility" name="preventExtractForAccessibility">
|
||||||
<label for="canExtractForAccessibility" th:text="#{addPassword.selectText.8}"></label>
|
<label for="preventExtractForAccessibility" th:text="#{addPassword.selectText.8}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canFillInForm" name="canFillInForm">
|
<input type="checkbox" id="preventFillInForm" name="preventFillInForm">
|
||||||
<label for="canFillInForm" th:text="#{addPassword.selectText.9}"></label>
|
<label for="preventFillInForm" th:text="#{addPassword.selectText.9}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canModify" name="canModify">
|
<input type="checkbox" id="preventModify" name="preventModify">
|
||||||
<label for="canModify" th:text="#{addPassword.selectText.10}"></label>
|
<label for="preventModify" th:text="#{addPassword.selectText.10}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canModifyAnnotations" name="canModifyAnnotations">
|
<input type="checkbox" id="preventModifyAnnotations" name="preventModifyAnnotations">
|
||||||
<label for="canModifyAnnotations" th:text="#{addPassword.selectText.11}"></label>
|
<label for="preventModifyAnnotations" th:text="#{addPassword.selectText.11}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canPrint" name="canPrint">
|
<input type="checkbox" id="preventPrinting" name="preventPrinting">
|
||||||
<label for="canPrint" th:text="#{addPassword.selectText.12}"></label>
|
<label for="preventPrinting" th:text="#{addPassword.selectText.12}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canPrintFaithful" name="canPrintFaithful">
|
<input type="checkbox" id="preventPrintingFaithful" name="preventPrintingFaithful">
|
||||||
<label for="canPrintFaithful" th:text="#{addPassword.selectText.13}"></label>
|
<label for="preventPrintingFaithful" th:text="#{addPassword.selectText.13}"></label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|||||||
@ -25,36 +25,36 @@
|
|||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label class="mb-2" th:text="#{permissions.selectText.2}"></label>
|
<label class="mb-2" th:text="#{permissions.selectText.2}"></label>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canAssembleDocument" name="canAssembleDocument">
|
<input type="checkbox" id="preventAssembly" name="preventAssembly">
|
||||||
<label for="canAssembleDocument" th:text="#{permissions.selectText.3}"></label>
|
<label for="preventAssembly" th:text="#{permissions.selectText.3}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canExtractContent" name="canExtractContent">
|
<input type="checkbox" id="preventExtractContent" name="preventExtractContent">
|
||||||
<label for="canExtractContent" th:text="#{permissions.selectText.4}"></label>
|
<label for="preventExtractContent" th:text="#{permissions.selectText.4}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canExtractForAccessibility" name="canExtractForAccessibility">
|
<input type="checkbox" id="preventExtractForAccessibility" name="preventExtractForAccessibility">
|
||||||
<label for="canExtractForAccessibility" th:text="#{permissions.selectText.5}"></label>
|
<label for="preventExtractForAccessibility" th:text="#{permissions.selectText.5}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canFillInForm" name="canFillInForm">
|
<input type="checkbox" id="preventFillInForm" name="preventFillInForm">
|
||||||
<label for="canFillInForm" th:text="#{permissions.selectText.6}"></label>
|
<label for="preventFillInForm" th:text="#{permissions.selectText.6}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canModify" name="canModify">
|
<input type="checkbox" id="preventModify" name="preventModify">
|
||||||
<label for="canModify" th:text="#{permissions.selectText.7}"></label>
|
<label for="preventModify" th:text="#{permissions.selectText.7}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canModifyAnnotations" name="canModifyAnnotations">
|
<input type="checkbox" id="preventModifyAnnotations" name="preventModifyAnnotations">
|
||||||
<label for="canModifyAnnotations" th:text="#{permissions.selectText.8}"></label>
|
<label for="preventModifyAnnotations" th:text="#{permissions.selectText.8}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canPrint" name="canPrint">
|
<input type="checkbox" id="preventPrinting" name="preventPrinting">
|
||||||
<label for="canPrint" th:text="#{permissions.selectText.9}"></label>
|
<label for="preventPrinting" th:text="#{permissions.selectText.9}"></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check ms-3">
|
<div class="form-check ms-3">
|
||||||
<input type="checkbox" id="canPrintFaithful" name="canPrintFaithful">
|
<input type="checkbox" id="preventPrintingFaithful" name="preventPrintingFaithful">
|
||||||
<label for="canPrintFaithful" th:text="#{permissions.selectText.10}"></label>
|
<label for="preventPrintingFaithful" th:text="#{permissions.selectText.10}"></label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user