wafris 0.8.2 → 0.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/lua/dist/wafris_core.lua +8 -7
- data/lib/wafris/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: db4ac55c07f22ff09c83a0d4a1056eb9bbdd14f28c9704978ac8faef7ba438b9
|
|
4
|
+
data.tar.gz: 8d114c0ca77681e7c9bd20b39a565973a968031980b28fed9964bd0c78213eb1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0b5f0d3e83fa9d33874aa21170aa89a0126745cd3f9de4e4a6c2b299c86d519763601a97e4b76fd2675d69cd0fa5529cb5582a741591e5f7d2c57f5ad0fb4743
|
|
7
|
+
data.tar.gz: ecebfb0bb9f7e5b835ddd696af75a35189cd8cc94a0fffb85c3804e309177a068e65049c3ae7245353ee05e87c0e1eb1b5b30eb108b1bed4c173cceed0127acb
|
|
@@ -84,8 +84,8 @@ local function increment_partial_hourly_request_counters(unix_time_milliseconds)
|
|
|
84
84
|
local timebucket = get_time_bucket_from_timestamp(timebucket_in_milliseconds, true)
|
|
85
85
|
local key = wafris_prefix .. "hr-ct:" .. timebucket
|
|
86
86
|
redis.call("INCR", key)
|
|
87
|
-
-- Expire the key after
|
|
88
|
-
redis.call("EXPIRE", key,
|
|
87
|
+
-- Expire the key after 121 minutes if it has no expiry
|
|
88
|
+
redis.call("EXPIRE", key, 7260)
|
|
89
89
|
end
|
|
90
90
|
end
|
|
91
91
|
|
|
@@ -117,17 +117,18 @@ increment_timebucket_for("ua:", current_timebucket, user_agent)
|
|
|
117
117
|
increment_timebucket_for("path:", current_timebucket, request_path)
|
|
118
118
|
increment_timebucket_for("host:", current_timebucket, host)
|
|
119
119
|
|
|
120
|
-
redis.call("ZRANGEBYSCORE", "blocked_ranges", client_ip_to_decimal, client_ip_to_decimal, "LIMIT", 0, 1)
|
|
121
|
-
|
|
122
120
|
-- BLOCKING LOGIC
|
|
123
121
|
-- TODO: ZRANGEBYSCORE is deprecated in Redis 6.2+. Replace with ZRANGE
|
|
124
122
|
if
|
|
125
|
-
-- ZRANGEBYSCORE will always return a lua table, even if empty
|
|
126
123
|
-- TODO: When we introduce ranges we'll have to do an exact check followed by a range starting with decimal ip to infinity.
|
|
127
124
|
-- If the first result returned is "END" that means it falls in the range
|
|
128
|
-
|
|
125
|
+
|
|
126
|
+
-- ZRANGEBYSCORE will always return a lua table, even if empty
|
|
127
|
+
-- This call is checking if the table is empty
|
|
128
|
+
next(redis.call("ZRANGEBYSCORE", "w:blocked-ranges", client_ip_to_decimal, client_ip_to_decimal, "LIMIT", 0, 1))
|
|
129
|
+
~= nil
|
|
129
130
|
then
|
|
130
|
-
increment_timebucket_for("
|
|
131
|
+
increment_timebucket_for("blk:", current_timebucket, client_ip)
|
|
131
132
|
return "Blocked"
|
|
132
133
|
-- No Matches
|
|
133
134
|
else
|
data/lib/wafris/version.rb
CHANGED