wafris 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a2722b928a9589d9a25292b4116200e428fabfbbc7fa7d15e2eaada1a42927a
-  data.tar.gz: c3b941f3ed47136b92731e62df8dbb9d47c29d0817bf85e5b974bcd7b01c9ca8
+  metadata.gz: db4ac55c07f22ff09c83a0d4a1056eb9bbdd14f28c9704978ac8faef7ba438b9
+  data.tar.gz: 8d114c0ca77681e7c9bd20b39a565973a968031980b28fed9964bd0c78213eb1
 SHA512:
-  metadata.gz: 8e52e73b5d385e3a81ee4f5845f50dc00cd52683b595db3e5cb4f47ca7e573d49343525b8c2d6de423f9f189752b82f47acb71240d298b509f1da9b72023313e
-  data.tar.gz: b8cb1ccb52d9edc06756f78b277ff4ca2c2c39c94bea68e1e913b74dd620cf8033342759b232cfa086e6cf55f683729258cbb44488eca08f4d821ee751ab1929
+  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/configuration.rb

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

data/lib/wafris/version.rb

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

data/lib/wafris.rb

@@ -13,6 +13,7 @@ module Wafris
   class << self
     def configure
       yield configuration
+      configuration.set_version
     end
 
     def configuration

metadata

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