securenative 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37b0720aab5431b97f1b2313e9e1e88d6a3ce712ba342575c86884a5d3ed9f7c
-  data.tar.gz: 74258ad8d16b072378bda84119bb65831cb1441f186fcb49a893308d777249d6
+  metadata.gz: e936efafd72a5c0c1a5014d6649b6fafff6494a117a7dcd04090f031971cc5af
+  data.tar.gz: db9ba27daf67f22e6764632d944a24039b617b71a4364a7180ef792b9e631ee6
 SHA512:
-  metadata.gz: bb0ce8d22b7b1ce832c49a3690856312b298cc8cc55046ebe966cf7ddb410079ae5d13cc93a4fd25b4a111fd971ec7be9782f92b5716103bba2842ce72607d8e
-  data.tar.gz: 17dece79e7f8dabed7fd270d1da3d7cc50f94691bfed65324e45b961ac8bd0a33371d4390f941cb3fa460e24a72fb86487a466ceaff91ec6d23595fc6cb6b9a8
+  metadata.gz: f1009b1d827f473ea051b0e9bfd406508c8e6e9019009c3cb1b43a6aee6d1c551c41dfd1956d9a45e0f2f52eea633a9f183c3327cb93eb7a94c6357570d5c1a6
+  data.tar.gz: 843dd129a073f551ce5878fc788809b3611e98769cb4723ff2563176016be7a26f7190ff0a8d20bc513420dfe067943bf16e7efd52ce1ba51a13e98b203293e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    securenative (0.1.30)
+    securenative (0.1.31)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -114,7 +114,7 @@ require 'securenative'
 
 def track(request)
     securenative = SecureNative::Client.instance
-    context = SecureNative::Context.from_http_request(request)
+    context = securenative.from_http_request(request)
     
     event_options = SecureNative::EventOptions.new(event: SecureNative::EventTypes::LOG_IN, user_id: '1234', context: context,
                                      user_traits: SecureNative::UserTraits.new(name: 'Your Name', email: 'name@gmail.com', phone: '+1234567890'),
@@ -136,7 +136,7 @@ require 'securenative'
 
 def verify(request)
     securenative = SecureNative::Client.instance
-    context = SecureNative::Context.from_http_request(request)
+    context = securenative.from_http_request(request)
 
     event_options = SecureNative::EventOptions.new(event: SecureNative::EventTypes::LOG_IN, user_id: '1234', context: context,
                                          user_traits: SecureNative::UserTraits.new(name: 'Your Name', email: 'name@gmail.com', phone: '+1234567890'),

data/lib/securenative/client.rb

@@ -42,6 +42,10 @@ module SecureNative
       end
     end
 
+    def from_http_request(request)
+      SecureNative::Context.from_http_request(request, @options)
+    end
+
     def self.init
       options = SecureNative::Config::ConfigurationManager.load_config
       init_with_options(options)

data/lib/securenative/context.rb

@@ -21,7 +21,7 @@ module SecureNative
       SecureNative::Context.new
     end
 
-    def self.from_http_request(request)
+    def self.from_http_request(request, options)
       client_token = SecureNative::Frameworks::Rails.get_client_token(request)
       client_token = SecureNative::Frameworks::Sinatra.get_client_token(request) if client_token.nil?
       client_token = SecureNative::Frameworks::Hanami.get_client_token(request) if client_token.nil?
@@ -57,9 +57,9 @@ module SecureNative
         client_token = SecureNative::Utils::RequestUtils.get_secure_header_from_request(headers)
       end
 
-      SecureNative::Context.new(client_token: client_token, ip: SecureNative::Utils::RequestUtils.get_client_ip_from_request(request),
-                     remote_ip: SecureNative::Utils::RequestUtils.get_remote_ip_from_request(request),
-                     headers: headers, url: url, http_method: method || '', body: body)
+      SecureNative::Context.new(client_token: client_token, ip: SecureNative::Utils::RequestUtils.get_client_ip_from_request(request, options),
+                                remote_ip: SecureNative::Utils::RequestUtils.get_remote_ip_from_request(request),
+                                headers: headers, url: url, http_method: method || '', body: body)
     end
   end
 end

data/lib/securenative/utils/request_utils.rb

@@ -5,6 +5,7 @@ module SecureNative
     class RequestUtils
       SECURENATIVE_COOKIE = '_sn'
       SECURENATIVE_HEADER = 'x-securenative'
+      PREFIX = 'HTTP_'
 
       def self.get_secure_header_from_request(headers)
         begin
@@ -15,15 +16,21 @@ module SecureNative
         []
       end
 
-      def self.get_client_ip_from_request(request, options = nil)
+      def self.get_client_ip_from_request(request, options)
         unless options.nil?
           for header in options.proxy_headers do
             begin
               h = request.env[header]
+              unless !h.nil?
+                h = request.env[self.parse_ip(header)]
+              end
               return h.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless h.nil?
             rescue NoMethodError
               begin
                 h = request[header]
+                unless !h.nil?
+                  h = request.env[self.parse_ip(header)]
+                end
                 return h.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless h.nil?
               rescue NoMethodError
               end
@@ -79,6 +86,11 @@ module SecureNative
           ''
         end
       end
+
+      def self.parse_ip(headers)
+        h = headers.gsub('-', '_')
+        return PREFIX + h.upcase
+      end
     end
   end
 end

data/lib/securenative/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SecureNative
-  VERSION = '0.1.30'
+  VERSION = '0.1.31'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: securenative
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - SecureNative
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler