paraxial 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baa2ee1790a37ff9ba35dabce992774e0a7d1090e6b5ffd9fb24fcc3eefd037c
-  data.tar.gz: 8d454295bf64117f57e9df2c90a3cb6e888b291f0d40d101b3b264c02cbc7b8e
+  metadata.gz: b51eef23aae22276c25b2f576f35d4a66fd2c0e286cd5d8b8c5ba86172bb9167
+  data.tar.gz: d1c5152de188f489b296ba377d0358fc8265bb5ba7d0cefb2b0975dfce2897fe
 SHA512:
-  metadata.gz: 8406bf6da59a65c52c31b5dd2fa7c967924a4f6de9a6a6b1695877a01643ebc8e08d79e7f6cf53f5a95bf5af495dac550fdefbf6d28f98957afb8b1a34c46cac
-  data.tar.gz: f5327f15ba804a0a50fa3575fee33dd6db99cb99c0e1ab58aa22cd5248e9d169d3fe5c8c66e991d5dec18ca66640b1697e7ef86622381fbe0201a6c672aa862b
+  metadata.gz: f9720fcb74a4146551ff9a1c51d5d28bcb45e82d01ce0d6f28ee34f3923fc2c5c05b3a18548e34d92ba5aed8976541eccfc0c73be562404f3e0f7cd3a469b2d7
+  data.tar.gz: 1cf80129ca6b2ed6c1e2dbe422af2ea150bc4f245f45cb89e5eec2fe07a002ccedc3816f7e8a4a02ea4a46386d5ff61508517a3e85b3af1b6ec71ee5fe5e0f79

data/lib/paraxial/checker.rb

@@ -130,7 +130,11 @@ module Paraxial
     end
 
     def self.ban_ip_msg(ip, length, msg)
-      if allow_ip?(ip) == true
+      if whitelist_ip?(ip)
+        :on_whitelist
+      elsif blacklist_ip?(ip)
+        :already_banned
+      else
         local_ban(ip)
 
         uri = URI.parse(Paraxial::Helpers.get_ruby_ban_url)
@@ -147,8 +151,6 @@ module Paraxial
         else
           :error
         end
-      else
-        :already_banned
       end
     end
 
@@ -166,19 +168,6 @@ module Paraxial
       end
     end
 
-    def self.ban_ip(ip)
-      local_ban(ip)
-      uri = URI.parse(Paraxial::Helpers.get_ban_url)
-
-      body = { api_key: Paraxial::Helpers.get_api_key, ip_address: ip }
-      r = Net::HTTP.post(uri, body.to_json, @headers)
-      if r.code == '200'
-        :ok
-      else
-        :error
-      end
-    end
-
     def self.local_ban(ip)
       if ip.include?('.')
         # IPv4
@@ -193,21 +182,19 @@ module Paraxial
       end
     end
 
-    def self.allow_ip?(ip)
+    def self.whitelist_ip?(ip)
       if ip.include?('.')
-        if !@allows['v4'].search_best(ip).nil? # v4 on allow list
-          true
-        elsif !@bans['v4'].search_best(ip).nil? # v4 on ban list
-          false
-        else # v4 on no list
-          true
-        end
-      elsif !@allows['v6'].search_best(ip).nil? # v6 on allow list
-        true
-      elsif !@bans['v6'].search_best(ip).nil? # v6 on ban list
-        false
-      else # v6 on no list
-        true
+        !@allows['v4'].search_best(ip).nil? # v4 on allow list
+      else
+        !@allows['v6'].search_best(ip).nil? # v6 on allow list
+      end
+    end
+
+    def self.blacklist_ip?(ip)
+      if ip.include?('.')
+        !@bans['v4'].search_best(ip).nil? # v4 on allow list
+      else
+        !@bans['v6'].search_best(ip).nil? # v6 on allow list
       end
     end
   end

data/lib/paraxial/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Paraxial
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/lib/paraxial.rb

@@ -98,14 +98,16 @@ module Paraxial
   def self.req_allowed?(request)
     return if Paraxial::Helpers.get_api_key.nil?
 
-    if request.env['paraxial.deny'] == true
-      false
-    elsif Paraxial::Checker.allow_ip?(request.remote_ip) == true
+    if Paraxial::Checker.whitelist_ip?(request.remote_ip)
       request.env['paraxial.deny'] = false
       true
-    else
+    elsif Paraxial::Checker.blacklist_ip?(request.remote_ip)
       request.env['paraxial.deny'] = true
       false
+    elsif request.env['paraxial.deny']
+      false
+    else
+      true
     end
   end
 
@@ -129,12 +131,6 @@ module Paraxial
     end
   end
 
-  def self.ban_ip(ip)
-    return if Paraxial::Helpers.get_api_key.nil?
-
-    Paraxial::Checker.ban_ip(ip)
-  end
-
   def self.ban_ip_msg(ip, length, msg)
     return if Paraxial::Helpers.get_api_key.nil?
 
@@ -147,12 +143,6 @@ module Paraxial
     Paraxial::Checker.honeypot_ban(ip, length)
   end
 
-  def self.allow_ip?(ip)
-    return if Paraxial::Helpers.get_api_key.nil?
-
-    Paraxial::Checker.allow_ip?(ip)
-  end
-
   def self.trim_dep(input)
     if input.nil?
       nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paraxial
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Michael Lubas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec