wafris 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fab800ba280f295d31d26326cd24af8b30585db667f0cd26cb0b40e78e23dc34
-  data.tar.gz: 134f0b73d8cabfa0cd889974301d843e8c4341dc18ee76c23401af0adf313bae
+  metadata.gz: b12f70edd52fc81916790101bddabe8e450b1d97683bc115be5737e5a4d3562a
+  data.tar.gz: cf42cbb5eb83750ad066b4762e3b42fead8c02ea3f7c18b6494c0bef1b0c6a48
 SHA512:
-  metadata.gz: 617ee93c06d6b634a78a8a2f03e02d9de5df6916ace984a2efaf791b6635e2e3b4095acc9fc67d3b40200acfb0948502f22ecb1a4f55fcfbd2c26fcb2b2e7565
-  data.tar.gz: af26e184475c1d8fb2683cbb4f02dc1b3f08a8f7984c7ac62609cf34cc0721d1894fd82efd49df9a9dd6b3ff08f6a43035ac566d4ad0f13df776c9f1f0e6ec45
+  metadata.gz: 6839912471ef9957061996a9376119f907cf6d99f5d6d92a48c08d57a0c7f106f1d3234b9be431ad6b53b99d6e026bbc614d4fe47398738b48cf935b507b8616
+  data.tar.gz: eca82696939268ef17064912d3d072686ebd01eac5d1a7aa32e35ca2f72c8d7073176c58cc9010a4d308b2113273c43b9f9b1af8a56b5ad559cbc837b3b3092c

data/lib/wafris/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wafris
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/wafris/wafris_request.rb

@@ -27,6 +27,8 @@ module Wafris
     end
 
     def encode_to_utf8(value)
+      return '' if value.nil?
+
       value&.dup&.force_encoding('UTF-8')
     end
   end

data/lib/wafris.rb

@@ -164,9 +164,7 @@ module Wafris
     end
   
     def send_upsync_requests(requests_array)
-  
       begin
-        
         headers = {'Content-Type' => 'application/json'}
 
         if Rails && Rails.application
@@ -214,23 +212,22 @@ module Wafris
     # The 'rule' parameter represents the specific rule that was matched within the category 
     # ex: '192.23.5.4', 'SemRush', etc.
     def queue_upsync_request(ip, user_agent, path, parameters, host, method, treatment, category, rule, request_id, request_timestamp)
-      
       if @configuration.upsync_status != 'Disabled' || @configuration.upsync_status != 'Uploading'
         @configuration.upsync_status = 'Uploading'
 
         # Add request to the queue
         request = [ip, user_agent, path, parameters, host, method, treatment, category, rule, request_id, request_timestamp]
         @configuration.upsync_queue << request
-  
+
         # If the queue is full, send the requests to the upsync server
         if @configuration.upsync_queue.length >= @configuration.upsync_queue_limit || (Time.now.to_i - @configuration.last_upsync_timestamp) >= @configuration.upsync_interval
           requests_array = @configuration.upsync_queue
           @configuration.upsync_queue = []
           @configuration.last_upsync_timestamp = Time.now.to_i
-          
+
           send_upsync_requests(requests_array)
         end
-  
+
         @configuration.upsync_status = 'Enabled'
         # Return the treatment - used to return 403 or 200
 
@@ -453,92 +450,93 @@ module Wafris
   
     # This is the main loop that evaluates the request
     # as well as sorts out when downsync and upsync should be called
-    def evaluate(ip, user_agent, path, parameters, host, method, headers, body, request_id, request_timestamp)
-        @configuration ||= Wafris::Configuration.new
+    def evaluate(ip, user_agent, path, parameters, host, method, _headers, _body, request_id, request_timestamp)
+      @configuration ||= Wafris::Configuration.new
 
-        if @configuration.api_key.nil?          
-          return "Passed"
-        else
+      if @configuration.api_key.nil?
+        return "Passed"
+      else
+        rules_db_filename = current_db('custom_rules')
+        data_subscriptions_db_filename = current_db('data_subscriptions')
 
-          rules_db_filename = current_db('custom_rules')
-          data_subscriptions_db_filename = current_db('data_subscriptions')
-    
-          if rules_db_filename.to_s.strip != '' && data_subscriptions_db_filename.strip.to_s.strip != ''
-    
-            rules_db = SQLite3::Database.new "#{@configuration.db_file_path}/#{rules_db_filename}"
-            data_subscriptions_db = SQLite3::Database.new "#{@configuration.db_file_path}/#{data_subscriptions_db_filename}"
+        if rules_db_filename.to_s.strip != '' && data_subscriptions_db_filename.strip.to_s.strip != ''
 
