antispam 0.1.7 → 0.2.3

data/lib/antispam/tools.rb

@@ -1,57 +1,59 @@
-module Antispam
-  module Tools
-    # Checks spam against an IP database of spammers.
-    # Usage: before_action :check_ip_against_database
-    def check_ip_against_database(options = {ip_blacklists: {default: ''}})
-      if (options[:methods])
-        return if request.get? unless options[:methods].include?(:get)
-        return if request.post? unless options[:methods].include?(:post)
-        return if request.put? unless options[:methods].include?(:put)
-        return if request.patch? unless options[:methods].include?(:patch)
-        return if request.delete? unless options[:methods].include?(:delete)
-      else
-        return if request.get?
-      end
-      return if skip_if_user_whitelisted
-      return if controller_name == "validate"
-      ip = request.remote_ip
-      # First, check IP blacklists.
-      if (options[:ip_blacklists])
-        if options[:ip_blacklists][:default]
-          options[:ip_blacklists][:httpbl] = options[:ip_blacklists][:default]
-          options[:ip_blacklists].delete(:default)
-        end
-        check_ip_against_blacklists(ip, options[:ip_blacklists], options[:verbose])
-      end
-      # Second, check for weird countries.
-      if (options[:scrutinize_countries_except])
-
-      end
-      Rails.logger.info "Completed IP database check. #{ip}" if options[:verbose]
-    end
-    # Checks the specific blacklists
-    def check_ip_against_blacklists(ip, lists, verbose)
-      lists.each do |provider_name, provider_api_key|
-        Rails.logger.info "Checking provider: #{provider_name}" if verbose
-        if provider_name == :httpbl
-          result = Antispam::Blacklists::Httpbl.check(ip, provider_api_key, verbose)
-          Rails.logger.info(result) if verbose
-          if (result > 30)
-            Block.create(ip: ip, provider: provider_name, threat: result)
-            redirect_to '/antispam/validate'
-          end
-        end
-      end
-    end
-
-    def skip_if_user_whitelisted
-      if respond_to? :current_user
-        if current_user && current_user.respond_to?(:antispam_whitelisted?)
-          return true if current_user.antispam_whitelisted?
-        end
-      end
-    end
-
-
-  end
-end
+module Antispam
+  module Tools
+    # Checks spam against an IP database of spammers.
+    # Usage: before_action :check_ip_against_database
+    def check_ip_against_database(options = {ip_blacklists: {default: ''}})
+      if (options[:methods])
+        return if request.get? unless options[:methods].include?(:get)
+        return if request.post? unless options[:methods].include?(:post)
+        return if request.put? unless options[:methods].include?(:put)
+        return if request.patch? unless options[:methods].include?(:patch)
+        return if request.delete? unless options[:methods].include?(:delete)
+      else
+        return if request.get?
+      end
+      return if skip_if_user_whitelisted
+      return if controller_name.in?["validate","challenges"]
+      ip = request.remote_ip
+      # First, check IP blacklists.
+      if (options[:ip_blacklists])
+        if options[:ip_blacklists][:default]
+          options[:ip_blacklists][:httpbl] = options[:ip_blacklists][:default]
+          options[:ip_blacklists].delete(:default)
+        end
+        check_ip_against_blacklists(ip, options[:ip_blacklists], options[:verbose])
+      end
+      # Second, check for weird countries.
+      if (options[:scrutinize_countries_except])
+
+      end
+      Rails.logger.info "Completed IP database check. #{ip}" if options[:verbose]
+    end
+    # Checks the specific blacklists
+    def check_ip_against_blacklists(ip, lists, verbose)
+      results = []
+      lists.each do |provider_name, provider_api_key|
+        Rails.logger.info "Checking provider: #{provider_name}" if verbose
+        results.append blacklist(provider_name).check(ip, provider_api_key, verbose)
+      end
+      result = Antispam::BlacklistResult.new(results)
+      if result.is_bad?
+        Block.create(ip: ip, provider: lists.keys.first, threat: result)
+        redirect_to '/antispam/validate'
+      end
+    end
+    def skip_if_user_whitelisted
+      if respond_to? :current_user
+        if current_user && current_user.respond_to?(:antispam_whitelisted?)
+          return true if current_user.antispam_whitelisted?
+        end
+      end
+    end
+    def blacklist(provider)
+      class_name = provider.to_s.camelize
+      raise Antispam::NoSuchBlacklistError unless Antispam::Blacklists.const_defined? class_name
+      Antispam::Blacklists.const_get class_name
+    end
+  end
+  class NoSuchBlacklistError < StandardError; end
+end

data/lib/antispam/version.rb

@@ -1,3 +1,3 @@
-module Antispam
-  VERSION = '0.1.7'
-end
+module Antispam
+  VERSION = '0.2.3'
+end

data/lib/antispam.rb

@@ -1,17 +1,21 @@
-require "antispam/version"
-require "antispam/engine"
-require "antispam/tools"
-require "antispam/checker"
-require "antispam/blacklists/httpbl"
-require "antispam/spamcheckers/defendium"
-require "antispam/results"
-
-module Antispam
-  ActiveSupport.on_load(:action_controller) do
-    # self refers to ActionController::Base here
-    # This way is removed because below may be more compatible.
-    # self.include Antispam::Tools
-    # Would the below be a better (clearer? more compatible?) way to do this?
-    ActionController::Base.send(:include, Antispam::Tools)
-  end
-end
+require "antispam/version"
+require "antispam/engine"
+require "antispam/tools"
+require "antispam/checker"
+require "antispam/blacklists/httpbl"
+require "antispam/spamcheckers/defendium"
+require "antispam/results"
+
+module Antispam
+  ActiveSupport.on_load(:action_controller) do
+    # Ensure ApplicationController has is_admin? defined
+    unless ApplicationController.method_defined?(:is_admin?)
+      raise "Antispam Error: ApplicationController must define `is_admin?` method to use Antispam."
+    end
+    # self refers to ActionController::Base here
+    # This way is removed because below may be more compatible.
+    # self.include Antispam::Tools
+    # Would the below be a better (clearer? more compatible?) way to do this?
+    ActionController::Base.send(:include, Antispam::Tools)
+  end
+end

data/lib/tasks/antispam_tasks.rake

@@ -1,4 +1,4 @@
-# desc "Explaining what the task does"
-# task :antispam do
-#   # Task goes here
-# end
+# desc "Explaining what the task does"
+# task :antispam do
+#   # Task goes here
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antispam
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.3
 platform: ruby
 authors:
 - Ryan Kopf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -131,7 +131,7 @@ metadata:
   homepage_uri: https://ryankopf.com
   source_code_uri: https://github.com/ryankopf/antispam
   changelog_uri: https://github.com/ryankopf/antispam/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
-signing_key: 
+rubygems_version: 3.5.20
+signing_key:
 specification_version: 4
 summary: A spam prevention gem.
 test_files: []