From c8c23ead1374030a52bc91f8b6380834b507509c Mon Sep 17 00:00:00 2001 From: michaeloffner Date: Fri, 24 Jan 2025 15:05:18 +0100 Subject: [PATCH] LDEV-5217 - extend properties and make sure the properties not get renewed all the time --- build.number | 4 ++-- .../src/org/lucee/extension/esapi/resource/ESAPI.properties | 1 + .../src/org/lucee/extension/esapi/util/PropertyDeployer.java | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.number b/build.number index 4da3770..f68a7a8 100644 --- a/build.number +++ b/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon Jan 06 17:20:50 CET 2025 -build.number=18 +#Fri Jan 24 15:04:26 CET 2025 +build.number=19 diff --git a/source/java/src/org/lucee/extension/esapi/resource/ESAPI.properties b/source/java/src/org/lucee/extension/esapi/resource/ESAPI.properties index 63c3e5f..8b41d13 100644 --- a/source/java/src/org/lucee/extension/esapi/resource/ESAPI.properties +++ b/source/java/src/org/lucee/extension/esapi/resource/ESAPI.properties @@ -174,3 +174,4 @@ Validator.HTTPJSESSIONID=^[A-Z0-9]{10,30}$ Validator.FileName=^[a-zA-Z0-9!@#$%^&{}\\[\\]()_+\\-=,.~'` ]{1,255}$ Validator.DirectoryName=^[a-zA-Z0-9:/\\\\!@#$%^&{}\\[\\]()_+\\-=,.~'` ]{1,255}$ +IntrusionDetector.Disable=true \ No newline at end of file diff --git a/source/java/src/org/lucee/extension/esapi/util/PropertyDeployer.java b/source/java/src/org/lucee/extension/esapi/util/PropertyDeployer.java index 539a48a..e959d4d 100644 --- a/source/java/src/org/lucee/extension/esapi/util/PropertyDeployer.java +++ b/source/java/src/org/lucee/extension/esapi/util/PropertyDeployer.java @@ -27,7 +27,6 @@ private static Resource create(String srcPath, String name, Resource dir) { static boolean fileDiff(String resource, Resource file) { try { - file.delete(); InputStream is = FunctionSupport.class.getResourceAsStream(resource); if (is == null) throw new IOException("file [" + resource + "] does not exist."); @@ -35,7 +34,6 @@ static boolean fileDiff(String resource, Resource file) { ByteArrayOutputStream baos = new ByteArrayOutputStream(); IO io = CFMLEngineFactory.getInstance().getIOUtil(); io.copy(is, baos, true, true); - byte[] input = baos.toByteArray(); boolean diff = baos.toByteArray().length != file.length(); return diff; }