securenative 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d6008fff3b5f2dea4e6d6680af895c51a18a14a80a495f1fbe3da99513d955b
-  data.tar.gz: 6de47ae10eb46753aa40d1854ed35d42f961c39543bd12e931f80d191d033114
+  metadata.gz: 8aa7eb317d253da74f5b3f78ef8ca0739074e23c0c06396b4a4fb23d40e44320
+  data.tar.gz: '0975ccad317a881c689bc6b5d80d9c38b677d2d65907f275548471e4cc4c5f9d'
 SHA512:
-  metadata.gz: 61c717b498a2a0464ad74fd32a1daca48f8ff115348f0b8a49710d54e3ce7f6d99f21c92560b8936c64548e08ba9ddd2cf105902d614f656925a15d9fa7094e4
-  data.tar.gz: 7667f250f61f1629cdf36829e8f74ce74bcd66e862b183051616c3774090229426b8b38d96e873cc58496f64f8774616c4104799c50e26df8266acf95c60948f
+  metadata.gz: 5d032dcb9eead67fd2cda1e40e3d402853fc250134d3a325bfb37edf5545440307dd53def5ea79d40e737b2afc2a472110c6a7e9a5092f37d540f7a205637a1b
+  data.tar.gz: f8093a2e2c272d911f5a0ae9f6039e229f1598b1a428efdcdf6752f2f20b7b98acf5aa4553c820e8868b36d218937b7e26c85ab13ce4682ffa4054a729518cdd

data/Gemfile

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec
 gem "rspec"
 gem "rake"
-gem "parseconfig"
 gem "simplecov", :require => false, :group => :test
 gem "codecov", :require => false, :group => :test
 gem "webmock", :require => false, :group => :test

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    securenative (0.1.20)
+    securenative (0.1.21)
 
 GEM
   remote: https://rubygems.org/
@@ -73,7 +73,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
@@ -174,7 +174,6 @@ GEM
     nio4r (2.5.2)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    parseconfig (1.0.8)
     public_suffix (4.0.5)
     rack (2.2.3)
     rack-protection (2.0.8.1)
@@ -208,19 +207,19 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rake (13.0.1)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     ruby2_keywords (0.0.2)
     safe_yaml (1.0.5)
     simplecov (0.19.0)
@@ -263,7 +262,6 @@ DEPENDENCIES
   bundler (~> 2.0)
   codecov
   hanami
-  parseconfig
   rails
   rake
   rspec

data/README.md

@@ -47,7 +47,7 @@ Or install it yourself as:
 To get your *API KEY*, login to your SecureNative account and go to project settings page:
 
 ### Option 1: Initialize via Config file
-SecureNative can automatically load your config from *securenative.cfg* file or from the file that is specified in your *SECURENATIVE_CONFIG_FILE* env variable:
+SecureNative can automatically load your config from *securenative.yml* file or from the file that is specified in your *SECURENATIVE_CONFIG_FILE* env variable:
 
 ```ruby
 require 'securenative'
@@ -69,7 +69,8 @@ securenative =  SecureNative.init_with_api_key('YOUR_API_KEY')
 require 'securenative'
 
 
-securenative = SecureNative.init_with_options(SecureNative.config_builder(api_key = 'API_KEY', max_event = 10, log_level = 'ERROR'))                                 
+options = ConfigurationBuilder.new(api_key: 'API_KEY', max_events: 10, log_level: 'ERROR')
+SecureNative.init_with_options(options)                                 
 ```
 
 ## Getting SecureNative instance
