Merge pull request #28 from securenative/dev

Support custom path

Author: inbaltako

README.md

@@ -56,7 +56,12 @@ To get your *API KEY*, login to your SecureNative account and go to project sett
 SecureNative can automatically load your config from *securenative.properties* file or from the file that is specified in your *SECURENATIVE_CONFIG_FILE* env variable:
 
 ```java
+// Options 1: Use default config file path
 SecureNative secureNative =  SecureNative.init();
+
+// Options 2: Use specific config file path
+Path path = Paths.get("/path/to/securenative.properties");
+SecureNative secureNative =  SecureNative.init(path);
 ```
 ### Option 2: Initialize via API Key
 
@@ -140,8 +145,8 @@ public void track(HttpServletRequest request, HttpServletResponse response) {
 **Example**
 
 ```java
-@RequestMapping("/track")
-public void track(HttpServletRequest request, HttpServletResponse response) {
+@RequestMapping("/verify")
+public void verify(HttpServletRequest request, HttpServletResponse response) {
     SecureNativeContext context = SecureNative.contextBuilder()
                                               .fromHttpServletRequest(request)
                                               .build();
@@ -159,9 +164,9 @@ public void track(HttpServletRequest request, HttpServletResponse response) {
             .build();
 
     VerifyResult verifyResult = secureNative.verify(eventOptions);
-    verifyResult.getRiskLevel() // Low, Medium, High
-    verifyResult.score() // Risk score: 0 -1 (0 - Very Low, 1 - Very High)
-    verifyResult.getTriggers() // ["TOR", "New IP", "New City"]
+    verifyResult.getRiskLevel(); // Low, Medium, High
+    verifyResult.score(); // Risk score: 0 -1 (0 - Very Low, 1 - Very High)
+    verifyResult.getTriggers(); // ["TOR", "New IP", "New City"]
 }
 ```
 

pom.xml

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

src/main/java/com/securenative/ApiManager.java

@@ -5,5 +5,6 @@
 
 public interface ApiManager {
     void track(EventOptions eventOptions);
+
     VerifyResult verify(EventOptions eventOptions);
 }

src/main/java/com/securenative/ApiManagerImpl.java

@@ -7,8 +7,8 @@
 import com.securenative.exceptions.SecureNativeSDKException;
 import com.securenative.models.Event;
 import com.securenative.models.EventOptions;
-import com.securenative.models.VerifyResult;
 import com.securenative.models.SDKEvent;
+import com.securenative.models.VerifyResult;
 
 public class ApiManagerImpl implements ApiManager {
     private final EventManager eventManager;
@@ -32,7 +32,7 @@ public VerifyResult verify(EventOptions eventOptions) {
         logger.info("Verify event call");
         Event event = new SDKEvent(eventOptions, this.options);
         try {
-            return this.eventManager.sendSync(VerifyResult.class , event, ApiRoute.VERIFY.getApiRoute());
+            return this.eventManager.sendSync(VerifyResult.class, event, ApiRoute.VERIFY.getApiRoute());
         } catch (Exception ex) {
             logger.error("Failed to call verify", ex);
             return this.options.getFailoverStrategy() == FailoverStrategy.FAIL_OPEN ?

src/main/java/com/securenative/EventManager.java

@@ -1,14 +1,16 @@
 package com.securenative;
 
-import com.securenative.exceptions.SecureNativeInvalidUriException;
 import com.securenative.exceptions.SecureNativeParseException;
 import com.securenative.models.Event;
 
 import java.io.IOException;
 
 public interface EventManager {
     <T> T sendSync(Class<T> clazz, Event event, String url) throws IOException, SecureNativeParseException;
+
     void sendAsync(Event event, String url, Boolean retry);
+
     void startEventsPersist();
+
     void stopEventsPersist();
 }

src/main/java/com/securenative/EventOptionsBuilder.java

@@ -2,9 +2,9 @@
 
 
 import com.securenative.context.SecureNativeContext;
+import com.securenative.enums.EventTypes;
 import com.securenative.exceptions.SecureNativeInvalidOptionsException;
 import com.securenative.models.EventOptions;
-import com.securenative.enums.EventTypes;
 import com.securenative.models.UserTraits;
 
 import java.util.Date;
@@ -15,11 +15,11 @@ public class EventOptionsBuilder {
     private static final Logger logger = Logger.getLogger(EventOptionsBuilder.class);
     private final EventOptions eventOptions;
 
-    public static EventOptionsBuilder builder(String eventType){
+    public static EventOptionsBuilder builder(String eventType) {
         return new EventOptionsBuilder(eventType);
     }
 
-    public static EventOptionsBuilder builder(EventTypes eventType){
+    public static EventOptionsBuilder builder(EventTypes eventType) {
         return new EventOptionsBuilder(eventType.getType());
     }
 
@@ -68,7 +68,7 @@ public EventOptionsBuilder timestamp(Date timestamp) {
     }
 
     public EventOptions build() throws SecureNativeInvalidOptionsException {
-        if(this.eventOptions.getProperties().size() > MAX_PROPERTIES_SIZE){
+        if (this.eventOptions.getProperties().size() > MAX_PROPERTIES_SIZE) {
             throw new SecureNativeInvalidOptionsException(String.format("You can have only up to %d custom properties", MAX_PROPERTIES_SIZE));
         }
         return this.eventOptions;

src/main/java/com/securenative/Logger.java

@@ -24,24 +24,28 @@ public String toString() {
 
 interface ILogger {
     void trace(String var1, Object... var2);
+
     void debug(String var1, Object... var2);
+
     void info(String var1, Object... var2);
+
     void warn(String var1, Object... var2);
+
     void error(String var1, Object... var2);
 }
 
 public class Logger implements ILogger {
     private static LogLevel _logLevel = LogLevel.ERROR;
     private org.slf4j.Logger _logger = null;
 
-    private Logger(Class<?> clazz){
+    private Logger(Class<?> clazz) {
         this._logger = LoggerFactory.getLogger(clazz);
     }
 
     static void initLogger(String logLevel) {
-        try{
+        try {
             _logLevel = LogLevel.valueOf(logLevel);
-        }catch (IllegalArgumentException ex){
+        } catch (IllegalArgumentException ex) {
             _logLevel = LogLevel.ERROR;
         }
     }
@@ -52,35 +56,35 @@ public static Logger getLogger(Class<?> clazz) {
 
     @Override
     public void trace(String var1, Object... var2) {
-        if(_logLevel == LogLevel.TRACE){
+        if (_logLevel == LogLevel.TRACE) {
             _logger.error(var1, var2);
         }
     }
 
     @Override
     public void debug(String var1, Object... var2) {
-        if(_logLevel == LogLevel.DEBUG){
+        if (_logLevel == LogLevel.DEBUG) {
             _logger.debug(var1, var2);
         }
     }
 
     @Override
     public void info(String var1, Object... var2) {
-        if(_logLevel == LogLevel.INFO){
+        if (_logLevel == LogLevel.INFO) {
             _logger.error(var1, var2);
         }
     }
 
     @Override
     public void warn(String var1, Object... var2) {
-        if(_logLevel == LogLevel.WARN){
+        if (_logLevel == LogLevel.WARN) {
             _logger.warn(var1, var2);
         }
     }
 
     @Override
     public void error(String var1, Object... var2) {
-        if(_logLevel == LogLevel.ERROR){
+        if (_logLevel == LogLevel.ERROR) {
             _logger.error(var1, var2);
         }
     }

src/main/java/com/securenative/ResourceStream.java

@@ -1,4 +1,5 @@
 package com.securenative;
+
 import java.io.InputStream;
 
 public interface ResourceStream {

src/main/java/com/securenative/SecureNative.java

@@ -15,6 +15,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.stream.Collectors;
 
 import static com.securenative.utils.SignatureUtils.SIGNATURE_HEADER;
@@ -32,7 +33,7 @@ private SecureNative(SecureNativeOptions options) throws SecureNativeSDKExceptio
         this.options = options;
 
         EventManager eventManager = new SecureNativeEventManager(new SecureNativeHTTPClient(options), options);
-        if(options.getAutoSend()){
+        if (options.getAutoSend()) {
             eventManager.startEventsPersist();
         }
         this.apiManager = new ApiManagerImpl(eventManager, options);
@@ -51,16 +52,22 @@ public static SecureNative init(String apiKey) throws SecureNativeSDKException,
         if (Utils.isNullOrEmpty(apiKey)) {
             throw new SecureNativeConfigException("You must pass your SecureNative api key");
         }
-        SecureNativeConfigurationBuilder builder =  SecureNativeConfigurationBuilder.defaultConfigBuilder();
+        SecureNativeConfigurationBuilder builder = SecureNativeConfigurationBuilder.defaultConfigBuilder();
         SecureNativeOptions secureNativeOptions = builder.withApiKey(apiKey).build();
         return init(secureNativeOptions);
     }
 
+
     public static SecureNative init() throws SecureNativeSDKException, SecureNativeConfigException {
         SecureNativeOptions secureNativeOptions = ConfigurationManager.loadConfig();
         return init(secureNativeOptions);
     }
 
+    public static SecureNative init(Path path) throws SecureNativeSDKException, SecureNativeConfigException {
+        SecureNativeOptions secureNativeOptions = ConfigurationManager.loadConfig(path);
+        return init(secureNativeOptions);
+    }
+
     public static SecureNative getInstance() throws SecureNativeSDKIllegalStateException {
         if (secureNative == null) {
             throw new SecureNativeSDKIllegalStateException();
@@ -72,24 +79,24 @@ public SecureNativeOptions getOptions() {
         return options;
     }
 
-    public static SecureNativeConfigurationBuilder configBuilder(){
+    public static SecureNativeConfigurationBuilder configBuilder() {
         return SecureNativeConfigurationBuilder.defaultConfigBuilder();
     }
 
-    public static SecureNativeContextBuilder contextBuilder(){
+    public static SecureNativeContextBuilder contextBuilder() {
         return SecureNativeContextBuilder.defaultContextBuilder();
     }
 
     public boolean verifyRequestPayload(HttpServletRequest request) throws IOException {
         String requestSignature = request.getHeader(SIGNATURE_HEADER);
-        String body =  request.getReader().lines().collect(Collectors.joining());
+        String body = request.getReader().lines().collect(Collectors.joining());
 
         return SignatureUtils.isValidSignature(requestSignature, body, this.options.getApiKey());
     }
 
     @Override
     public void track(EventOptions eventOptions) {
-         this.apiManager.track(eventOptions);
+        this.apiManager.track(eventOptions);
     }
 
     @Override

src/main/java/com/securenative/SecureNativeEventManager.java

@@ -3,23 +3,25 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.securenative.config.SecureNativeOptions;
 import com.securenative.exceptions.SecureNativeHttpException;
-import com.securenative.exceptions.SecureNativeInvalidUriException;
 import com.securenative.exceptions.SecureNativeParseException;
 import com.securenative.exceptions.SecureNativeSDKException;
 import com.securenative.http.HttpClient;
 import com.securenative.http.HttpResponse;
 import com.securenative.models.Event;
 import com.securenative.models.RequestOptions;
-import com.securenative.config.SecureNativeOptions;
 
 import java.io.IOException;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 
 public class SecureNativeEventManager implements EventManager {
     private static final Logger logger = Logger.getLogger(SecureNativeEventManager.class);
-    private final int[] coefficients = new int[] { 1, 1, 2, 3, 5, 8, 13 };
+    private final int[] coefficients = new int[]{1, 1, 2, 3, 5, 8, 13};
     private int attempt = 0;
     private Boolean sendEnabled = false;
     private ScheduledExecutorService scheduler;
@@ -54,7 +56,7 @@ public <T> T sendSync(Class<T> clazz, Event event, String url) throws IOExceptio
         String responseBody = response.getBody();
         try {
             return mapper.readValue(responseBody, clazz);
-        }catch (Exception ex){
+        } catch (Exception ex) {
             logger.error("Failed to parse response body", ex.getMessage());
             throw new SecureNativeParseException(ex.getMessage());
         }
@@ -77,10 +79,10 @@ public void sendAsync(Event event, String url, Boolean retry) {
 
     private void sendEvents() throws InterruptedException {
         if (!this.events.isEmpty() && this.sendEnabled) {
-            RequestOptions requestOptions =  events.peek();
+            RequestOptions requestOptions = events.peek();
             try {
                 String body = requestOptions.getBody();
-                HttpResponse resp =  this.httpClient.post(requestOptions.getUrl(), body);
+                HttpResponse resp = this.httpClient.post(requestOptions.getUrl(), body);
                 if (resp.getStatusCode() == 401) {
                     requestOptions.setRetry(false);
                 }
@@ -93,15 +95,15 @@ private void sendEvents() throws InterruptedException {
             } catch (Exception ex) {
                 logger.error("Failed to send event", ex.getMessage());
                 if (requestOptions.getRetry()) {
-                    if(attempt++ == coefficients.length){
+                    if (attempt++ == coefficients.length) {
                         attempt = 0;
                     }
                     int backoff = coefficients[attempt] * this.options.getInterval();
                     logger.debug("BackOff automatic sending by", backoff);
                     this.sendEnabled = false;
                     Thread.sleep(backoff);
                     this.sendEnabled = true;
-                }else{
+                } else {
                     // remove the event from queue, retry: false
                     events.remove(requestOptions);
                 }
@@ -119,7 +121,10 @@ public void startEventsPersist() {
         this.sendEnabled = true;
         this.scheduler = Executors.newSingleThreadScheduledExecutor();
         this.scheduler.scheduleWithFixedDelay(() -> {
-            try { sendEvents(); } catch (InterruptedException ignored) { }
+            try {
+                sendEvents();
+            } catch (InterruptedException ignored) {
+            }
         }, 0, this.options.getInterval(), TimeUnit.MILLISECONDS);
     }
 
@@ -131,7 +136,8 @@ public void stopEventsPersist() {
                 this.scheduler.shutdown();
                 // drain event queue
                 this.scheduler.awaitTermination(this.options.getTimeout(), TimeUnit.MILLISECONDS);
-            } catch (InterruptedException ignored) { }
+            } catch (InterruptedException ignored) {
+            }
 
             logger.debug("Stopped event persistence");
         }