securenative 0.1.35 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20dc3ef7982fbbe1393a802c4b3e146bc5e2c156bbe47d69ab51de349af96897
-  data.tar.gz: 7f45ebdfc1015a73c592e38bb51b1dde881db64268c7de7844a0891fcebfd6af
+  metadata.gz: e1524c2a6da61fa55a95f7934b08bea91905fa43a4a36ff4b0fc5183edf5ab2f
+  data.tar.gz: '0915dd3e1ebbe7c665d66965e6ee274f2a9b55dbd7fc5745047a26be6b202f72'
 SHA512:
-  metadata.gz: d9dec72d78c52595114438d45f22d14ae719f1852050af0c694791e66cc8292d9b9b1a6eabd4ea459f192bac694272f2f1167d9e147512df01e9c605a7bef9cd
-  data.tar.gz: e88c021e75f087d06f7ba6ba9760fe71ee9b49c950d9d69da424a95e17b2b17e9f6b56c08b70486e245425f5147954ab9bed60a37c9b34784dcda4d29a8ca9b9
+  metadata.gz: e9d062d7222932be86a84e528a1265d18e8d2777aae3dbf786423ad14be3266b038e5345d046949a8e7c2b1c3e4e2ccfc941122fd853f92129f159cdb2a2f86b
+  data.tar.gz: c640a7286aa36570e4e86a9fe9c28efa47284e1b908e7a02ffa64d5e58437340707c49851032e3993985d7142bc192b63d8e38ac27448c0f7d07c9bce3917fa7

data/.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
           gem install bundler
           bundler install
       - name: Run tests
-        run: bundle exec rspec spec --pattern **/spec_*.rb
+        run: bundle exec rspec spec --pattern **/**/spec_*.rb
 
       - name: Notify slack success
         if: success()

data/.github/workflows/test.yml

@@ -23,7 +23,7 @@ jobs:
           gem install bundler
           bundler install
       - name: Run tests
-        run: bundle exec rspec spec --pattern **/spec_*.rb
+        run: bundle exec rspec spec --pattern **/**/spec_*.rb
 
       - name: Notify slack success
         if: success()

data/Gemfile.lock

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

data/README.md

