wafris 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4648b968fb97b4c210848c124e505d4fd352f4d5c4342aff63aa972f82967db0
-  data.tar.gz: 7a13b0c631ba0dd8b7730c08743ca038e45da6bf2aee84e16c85ea4e87c57c73
+  metadata.gz: db4ac55c07f22ff09c83a0d4a1056eb9bbdd14f28c9704978ac8faef7ba438b9
+  data.tar.gz: 8d114c0ca77681e7c9bd20b39a565973a968031980b28fed9964bd0c78213eb1
 SHA512:
-  metadata.gz: 6e6fba1bd54b344308e61629d1763d503c501d55304c84725ae55743410691ea7d92a6542cca96df26415126a3d6993bca062b5c88b315d33dff748e5182ad73
-  data.tar.gz: fe7c14c52b91ad41c8c8f2d92d7f6ddfe2c1285880e34c18904140f0cd9ffe41ee0de677bd84f39af198c97a4a6735bdc39bf255078a1e436551be74f27b75e5
+  metadata.gz: 0b5f0d3e83fa9d33874aa21170aa89a0126745cd3f9de4e4a6c2b299c86d519763601a97e4b76fd2675d69cd0fa5529cb5582a741591e5f7d2c57f5ad0fb4743
+  data.tar.gz: ecebfb0bb9f7e5b835ddd696af75a35189cd8cc94a0fffb85c3804e309177a068e65049c3ae7245353ee05e87c0e1eb1b5b30eb108b1bed4c173cceed0127acb

data/lib/lua/dist/wafris_core.lua

@@ -84,8 +84,8 @@ local function increment_partial_hourly_request_counters(unix_time_milliseconds)
     local timebucket = get_time_bucket_from_timestamp(timebucket_in_milliseconds, true)
     local key = wafris_prefix .. "hr-ct:" .. timebucket
     redis.call("INCR", key)
-    -- Expire the key after 61 minutes if it has no expiry
-    redis.call("EXPIRE", key, 3660)
+    -- Expire the key after 121 minutes if it has no expiry
+    redis.call("EXPIRE", key, 7260)
   end
 end
 
@@ -117,17 +117,18 @@ increment_timebucket_for("ua:", current_timebucket, user_agent)
 increment_timebucket_for("path:", current_timebucket, request_path)
 increment_timebucket_for("host:", current_timebucket, host)
 
-redis.call("ZRANGEBYSCORE", "blocked_ranges", client_ip_to_decimal, client_ip_to_decimal, "LIMIT", 0, 1)
-
 -- BLOCKING LOGIC
 -- TODO: ZRANGEBYSCORE is deprecated in Redis 6.2+. Replace with ZRANGE
 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
+
+  -- ZRANGEBYSCORE will always return a lua table, even if empty
+  -- This call is checking if the table is empty
+  next(redis.call("ZRANGEBYSCORE", "w:blocked-ranges", client_ip_to_decimal, client_ip_to_decimal, "LIMIT", 0, 1))
+  ~= nil
 then
-  increment_timebucket_for("wafris:blocked:", current_timebucket, client_ip)
+  increment_timebucket_for("blk:", current_timebucket, client_ip)
   return "Blocked"
 -- No Matches
 else

data/lib/wafris/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Micahel Buckbee