From f4082e3f965d037bb85f99f2508f08180cbb251b Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:51:59 +0100
Subject: [PATCH 02/27] Update PasswordController.java
---
.../SPDF/controller/api/security/PasswordController.java | 1 -
1 file changed, 1 deletion(-)
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 b8e36e0e106..8a947c8e0b5 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
@@ -68,7 +68,6 @@ public ResponseEntity
addPassword(@ModelAttribute AddPasswordRequest req
boolean canModifyAnnotations = request.isCanModifyAnnotations();
boolean canPrint = request.isCanPrint();
boolean canPrintFaithful = request.isCanPrintFaithful();
- System.out.println(fileInput.getOriginalFilename());
PDDocument document = Loader.loadPDF(fileInput.getBytes());
AccessPermission ap = new AccessPermission();
ap.setCanAssembleDocument(!canAssembleDocument);
From 4d017610b80a5c5ff763a97dbd9e5d7472b8bc37 Mon Sep 17 00:00:00 2001
From: Reece Browne
Date: Fri, 6 Dec 2024 19:08:18 +0000
Subject: [PATCH 03/27] PDF decryption
---
.../static/js/multitool/DecryptFiles.js | 90 +++++++++++++++++++
.../static/js/multitool/PdfContainer.js | 27 ++++--
2 files changed, 110 insertions(+), 7 deletions(-)
create mode 100644 src/main/resources/static/js/multitool/DecryptFiles.js
diff --git a/src/main/resources/static/js/multitool/DecryptFiles.js b/src/main/resources/static/js/multitool/DecryptFiles.js
new file mode 100644
index 00000000000..bd7e0073a5c
--- /dev/null
+++ b/src/main/resources/static/js/multitool/DecryptFiles.js
@@ -0,0 +1,90 @@
+export class DecryptFile {
+ async decryptFile(file) {
+ try {
+ const password = prompt('This file is password-protected. Please enter the password:');
+
+ if (password === null) {
+ // User cancelled
+ console.error(`Password prompt cancelled for PDF: ${file.name}`);
+ this.showErrorBanner(`Operation cancelled for PDF: ${file.name}`, 'You cancelled the decryption process.');
+ return null; // No file to return
+ }
+
+ if (!password) {
+ // No password provided
+ console.error(`No password provided for encrypted PDF: ${file.name}`);
+ this.showErrorBanner(`No password provided for encrypted PDF: ${file.name}`, 'Please enter a valid password.');
+ return null; // No file to return
+ }
+
+ const formData = new FormData();
+ formData.append('fileInput', file);
+ formData.append('password', password);
+
+ // Send decryption request
+ const response = await fetch('/api/v1/security/remove-password', {
+ method: 'POST',
+ body: formData,
+ });
+
+ if (response.ok) {
+ const decryptedBlob = await response.blob();
+ this.removeErrorBanner();
+ return new File([decryptedBlob], file.name, {type: 'application/pdf'});
+ } else {
+ const errorText = await response.text();
+ console.error(`Server error while decrypting: ${errorText}`);
+ this.showErrorBanner(
+ 'Please try again with the correct password.',
+ errorText,
+ `Incorrect password for PDF: ${file.name}`
+ );
+ return null; // No file to return
+ }
+ } catch (error) {
+ // Handle network or unexpected errors
+ console.error(`Failed to decrypt PDF: ${file.name}`, error);
+ this.showErrorBanner(
+ `Decryption error for PDF: ${file.name}`,
+ error.message || 'Unexpected error occurred.',
+ 'There was an error processing the file. Please try again.'
+ );
+ return null; // No file to return
+ }
+ }
+
+ async checkFileEncrypted(file) {
+ try {
+ pdfjsLib.GlobalWorkerOptions.workerSrc = './pdfjs-legacy/pdf.worker.mjs';
+ const arrayBuffer = await file.arrayBuffer(); // Convert file to ArrayBuffer
+ await pdfjsLib.getDocument({
+ data: arrayBuffer,
+ password: '',
+ }).promise;
+
+ return false; // File is not encrypted
+ } catch (error) {
+ if (error.name === 'PasswordException') {
+ return true; // File is encrypted
+ }
+ console.error('Error checking encryption:', error);
+ throw new Error('Failed to determine if the file is encrypted.');
+ }
+ }
+
+ showErrorBanner(message, stackTrace, error) {
+ const errorContainer = document.getElementById('errorContainer');
+ errorContainer.style.display = 'block'; // Display the banner
+ errorContainer.querySelector('.alert-heading').textContent = error;
+ errorContainer.querySelector('p').textContent = message;
+ document.querySelector('#traceContent').textContent = stackTrace;
+ }
+
+ removeErrorBanner() {
+ const errorContainer = document.getElementById('errorContainer');
+ errorContainer.style.display = 'none'; // Hide the banner
+ errorContainer.querySelector('.alert-heading').textContent = '';
+ errorContainer.querySelector('p').textContent = '';
+ document.querySelector('#traceContent').textContent = '';
+ }
+}
diff --git a/src/main/resources/static/js/multitool/PdfContainer.js b/src/main/resources/static/js/multitool/PdfContainer.js
index 4eaf43f1420..f7fa2536613 100644
--- a/src/main/resources/static/js/multitool/PdfContainer.js
+++ b/src/main/resources/static/js/multitool/PdfContainer.js
@@ -5,6 +5,7 @@ import {SplitAllCommand} from './commands/split.js';
import {UndoManager} from './UndoManager.js';
import {PageBreakCommand} from './commands/page-break.js';
import {AddFilesCommand} from './commands/add-page.js';
+import {DecryptFile} from './DecryptFiles.js';
class PdfContainer {
fileName;
@@ -40,6 +41,8 @@ class PdfContainer {
this.removeAllElements = this.removeAllElements.bind(this);
this.resetPages = this.resetPages.bind(this);
+ this.decryptFile = new DecryptFile();
+
this.undoManager = undoManager || new UndoManager();
this.pdfAdapters = pdfAdapters;
@@ -165,7 +168,6 @@ class PdfContainer {
input.click();
});
}
-
async addFilesFromFiles(files, nextSiblingElement, pages) {
this.fileName = files[0].name;
for (var i = 0; i < files.length; i++) {
@@ -173,17 +175,27 @@ class PdfContainer {
let processingTime,
errorMessage = null,
pageCount = 0;
+
try {
- const file = files[i];
- if (file.type === 'application/pdf') {
- const {renderer, pdfDocument} = await this.loadFile(file);
+ let decryptedFile = files[i];
+
+ if (decryptedFile.type === 'application/pdf' && (await this.decryptFile.checkFileEncrypted(decryptedFile))) {
+ decryptedFile = await this.decryptFile.decryptFile(decryptedFile);
+ if (!decryptedFile) {
+ throw new Error('File decryption failed.');
+ }
+ }
+
+ if (decryptedFile.type === 'application/pdf') {
+ const {renderer, pdfDocument} = await this.loadFile(decryptedFile);
pageCount = renderer.pageCount || 0;
pages = await this.addPdfFile(renderer, pdfDocument, nextSiblingElement, pages);
- } else if (file.type.startsWith('image/')) {
- pages = await this.addImageFile(file, nextSiblingElement, pages);
+ } else if (decryptedFile.type.startsWith('image/')) {
+ pages = await this.addImageFile(decryptedFile, nextSiblingElement, pages);
}
+
processingTime = Date.now() - startTime;
- this.captureFileProcessingEvent(true, file, processingTime, null, pageCount);
+ this.captureFileProcessingEvent(true, decryptedFile, processingTime, null, pageCount);
} catch (error) {
processingTime = Date.now() - startTime;
errorMessage = error.message || 'Unknown error';
@@ -194,6 +206,7 @@ class PdfContainer {
document.querySelectorAll('.enable-on-file').forEach((element) => {
element.disabled = false;
});
+
return pages;
}
From 58278c07ff368fe565a6e301664408015c2827e7 Mon Sep 17 00:00:00 2001
From: Reece Browne
Date: Fri, 6 Dec 2024 20:46:04 +0000
Subject: [PATCH 04/27] Translations for errors
---
src/main/resources/messages_en_GB.properties | 10 ++++++++
.../static/js/multitool/DecryptFiles.js | 24 ++++++++++++-------
src/main/resources/templates/multi-tool.html | 10 +++++++-
3 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties
index b8c443216cc..c5e42bff502 100644
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.properties
@@ -965,6 +965,16 @@ multiTool.dragDropMessage=Page(s) Selected
multiTool.undo=Undo
multiTool.redo=Redo
+#multiTool-decrypt
+multiTool.decrypt.passwordPrompt=This file is password-protected. Please enter the password:
+multiTool.decrypt.cancelled=Operation cancelled for PDF: {0}
+multiTool.decrypt.noPassword=No password provided for encrypted PDF: {0}
+multiTool.decrypt.invalidPassword=Please try again with the correct password.
+multiTool.decrypt.invalidPasswordHeader=Incorrect password for PDF: {0}
+multiTool.decrypt.unexpectedError=There was an error processing the file. Please try again.
+multiTool.decrypt.serverError=Server error while decrypting: {0}
+multiTool.decrypt.success=File decrypted successfully.
+
#multiTool-advert
multiTool-advert.message=This feature is also available in our multi-tool page. Check it out for enhanced page-by-page UI and additional features!
diff --git a/src/main/resources/static/js/multitool/DecryptFiles.js b/src/main/resources/static/js/multitool/DecryptFiles.js
index bd7e0073a5c..a9acbccc6e9 100644
--- a/src/main/resources/static/js/multitool/DecryptFiles.js
+++ b/src/main/resources/static/js/multitool/DecryptFiles.js
@@ -6,14 +6,22 @@ export class DecryptFile {
if (password === null) {
// User cancelled
console.error(`Password prompt cancelled for PDF: ${file.name}`);
- this.showErrorBanner(`Operation cancelled for PDF: ${file.name}`, 'You cancelled the decryption process.');
+ this.showErrorBanner(
+ `${window.translations.cancelled.replace('{0}', file.name)}`,
+ '',
+ `${window.translations.unexpectedError}`
+ );
return null; // No file to return
}
if (!password) {
// No password provided
console.error(`No password provided for encrypted PDF: ${file.name}`);
- this.showErrorBanner(`No password provided for encrypted PDF: ${file.name}`, 'Please enter a valid password.');
+ this.showErrorBanner(
+ `${window.translations.noPassword.replace('{0}', file.name)}`,
+ '',
+ `${window.translations.unexpectedError}`
+ );
return null; // No file to return
}
@@ -33,11 +41,11 @@ export class DecryptFile {
return new File([decryptedBlob], file.name, {type: 'application/pdf'});
} else {
const errorText = await response.text();
- console.error(`Server error while decrypting: ${errorText}`);
+ console.error(`${window.translations.invalidPassword} ${errorText}`);
this.showErrorBanner(
- 'Please try again with the correct password.',
+ `${window.translations.invalidPassword}`,
errorText,
- `Incorrect password for PDF: ${file.name}`
+ `${window.translations.invalidPasswordHeader.replace('{0}', file.name)}`
);
return null; // No file to return
}
@@ -45,9 +53,9 @@ export class DecryptFile {
// Handle network or unexpected errors
console.error(`Failed to decrypt PDF: ${file.name}`, error);
this.showErrorBanner(
- `Decryption error for PDF: ${file.name}`,
- error.message || 'Unexpected error occurred.',
- 'There was an error processing the file. Please try again.'
+ `${window.translations.unexpectedError.replace('{0}', file.name)}`,
+ `${error.message || window.translations.unexpectedError}`,
+ error
);
return null; // No file to return
}
diff --git a/src/main/resources/templates/multi-tool.html b/src/main/resources/templates/multi-tool.html
index 14e5a85ec03..532ca5f8193 100644
--- a/src/main/resources/templates/multi-tool.html
+++ b/src/main/resources/templates/multi-tool.html
@@ -162,7 +162,15 @@ multi-tool page. Check it out for enhanced page-by-page UI and additional features!
diff --git a/src/main/resources/static/js/downloader.js b/src/main/resources/static/js/downloader.js
index c651620e9b5..f89c28ec331 100644
--- a/src/main/resources/static/js/downloader.js
+++ b/src/main/resources/static/js/downloader.js
@@ -71,9 +71,6 @@
}, 5000);
try {
- submitButton.textContent = 'Processing...';
- submitButton.disabled = true;
-
if (!url.includes('remove-password')) {
// Check if any PDF files are encrypted and handle decryption if necessary
const decryptedFiles = await checkAndDecryptFiles(url, files);
@@ -84,6 +81,9 @@
});
}
+ submitButton.textContent = 'Processing...';
+ submitButton.disabled = true;
+
if (remoteCall === true) {
if (override === 'multi' || (!multipleInputsForSingleRequest && files.length > 1 && override !== 'single')) {
await submitMultiPdfForm(url, files);
@@ -181,11 +181,14 @@
if (error.name === 'PasswordException' && error.code === 1) {
console.log(`PDF requires password: ${file.name}`, error);
console.log(`Attempting to remove password from PDF: ${file.name} with password.`);
- const password = prompt(`This PDF (${file.name}) is encrypted. Please enter the password:`);
+ const password = prompt(`${window.translations.decrypt.passwordPrompt}`);
if (!password) {
console.error(`No password provided for encrypted PDF: ${file.name}`);
- showErrorBanner(`No password provided for encrypted PDF: ${file.name}`, 'Please enter a valid password.');
+ showErrorBanner(
+ `${window.translations.decrypt.noPassword.replace('{0}', file.name)}`,
+ `${window.translations.decrypt.unexpectedError}`
+ );
throw error;
}
@@ -217,7 +220,10 @@
}
} catch (decryptError) {
console.error(`Failed to decrypt PDF: ${file.name}`, decryptError);
- showErrorBanner(`Failed to decrypt PDF: ${file.name}`, 'Incorrect password or unsupported encryption.');
+ showErrorBanner(
+ `${window.translations.invalidPasswordHeader.replace('{0}', file.name)}`,
+ `${window.translations.invalidPassword}`
+ );
throw decryptError;
}
} else {
diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html
index f372d1dd517..04a91a8dd24 100644
--- a/src/main/resources/templates/fragments/common.html
+++ b/src/main/resources/templates/fragments/common.html
@@ -203,7 +203,19 @@
-
+
diff --git a/src/main/resources/templates/multi-tool.html b/src/main/resources/templates/multi-tool.html
index 260ad74cde1..17eafedf366 100644
--- a/src/main/resources/templates/multi-tool.html
+++ b/src/main/resources/templates/multi-tool.html
@@ -163,17 +163,18 @@
-
+
+
@@ -42,75 +43,6 @@
th:replace="~{fragments/common :: fileSelector(name='pdf-upload', multipleInputsForSingleRequest=false, disableMultipleFiles=true, accept='application/pdf')}">
-
-
-
-
-
-
@@ -410,35 +225,11 @@
-