wafris 2.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a6832a6803974c5ebc7e337c3e118fb876dececdb8154f9877411e4169baca
-  data.tar.gz: f8c60d439b09b2b299bb17f6ab233fb265b214e72ea1791cc43d5c8a34aa2264
+  metadata.gz: 18143fac18debaf1b85c3b0bcef4deef24ea2fd27fbfaca36969a860e2ba1829
+  data.tar.gz: cc6c953ec32d817b2484336902c9474fea514a47d1e43860f7699bed2a79524e
 SHA512:
-  metadata.gz: 020ff0f8179cfd43719fc7e44814fb734873f7f496e6c8a5498800643f06bb9fc1914f255cbbbb4b5b96f7a91d2fe20d6e5c9f26ed8b623684823818e9a6d970
-  data.tar.gz: d9e6a41ea3ab39f34fbf74a81cea82846b3ad2861939c06f9ec3cb6a5f6f95e198c1af3e83c5af7ed3cffb53313398e852f163489fc4b07dc595bc5f6b4d94d3
+  metadata.gz: 73d478b06f745fc49c2f073466c931fe118ed1a3fc127ad6598087d5aab1d2f5009bac3dc588aa597f802402cbc0262a147866f43815ef9e4f0ba0d73a4be592
+  data.tar.gz: 1ce9b2e491f7c776ee0ec113d515b5c9a47bfc1ee5debd0a59a0684e81771870a022886131fc8c7605776d6c52e52f1854f318b41cc63b9240c897203e83e39b

data/lib/wafris/middleware.rb

@@ -4,16 +4,20 @@ module Wafris
   class Middleware
     def initialize(app)
       @app = app
+      @notifier = ActiveSupport::Notifications if defined?(ActiveSupport::Notifications)
       ProxyFilter.set_filter
     end
 
     def call(env)
-      request = Rack::Request.new(env)
-
-      treatment = Wafris.evaluate(
-        WafrisRequest.new(request, env)
+      wafris_request = WafrisRequest.new(
+        Rack::Request.new(env),
+        env
       )
 
+      treatment = Wafris.evaluate(wafris_request)
+
+      @notifier&.instrument("#{treatment}.wafris", request: wafris_request, treatment: treatment)
+
       # These values match what the client tests expect (200, 404, 403, 500)
       if treatment == "Allowed" || treatment == "Passed"
         @app.call(env)

data/lib/wafris/proxy_filter.rb

@@ -1,3 +1,25 @@
+# This file includes code from the https://github.com/rack/rack project,
+# which is licensed under the MIT License.
+# Copyright (C) 2007-2021 Leah Neukirchen <http://leahneukirchen.org/infopage.html>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 # frozen_string_literal: true
 
 module Wafris

data/lib/wafris/version.rb

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

data/lib/wafris.rb

@@ -19,6 +19,19 @@ module Wafris
   class << self
     attr_accessor :configuration
 
+    ALLOWED_IP = "ai"
+    ALLOWED_CIDR = "ac"
+    BLOCKED_IP = "bi"
+    BLOCKED_CIDR = "bc"
+    BLOCKED_REPUTATION = "brep"
+    BLOCKED_COUNTRY = "bctry"
+    BLOCKED_USER_AGENT = "bu"
+    BLOCKED_PATH = "bp"
+    BLOCKED_PARAM = "bparam"
+    BLOCKED_HOST = "bh"
+    BLOCKED_METHOD = "bm"
+    BLOCKED_RATE_LIMIT = "brl"
+
     def configure
       self.configuration ||= Wafris::Configuration.new
       yield(configuration)
@@ -434,34 +447,35 @@ module Wafris
           SQLite3::Database.new "#{@configuration.db_file_path}/#{data_subscriptions_db_filename}"
 
         ip = request.ip
-        return queue_upsync_request(request, "Allowed", "ai", ip) if exact_match(ip, "allowed_ips", rules_db)
-        return queue_upsync_request(request, "Allowed", "ac", ip) if ip_in_cidr_range(ip, "allowed_cidr_ranges", rules_db)
-        return queue_upsync_request(request, "Blocked", "bi", ip) if exact_match(ip, "blocked_ips", rules_db)
-        return queue_upsync_request(request, "Blocked", "bc", ip) if ip_in_cidr_range(ip, "blocked_cidr_ranges", rules_db)
+
+        return queue_upsync_request(request, "Allowed", ALLOWED_IP, ip) if exact_match(ip, "allowed_ips", rules_db)
+        return queue_upsync_request(request, "Allowed", ALLOWED_CIDR, ip) if ip_in_cidr_range(ip, "allowed_cidr_ranges", rules_db)
+        return queue_upsync_request(request, "Blocked", BLOCKED_IP, ip) if exact_match(ip, "blocked_ips", rules_db)
+        return queue_upsync_request(request, "Blocked", BLOCKED_CIDR, ip) if ip_in_cidr_range(ip, "blocked_cidr_ranges", rules_db)
 
         country_code = get_country_code(ip, data_subscriptions_db)
-        return queue_upsync_request(request, "Blocked", "bs", "G_#{country_code}") if exact_match(country_code, "blocked_country_codes", rules_db)
+        return queue_upsync_request(request, "Blocked", BLOCKED_COUNTRY, "G_#{country_code}") if exact_match(country_code, "blocked_country_codes", rules_db)
 
         # Blocked Reputation IP Ranges
-        return queue_upsync_request(request, "Blocked", "bs", "R") if ip_in_cidr_range(ip, "reputation_ip_ranges", data_subscriptions_db)
+        return queue_upsync_request(request, "Blocked", BLOCKED_REPUTATION, "R") if ip_in_cidr_range(ip, "reputation_ip_ranges", data_subscriptions_db)
 
         user_agent_match = substring_match(request.user_agent, "blocked_user_agents", rules_db)
-        return queue_upsync_request(request, "Blocked", "bu", user_agent_match) if user_agent_match
+        return queue_upsync_request(request, "Blocked", BLOCKED_USER_AGENT, user_agent_match) if user_agent_match
 
         path_match = substring_match(request.path, "blocked_paths", rules_db)
-        return queue_upsync_request(request, "Blocked", "bp", path_match) if path_match
+        return queue_upsync_request(request, "Blocked", BLOCKED_PATH, path_match) if path_match
 
         parameters_match = substring_match(request.parameters, "blocked_parameters", rules_db)
-        return queue_upsync_request(request, "Blocked", "ba", parameters_match) if parameters_match
+        return queue_upsync_request(request, "Blocked", BLOCKED_PARAM, parameters_match) if parameters_match
 
-        return queue_upsync_request(request, "Blocked", "bh", request.host) if exact_match(request.host, "blocked_hosts", rules_db)
+        return queue_upsync_request(request, "Blocked", BLOCKED_HOST, request.host) if exact_match(request.host, "blocked_hosts", rules_db)
 
-        return queue_upsync_request(request, "Blocked", "bm", request.method) if exact_match(request.method, "blocked_methods", rules_db)
+        return queue_upsync_request(request, "Blocked", BLOCKED_METHOD, request.method) if exact_match(request.method, "blocked_methods", rules_db)
 
         # Rate Limiting
         rule_id = check_rate_limit(ip, request.path, request.method, rules_db)
         if rule_id
-          return queue_upsync_request(request, "Blocked", "brl", rule_id)
+          return queue_upsync_request(request, "Blocked", BLOCKED_RATE_LIMIT, rule_id)
         end
       end
 

metadata

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