@@ -88,42 +89,46 @@ instance. Make sure you build event with the EventBuilder:
 
  ```ruby
 require 'securenative'
-require 'securenative/enums/event_types'
-require 'securenative/event_options_builder'
-require 'securenative/models/user_traits'
-require 'securenative/context/context_builder'
+require 'models/event_options'
+require 'enums/event_types'
+require 'models/user_traits'
 
 
-securenative = SecureNative.instance
-
-context = securenative.context_builder(ip = '127.0.0.1', client_token = 'SECURED_CLIENT_TOKEN',
-        headers = { 'user-agent' => 'Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405' })
-
-event_options = EventOptions(event_type = EventTypes::LOG_IN,
-        user_id = '1234', user_traits = UserTraits('Your Name', 'name@gmail.com', '+1234567890'),
-        context = context, properties = {prop1 => 'CUSTOM_PARAM_VALUE', prop2 => true, prop3 => 3}).build
-
-securenative.track(event_options)
+def track
+    securenative = SecureNative.instance
+    context = SecureNativeContext.new(client_token: '2a980d872b939c7e4f4378aa111a5eeffb22808b58b5372f658d34904ebd5b05fff0daab91921243ac08b72442a5b3992e402dc21df16aa7cc0e19f8bffa9d6cc59996d480d70aa22b857189403675d37fd144ebaf9dc697fed149b907678f2b1f964d73b332dc8ea7df63fcfc3c11f7bbb51ba2672652ca7d5d43f36a62e15db8b13dfd794a5eccfc5968ca514dd7cce59f2df2b9d8184d076eba808c81b311', ip: '127.0.0.1',
+                                       headers: { 'user-agent' => 'Mozilla: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.3 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/43.4' })
+    
+    event_options = EventOptions.new(event: EventTypes::LOG_IN, user_id: '1234', context: context,
+                                     user_traits: UserTraits.new(name: 'Your Name', email: 'name@gmail.com', phone: '+1234567890'),
+                                     properties: { custom_param1: 'CUSTOM_PARAM_VALUE', custom_param2: true, custom_param3: 3 })
+    
+    securenative.track(event_options)
+    
+    @message = 'tracked'
+end
  ```
 
 You can also create request context from requests:
 
 ```ruby
 require 'securenative'
-require 'securenative/enums/event_types'
-require 'securenative/event_options_builder'
-require 'securenative/models/user_traits'
+require 'models/event_options'
+require 'enums/event_types'
+require 'models/user_traits'
 
 
-def track(request)
+def track
     securenative = SecureNative.instance
-    context = SecureNative.context_builder.from_http_request(request).build
-
-    event_options = EventOptions(event_type = EventTypes::LOG_IN,
-            user_id = '1234', user_traits = UserTraits('Your Name', 'name@gmail.com', '+1234567890'),
-            context = context, properties = {prop1 => 'CUSTOM_PARAM_VALUE', prop2 => true, prop3 => 3}).build
+    context = SecureNativeContext.from_http_request(request)
+    
+    event_options = EventOptions.new(event: EventTypes::LOG_IN, user_id: '1234', context: context,
+                                     user_traits: UserTraits.new(name: 'Your Name', email: 'name@gmail.com', phone: '+1234567890'),
+                                     properties: { custom_param1: 'CUSTOM_PARAM_VALUE', custom_param2: true, custom_param3: 3 })
     
     securenative.track(event_options)
+    
+    @message = 'tracked'
 end
 ```
 
