From 7b1996c55e70cbc80ddf19e8b14234418d3a26ab Mon Sep 17 00:00:00 2001 From: JosephWitthuhnTR Date: Mon, 6 Feb 2023 09:19:41 -0600 Subject: [PATCH 1/2] remove dependency on servlet API (use case where not needed) --- .../esapi/logging/appender/ServerInfoSupplier.java | 8 +++++--- .../logging/appender/ServerInfoSupplierTest.java | 12 +++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/owasp/esapi/logging/appender/ServerInfoSupplier.java b/src/main/java/org/owasp/esapi/logging/appender/ServerInfoSupplier.java index 8fbef3e6c..45fb4da55 100644 --- a/src/main/java/org/owasp/esapi/logging/appender/ServerInfoSupplier.java +++ b/src/main/java/org/owasp/esapi/logging/appender/ServerInfoSupplier.java @@ -51,9 +51,11 @@ public ServerInfoSupplier(String logName) { public String get() { // log server, port, app name, module name -- server:80/app/module StringBuilder appInfo = new StringBuilder(); - HttpServletRequest request = ESAPI.currentRequest(); - if (request != null && logServerIP) { - appInfo.append(request.getLocalAddr()).append(":").append(request.getLocalPort()); + if (logServerIP) { + HttpServletRequest request = ESAPI.currentRequest(); + if (request != null) { + appInfo.append(request.getLocalAddr()).append(":").append(request.getLocalPort()); + } } if (logAppName) { appInfo.append("/").append(applicationName); diff --git a/src/test/java/org/owasp/esapi/logging/appender/ServerInfoSupplierTest.java b/src/test/java/org/owasp/esapi/logging/appender/ServerInfoSupplierTest.java index db91b8087..41131847d 100644 --- a/src/test/java/org/owasp/esapi/logging/appender/ServerInfoSupplierTest.java +++ b/src/test/java/org/owasp/esapi/logging/appender/ServerInfoSupplierTest.java @@ -25,14 +25,14 @@ public class ServerInfoSupplierTest { private HttpServletRequest request; @Before - public void buildStaticMocks() throws Exception { + public void buildStaticMocks() { request = mock(HttpServletRequest.class); mockStatic(ESAPI.class); - when(ESAPI.class, "currentRequest").thenReturn(request); } @Test - public void verifyFullOutput() { + public void verifyFullOutput() throws Exception { + when(ESAPI.class, "currentRequest").thenReturn(request); when(request.getLocalAddr()).thenReturn("LOCAL_ADDR"); when(request.getLocalPort()).thenReturn(99999); @@ -57,7 +57,8 @@ public void verifyOutputNullRequest() throws Exception { } @Test - public void verifyOutputNoAppName() { + public void verifyOutputNoAppName() throws Exception { + when(ESAPI.class, "currentRequest").thenReturn(request); when(request.getLocalAddr()).thenReturn("LOCAL_ADDR"); when(request.getLocalPort()).thenReturn(99999); @@ -70,7 +71,8 @@ public void verifyOutputNoAppName() { } @Test - public void verifyOutputNullAppName() { + public void verifyOutputNullAppName() throws Exception { + when(ESAPI.class, "currentRequest").thenReturn(null); when(request.getLocalAddr()).thenReturn("LOCAL_ADDR"); when(request.getLocalPort()).thenReturn(99999); From b40bce28a2b96e8acb0e2d9f88b47db9d3b3151e Mon Sep 17 00:00:00 2001 From: JosephWitthuhnTR Date: Mon, 6 Feb 2023 12:04:17 -0600 Subject: [PATCH 2/2] typo in unit test --- .../owasp/esapi/logging/appender/ServerInfoSupplierTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/owasp/esapi/logging/appender/ServerInfoSupplierTest.java b/src/test/java/org/owasp/esapi/logging/appender/ServerInfoSupplierTest.java index 41131847d..807c61290 100644 --- a/src/test/java/org/owasp/esapi/logging/appender/ServerInfoSupplierTest.java +++ b/src/test/java/org/owasp/esapi/logging/appender/ServerInfoSupplierTest.java @@ -72,7 +72,7 @@ public void verifyOutputNoAppName() throws Exception { @Test public void verifyOutputNullAppName() throws Exception { - when(ESAPI.class, "currentRequest").thenReturn(null); + when(ESAPI.class, "currentRequest").thenReturn(request); when(request.getLocalAddr()).thenReturn("LOCAL_ADDR"); when(request.getLocalPort()).thenReturn(99999);