wafris 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7590310d437ae2574c37907b8c285e236b3e22686769cb2a5043a1e8a4c6171b
-  data.tar.gz: 4bbc22d46692a7505b37845a5c39d8b5197441c6dc8b8bf61b12622fa690d9b6
+  metadata.gz: 6600b4667202df4429e13018d9eb1bdc0473029ad20dd5052e993f8390f06330
+  data.tar.gz: a4cf7a7781a19b03aa2c6389e24093b69f8b448c49beff1ddf798de9e9c97ef0
 SHA512:
-  metadata.gz: 89063fcce8dcd2f35c10651bccc9de6b517f2925194493673fa6e2fa672eba4a6c3bfc1444624c957a70cd3d3b401cbc743ad13a0d8981fd5f18bcbba8eb02c8
-  data.tar.gz: 61b32244a41efdca5cffa93f753e8bed5fdbf23849fb4f0f8773083493c3bb26e0a9cc23480584d41e674a1cb0fa749faafa428af2c741ee9d12c5fb8078c1d4
+  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.2"
+  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.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Micahel Buckbee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-13 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -49,9 +49,6 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.0
@@ -59,9 +56,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.0
@@ -103,82 +97,58 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '12.0'
 description: 
 email: 
 executables: []
@@ -196,8 +166,13 @@ homepage:
 licenses:
 - Elastic-2.0
 metadata: {}
-post_install_message: "    Thank you for installing the wafris gem. \n    \n    If
-  you haven't already, please sign up for Wafris Hub at:\n\n    https://wafris.org\n\n"
+post_install_message: |2+
+      Thank you for installing the wafris gem.
+
+      If you haven't already, please sign up for Wafris Hub at:
+
+      https://wafris.org
+
 rdoc_options: []
 require_paths:
 - lib