paraxial 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b27974dfe877ee32f7c49718c18916c39c6d13dff2b1fd0087b8da359207713
-  data.tar.gz: d93d8ab5654d522f8093f998afa5f65fc77c7abc363bd89c377dccca8b140bb3
+  metadata.gz: b51eef23aae22276c25b2f576f35d4a66fd2c0e286cd5d8b8c5ba86172bb9167
+  data.tar.gz: d1c5152de188f489b296ba377d0358fc8265bb5ba7d0cefb2b0975dfce2897fe
 SHA512:
-  metadata.gz: 0e0e45aece62762e91542544721c3ff73ee9c0de01ee0215793ae2f4120cd9b21de34a392c0ab805805720e7955befb8a99d9a6ffa9a57571d95c73d5ebed34c
-  data.tar.gz: 242039eabbd12a31d0c5e48f0c7b63a18b559ec5f49d867ff7dabcd6fe81398ba8fb8e47f08cb6c1c43f3beecd94e71e62eff014acc83afb2ae718ce1864b2b3
+  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/initializers/startup.rb

@@ -7,7 +7,7 @@ require_relative '../free_tier'
 
 Bundler.setup
 
-unless Rails.env.test? || File.basename($0) == 'rake' || defined?(Rails::Generators)
+unless Rails.env.test? || File.basename($0) == 'rake' || Paraxial.do_not_start?
   Rails.application.config.to_prepare do
     puts "[Paraxial] v#{Paraxial::VERSION} Agent starting..."
     api_key = Paraxial::Helpers.get_api_key

data/lib/paraxial/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Paraxial
-  VERSION = '1.3.0'
+  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
@@ -176,7 +166,7 @@ module Paraxial
 
   def self.check_exploit_guard
     if configuration.nil?
-      puts "[Paraxial] Exploit Guard, no configuration exists, will not run"
+      # puts "[Paraxial] Exploit Guard, no configuration exists, will not run"
       return
     end
 
@@ -199,4 +189,21 @@ module Paraxial
       @exploit_guard = nil
     end
   end
+
+  def self.do_not_start?
+    defined?(Rails::Command::CredentialsCommand) ||
+      defined?(Rails::Command::Db::System::ChangeCommand) ||
+      defined?(Rails::Command::DbConsoleCommand) ||
+      defined?(Rails::Command::DestroyCommand) ||
+      defined?(Rails::Command::DevCommand) ||
+      defined?(Rails::Command::EncryptedCommand) ||
+      defined?(Rails::Command::GenerateCommand) ||
+      defined?(Rails::Command::InitializersCommand) ||
+      defined?(Rails::Command::NotesCommand) ||
+      defined?(Rails::Command::RoutesCommand) ||
+      defined?(Rails::Command::RunnerCommand) ||
+      defined?(Rails::Command::SecretsCommand) ||
+      defined?(Rails::Command::AboutCommand) ||
+      defined?(Rails::Command::DbconsoleCommand)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paraxial
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Michael Lubas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Paraxial.io Ruby Agent