wafris 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83c6b329d3746bbf4c287cb873197fdb2ffa624d234985ca776053a9d5c9cf7b
-  data.tar.gz: 5a8640a929b7d940d2439e6c27bd2612b353057dac92e3da6947f2a75c8c3c55
+  metadata.gz: e59525f95ab8d7eb6699b54e29cf5898ccd705a801f2114d19c120ec7764655e
+  data.tar.gz: 6c9690caf94f9c521b4bffcaecae3fa15042fc3873f2460f25e02ad68b43f1c4
 SHA512:
-  metadata.gz: 9a3fef28735edcf3fda097bca89158c27205a7fdef8326d96f86c8e4306851210f334b5737ca0bbc909da961095fd2f88d7c2af53e99dd8df3e82d10bab8d2eb
-  data.tar.gz: 83e364033093b4b0c87f6c08b0aa52128c88d0e94efb830f397c48eb8ddea33d4bbca1295f940934faf0b01fd7001446998323ade3324f99bc617e9c30a387ab
+  metadata.gz: 31a0bd63d3dcdda330336cd07367ae29c58a864beeecefe6d893eb18dad9335d84c17c3f1391d509c376f4374d7491cdb9d7616edf4b2b10dee8b34c443ee037
+  data.tar.gz: 61e9d0164f1082ff2d3da4181c6ccf912b1223499f96cc6011ffce4d12c7328d4f275b81e64fa5967d0dc85a9a4b926fcb609a3ea089006f3d830ac5e308f470

data/lib/lua/dist/wafris_core.lua

@@ -96,18 +96,21 @@ increment_timebucket_for("user_agent:", current_timebucket, user_agent)
 increment_timebucket_for("request_path:", current_timebucket, request_path)
 increment_timebucket_for("host:", current_timebucket, host)
 
+local foobar = redis.call("ZRANGEBYSCORE", "blocked_ranges", client_ip_to_decimal, client_ip_to_decimal, "LIMIT", 0, 1)
+
+redis.breakpoint()
+
 -- BLOCKING LOGIC
--- Safelist Range Check
 -- TODO: ZRANGEBYSCORE is deprecated in Redis 6.2+. Replace with ZRANGE
-if not (next(redis.call("ZRANGEBYSCORE", "allowed_ranges", client_ip_to_decimal, "+inf", "LIMIT", 0, 1)) == nil) then
-  return "Allowed"
--- Blocklist Range Check
-elseif
-  not (next(redis.call("ZRANGEBYSCORE", "blocked_ranges", client_ip_to_decimal, "+inf", "LIMIT", 0, 1)) == nil)
+if
+  -- ZRANGEBYSCORE will always return a lua table, even if empty
+  -- TODO: When we introduce ranges we'll have to do an exact check followed by a range starting with decimal ip to infinity.
+  -- If the first result returned is "END" that means it falls in the range
+  next(redis.call("ZRANGEBYSCORE", "blocked_ranges", client_ip_to_decimal, client_ip_to_decimal, "LIMIT", 0, 1)) ~= nil
 then
   increment_timebucket_for("wafris:blocked:", current_timebucket, client_ip)
   return "Blocked"
 -- No Matches
 else
-  return "Not found"
+  return "Allowed"
 end

data/lib/wafris/version.rb

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

metadata

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