-            # Allowed IPs
-            if exact_match(ip, 'allowed_ips', rules_db)
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Allowed', 'ai', ip, request_id, request_timestamp)
-            end
-    
-            # Allowed CIDR Ranges
-            if ip_in_cidr_range(ip, 'allowed_cidr_ranges', rules_db)
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Allowed', 'ac', ip, request_id, request_timestamp)
-            end
-    
-            # Blocked IPs
-            if exact_match(ip, 'blocked_ips', rules_db)
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bi', ip, request_id, request_timestamp)
-            end
-    
-            # Blocked CIDR Ranges
-            if ip_in_cidr_range(ip, 'blocked_cidr_ranges', rules_db)
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bc', ip, request_id, request_timestamp)
-            end
-    
-            # Blocked Country Codes
-            country_code = get_country_code(ip, data_subscriptions_db)      
-            if exact_match(country_code, 'blocked_country_codes', rules_db)
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bs', "G_#{country_code}", request_id, request_timestamp)
-            end 
-    
-            # Blocked Reputation IP Ranges
-            if ip_in_cidr_range(ip, 'reputation_ip_ranges', data_subscriptions_db)
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bs', "R", request_id, request_timestamp)
-            end
-    
-            # Blocked User Agents
-            user_agent_match = substring_match(user_agent, 'blocked_user_agents', rules_db)
-            if user_agent_match
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bu', user_agent_match, request_id, request_timestamp)
-            end
-    
-            # Blocked Paths
-            path_match = substring_match(path, 'blocked_paths', rules_db)
-            if path_match
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bp', path_match, request_id, request_timestamp)
-            end
-    
-            # Blocked Parameters
-            parameters_match = substring_match(parameters, 'blocked_parameters', rules_db)
-            if parameters_match
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'ba', parameters_match, request_id, request_timestamp)
-            end
-    
-            # Blocked Hosts
-            if exact_match(host, 'blocked_hosts', rules_db)
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bh', host, request_id, request_timestamp)
-            end
-    
-            # Blocked Methods
-            if exact_match(method, 'blocked_methods', rules_db)
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bm', method, request_id, request_timestamp)
-            end
-    
-            # Rate Limiting
-            rule_id = check_rate_limit(ip, path, method, rules_db)
-            if rule_id
-              return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'brl', rule_id, request_id, request_timestamp)
-            end
-    
+          rules_db = SQLite3::Database.new "#{@configuration.db_file_path}/#{rules_db_filename}"
+          data_subscriptions_db =
+            SQLite3::Database.new "#{@configuration.db_file_path}/#{data_subscriptions_db_filename}"
+
+          # Allowed IPs
+          if exact_match(ip, 'allowed_ips', rules_db)
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Allowed', 'ai',
+                                        ip, request_id, request_timestamp)
           end
-    
-          # Passed if no allow or block rules matched
-          return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Passed', 'passed', '-', request_id, request_timestamp)
 
-        end # end api_key.nil?
+          # Allowed CIDR Ranges
+          if ip_in_cidr_range(ip, 'allowed_cidr_ranges', rules_db)
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Allowed', 'ac', ip, request_id, request_timestamp)
+          end
+
+          # Blocked IPs
+          if exact_match(ip, 'blocked_ips', rules_db)
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bi', ip, request_id, request_timestamp)
+          end
+
+          # Blocked CIDR Ranges
+          if ip_in_cidr_range(ip, 'blocked_cidr_ranges', rules_db)
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bc', ip, request_id, request_timestamp)
+          end
+
+          # Blocked Country Codes
+          country_code = get_country_code(ip, data_subscriptions_db)      
+          if exact_match(country_code, 'blocked_country_codes', rules_db)
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bs', "G_#{country_code}", request_id, request_timestamp)
+          end 
+
+          # Blocked Reputation IP Ranges
+          if ip_in_cidr_range(ip, 'reputation_ip_ranges', data_subscriptions_db)
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bs', "R", request_id, request_timestamp)
+          end
+
+          # Blocked User Agents
+          user_agent_match = substring_match(user_agent, 'blocked_user_agents', rules_db)
+          if user_agent_match
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bu', user_agent_match, request_id, request_timestamp)
+          end
+
+          # Blocked Paths
+          path_match = substring_match(path, 'blocked_paths', rules_db)
+          if path_match
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bp', path_match, request_id, request_timestamp)
+          end
+  
+          # Blocked Parameters
+          parameters_match = substring_match(parameters, 'blocked_parameters', rules_db)
+          if parameters_match
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'ba', parameters_match, request_id, request_timestamp)
+          end
+  
+          # Blocked Hosts
+          if exact_match(host, 'blocked_hosts', rules_db)
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bh', host, request_id, request_timestamp)
+          end
+  
+          # Blocked Methods
+          if exact_match(method, 'blocked_methods', rules_db)
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'bm', method, request_id, request_timestamp)
+          end
+  
+          # Rate Limiting
+          rule_id = check_rate_limit(ip, path, method, rules_db)
+          if rule_id
+            return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Blocked', 'brl', rule_id, request_id, request_timestamp)
+          end
+  
+        end
+  
+        # Passed if no allow or block rules matched
+        return queue_upsync_request(ip, user_agent, path, parameters, host, method, 'Passed', 'passed', '-', request_id, request_timestamp)
+
+      end # end api_key.nil?
     end # end evaluate
   
     def debug(api_key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Michael Buckbee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-21 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack