LDEV-4692 remove password from error message, add test

lucee · Sep 14, 2023 · 15bd7da · 15bd7da
1 parent 4f73f6f
commit 15bd7da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/source/java/src/org/lucee/extension/pdf/PDFStruct.java b/source/java/src/org/lucee/extension/pdf/PDFStruct.java
@@ -228,7 +228,8 @@ public PdfReader getPdfReader() throws PageException {
 			return unlockPdf(new PdfReader(PDFUtil.toBytes(resource)));
 		}
 		catch (IOException ioe) {
-			throw CFMLEngineFactory.getInstance().getExceptionUtil().createApplicationException("can not load file " + password + " [" + resource + "]", ioe.getMessage());
+			throw CFMLEngineFactory.getInstance().getExceptionUtil().createApplicationException("Error opening pdf file [" + resource 
+				+ "], error thrown [" + ioe.getMessage() + "]" );
 		}
 	}
 

diff --git a/tests/LDEV4692.cfc b/tests/LDEV4692.cfc
@@ -22,6 +22,9 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="pdf" {
 				pdf action="protect" source="#testPdf#" destination="#testPdf#" newUserPassword="#variables.password#" overwrite="true";
 				pdf action="extractText" source="#testPdf#" name="local.extractedText" password="#variables.password#";
 				expect( extractedText ).toInclude( testCode );
+				expect(function(){
+					pdf action="extractText" source="#testPdf#" name="local.extractedText";
+				}).toThrow(); // no password
 
 				pdf action="removePassword" source="#testPdf#" destination="#testPdf#" password="#variables.password#" overwrite="true";
 				pdf action="extractText" source="#testPdf#" name="local.extractedText";