wafris 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cbb8c27a7af9771ecf6c07a34fd7da75f4ebacf4fd21dba0b37551a8b2ca2cd
-  data.tar.gz: 492a0f193e4c976a612106b5a0bb8c25aa008f170ec8111fa9504bd1cf585faf
+  metadata.gz: 8a2722b928a9589d9a25292b4116200e428fabfbbc7fa7d15e2eaada1a42927a
+  data.tar.gz: c3b941f3ed47136b92731e62df8dbb9d47c29d0817bf85e5b974bcd7b01c9ca8
 SHA512:
-  metadata.gz: b50f3ad94a373c55285d5e800e55a483f7311a45d18c80d42464931f265edae1bc36a39f97ecf803a99065e5f12b106cc1739cd3716b3219f3a1a60f31b1a6c5
-  data.tar.gz: d23d85b065a338c454216d37755ec6d112d4392f9415e7e13df30c4610c96ab58a15a046211332a273cee3da12bdeae2fc3c4f09722239e5cd3b414fa09d4351
+  metadata.gz: 8e52e73b5d385e3a81ee4f5845f50dc00cd52683b595db3e5cb4f47ca7e573d49343525b8c2d6de423f9f189752b82f47acb71240d298b509f1da9b72023313e
+  data.tar.gz: b8cb1ccb52d9edc06756f78b277ff4ca2c2c39c94bea68e1e913b74dd620cf8033342759b232cfa086e6cf55f683729258cbb44488eca08f4d821ee751ab1929

data/lib/lua/dist/wafris_core.lua

@@ -1,3 +1,6 @@
+local version = "v0.8:"
+local wafris_prefix = "w:" .. version
+
 local function get_time_bucket_from_timestamp(unix_time_milliseconds, minutes_flag)
   local function calculate_years_number_of_days(yr)
     return (yr % 4 == 0 and (yr % 100 ~= 0 or yr % 400 == 0)) and 366 or 365
@@ -46,10 +49,10 @@ local function get_time_bucket_from_timestamp(unix_time_milliseconds, minutes_fl
   -- local minutes, seconds = math.floor(unix_time / 60 % 60), math.floor(unix_time % 60)
   -- hours = hours > 12 and hours - 12 or hours == 0 and 12 or hours
   if minutes_flag == false then
-    return string.format("%04d-%02d-%02d-%02d", year, month, days, hours)
+    return string.format("%04d%02d%02d%02d", year, month, days, hours)
   elseif minutes_flag == true then
     local minutes = math.floor(unix_time / 60 % 60)
-    return string.format("%04d-%02d-%02d-%02d-%02d", year, month, days, hours, minutes)
+    return string.format("%04d%02d%02d%02d%02d", year, month, days, hours, minutes)
   end
 end
 
@@ -60,25 +63,29 @@ local function get_request_id(timestamp, ip, max_requests)
   return request_id
 end
 
-local function add_to_HLL_request_count(timebucket, request_id)
-  redis.call("PFADD", "unique-requests:" .. timebucket, request_id)
+local function add_to_graph_timebucket(timebucket, request_id)
+  local key = wafris_prefix .. "gr-ct:"
+  redis.call("PFADD", key .. timebucket, request_id)
+  -- Expire the key after 25 hours if it has no expiry
+  redis.call("EXPIRE", key, 90000)
 end
 
 -- For: Leaderboard of IPs with Request count as score
 local function increment_timebucket_for(type, timebucket, property)
-  -- TODO: breaking change will to switch to client_ip: prefix
-  type = type or "ip-"
-  redis.call("ZINCRBY", type .. "leader-sset:" .. timebucket, 1, property)
+  local key = wafris_prefix .. type .. "lb:" .. timebucket
+  redis.call("ZINCRBY", key, 1, property)
+  -- Expire the key after 25 hours if it has no expiry
+  redis.call("EXPIRE", key, 90000)
 end
 
-local function increment_hourly_request_counters(unix_time_milliseconds)
+local function increment_partial_hourly_request_counters(unix_time_milliseconds)
   for i = 1, 60 do
     local timebucket_in_milliseconds = unix_time_milliseconds + 60000 * (i - 1)
     local timebucket = get_time_bucket_from_timestamp(timebucket_in_milliseconds, true)
-    local key = "w:v0:hr-ct:" .. timebucket
+    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, "NX")
+    redis.call("EXPIRE", key, 3660)
   end
 end
 
@@ -99,16 +106,15 @@ local request_id = get_request_id(nil, client_ip, max_requests)
 local current_timebucket = get_time_bucket_from_timestamp(unix_time_milliseconds, false)
 
 -- CARD DATA COLLECTION
-increment_hourly_request_counters(unix_time_milliseconds)
+increment_partial_hourly_request_counters(unix_time_milliseconds)
 
 -- GRAPH DATA COLLECTION
-add_to_HLL_request_count(current_timebucket, request_id)
+add_to_graph_timebucket(current_timebucket, request_id)
 
 -- LEADERBOARD DATA COLLECTION
--- TODO: breaking change will to switch to client_ip: prefix
-increment_timebucket_for(nil, current_timebucket, client_ip)
-increment_timebucket_for("user_agent:", current_timebucket, user_agent)
-increment_timebucket_for("request_path:", current_timebucket, request_path)
+increment_timebucket_for("ip:", current_timebucket, client_ip)
+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)

data/lib/wafris/configuration.rb

@@ -6,11 +6,20 @@ module Wafris
     attr_accessor :redis_pool_size
 
     def initialize
-      @redis = Redis.new(
-        url: ENV['REDIS_URL'],
-        ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }
-      )
+      @redis = set_redis
       @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
@@ -31,6 +40,15 @@ module Wafris
       CONNECTION_ERROR
     end
 
+    def set_version
+      version_line = File.open(
+        file_path("wafris_core"),
+        &:readline
+      )
+      version = version_line.slice(/v\d.\d/)
+      redis.set('version', version)
+    end
+
     def core_sha
       @core_sha ||= redis.script(:load, wafris_core)
     end
@@ -43,10 +61,14 @@ module Wafris
 
     def read_lua_dist(filename)
       File.read(
-        File.join(
-          File.dirname(__FILE__),
-          "../lua/dist/#{filename}.lua"
-        )
+        file_path(filename)
+      )
+    end
+
+    def file_path(filename)
+      File.join(
+        File.dirname(__FILE__),
+        "../lua/dist/#{filename}.lua"
       )
     end
   end

data/lib/wafris/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Micahel Buckbee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool