antispam 0.2.10 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9976b110e83413c117ba4e2aadebe3ee782a2e22075b4d005b8ee23f859b6c
-  data.tar.gz: b103e465db532012980a7a37e01d0b337a11bf58c5182e6951471ee2a344c427
+  metadata.gz: b07aedf9f86eeb54b11c0eaa26f5a5dfb46c8b2dffa1dd98458e1762f740a57e
+  data.tar.gz: de4475c090684b4b20b0083debbeb39e21a3af2061477b7bb2a962d3497cbb8b
 SHA512:
-  metadata.gz: c74852eabd842ab4d54b5dc99cc99224ee40c930d4a1e047a77506c3cc4a6a04bb445c0a92d3946dbdbf81116c1f9334046e4631574af9001b4b13bfee8eebaf
-  data.tar.gz: 34c5bd57b1db3f574f16a7b467a9e16fb3eb01271a172491eca71d6362f454f8df42cd4c468bfa7059e72466904fbe778f5e26aa7748f29c45bf53820ffb72bf
+  metadata.gz: b19aeb03a252ccd582a39d4e9a0c2364f66613b2361c65b2626570856ee44c5a65bfcf33fee5f18e6f3d607ba2768a418012c86eec91425f6086d99e3c4cfe6e
+  data.tar.gz: b2b886dcbdb0c2a9587c57a8491e86d872c76713dfb545b3a9cefb72f21384e666aec95241674cadc18307242bdd7ed8a66bf8b1272e550f893809133187cb0d

data/MIT-LICENSE

@@ -18,3 +18,8 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+IP DATABASE LICENSE
+
+The ip database is from db-ip .com, and is not subject to this license, but
+is CC 4.0 Attribution. https://creativecommons.org/licenses/by/4.0/

data/README.md

@@ -84,28 +84,29 @@ gem 'antispam'
 ```
 
 And then execute:
-```bash
-$ bundle
-```
 
-Or install it yourself as:
 ```bash
 $ gem install antispam
 $ rails antispam:install:migrations
+$ rails antispam:install
 $ rails db:migrate SCOPE=antispam
 ```
+
 The gem depends on image_processing, which depends on vips. We are using vips to
 generate captcha images.
+
 ```
 sudo apt install libvips-tools
 ```
 
-You need to add this to your routes.rb
+To be able to view recent spam-blocking activity, you need to add antispam to your routes.rb
+
 ```
   mount Antispam::Engine => "/antispam"
 ```
 
-Then add to your application controller:
+Then add the following to your application controller:
+
 ```
 before_action do
   check_ip_against_database(ip_blacklists: {default: 'your_api_key_here'}, verbose: true)

data/app/controllers/antispam/signups_controller.rb

@@ -0,0 +1,10 @@
+require_dependency "antispam/application_controller"
+
+module Antispam
+  class SignupsController < ApplicationController
+    before_action :must_be_admin
+    def index
+      @signups = Signup.order(created_at: :desc).limit(100).offset(params[:page].to_i * 100)
+    end
+  end
+end

data/app/models/antispam/iplocator.rb

@@ -0,0 +1,40 @@
+module Antispam
+  class Iplocator < ApplicationRecord
+
+    def self.get_country(ip_integer)
+      ip = Iplocator.find_by("? > ip_from AND ? < ip_to",ip_integer,ip_integer)
+      return nil if ip.nil?
+      ip.country_code
+    end
+
+    def self.import
+      require 'csv'
+      file_path = File.expand_path('../../../../ip-to-country.csv', __FILE__)
+      csv_data = CSV.read(file_path, headers: false)
+      csv_data.each do |row|
+        begin
+          Iplocator.create(
+            ip_from: IPAddr.new(row[0]).to_i,
+            ip_to: IPAddr.new(row[1]).to_i,
+            country_code: row[2]
+          )
+        rescue
+          puts "Error importing row: #{row.inspect}"
+        end
+      end
+      puts "Imported #{csv_data.length} rows."
+    end
+
+    def self.ip_to_string(ip)
+      ip.split(".").map{|x|x.to_i.to_s(16)}.join("_")
+    end
+
+    def self.countries_suspected_of_spam
+      %w[CN IN RU BR ID PH TH VN SG NG UA PK BD EG TR ZA MX MA KE]
+    end
+    def self.trusted_countries
+      %w[US DE GB CA AU JP FR NL]
+    end
+  end
+
+end

data/app/models/antispam/signup.rb

@@ -0,0 +1,27 @@
+module Antispam
+  class Signup < ApplicationRecord
+    def self.analyze(user_id:, ip:)
+      ip_integer = IPAddr.new(ip).to_i rescue 0
+      signup = Signup.where(user_id: user_id).first_or_initialize
+      signup.ip = ip
+      signup.country_code = Iplocator.get_country(ip_integer)
+      signup.number_from_this_ip = Signup.where(ip: ip).count
+      signup.save
+      signup.safe?
+    end
+    def spamscore
+      spamscore = 50 # Start at a neutral score
+      spamscore += 10 if self.country_code.nil? || (self.country_code == 'ZZ')
+      spamscore += 10 if self.number_from_this_ip > 5
+      spamscore += 10 if self.number_from_this_ip > 10
+      spamscore += 10 if Iplocator.countries_suspected_of_spam.include?(self.country_code)
+      spamscore -= 10 if self.number_from_this_ip < 2
+      spamscore -= 10 if Iplocator.trusted_countries.include?(self.country_code)
+      spamscore = [[spamscore, 0].max, 100].min # Clamp to a value between 0 and 100
+      spamscore
+    end
+    def safe?
+      self.spamscore <= 50
+    end
+  end
+end

data/app/views/antispam/signups/index.html.erb

@@ -0,0 +1,31 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Signups</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>User ID</th>
+      <th>IP</th>
+      <th>Country Code</th>
+      <th>Number from this IP</th>
+      <th>Created At</th>
+      <th>Updated At</th>
+      <th>Safe?</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @signups.each do |signup| %>
+      <tr>
+        <td><%= signup.user_id %></td>
+        <td><%= signup.ip %></td>
+        <td><%= signup.country_code %></td>
+        <td><%= signup.number_from_this_ip %></td>
+        <td><%= signup.created_at %></td>
+        <td><%= signup.updated_at %></td>
+        <td><%= signup.safe? %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/config/routes.rb

@@ -2,6 +2,7 @@ Antispam::Engine.routes.draw do
   resources :clears
   resources :blocks
   resources :challenges
+  resources :signups
   root to: 'ips#index'
   get 'validate', to: 'validate#index'
 end

data/db/migrate/20210130213708_create_antispam_tables.rb

@@ -0,0 +1,58 @@
+class CreateAntispamTables < ActiveRecord::Migration[6.1]
+  def change
+    create_table :antispam_ips do |t|
+      t.string :address
+      t.string :provider
+      t.integer :threat
+      t.datetime :expires_at
+
+      t.timestamps
+    end
+
+    create_table :antispam_challenges do |t|
+      t.string :question
+      t.string :answer
+      t.string :code
+
+      t.timestamps
+    end
+
+    create_table :antispam_blocks do |t|
+      t.string :ip
+      t.string :provider
+      t.string :controllername
+      t.string :actionname
+      t.integer :threat
+
+      t.timestamps
+    end
+
+    create_table :antispam_clears do |t|
+      t.string :ip
+      t.string :result
+      t.string :answer
+      t.integer :threat_before
+      t.integer :threat_after
+
+      t.timestamps
+    end
+
+    create_table :antispam_iplocators do |t|
+      t.integer :ip_from, null: false, unsigned: true
+      t.integer :ip_to, null: false, unsigned: true
+      t.string :country_code, limit: 2, null: false
+      t.index ["ip_from", "ip_to"], name: "ips"
+      t.index ["ip_from"], name: "ip_from"
+      t.index ["ip_to"], name: "ip_to"
+    end
+
+    create table :antispam_signups do |t|
+      t.integer :user_id
+      t.string :ip
+      t.string :country_code
+      t.integer :number_from_this_ip
+      t.timestamps
+    end
+    
+  end
+end

data/lib/antispam/tools.rb

@@ -8,32 +8,31 @@ module Antispam
         scrutinize_countries_except: nil,
         verbose: false
       )
-      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)
+      if methods
+        return if request.get? && !methods.include?(:get)
+        return if request.post? && !methods.include?(:post)
+        return if request.put? && !methods.include?(:put)
+        return if request.patch? && !methods.include?(:patch)
+        return if request.delete? && !methods.include?(:delete)
       else
         return if request.get?
       end
+    
       return if skip_if_user_whitelisted
-      return if controller_name.in?["validate","challenges"]
+      return if controller_name.in?(%w[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])
-
+    
+      # Handle IP blacklists
+      if ip_blacklists
+        ip_blacklists[:httpbl] ||= ip_blacklists.delete(:default)
+        check_ip_against_blacklists(ip, ip_blacklists, verbose)
       end
-      Rails.logger.info "Completed IP database check. #{ip}" if options[:verbose]
-    end
+    
+      # Country checks, if necessary
+      # (expand logic as needed)
+      Rails.logger.info "Completed IP database check. #{ip}" if verbose
+    end    
     # Checks the specific blacklists
     def check_ip_against_blacklists(ip, lists, verbose)
       results = []

data/lib/antispam/version.rb

@@ -1,3 +1,3 @@
 module Antispam
-  VERSION = '0.2.10'
+  VERSION = '0.3.0'
 end

data/lib/tasks/antispam_tasks.rake

@@ -2,3 +2,11 @@
 # task :antispam do
 #   # Task goes here
 # end
+
+namespace :antispam do
+  desc "Install Antispam by importing IP data"
+  task install: :environment do
+    Antispam::Iplocator.import
+    puts "Antispam IP data imported successfully."
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: antispam
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Kopf
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2025-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-http
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +98,7 @@ files:
 - app/controllers/antispam/blocks_controller.rb
 - app/controllers/antispam/challenges_controller.rb
 - app/controllers/antispam/clears_controller.rb
+- app/controllers/antispam/signups_controller.rb
 - app/controllers/antispam/validate_controller.rb
 - app/helpers/antispam/application_helper.rb
 - app/helpers/antispam/blocks_helper.rb
@@ -97,6 +111,8 @@ files:
 - app/models/antispam/challenge.rb
 - app/models/antispam/clear.rb
 - app/models/antispam/ip.rb
+- app/models/antispam/iplocator.rb
+- app/models/antispam/signup.rb
 - app/views/antispam/blocks/index.html.erb
 - app/views/antispam/blocks/show.html.erb
 - app/views/antispam/challenges/_form.html.erb
@@ -106,14 +122,11 @@ files:
 - app/views/antispam/challenges/show.html.erb
 - app/views/antispam/clears/index.html.erb
 - app/views/antispam/clears/show.html.erb
+- app/views/antispam/signups/index.html.erb
 - app/views/antispam/validate/index.html.erb
 - app/views/layouts/antispam/application.html.erb
 - config/routes.rb
-- db/migrate/20210130213708_create_antispam_ips.rb
-- db/migrate/20210130214835_create_antispam_challenges.rb
-- db/migrate/20210130234107_create_antispam_blocks.rb
-- db/migrate/20210130235537_create_antispam_clears.rb
-- db/migrate/20210131165122_add_threat_to_antispam_blocks.rb
+- db/migrate/20210130213708_create_antispam_tables.rb
 - lib/antispam.rb
 - lib/antispam/blacklists/httpbl.rb
 - lib/antispam/checker.rb
@@ -131,7 +144,6 @@ 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:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.20
-signing_key:
+rubygems_version: 3.6.4
 specification_version: 4
 summary: A spam prevention gem.
 test_files: []

data/db/migrate/20210130213708_create_antispam_ips.rb

@@ -1,12 +0,0 @@
-class CreateAntispamIps < ActiveRecord::Migration[6.1]
-  def change
-    create_table :antispam_ips do |t|
-      t.string :address
-      t.string :provider
-      t.integer :threat
-      t.datetime :expires_at
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210130214835_create_antispam_challenges.rb

@@ -1,11 +0,0 @@
-class CreateAntispamChallenges < ActiveRecord::Migration[6.1]
-  def change
-    create_table :antispam_challenges do |t|
-      t.string :question
-      t.string :answer
-      t.string :code
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210130234107_create_antispam_blocks.rb

@@ -1,12 +0,0 @@
-class CreateAntispamBlocks < ActiveRecord::Migration[6.1]
-  def change
-    create_table :antispam_blocks do |t|
-      t.string :ip
-      t.string :provider
-      t.string :controllername
-      t.string :actionname
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210130235537_create_antispam_clears.rb

@@ -1,13 +0,0 @@
-class CreateAntispamClears < ActiveRecord::Migration[6.1]
-  def change
-    create_table :antispam_clears do |t|
-      t.string :ip
-      t.string :result
-      t.string :answer
-      t.integer :threat_before
-      t.integer :threat_after
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210131165122_add_threat_to_antispam_blocks.rb

@@ -1,5 +0,0 @@
-class AddThreatToAntispamBlocks < ActiveRecord::Migration[6.1]
-  def change
-    add_column :antispam_blocks, :threat, :integer
-  end
-end