wafris 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 259b4944d7b5a3db3fc1b29575c871fae0519662db44c54b3558db9910f26d4a
-  data.tar.gz: 9a6ba2a54a94551c8aee3f0e14ba03cdf969048b250825126b0af88e867ced5b
+  metadata.gz: 031d8144c5556cf40a2325f2299edfadbe4e9f1528d8150df8d87548b47ace09
+  data.tar.gz: baa7327a7cd765ccd5ebe098490e108f1e04d4ca66a57c6c19eead5a9ba4ff84
 SHA512:
-  metadata.gz: 9915b54980a670e2c0888f290c9946a67abdbe884241aaeb087b0898710a0f36bb2c3be7ac9569e0c57881e29b07794dcc026cbf6bbf10965be26da14b3a04ba
-  data.tar.gz: 6c86c916bead230540c6bb2921c7427a1e07a89f09cc8365a02131514386b351b2fce30a6d8886ab984ca1528140f1fe0d40fa2b838ed86ab7d0060ae63aee0b
+  metadata.gz: 8ea901efba9cb37e0756ffdb94c2f35d18927b78874da49dbb5c52d1cd06a5f152ecfac867fcd5232ae823e3809e24e6c7f7f8f1174c233cd16bb9c56d93a20f
+  data.tar.gz: 2f38a25d6cd4a16be22bd422e47fbb8cda1d1553794daf7da2fa5190d70f3ef4a04f5e5a382b66c36741ada88562d9cdbed697821b97aaa2fa5d1646c61ea72e

data/lib/lua/dist/wafris_core.lua

@@ -1,7 +1,7 @@
 
 
 local USE_TIMESTAMPS_AS_REQUEST_IDS = false
-local EXPIRATION_IN_SECONDS = 86400
+local EXPIRATION_IN_SECONDS = tonumber(redis.call("HGET", "waf-settings", "expiration-time")) or 86400
 local EXPIRATION_OFFSET_IN_SECONDS = 3600
 
 
@@ -19,11 +19,11 @@ local function set_property_value_id_lookups(property_abbreviation, property_val
     property_id = redis.call("INCR", property_abbreviation .. "-id-counter")
     redis.call("SET", value_key, property_id)
     redis.call("SET", property_abbreviation .. "I" .. property_id, property_value)
-  else
-    redis.call("EXPIRE", value_key, EXPIRATION_IN_SECONDS + EXPIRATION_OFFSET_IN_SECONDS)
-    redis.call("EXPIRE", property_abbreviation .. "I" .. property_id, EXPIRATION_IN_SECONDS + EXPIRATION_OFFSET_IN_SECONDS)
   end
 
+  redis.call("EXPIRE", value_key, EXPIRATION_IN_SECONDS + EXPIRATION_OFFSET_IN_SECONDS)
+  redis.call("EXPIRE", property_abbreviation .. "I" .. property_id, EXPIRATION_IN_SECONDS + EXPIRATION_OFFSET_IN_SECONDS)
+
   return property_id
 end
 
@@ -153,6 +153,7 @@ local function check_blocks(request)
   local rule_categories = {
     { category = "bi", func = ip_in_hash, args = { "rules-blocked-i", request.ip } },
     { category = "bc", func = ip_in_cidr_range, args = { "rules-blocked-cidrs-set", request.ip_decimal_lexical } },
+    { category = "bs", func = ip_in_cidr_range, args = { "rules-blocked-cidrs-subscriptions-set", request.ip_decimal_lexical } },    
     { category = "bu", func = match_by_pattern, args = { "u", request.user_agent } },
     { category = "bp", func = match_by_pattern, args = { "p", request.path } },
     { category = "ba", func = match_by_pattern, args = { "a", request.parameters } },

data/lib/wafris/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Micahel Buckbee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-17 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool