wafris 0.3.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b39cabfbc682a8747543a828ed6f4247391510133775eccddc5b993a8aba71
-  data.tar.gz: 8e1b9ed6f5f28142a7b2f9573ed08c08d3289ec6426b90b4295327900cdd0eaf
+  metadata.gz: a6403b9b2f805fb237789d238e0eaffd0fef7b488f8a105ee402eda335a30de0
+  data.tar.gz: 76aec9129b297c975ce26f0c9992d5296ff9ff643543154e58192b7a3df49bed
 SHA512:
-  metadata.gz: e23d9df1014a335af26d8ccc44eece11276ba603903b7bcb21c9912459b2371bead29ed29c083c442a202f05307e4de74a821093338236cfca33cd48c77eb8f1
-  data.tar.gz: 10209a6b297681ef18b400db8e3101e4b2f44d21e08760bbb10e9928d67a1d64660f586fbf3a060565532b4417c68fc2aabdae7f4b74f164b1ffcfc4075a1bc5
+  metadata.gz: bc5eddfd5163e22f711fec29cd3be30b32be39846a1536fdafab77b7c85ba48be7f9af026cf91a6d0d233beabd3e965541dd681b19e818fa3272b583693302c5
+  data.tar.gz: 95e21d8938ec9cd481fafd0bda406f31e5305b5dce24cef3e681a8436cce5535fa8b51f51c339cf2b1a15ebde2fa4fade9968caaf33afbc72a2ef70f2b6b4dd5

data/lib/lua/dist/wafris_core.lua

@@ -71,7 +71,7 @@ local max_requests = 100000
 local max_requests_per_ip = 10000
 
 local client_ip = ARGV[1]
-local ip_to_decimal = ARGV[2]
+local client_ip_to_decimal = ARGV[2]
 local unix_time_milliseconds = ARGV[3]
 local unix_time = ARGV[3] / 1000
 local proxy_ip = ARGV[4]
@@ -98,10 +98,12 @@ increment_timebucket_for("host:", current_timebucket, host)
 
 -- BLOCKING LOGIC
 -- Safelist Range Check
-if next(redis.call("ZRANGEBYSCORE", "allowed_ranges", ip_to_decimal, "+inf", "LIMIT", 0, 1)) then
+-- TODO: ZRANGEBYSCORE is deprecated in Redis 6.2+. Replace with ZRANGE
+if next(redis.call("ZRANGEBYSCORE", "allowed_ranges", client_ip_to_decimal, "+inf", "LIMIT", 0, 1)) then
   return "Allowed"
 -- Blocklist Range Check
-elseif next(redis.call("ZRANGEBYSCORE", "blocked_ranges", ip_to_decimal, "+inf", "LIMIT", 0, 1)) then
+elseif next(redis.call("ZRANGEBYSCORE", "blocked_ranges", client_ip_to_decimal, "+inf", "LIMIT", 0, 1)) then
+  increment_timebucket_for("wafris:blocked:", current_timebucket, client_ip)
   return "Blocked"
 -- No Matches
 else

data/lib/wafris/configuration.rb

@@ -6,7 +6,10 @@ module Wafris
     attr_accessor :redis_pool_size
 
     def initialize
-      @redis = Redis.new
+      @redis = Redis.new(
+        url: ENV['REDIS_URL'],
+        ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }
+      )
       @redis_pool_size = 20
     end
 

data/lib/wafris/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Micahel Buckbee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool