trackguard 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4acea93b885f29862fb335806a5f378f63497793fff3e6a57cdb3eb2f0de255
-  data.tar.gz: 0aa85cf87c159a589960c253ae5bb96b4ae095093b4b2963a7f4b96590e3b065
+  metadata.gz: 79ebac148a49b2b6df9f280c3a8e8e624fa82910ccf0e3d4c608a04ac7f73ced
+  data.tar.gz: a0a0648dacb35df737e19413603d658b1c015f6e5fa60d0a6adc72da497082da
 SHA512:
-  metadata.gz: 1f770cb91aedabae79a1195b075a68d690eb730fb1ca55529c68b37ce156aebd42217174efc32beb8296d0a4bd6f45a67f94d56a3b9d8ca6103c5bc2b389bd42
-  data.tar.gz: 67b00fa4e4f2500fc2145650871f973808f0c7e6af12b0e2b212dd700c8f35b8dae9e521c4a5719ead55dd5911e43db2e428e072e7e84ed514b18a0e35a4cd40
+  metadata.gz: 59d2f2a7dde041da4cc0acf29249c77d9f911a76c498f9381293c838a29bd6ac5fec3c875645c7be60b686d77cb99e4731032b45eb7a2a93464dadaac81b04cb
+  data.tar.gz: 5c1bf529774f1af5e8a7e83154e7e21b94e468c95702ac00bed7f0b133b85c092359e544e7f2f615d4e364d904e4512d16ad42d42e3c712d8f8dcb4b60cb81ae

data/app/controllers/trackguard/admin/visitors_controller.rb

@@ -11,11 +11,13 @@ module Trackguard
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
       def flag
         if @visitor.update(
           flagged_at: Time.current,
           flag_reason: params[:flag_reason].presence,
-          flagged_by: params[:flagged_by].presence || Visitor::FLAGGED_BY.first
+          flagged_by: params[:flagged_by].presence || Visitor::FLAGGED_BY.first,
+          name: params[:name].presence || BlockedUserAgent.matching_pattern(@visitor.user_agent)
         )
           respond_to do |format|
             format.html { redirect_back_or_to dashboard_path }
@@ -28,6 +30,7 @@ module Trackguard
           end
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def unflag
         @visitor.update!(flagged_at: nil, flag_reason: nil, flagged_by: nil)

data/app/jobs/trackguard/detect_suspicious_visitors_job.rb

@@ -43,13 +43,15 @@ module Trackguard
       return if count.zero?
       return if visitor.whitelisted_ip&.active?
 
+      name = name_from_ua(visitor.user_agent)
+
       if count >= HARD_FLAG_THRESHOLD
-        flag!(visitor, "#{count} page views in 24h (hard flag threshold)")
+        flag!(visitor, "#{count} page views in 24h (hard flag threshold)", name: name)
         return
       end
 
       if (reason = ua_flag_reason(visitor.user_agent))
-        flag!(visitor, reason)
+        flag!(visitor, reason, name: name)
         return
       end
 
@@ -58,7 +60,7 @@ module Trackguard
       return if count < MIN_VIEWS
 
       if views.all? { |pv| pv.session_id.nil? && pv.referer.nil? && pv.path == "/" }
-        flag!(visitor, "no session, no referrer, single root hit")
+        flag!(visitor, "no session, no referrer, single root hit", name: name)
         return
       end
 
@@ -85,7 +87,7 @@ module Trackguard
 
       return if score < FLAG_SCORE_THRESHOLD
 
-      flag!(visitor, reasons.join("; "))
+      flag!(visitor, reasons.join("; "), name: name)
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
@@ -107,7 +109,8 @@ module Trackguard
         .where("wi.id IS NULL OR wi.expires_at <= ?", Time.current)
         .distinct
         .each do |visitor|
-          flag!(visitor, "trace_id shared across multiple visitors (cross-visitor bot detected)")
+          flag!(visitor, "trace_id shared across multiple visitors (cross-visitor bot detected)",
+                name: name_from_ua(visitor.user_agent))
         end
     end
 
@@ -115,8 +118,12 @@ module Trackguard
       "blank or minimal user-agent" if user_agent.blank? || user_agent.to_s.length < 10
     end
 
-    def flag!(visitor, reason)
-      visitor.update!(flagged_at: Time.current, flag_reason: reason, flagged_by: "claw:auto")
+    def flag!(visitor, reason, name: nil)
+      visitor.update!(flagged_at: Time.current, flag_reason: reason, flagged_by: "claw:auto", name: name)
+    end
+
+    def name_from_ua(user_agent)
+      BlockedUserAgent.matching_pattern(user_agent)
     end
 
     def blank_ratio(views, attr)

data/app/models/trackguard/blocked_user_agent.rb

@@ -12,5 +12,12 @@ module Trackguard
       end
       patterns.any? { |p| user_agent.to_s.downcase.include?(p.downcase) }
     end
+
+    def self.matching_pattern(user_agent)
+      patterns = Rails.cache.fetch(CACHE_KEY, expires_in: 10.minutes) do
+        pluck(:pattern)
+      end
+      patterns.find { |p| user_agent.to_s.downcase.include?(p.downcase) }
+    end
   end
 end

data/app/views/trackguard/admin/dashboards/show.html.erb

@@ -151,6 +151,7 @@
                           <%= hidden_field_tag :id, visitor.id %>
                           <%= f.submit "Flag", class: "tg-btn tg-btn--danger" %>
                           <%= f.text_field :flag_reason, placeholder: "Flag reason (optional)", class: "tg-input", autocomplete: "off" %>
+                          <%= f.text_field :name, placeholder: "Name (optional, auto-detected if blank)", class: "tg-input", autocomplete: "off" %>
                         <% end %>
                       <% end %>
                     </div>
@@ -175,6 +176,10 @@
                           <span class="tg-dl__term">User agent</span>
                           <span class="tg-dl__def tg-dl__def--break"><%= visitor&.user_agent.presence || "—" %></span>
                         </div>
+                        <div class="tg-dl__row">
+                          <span class="tg-dl__term">Name</span>
+                          <span class="tg-dl__def"><%= visitor&.name.presence || "—" %></span>
+                        </div>
                         <div class="tg-dl__row">
                           <span class="tg-dl__term">Flag status</span>
                           <% if flagged %>

data/app/views/trackguard/admin/visits/index.html.erb

@@ -63,6 +63,7 @@
                           <%= hidden_field_tag :id, visitor.id %>
                           <%= f.submit "Flag", class: "tg-btn tg-btn--danger" %>
                           <%= f.text_field :flag_reason, placeholder: "Flag reason (optional)", class: "tg-input", autocomplete: "off" %>
+                          <%= f.text_field :name, placeholder: "Name (optional, auto-detected if blank)", class: "tg-input", autocomplete: "off" %>
                         <% end %>
                       <% end %>
                     </div>
@@ -87,6 +88,10 @@
                           <span class="tg-dl__term">User agent</span>
                           <span class="tg-dl__def tg-dl__def--break"><%= visitor&.user_agent.presence || "—" %></span>
                         </div>
+                        <div class="tg-dl__row">
+                          <span class="tg-dl__term">Name</span>
+                          <span class="tg-dl__def"><%= visitor&.name.presence || "—" %></span>
+                        </div>
                         <div class="tg-dl__row">
                           <span class="tg-dl__term">Flag status</span>
                           <% if flagged %>

data/db/migrate/20260505191009_add_name_to_trackguard_visitors.rb

@@ -0,0 +1,5 @@
+class AddNameToTrackguardVisitors < ActiveRecord::Migration[8.0]
+  def change
+    add_column :trackguard_visitors, :name, :string
+  end
+end

data/lib/generators/trackguard/install_generator.rb

@@ -15,10 +15,6 @@ module Trackguard
       migration_template "create_trackguard_tables.rb", "db/migrate/create_trackguard_tables.rb"
     end
 
-    def create_visits_migration_file
-      migration_template "add_trackguard_visits.rb", "db/migrate/add_trackguard_visits.rb"
-    end
-
     def print_next_steps
       say "\nNext steps:", :green
       say "  1. rails db:migrate"

data/lib/generators/trackguard/templates/add_visitor_name.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddVisitorName < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  def change
+    add_column :trackguard_visitors, :name, :string
+  end
+end

data/lib/generators/trackguard/templates/create_trackguard_tables.rb

@@ -13,20 +13,25 @@ class CreateTrackguardTables < ActiveRecord::Migration[<%= ActiveRecord::Migrati
 
     add_index :trackguard_visitors, :ip, unique: true
 
-    create_table :trackguard_page_views do |t|
-      t.string    :path,       null: false
+    create_table :trackguard_visits do |t|
+      t.string    :type
+      t.string    :path,         null: false
       t.string    :user_agent
       t.string    :referer
       t.string    :session_id
       t.string    :trace_id
       t.string    :source
-      t.references :visitor,   null: false, foreign_key: { to_table: :trackguard_visitors }
-      t.datetime  :created_at, null: false
+      t.string    :block_reason
+      t.string    :http_method
+      t.references :visitor,     null: false, foreign_key: { to_table: :trackguard_visitors }
+      t.datetime  :created_at,   null: false
     end
 
-    add_index :trackguard_page_views, :path
-    add_index :trackguard_page_views, :created_at
-    add_index :trackguard_page_views, :source
+    add_index :trackguard_visits, :type
+    add_index :trackguard_visits, :path
+    add_index :trackguard_visits, :created_at
+    add_index :trackguard_visits, :source
+    add_index :trackguard_visits, :block_reason
 
     create_table :trackguard_whitelisted_ips do |t|
       t.string   :ip,         null: false

data/lib/generators/trackguard/upgrade_generator.rb

@@ -0,0 +1,27 @@
+require "rails/generators"
+require "rails/generators/active_record"
+
+module Trackguard
+  class UpgradeGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+
+    source_root File.expand_path("templates", __dir__)
+
+    def self.next_migration_number(dirname)
+      ActiveRecord::Generators::Base.next_migration_number(dirname)
+    end
+
+    def create_visits_migration_file
+      migration_template "add_trackguard_visits.rb", "db/migrate/add_trackguard_visits.rb"
+    end
+
+    def create_visitor_name_migration_file
+      migration_template "add_visitor_name.rb", "db/migrate/add_visitor_name.rb"
+    end
+
+    def print_next_steps
+      say "\nNext steps:", :green
+      say "  1. rails db:migrate"
+    end
+  end
+end

data/lib/trackguard/version.rb

@@ -1,3 +1,3 @@
 module Trackguard
-  VERSION = "0.16.0".freeze
+  VERSION = "0.17.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackguard
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Krzysztof Rygielski
@@ -72,9 +72,12 @@ files:
 - app/views/trackguard/admin/visits/index.html.erb
 - config/importmap.rb
 - config/routes.rb
+- db/migrate/20260505191009_add_name_to_trackguard_visitors.rb
 - lib/generators/trackguard/install_generator.rb
 - lib/generators/trackguard/templates/add_trackguard_visits.rb
+- lib/generators/trackguard/templates/add_visitor_name.rb
 - lib/generators/trackguard/templates/create_trackguard_tables.rb
+- lib/generators/trackguard/upgrade_generator.rb
 - lib/tasks/trackguard.rake
 - lib/trackguard.rb
 - lib/trackguard/engine.rb