@@ -133,18 +138,18 @@ end
 
 ```ruby
 require 'securenative'
-require 'securenative/enums/event_types'
-require 'securenative/event_options_builder'
-require 'securenative/models/user_traits'
+require 'models/event_options'
+require 'enums/event_types'
+require 'models/user_traits'
 
 
 def verify(request)
     securenative = SecureNative.instance
-    context = SecureNative.context_builder.from_http_request(request).build
+    context = SecureNativeContext.from_http_request(request)
 
-    event_options = EventOptions(event_type = EventTypes::LOG_IN,
-        user_id = '1234', user_traits = UserTraits('Your Name', 'name@gmail.com', '+1234567890'),
-        context = context, properties = {prop1 => 'CUSTOM_PARAM_VALUE', prop2 => true, prop3 => 3}).build
+    event_options = EventOptions.new(event: EventTypes::LOG_IN, user_id: '1234', context: context,
+                                         user_traits: UserTraits.new(name: 'Your Name', email: 'name@gmail.com', phone: '+1234567890'),
+                                         properties: { custom_param1: 'CUSTOM_PARAM_VALUE', custom_param2: true, custom_param3: 3 })
     
     verify_result = securenative.verify(event_options)
     verify_result.risk_level  # Low, Medium, High

data/lib/api_manager.rb

@@ -2,6 +2,9 @@
 
 require 'models/sdk_event'
 require 'enums/failover_strategy'
+require 'enums/risk_level'
+require 'enums/api_route'
+require 'models/verify_result'
 require 'json'
 
 class ApiManager
@@ -21,8 +24,9 @@ class ApiManager
     event = SDKEvent.new(event_options, @options)
 
     begin
-      res = JSON.parse(@event_manager.send_sync(event, ApiRoute::VERIFY, false))
-      return VerifyResult.new(risk_level: res['riskLevel'], score: res['score'], triggers: res['triggers'])
+      res = @event_manager.send_sync(event, ApiRoute::VERIFY, false)
+      ver_result = JSON.parse(res.body)
+      return VerifyResult.new(risk_level: ver_result['riskLevel'], score: ver_result['score'], triggers: ver_result['triggers'])
     rescue StandardError => e
       SecureNativeLogger.debug("Failed to call verify; #{e}")
     end

data/lib/config/configuration_builder.rb

@@ -20,10 +20,6 @@ class ConfigurationBuilder
     @fail_over_strategy = fail_over_strategy
   end
 
-  def self.default_config_builder
-    ConfigurationBuilder.new
-  end
-
   def self.default_securenative_options
     SecureNativeOptions.new
   end

data/lib/config/configuration_manager.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'parseconfig'
+require 'yaml'
+require 'config/configuration_builder'
 
 class ConfigurationManager
-  DEFAULT_CONFIG_FILE = 'securenative.cfg'
+  DEFAULT_CONFIG_FILE = 'securenative.yml'
   CUSTOM_CONFIG_FILE_ENV_NAME = 'SECURENATIVE_CONFIG_FILE'
   @config = nil
 
   def self.read_resource_file(resource_path)
-    @config = ParseConfig.new(resource_path)
-
     properties = {}
-    @config.get_groups.each do |group|
-      group.each do |key, value|
-        properties[key.upcase] = value
-      end
+    begin
+      @config = YAML.load_file(resource_path)
+      properties = @config unless @config.nil?
+    rescue StandardError => e
+      SecureNativeLogger.error("Could not parse config file #{resource_path}; #{e}")
     end
     properties
   end
@@ -24,32 +24,32 @@ class ConfigurationManager
   end
 
   def self.config_builder
-    ConfigurationBuilder.default_config_builder
+    ConfigurationBuilder.new
   end
 
   def self._get_env_or_default(properties, key, default)
-    return Env[key] if Env[key]
+    return ENV[key] if ENV[key]
     return properties[key] if properties[key]
 
     default
   end
 
   def self.load_config
-    options = ConfigurationBuilder().default_securenative_options
+    options = ConfigurationBuilder.default_securenative_options
 
     resource_path = DEFAULT_CONFIG_FILE
-    resource_path = Env[CUSTOM_CONFIG_FILE_ENV_NAME] if Env[CUSTOM_CONFIG_FILE_ENV_NAME]
+    resource_path = ENV[CUSTOM_CONFIG_FILE_ENV_NAME] unless ENV[CUSTOM_CONFIG_FILE_ENV_NAME].nil?
 
     properties = read_resource_file(resource_path)
 
-    ConfigurationBuilder(_get_env_or_default(properties, 'SECURENATIVE_API_KEY', options.api_key),
-                         _get_env_or_default(properties, 'SECURENATIVE_API_URL', options.api_url),
-                         _get_env_or_default(properties, 'SECURENATIVE_INTERVAL', options.interval),
-                         _get_env_or_default(properties, 'SECURENATIVE_MAX_EVENTS', options.max_events),
-                         _get_env_or_default(properties, 'SECURENATIVE_TIMEOUT', options.timeout),
-                         _get_env_or_default(properties, 'SECURENATIVE_AUTO_SEND', options.auto_send),
-                         _get_env_or_default(properties, 'SECURENATIVE_DISABLE', options.disable),
-                         _get_env_or_default(properties, 'SECURENATIVE_LOG_LEVEL', options.log_level),
-                         _get_env_or_default(properties, 'SECURENATIVE_FAILOVER_STRATEGY', options.fail_over_strategy))
+    ConfigurationBuilder.new(api_key: _get_env_or_default(properties, 'SECURENATIVE_API_KEY', options.api_key),
+                             api_url: _get_env_or_default(properties, 'SECURENATIVE_API_URL', options.api_url),
+                             interval: _get_env_or_default(properties, 'SECURENATIVE_INTERVAL', options.interval),
+                             max_events: _get_env_or_default(properties, 'SECURENATIVE_MAX_EVENTS', options.max_events),
+                             timeout: _get_env_or_default(properties, 'SECURENATIVE_TIMEOUT', options.timeout),
+                             auto_send: _get_env_or_default(properties, 'SECURENATIVE_AUTO_SEND', options.auto_send),
+                             disable: _get_env_or_default(properties, 'SECURENATIVE_DISABLE', options.disable),
+                             log_level: _get_env_or_default(properties, 'SECURENATIVE_LOG_LEVEL', options.log_level),
+                             fail_over_strategy: _get_env_or_default(properties, 'SECURENATIVE_FAILOVER_STRATEGY', options.fail_over_strategy))
   end
 end

data/lib/context/hanami_context.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
 class HanamiContext
+  SECURENATIVE_COOKIE = '_sn'
+
   def self.get_client_token(request)
     begin
       request.env[SECURENATIVE_COOKIE]
     rescue StandardError
-      nil
+      begin
+        request.cookies[SECURENATIVE_COOKIE]
+      rescue StandardError
+        nil
+      end
     end
   end
 
@@ -27,7 +33,8 @@ class HanamiContext
 
   def self.get_headers(request)
     begin
-      request.headers.to_hash
+      # Note: At the moment we're filtering out everything but user-agent since ruby's payload is way too big
+      { 'user-agent' => request.env['HTTP_USER_AGENT'] }
     rescue StandardError
       nil
     end

data/lib/context/rails_context.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class RailsContext
+  SECURENATIVE_COOKIE = '_sn'
+
   def self.get_client_token(request)
     begin
       request.cookies[SECURENATIVE_COOKIE]
@@ -33,7 +35,8 @@ class RailsContext
 
   def self.get_headers(request)
     begin
-      request.headers.to_hash
+      # Note: At the moment we're filtering out everything but user-agent since ruby's payload is way too big
+      { 'user-agent' => request.env['HTTP_USER_AGENT'] }
     rescue StandardError
       nil
     end

data/lib/context/securenative_context.rb

@@ -12,7 +12,7 @@ class SecureNativeContext
 
   SECURENATIVE_COOKIE = '_sn'
 
-  def initialize(client_token: nil, ip: nil, remote_ip: nil, headers: nil, url: nil, http_method: nil, body: nil)
+  def initialize(client_token: '', ip: '', remote_ip: '', headers: nil, url: '', http_method: '', body: '')
     @client_token = client_token
     @ip = ip
     @remote_ip = remote_ip

data/lib/context/sinatra_context.rb

@@ -1,17 +1,23 @@
 # frozen_string_literal: true
 
 class SinatraContext
+  SECURENATIVE_COOKIE = '_sn'
+
   def self.get_client_token(request)
     begin
       request.env[SECURENATIVE_COOKIE]
     rescue StandardError
-      nil
+      begin
+        request.cookies[SECURENATIVE_COOKIE]
+      rescue StandardError
+        nil
+      end
     end
   end
 
   def self.get_url(request)
     begin
-      request.url
+      request.env['REQUEST_URI']
     rescue StandardError
       nil
     end
@@ -19,7 +25,7 @@ class SinatraContext
 
   def self.get_method(request)
     begin
-      request.method
+      request.env['REQUEST_METHOD']
     rescue StandardError
       nil
     end
@@ -27,7 +33,8 @@ class SinatraContext
 
   def self.get_headers(request)
     begin
-      request.headers.to_hash
+      # Note: At the moment we're filtering out everything but user-agent since ruby's payload is way too big
+      { 'user-agent' => request.env['HTTP_USER_AGENT'] }
     rescue StandardError
       nil
     end

data/lib/event_manager.rb

@@ -4,6 +4,7 @@ require 'utils/secure_native_logger'
 require 'config/securenative_options'
 require 'http/securenative_http_client'
 require 'errors/securenative_sdk_error'
+require 'errors/securenative_http_error'
 
 class QueueItem
   attr_reader :url, :body, :retry_sending
@@ -64,7 +65,7 @@ class EventManager
     SecureNativeLogger.debug("Attempting to send event #{event}")
     res = @http_client.post(resource_path, EventManager.serialize(event).to_json)
 
-    if res.code != 200
+    if res.nil? || res.code != '200'
       SecureNativeLogger.info("SecureNative failed to call endpoint #{resource_path} with event #{event}. adding back to queue")
       item = QueueItem.new(resource_path, EventManager.serialize(event).to_json, retry_sending)
       @queue.append(item)
@@ -81,9 +82,9 @@ class EventManager
         @queue.each do |item|
           begin
             res = @http_client.post(item.url, item.body)
-            if res.status_code == 401
+            if res.code == '401'
               item.retry_sending = false
-            elsif res.status_code != 200
+            elsif res.code != '200'
               raise SecureNativeHttpError, res.status_code
             end
             SecureNativeLogger.debug("Event successfully sent; #{item.body}")
@@ -145,7 +146,7 @@ class EventManager
         fp: obj.request.fp,
         ip: obj.request.ip,
         remoteIp: obj.request.remote_ip,
-        http_method: obj.request.http_method,
+        method: obj.request.http_method || '',
         url: obj.request.url,
         headers: obj.request.headers
       },

data/lib/http/securenative_http_client.rb

@@ -3,6 +3,8 @@
 require 'net/http'
 require 'uri'
 require 'json'
+require 'utils/version_utils'
+require 'utils/secure_native_logger'
 
 class SecureNativeHttpClient
   AUTHORIZATION_HEADER = 'Authorization'
@@ -30,9 +32,19 @@ class SecureNativeHttpClient
     headers = _headers
 
     client = Net::HTTP.new(uri.host, uri.port)
+    client.use_ssl = true
+    client.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
     request = Net::HTTP::Post.new(uri.request_uri, headers)
-    request.body = body.to_json
+    request.body = body
 
-    client.request(request)
+    res = nil
+    begin
+      res = client.request(request)
+    rescue StandardError => e
+      SecureNativeLogger.error("Failed to send request; #{e}")
+      return res
+    end
+    res
   end
 end

data/lib/models/event_options.rb

@@ -1,10 +1,32 @@
 # frozen_string_literal: true
 
+require 'models/event_options'
+require 'models/user_traits'
+require 'errors/securenative_invalid_options_error'
+
 class EventOptions
   attr_reader :event, :user_id, :user_traits, :context, :properties, :timestamp
   attr_writer :event, :user_id, :user_traits, :context, :properties, :timestamp
 
-  def initialize(event: nil, user_id: nil, user_traits: nil, context: nil, properties: nil, timestamp: nil)
+  MAX_PROPERTIES_SIZE = 10
+
+  def initialize(event: nil, user_id: nil, user_traits: nil, user_name: nil, email: nil, phone: nil, created_at: nil, context: nil, properties: nil, timestamp: nil)
+    if !properties.nil? && properties.length > MAX_PROPERTIES_SIZE
+      raise SecureNativeInvalidOptionsError, "You can have only up to #{MAX_PROPERTIES_SIZE} custom properties"
+    end
+
+    if user_traits.nil?
+      if user_name && email && phone && created_at
+        user_traits = UserTraits(user_name, email, phone, created_at)
+      elsif user_name && email && phone
+        user_traits = UserTraits(user_name, email, phone)
+      elsif user_name && email
+        user_traits = UserTraits(user_name, email)
+      else
+        user_traits = UserTraits.new
+      end
+    end
+
     @event = event
     @user_id = user_id
     @user_traits = user_traits

data/lib/models/sdk_event.rb

@@ -2,6 +2,9 @@
 
 require 'context/securenative_context'
 require 'utils/encryption_utils'
+require 'utils/date_utils'
+require 'models/request_context'
+require 'securerandom'
 
 class SDKEvent
   attr_reader :context, :rid, :event_type, :user_id, :user_traits, :request, :timestamp, :properties
@@ -20,9 +23,11 @@ class SDKEvent
     @event_type = event_options.event
     @user_id = event_options.user_id
     @user_traits = event_options.user_traits
-    @request = RequestContext(client_token ? client_token.cid : '', client_token ? client_token.vid : '',
-                              client_token ? client_token.fp : '', @context.ip,
-                              @context.remote_ip, @context.headers, @context.url, @context.http_method)
+    @request = RequestContext.new(cid: client_token ? client_token.cid : '', vid: client_token ? client_token.vid : '',
+                                  fp: client_token ? client_token.fp : '', ip: @context.ip,
+                                  remote_ip: @context.remote_ip, headers: @context.headers,
+                                  url: @context.url, http_method: @context.http_method)
+
 
     @timestamp = DateUtils.to_timestamp(event_options.timestamp)
     @properties = event_options.properties

data/lib/models/verify_result.rb

@@ -9,4 +9,8 @@ class VerifyResult
     @score = score
     @triggers = triggers
   end
+
+  def to_s
+    "risk_level: #{@risk_level}, score: #{@score}, triggers: #{@triggers}"
+  end
 end

data/lib/securenative.rb

@@ -8,6 +8,7 @@ require 'errors/securenative_sdk_Illegal_state_error'
 require 'errors/securenative_config_error'
 require 'enums/failover_strategy'
 require 'config/configuration_builder'
+require 'config/configuration_manager'
 require 'event_manager'
 require 'api_manager'
 
@@ -61,19 +62,6 @@ class SecureNative
     @securenative
   end
 
-  def self.config_builder(api_key: nil, api_url: 'https://api.securenative.com/collector/api/v1', interval: 1000,
-                          max_events: 1000, timeout: 1500, auto_send: true, disable: false, log_level: 'FATAL',
-                          fail_over_strategy: FailOverStrategy::FAIL_OPEN)
-    ConfigurationBuilder.new(api_key: api_key, api_url: api_url, interval: interval, max_events: max_events,
-                             timeout: timeout, auto_send: auto_send, disable: disable, log_level: log_level,
-                             fail_over_strategy: fail_over_strategy)
-  end
-
-  def self.context_builder(client_token: nil, ip: nil, remote_ip: nil, headers: nil, url: nil, http_method: nil, body: nil)
-    SecureNativeContext.new(client_token: client_token, ip: ip, remote_ip: remote_ip, headers: headers,
-                            url: url, http_method: http_method, body: body)
-  end
-
   def track(event_options)
     @api_manager.track(event_options)
   end

data/lib/utils/date_utils.rb

@@ -2,7 +2,7 @@
 
 class DateUtils
   def self.to_timestamp(date)
-    return Time.now.strftime('%Y-%m-%dT%H:%M:%S%Z') if date.nil?
+    return Time.now.utc.iso8601 if date.nil?
 
     Time.parse(date).iso8601
   end

data/lib/utils/encryption_utils.rb

@@ -1,35 +1,49 @@
 # frozen_string_literal: true
 
 require 'openssl'
+require 'digest'
+require 'base64'
+require 'models/client_token'
 
 class EncryptionUtils
-  BLOCK_SIZE = 16
-  KEY_SIZE = 32
-
-  def self.encrypt(text, cipher_key)
-    cipher = OpenSSL::Cipher::AES.new(KEY_SIZE, :CBC).encrypt
-    cipher.padding = 0
-
-    if text.size % BLOCK_SIZE != 0
-      return nil
+  def self.padding_key(key, length)
+    if key.length == length
+      key
+    else
+      if key.length > length
+        key.slice(0, length)
+      else
+        (length - key.length).times { key << '0' }
+        key
+      end
     end
-
-    cipher_key = Digest::SHA1.hexdigest cipher_key
-    cipher.key = cipher_key.slice(0, BLOCK_SIZE)
-    s = cipher.update(text) + cipher.final
-
-    s.unpack('H*')[0].upcase
   end
 
-  def self.decrypt(encrypted, cipher_key)
-    cipher = OpenSSL::Cipher::AES.new(KEY_SIZE, :CBC).decrypt
-    cipher.padding = 0
-
-    cipher_key = Digest::SHA1.hexdigest cipher_key
-    cipher.key = cipher_key.slice(0, BLOCK_SIZE)
-    s = [encrypted].pack('H*').unpack('C*').pack('c*')
+  def self.encrypt(plain_text, secret_key)
+    begin
+      cipher = OpenSSL::Cipher.new('aes-256-cbc')
+      cipher.encrypt
+      iv = cipher.random_iv
+      cipher.key = padding_key(secret_key, 32)
+      encrypted = cipher.update(plain_text) + cipher.final
+      (iv + encrypted).unpack1('H*')
+    rescue StandardError
+      ''
+    end
+  end
 
-    rv = cipher.update(s) + cipher.final
-    rv.strip
+  def self.decrypt(cipher_text, secret_key)
+    begin
+      cipher = OpenSSL::Cipher.new('aes-256-cbc')
+      cipher.decrypt
+      raw_data = [cipher_text].pack('H*')
+      cipher.iv = raw_data.slice(0, 16)
+      cipher.key = padding_key(secret_key, 32)
+      decrypted = JSON.parse(cipher.update(raw_data.slice(16, raw_data.length)) + cipher.final)
+
+      return ClientToken.new(decrypted['cid'], decrypted['vid'], decrypted['fp'])
+    rescue StandardError
+      ClientToken.new('', '','')
+    end
   end
 end

data/lib/utils/version_utils.rb

@@ -2,11 +2,10 @@
 
 class VersionUtils
   def self.version
-    path = 'VERSION'
-    file = File.open(path)
-    version = file.read
-    file.close
-
-    version
+    begin
+      Gem.loaded_specs['securenative'].version.to_s
+    rescue StandardError
+      'unknown'
+    end
   end
 end

data/securenative.gemspec

@@ -4,7 +4,7 @@ require_relative "lib/utils/version_utils"
 
 Gem::Specification.new do |spec|
   spec.name          = "securenative"
-  spec.version       = VersionUtils.version
+  spec.version       = "0.1.21"
   spec.authors       = ["SecureNative"]
   spec.email         = ["support@securenative.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: securenative
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - SecureNative
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,7 +56,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - bin/console
 - bin/setup
 - lib/api_manager.rb
@@ -79,7 +78,6 @@ files:
 - lib/errors/securenative_sdk_Illegal_state_error.rb
 - lib/errors/securenative_sdk_error.rb
 - lib/event_manager.rb
-- lib/event_options.rb
 - lib/http/secure_native_http_response.rb
 - lib/http/securenative_http_client.rb
 - lib/models/client_token.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.20

data/lib/event_options.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-class EventOptions
-  MAX_PROPERTIES_SIZE = 10
-
-  def initialize(event_type, user_id, user_traits, user_name, email, phone, created_at, context, properties, timestamp)
-    traits = UserTraits(user_name)
-    if user_name && email && phone && created_at
-      traits = UserTraits(user_name, email, phone, created_at)
-    elsif user_name && email && phone
-      traits = UserTraits(user_name, email, phone)
-    elsif user_name && email
-      traits = UserTraits(user_name, email)
-    end
-
-    @event_options = EventOptions(event_type)
-    @event_options.user_id = user_id
-    @event_options.user_traits = user_traits if user_traits
-    @event_options.user_traits = traits
-    @event_options.context = context
-    @event_options.properties = properties
-    @event_options.timestamp = timestamp
-  end
-
-  def build
-    if !@event_options.properties.nil? && @event_options.properties.length > MAX_PROPERTIES_SIZE
-      raise SecureNativeInvalidOptionsError('You can have only up to {} custom properties', MAX_PROPERTIES_SIZE)
-    end
-
-    @event_options
-  end
-end