Add proxy headers support

Author: Inbal Tako

src/main/java/com/securenative/config/ConfigurationManager.java

@@ -7,11 +7,13 @@
 import com.securenative.utils.Utils;
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.Properties;
 
 public class ConfigurationManager {
@@ -61,6 +63,12 @@ private static String getPropertyOrEnvOrDefault(Properties properties, String ke
         return res == null ? null : res.toString();
     }
 
+    private static ArrayList<String> getPropertyListOrEnvOrDefault(Properties properties, String key, Object defaultValue) {
+        String defaultStrValue = defaultValue == null ? null : defaultValue.toString();
+        Object res = properties.getOrDefault(key, getEnvOrDefault(key, defaultStrValue));
+        return res == null ? null : new ArrayList<>(Arrays.asList(res.toString().split(",")));
+    }
+
     public static SecureNativeConfigurationBuilder configBuilder() {
         return SecureNativeConfigurationBuilder.defaultConfigBuilder();
     }
@@ -96,8 +104,8 @@ private static SecureNativeOptions getOptions(Properties properties) {
                 .withAutoSend(Utils.parseBooleanOrDefault(getPropertyOrEnvOrDefault(properties, "SECURENATIVE_AUTO_SEND", defaultOptions.getAutoSend()), defaultOptions.getAutoSend()))
                 .withDisable(Utils.parseBooleanOrDefault(getPropertyOrEnvOrDefault(properties, "SECURENATIVE_DISABLE", defaultOptions.getDisabled()), defaultOptions.getDisabled()))
                 .withLogLevel(getPropertyOrEnvOrDefault(properties, "SECURENATIVE_LOG_LEVEL", defaultOptions.getLogLevel()))
-                .withFailoverStrategy(FailoverStrategy.fromString(getPropertyOrEnvOrDefault(properties, "SECURENATIVE_FAILOVER_STRATEGY", defaultOptions.getFailoverStrategy()), defaultOptions.getFailoverStrategy()));
-
+                .withFailoverStrategy(FailoverStrategy.fromString(Objects.requireNonNull(getPropertyOrEnvOrDefault(properties, "SECURENATIVE_FAILOVER_STRATEGY", defaultOptions.getFailoverStrategy())), defaultOptions.getFailoverStrategy()))
+                .withProxyHeaders(getPropertyListOrEnvOrDefault(properties, "SECURENATIVE_PROXY_HEADERS", defaultOptions.getProxyHeaders()));
         return builder.build();
     }
 }

src/main/java/com/securenative/config/SecureNativeConfigurationBuilder.java

@@ -2,6 +2,8 @@
 
 import com.securenative.enums.FailoverStrategy;
 
+import java.util.ArrayList;
+
 public class SecureNativeConfigurationBuilder {
     /**
      * Api Secret associated with SecureNative account
@@ -48,6 +50,11 @@ public class SecureNativeConfigurationBuilder {
      */
     private FailoverStrategy failoverStrategy;
 
+    /**
+     * Proxy Headers
+     */
+    private ArrayList<String> proxyHeaders;
+
     private SecureNativeConfigurationBuilder() {
     }
 
@@ -61,7 +68,8 @@ public static SecureNativeConfigurationBuilder defaultConfigBuilder() {
                 .withAutoSend(true)
                 .withDisable(false)
                 .withLogLevel("fatal")
-                .withFailoverStrategy(FailoverStrategy.FAIL_OPEN);
+                .withFailoverStrategy(FailoverStrategy.FAIL_OPEN)
+                .withProxyHeaders(new ArrayList<>());
     }
 
     public SecureNativeConfigurationBuilder withApiKey(String apiKey) {
@@ -109,8 +117,12 @@ public SecureNativeConfigurationBuilder withFailoverStrategy(FailoverStrategy fa
         return this;
     }
 
+    public SecureNativeConfigurationBuilder withProxyHeaders(ArrayList<String> proxyHeaders) {
+        this.proxyHeaders = proxyHeaders;
+        return this;
+    }
 
     public SecureNativeOptions build() {
-        return new SecureNativeOptions(apiKey, apiUrl, interval, maxEvents, timeout, autoSend, disable, logLevel, failoverStrategy);
+        return new SecureNativeOptions(apiKey, apiUrl, interval, maxEvents, timeout, autoSend, disable, logLevel, failoverStrategy, proxyHeaders);
     }
 }

src/main/java/com/securenative/config/SecureNativeOptions.java

@@ -2,6 +2,8 @@
 
 import com.securenative.enums.FailoverStrategy;
 
+import java.util.ArrayList;
+
 public class SecureNativeOptions {
     /**
      * Api Secret associated with SecureNative account
@@ -48,7 +50,12 @@ public class SecureNativeOptions {
      */
     private final FailoverStrategy failoverStrategy;
 
-    public SecureNativeOptions(String apiKey, String apiUrl, int interval, int maxEvents, int timeout, boolean autoSend, boolean disable, String logLevel, FailoverStrategy failoverStrategy) {
+    /**
+     * Proxy Headers
+     */
+    private final ArrayList<String> proxyHeaders;
+
+    public SecureNativeOptions(String apiKey, String apiUrl, int interval, int maxEvents, int timeout, boolean autoSend, boolean disable, String logLevel, FailoverStrategy failoverStrategy, ArrayList<String> proxyHeaders) {
         this.apiKey = apiKey;
         this.apiUrl = apiUrl;
         this.interval = interval;
@@ -58,6 +65,7 @@ public SecureNativeOptions(String apiKey, String apiUrl, int interval, int maxEv
         this.disable = disable;
         this.logLevel = logLevel;
         this.failoverStrategy = failoverStrategy;
+        this.proxyHeaders = proxyHeaders;
     }
 
     public String getApiKey() {
@@ -95,4 +103,8 @@ public String getLogLevel() {
     public FailoverStrategy getFailoverStrategy() {
         return failoverStrategy;
     }
+
+    public ArrayList<String> getProxyHeaders() {
+        return proxyHeaders;
+    }
 }