From 9a06b5cdcedbb784995d40ab1ce51aeedbb2391b Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 28 Jul 2024 07:40:47 -0400 Subject: [PATCH 1/2] fix: update esapi resolves #74 --- esapi/pom.xml | 16 ++++++++- .../org/owasp/encoder/esapi/ESAPIEncoder.java | 34 +++++++++++++++++++ ...-logging.properties => logging.properties} | 0 3 files changed, 49 insertions(+), 1 deletion(-) rename esapi/src/test/resources/{esapi-java-logging.properties => logging.properties} (100%) diff --git a/esapi/pom.xml b/esapi/pom.xml index cc26851..9491ca9 100644 --- a/esapi/pom.xml +++ b/esapi/pom.xml @@ -67,7 +67,21 @@ org.owasp.esapi esapi - [2.2.3.1,3) + [2.5.1.0,3) + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + ${project.basedir}/src/test/resources/logging.properties + + + + + diff --git a/esapi/src/main/java/org/owasp/encoder/esapi/ESAPIEncoder.java b/esapi/src/main/java/org/owasp/encoder/esapi/ESAPIEncoder.java index 02334bd..f84b3d1 100644 --- a/esapi/src/main/java/org/owasp/encoder/esapi/ESAPIEncoder.java +++ b/esapi/src/main/java/org/owasp/encoder/esapi/ESAPIEncoder.java @@ -141,114 +141,148 @@ private enum Impl implements Encoder { private final Encoder _referenceEncoder = DefaultEncoder.getInstance(); /** {@inheritDoc} */ + @Override public String canonicalize(String s) { return _referenceEncoder.canonicalize(s); } /** {@inheritDoc} */ + @Override public String canonicalize(String s, boolean strict) { return _referenceEncoder.canonicalize(s, strict); } /** {@inheritDoc} */ + @Override public String canonicalize(String s, boolean restrictMultiple, boolean restrictMixed) { return _referenceEncoder.canonicalize(s, restrictMultiple, restrictMixed); } /** {@inheritDoc} */ + @Override public String getCanonicalizedURI(URI dirtyUri) { return _referenceEncoder.getCanonicalizedURI(dirtyUri); } /** {@inheritDoc} */ + @Override public String encodeForCSS(String s) { return Encode.forCssString(s); } /** {@inheritDoc} */ + @Override public String encodeForHTML(String s) { return Encode.forHtml(s); } /** {@inheritDoc} */ + @Override public String decodeForHTML(String s) { return _referenceEncoder.decodeForHTML(s); } /** {@inheritDoc} */ + @Override public String encodeForHTMLAttribute(String s) { return Encode.forHtmlAttribute(s); } /** {@inheritDoc} */ + @Override public String encodeForJavaScript(String s) { return Encode.forJavaScript(s); } /** {@inheritDoc} */ + @Override public String encodeForVBScript(String s) { return _referenceEncoder.encodeForVBScript(s); } /** {@inheritDoc} */ + @Override public String encodeForSQL(Codec codec, String s) { return _referenceEncoder.encodeForSQL(codec, s); } /** {@inheritDoc} */ + @Override public String encodeForOS(Codec codec, String s) { return _referenceEncoder.encodeForOS(codec, s); } /** {@inheritDoc} */ + @Override public String encodeForLDAP(String s) { return _referenceEncoder.encodeForLDAP(s); } /** {@inheritDoc} */ + @Override public String encodeForLDAP(String s, boolean b) { return _referenceEncoder.encodeForLDAP(s, b); } /** {@inheritDoc} */ + @Override public String encodeForDN(String s) { return _referenceEncoder.encodeForDN(s); } /** {@inheritDoc} */ + @Override public String encodeForXPath(String s) { return _referenceEncoder.encodeForXPath(s); } /** {@inheritDoc} */ + @Override public String encodeForXML(String s) { return Encode.forXml(s); } /** {@inheritDoc} */ + @Override public String encodeForXMLAttribute(String s) { return Encode.forXmlAttribute(s); } /** {@inheritDoc} */ + @Override public String encodeForURL(String s) throws EncodingException { return Encode.forUri(s); } /** {@inheritDoc} */ + @Override public String decodeFromURL(String s) throws EncodingException { return _referenceEncoder.decodeFromURL(s); } /** {@inheritDoc} */ + @Override public String encodeForBase64(byte[] bytes, boolean wrap) { return _referenceEncoder.encodeForBase64(bytes, wrap); } /** {@inheritDoc} */ + @Override public byte[] decodeFromBase64(String s) throws IOException { return _referenceEncoder.decodeFromBase64(s); } + /** {@inheritDoc} */ + @Override + public String encodeForJSON(String s) { + return _referenceEncoder.encodeForJSON(s); + } + + /** {@inheritDoc} */ + @Override + public String decodeFromJSON(String s) { + return _referenceEncoder.decodeFromJSON(s); + } + } } diff --git a/esapi/src/test/resources/esapi-java-logging.properties b/esapi/src/test/resources/logging.properties similarity index 100% rename from esapi/src/test/resources/esapi-java-logging.properties rename to esapi/src/test/resources/logging.properties From 04d79b828148927afaeffca77b5605be2ea08c04 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 29 Jul 2024 05:48:39 -0400 Subject: [PATCH 2/2] fix: remove properties to fix test --- esapi/pom.xml | 14 -------------- esapi/src/test/resources/logging.properties | 6 ------ 2 files changed, 20 deletions(-) delete mode 100644 esapi/src/test/resources/logging.properties diff --git a/esapi/pom.xml b/esapi/pom.xml index 9491ca9..c615095 100644 --- a/esapi/pom.xml +++ b/esapi/pom.xml @@ -70,18 +70,4 @@ [2.5.1.0,3) - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - ${project.basedir}/src/test/resources/logging.properties - - - - - diff --git a/esapi/src/test/resources/logging.properties b/esapi/src/test/resources/logging.properties deleted file mode 100644 index 71011ac..0000000 --- a/esapi/src/test/resources/logging.properties +++ /dev/null @@ -1,6 +0,0 @@ -handlers= java.util.logging.ConsoleHandler -.level= INFO -java.util.logging.ConsoleHandler.level = INFO -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] [%3$-7s] %5$s %n -#https://www.logicbig.com/tutorials/core-java-tutorial/logging/customizing-default-format.html \ No newline at end of file