wafris 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 283b178e632194aa6ff2e0aaaa5e3eca428cacb17a6383a8aa3b57d005c5a316
-  data.tar.gz: 9ce784b1e57629d072ccc9da4c9e8ec81916dbdcf03c3138e004777e498db4d4
+  metadata.gz: bc80b768ee486f172f3eb2d617fde7622bff15fca6078819e89ddbae2b112f97
+  data.tar.gz: 6a2528038d9ca8d278ce2a599051e74803635626ee35a67f224bc531d9fa1d7d
 SHA512:
-  metadata.gz: 32df667c3fa70c28fb2ea9b298c05ca2542f38d2c6ecee45208e1de6df518c33e6252cce179f2d9a65759fd60093c06909b3aef65068f926405daa07722d6ee8
-  data.tar.gz: 46722bd780d683360be5382f7b9729067cc1624e12d602caba624629ebb9b88e7e454e23e3231aef98a63087d2824fded586088cbf0d5a6ceff4203fbe0c0385
+  metadata.gz: a0401a246649e42b5b2f801dae3ae5b362aca9d42446c45e93f3aa8e1c32e23c63b0e065cc8ae6e5f9131be420090d80d72fa5f1d0e85e9cdb9073036657db3b
+  data.tar.gz: 2bf8cf0a8b1a0d13e0aef0c8bd08d869c619b3655b68a4de6a631b60f620212d171be294c9edfcb500bdfb1a856dc3e1fe578815e8d2b0ba6aa1ab9a57fb6324

data/lib/lua/dist/wafris_core.lua

@@ -1,4 +1,7 @@
-local function get_time_bucket_from_timestamp(unix_time_milliseconds)
+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
   end
@@ -45,7 +48,12 @@ local function get_time_bucket_from_timestamp(unix_time_milliseconds)
   local hours = math.floor(unix_time / 3600 % 24)
   -- 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
-  return string.format("%04d-%02d-%02d-%02d", year, month, days, hours)
+  if minutes_flag == false then
+    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)
+  end
 end
 
 -- For: Relationship of IP to time of Request (Stream)
@@ -55,15 +63,30 @@ 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, "NX")
 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, "NX")
+end
+
+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 = 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")
+  end
 end
 
 -- Configuration
@@ -80,16 +103,18 @@ local host = ARGV[6]
 
 -- Initialize local variables
 local request_id = get_request_id(nil, client_ip, max_requests)
-local current_timebucket = get_time_bucket_from_timestamp(unix_time_milliseconds)
+local current_timebucket = get_time_bucket_from_timestamp(unix_time_milliseconds, false)
+
+-- CARD DATA COLLECTION
+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

@@ -11,6 +11,7 @@ module Wafris
         ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }
       )
       @redis_pool_size = 20
+      set_version
     end
 
     def connection_pool
@@ -31,6 +32,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 +53,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.6.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 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