wafris 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05707fe625f71f24a02f26585d89356156b1dc83887195f1042a47856d3c86cf
-  data.tar.gz: 05e798e3298518a0310f1cdf6a68426b2b12f9c066acc74e78833987e26f2e31
+  metadata.gz: b9ad06b7e5b23c313860cbdd76ee405cda36958112889cc591b3733270e31312
+  data.tar.gz: 98239b5926e3d57f732c37638ec4166ffb170d1f1f79cc1c36779f803f0c07e4
 SHA512:
-  metadata.gz: b41d4ee2190f5a88e263ef6905ffe43e6727923df4f3f1a600f203d10ea2010409e95c02c965cc2161fce47d5d541aaa1217beeb05097134fcaecdcfcd4305f1
-  data.tar.gz: dd940d846b7892a4607c78767f2ca364c62ab33782deb76b863d8b393f1a5c82134f0b3f6c76a438f9993e7d7702df67899d9e6485bc5491e03fcc3e02a38c1e
+  metadata.gz: 1db5393514faa4b605923e039d7270f9eaddcc4d62e5b6f8897372a7b7c4c3a297e8d0900bf18acb53ebf2bb32b43c8ddf6c2ae0a2b1eca67df4ba547446d4b6
+  data.tar.gz: fcb42f4ba9a8d1a07f55ebdda5e76dd3e9651675b96f3d7a5ae7024978ac4e81bf35ae9d8fc1c71a67fc10f2f79e0baa8b781bf3a36eeac202fb44b7c386f040

data/lib/wafris/configuration.rb

@@ -36,14 +36,6 @@ module Wafris
       read_lua_dist("wafris_core")
     end
 
-    def graph_sha
-      @graph_sha ||= redis.script(:load, wafris_graph)
-    end
-
-    def wafris_graph
-      read_lua_dist("get_graph_data")
-    end
-
     private
 
     def read_lua_dist(filename)

data/lib/wafris/version.rb

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

data/lib/wafris.rb

@@ -48,61 +48,5 @@ module Wafris
         end
       end
     end
-
-    def add_block(ip)
-      configuration.connection_pool.with do |conn|
-        conn.zadd(
-          'blocked_ranges',
-          IPAddr.new(ip).to_i,
-          ip
-        )
-      end
-    end
-
-    def remove_block(ip)
-      configuration.connection_pool.with do |conn|
-        conn.zrem(
-          'blocked_ranges',
-          ip
-        )
-      end
-    end
-
-    def request_buckets(_now)
-      graph_data = []
-      configuration.connection_pool.with do |conn|
-        time = Time.now.to_f * 1000
-        graph_data = conn.evalsha(
-          configuration.graph_sha,
-          argv: [
-            time.to_i
-          ]
-        )
-      end
-
-      return graph_data
-    end
-
-    def ips_with_num_requests
-      configuration.connection_pool.with do |conn|
-        return conn.zunion(
-          *leader_timebuckets,
-          0, -1, with_scores: true
-        )
-      end
-    end
-
-    private
-
-    def leader_timebuckets
-      timebuckets = []
-
-      time = Time.now.utc
-      24.times do |hours|
-        timebuckets << "ip-leader-sset:#{(time - 60 * 60 * hours).strftime("%Y-%m-%d-%H")}"
-      end
-
-      return timebuckets
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Micahel Buckbee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -185,7 +185,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/lua/dist/get_graph_data.lua
 - lib/lua/dist/wafris_core.lua
 - lib/lua/src/get_time_buckets.lua
 - lib/lua/src/queries.lua

data/lib/lua/dist/get_graph_data.lua

@@ -1,81 +0,0 @@
--- Compiled from:
--- src/get_time_buckets.lua
-
--- Code was pulled from https://otland.net/threads/how-convert-timestamp-to-date-type.251657/
--- An alternate solution is https://gist.github.com/markuman/e96d04139cd8acc33604
-local function get_time_bucket_from_timestamp(unix_time_milliseconds)
-  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
-
-  local function get_year_and_day_number(year, days)
-    while days >= calculate_years_number_of_days(year) do
-      days = days - calculate_years_number_of_days(year)
-      year = year + 1
-    end
-    return year, days
-  end
-
-  local function get_month_and_month_day(days, year)
-    local days_in_each_month = {
-      31,
-      (calculate_years_number_of_days(year) == 366 and 29 or 28),
-      31,
-      30,
-      31,
-      30,
-      31,
-      31,
-      30,
-      31,
-      30,
-      31,
-    }
-
-    for month = 1, #days_in_each_month do
-      if days - days_in_each_month[month] <= 0 then
-        return month, days
-      end
-      days = days - days_in_each_month[month]
-    end
-  end
-
-  local unix_time = unix_time_milliseconds / 1000
-  local year = 1970
-  local days = math.ceil(unix_time / 86400)
-  local month = nil
-
-  year, days = get_year_and_day_number(year, days)
-  month, days = get_month_and_month_day(days, year)
-  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)
-end
-
-local function get_time_buckets(unix_time_milliseconds)
-  local time_buckets = {}
-
-  for i = 23, 0, -1 do
-    table.insert(time_buckets, get_time_bucket_from_timestamp(unix_time_milliseconds - (1000 * 60 * 60 * i)))
-  end
-  return time_buckets
-end
-
-local function num_requests(time_bucket)
-  local request_keys = redis.call("KEYS", "unique-requests:" .. time_bucket)
-  redis.call("PFMERGE", "merged_unique-requests", unpack(request_keys))
-  return redis.call("PFCOUNT", "merged_unique-requests")
-end
-
-local graph_data = {}
-local unix_time_milliseconds = ARGV[1]
-local time_buckets = get_time_buckets(unix_time_milliseconds)
--- use the get_time_buckets method to get each time bucket and
--- the associated count for that bucket
-for bucket in pairs(time_buckets) do
-  table.insert(graph_data, time_buckets[bucket])
-  table.insert(graph_data, num_requests(time_buckets[bucket]))
-end
-
-return graph_data