Moved logger to inside UrlEquivalenceValidator

Author: thomasm-ttd

src/main/java/com/uid2/shared/secure/NitroCoreAttestationService.java

@@ -57,7 +57,7 @@ private AttestationResult attestInternal(byte[] publicKey, AttestationRequest aR
 
         String givenAttestationUrl = aDoc.getUserDataString();
         if (givenAttestationUrl != null && !givenAttestationUrl.isEmpty()) {
-            if (!UrlEquivalenceValidator.areUrlsEquivalent(this.attestationUrl, givenAttestationUrl, LOGGER)) {
+            if (!UrlEquivalenceValidator.areUrlsEquivalent(this.attestationUrl, givenAttestationUrl)) {
                 return new AttestationResult(AttestationFailure.UNKNOWN_ATTESTATION_URL);
             }
         }

src/main/java/com/uid2/shared/secure/gcpoidc/PolicyValidator.java

@@ -144,7 +144,7 @@ private Environment checkEnvOverrides(TokenPayload payload) throws AttestationEx
     private void checkAttestationUrl(HashMap<String, String> optionalEnvOverrides) throws AttestationException {
         if (!Strings.isNullOrEmpty(optionalEnvOverrides.get(ENV_CORE_ENDPOINT))) {
             String givenAttestationUrl = optionalEnvOverrides.get(ENV_CORE_ENDPOINT);
-            if (!UrlEquivalenceValidator.areUrlsEquivalent(givenAttestationUrl, this.attestationUrl, LOGGER)) {
+            if (!UrlEquivalenceValidator.areUrlsEquivalent(givenAttestationUrl, this.attestationUrl)) {
                 throw new AttestationClientException("The given attestation URL is unknown. Given URL: " + givenAttestationUrl, AttestationFailure.UNKNOWN_ATTESTATION_URL);
             }
         }

src/main/java/com/uid2/shared/util/UrlEquivalenceValidator.java

@@ -1,29 +1,31 @@
 package com.uid2.shared.util;
 
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
 public class UrlEquivalenceValidator {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UrlEquivalenceValidator.class);
     private UrlEquivalenceValidator() {
 
     }
 
-    public static Boolean areUrlsEquivalent(String url1, String url2, Logger logger) {
-        logger.debug("Checking URLs equivalent: URL1: '{}', URL2: '{}'", url1, url2);
+    public static Boolean areUrlsEquivalent(String url1, String url2) {
+        LOGGER.debug("Checking URLs equivalent: URL1: '{}', URL2: '{}'", url1, url2);
         URL first;
         try {
             first = new URL(url1);
         } catch (MalformedURLException e) {
-            logger.error("URL could not be parsed to a valid URL. Given URL: " + url1, e);
+            LOGGER.error("URL could not be parsed to a valid URL. Given URL: " + url1, e);
             return false;
         }
         URL second;
         try {
             second = new URL(url2);
         } catch (MalformedURLException e) {
-            logger.error("URL could not be parsed to a valid URL. Given URL: " + url2, e);
+            LOGGER.error("URL could not be parsed to a valid URL. Given URL: " + url2, e);
             return false;
         }
 

src/test/java/com/uid2/shared/util/UrlEquivalenceValidatorTest.java

@@ -1,26 +1,42 @@
 package com.uid2.shared.util;
 
+import ch.qos.logback.classic.spi.LoggerRemoteView;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.mockito.MockedStatic;
 import org.mockito.MockitoAnnotations;
 import org.slf4j.Logger;
 import org.junit.Assert;
 import org.mockito.Mock;
+import org.slf4j.LoggerFactory;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
 public class UrlEquivalenceValidatorTest {
 
-    @Mock
-    private Logger loggerMock;
+    private MockedStatic<LoggerFactory> mockedLoggerFactory;
+    private static Logger mockedLogger = mock(Logger.class);
 
+    @BeforeClass
+    public static void classSetup() {
+
+    }
     @BeforeEach
     public void setup(){
-        MockitoAnnotations.openMocks(this);
+        mockedLoggerFactory = mockStatic(LoggerFactory.class);
+        mockedLoggerFactory.when(() -> LoggerFactory.getLogger(any(Class.class))).thenReturn(mockedLogger);
+    }
+
+    @AfterEach
+    public void close() {
+        mockedLoggerFactory.close();
     }
 
     @ParameterizedTest
@@ -37,7 +53,7 @@ public void setup(){
             "https://ade7-113-29-30-226.ngrok-free.app;https://ade7-113-29-30-226.ngrok-free.app/attest"
     }, delimiter = ';')
     public void urls_equal(String first, String second) {
-        Assert.assertTrue(UrlEquivalenceValidator.areUrlsEquivalent(first, second, loggerMock));
+        Assert.assertTrue(UrlEquivalenceValidator.areUrlsEquivalent(first, second));
     }
 
     @ParameterizedTest
@@ -51,7 +67,7 @@ public void urls_equal(String first, String second) {
             "http://example.com:8081;http://example.com:8080/",
     }, delimiter = ';')
     public void urls_not_equal(String first, String second) {
-        Assert.assertFalse(UrlEquivalenceValidator.areUrlsEquivalent(first, second, loggerMock));
+        Assert.assertFalse(UrlEquivalenceValidator.areUrlsEquivalent(first, second));
     }
 
     @ParameterizedTest
@@ -63,8 +79,7 @@ public void urls_not_equal(String first, String second) {
             "http://example1.com:abc;http://example2.com;URL could not be parsed to a valid URL. Given URL: http://example1.com:abc",
     }, delimiter = ';')
     public void urls_invalid(String first, String second, String expectedError) {
-        Assert.assertFalse(UrlEquivalenceValidator.areUrlsEquivalent(first, second, loggerMock));
-        verify(loggerMock, times(1)).error(eq(expectedError), (Throwable) any());
+        Assert.assertFalse(UrlEquivalenceValidator.areUrlsEquivalent(first, second));
+        verify(mockedLogger).error(eq(expectedError), (Throwable) any());
     }
-
 }