wafris 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 389651499912f24676b1254c9a5f4dc2b1093e441a47da4a288a657020bc3494
-  data.tar.gz: 9801b9f106f043b03816cee5ea26e3a85fc1f3f0ea0e572ffc0e4060368bfe78
+  metadata.gz: 6600b4667202df4429e13018d9eb1bdc0473029ad20dd5052e993f8390f06330
+  data.tar.gz: a4cf7a7781a19b03aa2c6389e24093b69f8b448c49beff1ddf798de9e9c97ef0
 SHA512:
-  metadata.gz: 7ed5770968fc34f646830d45596f5035134bdf741d0d44cafe82b13386b370621a6071b992c54d26997e07a5098ed1b136b6dc9fc6fe2122345877017284631c
-  data.tar.gz: 81e1e4fe9e4d01ee137a9ff1ee14e7b4422b20ad237a91f7611c3a0855d73b0d08deccf1cb53950ee58e10e55e1e6a485ff36f8e738524211acbe7460d494f2d
+  metadata.gz: 8eef758330be30b532d5b069df5db72d7bbbf8e98d277fe3cacc6842e8d01c997fcb1532810467497a2c87864f809b9fd83a0f13bfeef91a0503bfceace2f893
+  data.tar.gz: 0da7423796d0eb18d0d21d6ccda75555fe7042e1d5d999b539bfb13bde301d17b581b2b399faa122afc4e3acb32c567d5426cb04326dff34a81271319e341fd2

data/lib/wafris/configuration.rb

@@ -6,18 +6,11 @@ module Wafris
   class Configuration
     attr_accessor :redis
     attr_accessor :redis_pool_size
+    attr_accessor :maxmemory
 
     def initialize
-      @redis = Redis.new(
-        url: ENV['REDIS_URL'],
-        ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }
-      )
       @redis_pool_size = 20
-
-      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." unless LogSuppressor.suppress_logs?
+      @maxmemory = 25
     end
 
     def connection_pool
@@ -29,8 +22,10 @@ module Wafris
       redis.hset('waf-settings',
                  '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" unless LogSuppressor.suppress_logs?
+                 'maxmemory', @maxmemory)
+      LogSuppressor.puts_log(
+        "[Wafris] firewall enabled. Connected to Redis. Ready to process requests. Set rules at: https://wafris.org/hub"
+      )
     end
 
     def core_sha

data/lib/wafris/log_suppressor.rb

@@ -2,6 +2,10 @@
 
 module Wafris
   class LogSuppressor
+    def self.puts_log(message)
+      message unless suppress_logs?
+    end
+
     def self.suppress_logs?
       suppressed_environments.include?(current_environment)
     end

data/lib/wafris/middleware.rb

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

data/lib/wafris/version.rb

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

data/lib/wafris.rb

@@ -12,20 +12,21 @@ require 'wafris/railtie' if defined?(Rails::Railtie)
 
 module Wafris
   class << self
-    def configure
-      yield configuration
-      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." unless LogSuppressor.suppress_logs?
-    end
+    attr_accessor :configuration
 
-    def configuration
-      @configuration ||= Wafris::Configuration.new
-    end
+    def configure
+      raise ArgumentError, "[Wafris] block is required to configure Wafris" unless block_given?
 
-    def reset
-      @configuration = Wafris::Configuration.new
+      self.configuration ||= Wafris::Configuration.new
+      yield(configuration)
+      LogSuppressor.puts_log(
+        "[Wafris] attempting firewall connection via Wafris.configure initializer."
+      )
+      configuration.create_settings
+    rescue Redis::CannotConnectError, ArgumentError
+      LogSuppressor.puts_log(
+        "[Wafris] firewall disabled. Cannot connect via Wafris.configure. Please check your configuration settings."
+      )
     end
 
     def allow_request?(request)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Micahel Buckbee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool