Add request utils tests

Author: Inbal Tako

README.md

@@ -165,7 +165,7 @@ public void track(HttpServletRequest request, HttpServletResponse response) {
         System.err.printf("Could not get SecureNative instance; %s%n", e);
     }
 
-    SecureNativeContext context = SecureNativeContextBuilder.fromHttpServletRequest(request).build();
+    SecureNativeContext context = securenative.fromHttpServletRequest(request).build();
 
     EventOptions eventOptions = null;
     try {
@@ -199,7 +199,14 @@ public void track(HttpServletRequest request, HttpServletResponse response) {
 ```java
 @RequestMapping("/verify")
 public void verify(HttpServletRequest request, HttpServletResponse response) {
-    SecureNativeContext context = SecureNativeContextBuilder.fromHttpServletRequest(request).build();
+SecureNative securenative = null;
+    try {
+        securenative = SecureNative.getInstance();
+    } catch (SecureNativeSDKIllegalStateException e) {
+        System.err.printf("Could not get SecureNative instance; %s%n", e);
+    }
+
+    SecureNativeContext context = securenative.fromHttpServletRequest(request).build();
 
     EventOptions eventOptions = null;
     try {

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.securenative.java</groupId>
     <artifactId>securenative-java</artifactId>
     <packaging>jar</packaging>
-    <version>0.5.5</version>
+    <version>0.5.6</version>
     <url>https://github.com/securenative/securenative-java</url>
 
     <name>${project.groupId}:${project.artifactId}:${project.version}</name>

src/test/java/com/securenative/utils/RequestUtilsTest.java

@@ -0,0 +1,67 @@
+package com.securenative.utils;
+
+import com.securenative.config.SecureNativeConfigurationBuilder;
+import com.securenative.config.SecureNativeOptions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class RequestUtilsTest {
+
+    @Test
+    @DisplayName("Extract ip using proxy headers ipv4")
+    public void ExtractRequestWithProxyHeadersIPV4()
+    {
+        SecureNativeOptions options = SecureNativeConfigurationBuilder.defaultConfigBuilder()
+                .withProxyHeaders(new ArrayList<>(Collections.singleton("CF-Connecting-IP"))).build();
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.setServerName("www.securenative.com");
+        request.addHeader("CF-Connecting-IP", "203.0.113.1");
+
+        Map<String, String> headers = RequestUtils.getHeadersFromRequest(request);
+        String clientIp = RequestUtils.getClientIpFromRequest(request, headers, options);
+
+        assertThat(clientIp.equals("203.0.113.1"));
+    }
+
+    @Test
+    @DisplayName("Extract ip using proxy headers ipv6")
+    public void ExtractRequestWithProxyHeadersIPV6()
+    {
+        SecureNativeOptions options = SecureNativeConfigurationBuilder.defaultConfigBuilder()
+                .withProxyHeaders(new ArrayList<>(Collections.singleton("CF-Connecting-IP"))).build();
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.setServerName("www.securenative.com");
+        request.addHeader("CF-Connecting-IP", "f71f:5bf9:25ff:1883:a8c4:eeff:7b80:aa2d");
+
+        Map<String, String> headers = RequestUtils.getHeadersFromRequest(request);
+        String clientIp = RequestUtils.getClientIpFromRequest(request, headers, options);
+
+        assertThat(clientIp.equals("f71f:5bf9:25ff:1883:a8c4:eeff:7b80:aa2d"));
+    }
+
+    @Test
+    @DisplayName("Extract ip using proxy headers with multiple ipv4")
+    public void ExtractRequestWithProxyHeadersMultipleIPV4()
+    {
+        SecureNativeOptions options = SecureNativeConfigurationBuilder.defaultConfigBuilder()
+                .withProxyHeaders(new ArrayList<>(Collections.singleton("CF-Connecting-IP"))).build();
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.setServerName("www.securenative.com");
+        request.addHeader("CF-Connecting-IP", "141.246.115.116, 203.0.113.1, 12.34.56.3");
+
+        Map<String, String> headers = RequestUtils.getHeadersFromRequest(request);
+        String clientIp = RequestUtils.getClientIpFromRequest(request, headers, options);
+
+        assertThat(clientIp.equals("141.246.115.116"));
+    }
+}