wafris 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919967ec8203e767f77202e17964dbcfd21f60422bb91bd61b806575886c5dbf
-  data.tar.gz: ffe9b975f6613e1742c90b6335e85f53769d439d32f014517487142a97edb37e
+  metadata.gz: 7590310d437ae2574c37907b8c285e236b3e22686769cb2a5043a1e8a4c6171b
+  data.tar.gz: 4bbc22d46692a7505b37845a5c39d8b5197441c6dc8b8bf61b12622fa690d9b6
 SHA512:
-  metadata.gz: 4efff1ae48ec5417bf9917c0a3b7f073064216ee718eed8246f0b993397454ab4296a2e27ac48a1289f31abe20ca277d32f4bc848978a7c4dd88d04ee08c4cdb
-  data.tar.gz: 274d14a646e0e706a940d16c53adb050045df1593056f012ba47666af402c37e38a055038fa2074a73e32e73cc49bcf5f5d943c16e7bff71bd3d79d47e8aaadc
+  metadata.gz: 89063fcce8dcd2f35c10651bccc9de6b517f2925194493673fa6e2fa672eba4a6c3bfc1444624c957a70cd3d3b401cbc743ad13a0d8981fd5f18bcbba8eb02c8
+  data.tar.gz: 61b32244a41efdca5cffa93f753e8bed5fdbf23849fb4f0f8773083493c3bb26e0a9cc23480584d41e674a1cb0fa749faafa428af2c741ee9d12c5fb8078c1d4

data/lib/lua/dist/wafris_core.lua

@@ -73,13 +73,18 @@ local function ip_in_cidr_range(cidr_set, ip_decimal_lexical)
   end
 end
 
+local function escapePattern(s)
+    local patternSpecials = "[%^%$%(%)%%%.%[%]%*%+%-%?]"
+    return s:gsub(patternSpecials, "%%%1")
+end
+
 local function match_by_pattern(property_abbreviation, property_value)
   local hash_name = "rules-blocked-" .. property_abbreviation
 
   local patterns = redis.call('HKEYS', hash_name)
 
   for _, pattern in ipairs(patterns) do
-    if string.find(property_value, pattern) then
+    if string.find(string.lower(property_value), string.lower(escapePattern(pattern))) then
       return pattern
     end
   end

data/lib/wafris/configuration.rb

@@ -14,10 +14,10 @@ module Wafris
       )
       @redis_pool_size = 20
 
-      puts "[Wafris] attempting firewall connection via REDIS_URL."
+      puts "[Wafris] attempting firewall connection via REDIS_URL." unless LogSuppressor.suppress_logs?
       create_settings
     rescue Redis::CannotConnectError
-      puts "[Wafris] firewall disabled. Cannot connect to REDIS_URL. Will attempt Wafris.configure if it exists."
+      puts "[Wafris] firewall disabled. Cannot connect to REDIS_URL. Will attempt Wafris.configure if it exists." unless LogSuppressor.suppress_logs?
     end
 
     def connection_pool
@@ -30,7 +30,7 @@ module Wafris
                  'version', Wafris::VERSION,
                  'client', 'ruby',
                  'redis-host', 'heroku')
-      puts "[Wafris] firewall enabled. Connected to Redis. Ready to process requests. Set rules at: https://wafris.org/hub"
+      puts "[Wafris] firewall enabled. Connected to Redis. Ready to process requests. Set rules at: https://wafris.org/hub" unless LogSuppressor.suppress_logs?
     end
 
     def core_sha

data/lib/wafris/log_suppressor.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Wafris
+  class LogSuppressor
+    def self.suppress_logs?
+      suppressed_environments.include?(current_environment)
+    end
+
+    def self.suppressed_environments
+      ['test'] + (ENV['CI'] ? ['CI'] : [])
+    end
+
+    def self.current_environment
+      if defined?(Rails)
+        Rails.env
+      else
+        ENV['RACK_ENV'] || 'development'
+      end
+    end
+  end
+end

data/lib/wafris/middleware.rb

@@ -33,7 +33,7 @@ module Wafris
         [403, {}, ['Blocked']]
       end
     rescue StandardError => e
-      puts "[Wafris] Redis connection error: #{e.message}. Request passed without rules check."
+      puts "[Wafris] Redis connection error: #{e.message}. Request passed without rules check." unless LogSuppressor.suppress_logs?
       @app.call(env)
     end
   end

data/lib/wafris/version.rb

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

data/lib/wafris.rb

@@ -6,6 +6,7 @@ require 'redis'
 
 require 'wafris/configuration'
 require 'wafris/middleware'
+require 'wafris/log_suppressor'
 
 require 'wafris/railtie' if defined?(Rails::Railtie)
 
@@ -13,10 +14,10 @@ module Wafris
   class << self
     def configure
       yield configuration
-      puts "[Wafris] attempting firewall connection via Wafris.configure initializer."
+      puts "[Wafris] attempting firewall connection via Wafris.configure initializer." unless LogSuppressor.suppress_logs?
       configuration.create_settings
     rescue Redis::CannotConnectError
-      puts "[Wafris] firewall disabled. Cannot connect via Wafris.configure. Please check your configuration settings."
+      puts "[Wafris] firewall disabled. Cannot connect via Wafris.configure. Please check your configuration settings." unless LogSuppressor.suppress_logs?
     end
 
     def configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Micahel Buckbee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -188,6 +188,7 @@ files:
 - lib/lua/dist/wafris_core.lua
 - lib/wafris.rb
 - lib/wafris/configuration.rb
+- lib/wafris/log_suppressor.rb
 - lib/wafris/middleware.rb
 - lib/wafris/railtie.rb
 - lib/wafris/version.rb