@@ -176,7 +176,7 @@ SECURENATIVE_API_KEY: dsbe27fh3437r2yd326fg3fdg36f43
 SECURENATIVE_PROXY_HEADERS: ["CF-Connecting-IP"]
 ```
 
-Initialize sdk as showed above.
+Initialize sdk as shown above.
 
 ### Options 2: Using ConfigurationBuilder
 

data/lib/securenative/context.rb

@@ -54,7 +54,7 @@ module SecureNative
       end
 
       if SecureNative::Utils::Utils.null_or_empty?(client_token)
-        client_token = SecureNative::Utils::RequestUtils.get_secure_header_from_request(request.headers)
+          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, options),

data/lib/securenative/event_manager.rb

@@ -62,7 +62,7 @@ class EventManager
     res = @http_client.post(resource_path, EventManager.serialize(event).to_json)
 
     if res.nil? || res.code != '200'
-      SecureNative::Log.info("SecureNative failed to call endpoint #{resource_path} with event #{event}. adding back to queue")
+      SecureNative::Log.info("SecureNative failed to call endpoint #{resource_path} with event #{event}")
     end
 
     res

data/lib/securenative/frameworks/hanami.rb

@@ -36,9 +36,16 @@ module SecureNative
       def self.get_headers(request)
         begin
           headers = {}
-          request.headers.env.select { |k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/ }.each { |header|
+
+          request.env.select { |k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/ }.each { |header|
             headers[header[0].downcase.gsub("http_", "").gsub("_", "-")] = header[1]
           }
+
+          if headers.length == 0
+            request.headers.env.select { |k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/ }.each { |header|
+              headers[header[0].downcase.gsub("http_", "").gsub("_", "-")] = header[1]
+            }
+          end
           return headers
         rescue StandardError
           nil

data/lib/securenative/frameworks/rails.rb

@@ -38,9 +38,16 @@ module SecureNative
       def self.get_headers(request)
         begin
           headers = {}
-          request.headers.env.select { |k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/ }.each { |header|
+
+          request.env.select { |k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/ }.each { |header|
             headers[header[0].downcase.gsub("http_", "").gsub("_", "-")] = header[1]
           }
+
+          if headers.length == 0
+            request.headers.env.select { |k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/ }.each { |header|
+              headers[header[0].downcase.gsub("http_", "").gsub("_", "-")] = header[1]
+            }
+          end
           return headers
         rescue StandardError
           nil

data/lib/securenative/frameworks/sinatra.rb

@@ -36,9 +36,16 @@ module SecureNative
       def self.get_headers(request)
         begin
           headers = {}
-          request.headers.env.select { |k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/ }.each { |header|
+
+          request.env.select { |k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/ }.each { |header|
             headers[header[0].downcase.gsub("http_", "").gsub("_", "-")] = header[1]
           }
+
+          if headers.length == 0
+            request.headers.env.select { |k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/ }.each { |header|
+              headers[header[0].downcase.gsub("http_", "").gsub("_", "-")] = header[1]
+            }
+          end
           return headers
         rescue StandardError
           nil

data/lib/securenative/http_client.rb

@@ -27,7 +27,7 @@ module SecureNative
       headers = _headers
 
       client = Net::HTTP.new(uri.host, uri.port)
-      client.read_timeout = @options.timeout
+      client.read_timeout = @options.timeout / 1000
       client.use_ssl = true
       client.verify_mode = OpenSSL::SSL::VERIFY_NONE
 

data/lib/securenative/utils/request_utils.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'ipaddr'
+
 module SecureNative
   module Utils
     class RequestUtils
@@ -24,14 +26,20 @@ module SecureNative
               if 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?
+              parsed = self.parse_proxy_header(h, header)
+              if self.validate_ip(parsed)
+                return parsed
+              end
             rescue NoMethodError
               begin
                 h = request[header]
                 if 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?
+                parsed = self.parse_proxy_header(h, header)
+                if self.validate_ip(parsed)
+                  return parsed
+                end
               rescue NoMethodError
                 # Ignored
               end
@@ -40,36 +48,66 @@ module SecureNative
         end
 
         begin
-          x_forwarded_for = request.env['HTTP_X_FORWARDED_FOR']
-          return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
+          header_value = request.env['HTTP_X_FORWARDED_FOR']
+          if header_value.include? ','
+            header_value = header_value.split(',')[0]
+          end
+          if self.validate_ip(header_value)
+            return header_value
+          end
         rescue NoMethodError
           begin
-            x_forwarded_for = request['HTTP_X_FORWARDED_FOR']
-            return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
+            header_value = request['HTTP_X_FORWARDED_FOR']
+            if header_value.include? ','
+              header_value = header_value.split(',')[0]
+            end
+            if self.validate_ip(header_value)
+              return header_value
+            end
           rescue NoMethodError
             # Ignored
           end
         end
 
         begin
-          x_forwarded_for = request.env['HTTP_X_REAL_IP']
-          return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
+          header_value = request.env['HTTP_X_REAL_IP']
+          if header_value.include? ','
+            header_value = header_value.split(',')[0]
+          end
+          if self.validate_ip(header_value)
+            return header
+          end
         rescue NoMethodError
           begin
-            x_forwarded_for = request['HTTP_X_REAL_IP']
-            return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
+            header_value = request['HTTP_X_REAL_IP']
+            if header_value.include? ','
+              header_value = header_value.split(',')[0]
+            end
+            if self.validate_ip(header_value)
+              return header_value
+            end
           rescue NoMethodError
             # Ignored
           end
         end
 
         begin
-          x_forwarded_for = request.env['REMOTE_ADDR']
-          return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
+          header_value = request.env['REMOTE_ADDR']
+          if header_value.include? ','
+            header_value = header_value.split(',')[0]
+          end
+          if self.validate_ip(header_value)
+            return header_value
+          end
         rescue NoMethodError
           begin
-            x_forwarded_for = request['REMOTE_ADDR']
-            return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
+            header_value = request['REMOTE_ADDR']
+            if header_value.include? ','
+              header_value = header_value.split(',')[0]
+            end
+            if self.validate_ip(header_value)
+              return header_value
+            end
           rescue NoMethodError
             # Ignored
           end
@@ -96,6 +134,35 @@ module SecureNative
         h = headers.gsub('-', '_')
         return PREFIX + h.upcase
       end
+
+      def self.parse_proxy_header(headers, header_key)
+        h = headers.gsub(header_key + ': ', '')
+        if headers.include? ','
+          h = h.split(',')[0]
+        end
+        return h
+      end
+
+      def self.validate_ip(ip)
+        if ip.nil?
+          return false
+        end
+
+        begin
+          ipaddr = IPAddr.new(ip)
+          if ipaddr.ipv4?
+            return true
+          end
+
+          if ipaddr.ipv6?
+            return true
+          end
+        rescue Exception
+          # Ignored
+        end
+
+        return false
+      end
     end
   end
 end

data/lib/securenative/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: securenative
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.40
 platform: ruby
 authors:
 - SecureNative
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: SecureNative SDK for Ruby