Merge branch 'master' into issue-fix-remove-cli

zinduolis · web-flow · commit a67d783cbce3 · 2025-12-22T11:56:00.000+10:00
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -26,6 +26,7 @@
 2. Update `client_debug` to `true`
 3. Retrieve browser logs from your browser's developer console (Ctrl + Shift + I or F12 depending on browser)
 4. Retrieve your server-side logs from `~/.beef/beef.log`
-   * If using **beef-xss** logs found with `journalctl -u beef-xss`
+   * If you have a kali (beef-xss) problem, you can submit a bug here:
+     https://www.kali.org/docs/community/submitting-issues-kali-bug-tracker/
 
 **If we request additional information and we don't hear back from you within a week, we will be closing the ticket off.**
diff --git a/Gemfile b/Gemfile
@@ -24,7 +24,7 @@ gem 'rake', '~> 13.3'
 gem 'activerecord', '~> 8.1'
 gem 'otr-activerecord', '~> 2.6.0'
 gem 'sqlite3', '~> 2.8'
-gem 'rubocop', '~> 1.81.7', require: false
+gem 'rubocop', '~> 1.82.0', require: false
 
 # Geolocation support
 group :geoip do
@@ -66,7 +66,7 @@ group :test do
   gem 'rdoc', '~> 6.17'
   gem 'browserstack-local', '~> 1.4'
 
-  gem 'irb', '~> 1.15'
+  gem 'irb', '~> 1.16'
   gem 'pry-byebug', '~> 3.11'
 
   gem 'rest-client', '~> 2.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -55,14 +55,14 @@ GEM
       json
     curb (1.2.2)
     daemons (1.4.1)
-    date (3.5.0)
+    date (3.5.1)
     diff-lcs (1.6.2)
     domain_name (0.6.20240107)
     drb (2.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    erb (6.0.0)
+    erb (6.0.1)
     erubis (2.7.0)
     espeak-ruby (1.1.0)
     event_emitter (0.2.6)
@@ -80,10 +80,10 @@ GEM
     http_parser.rb (0.8.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.1)
+    io-console (0.8.2)
     io-endpoint (0.15.2)
     io-like (0.4.0)
-    irb (1.15.3)
+    irb (1.16.0)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
@@ -146,7 +146,7 @@ GEM
     pry-byebug (3.11.0)
       byebug (~> 12.0)
       pry (>= 0.13, < 0.16)
-    psych (5.2.6)
+    psych (5.3.1)
       date
       stringio
     public_suffix (6.0.2)
@@ -171,7 +171,7 @@ GEM
       psych (>= 4.0.0)
       tsort
     regexp_parser (2.11.3)
-    reline (0.6.2)
+    reline (0.6.3)
       io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -194,18 +194,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
-    rubocop (1.81.7)
+    rubocop (1.82.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.47.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     ruby-progressbar (1.13.0)
@@ -237,7 +237,7 @@ GEM
     sqlite3 (2.8.1-x86_64-darwin)
     sqlite3 (2.8.1-x86_64-linux-gnu)
     sqlite3 (2.8.1-x86_64-linux-musl)
-    stringio (3.1.9)
+    stringio (3.2.0)
     sync (0.5.0)
     term-ansicolor (1.11.3)
       tins (~> 1)
@@ -312,7 +312,7 @@ DEPENDENCIES
   eventmachine (~> 1.2, >= 1.2.7)
   execjs (~> 2.10)
   geckodriver-helper (~> 0.24.0)
-  irb (~> 1.15)
+  irb (~> 1.16)
   json
   maxmind-db (~> 1.4)
   mime-types (~> 3.7)
@@ -328,7 +328,7 @@ DEPENDENCIES
   rdoc (~> 6.17)
   rest-client (~> 2.1.0)
   rspec (~> 3.13)
-  rubocop (~> 1.81.7)
+  rubocop (~> 1.82.0)
   rubyzip (~> 3.2)
   rushover (~> 0.3.0)
   selenium-webdriver (~> 4.39)
diff --git a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb
@@ -12,6 +12,7 @@
 
 RSpec.describe 'AutoRunEngine Test', run_on_browserstack: true do
   before(:all) do
+    @__ar_config_snapshot = SpecActiveRecordConnection.snapshot
     @config = BeEF::Core::Configuration.instance
 
     # Grab DB file and regenerate if requested
@@ -110,6 +111,7 @@
   after(:all) do
     server_teardown(@driver, @pid, @pids)
     disconnect_all_active_record!
+    SpecActiveRecordConnection.restore!(@__ar_config_snapshot)
   end
 
   it 'AutoRunEngine is working' do
diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb
@@ -12,7 +12,7 @@
 
 RSpec.describe 'Browser Details Handler', run_on_browserstack: true do
   before(:all) do
-
+    @__ar_config_snapshot = SpecActiveRecordConnection.snapshot
     @config = BeEF::Core::Configuration.instance
     db_file = @config.get('beef.database.file')
     print_info 'Resetting the database for BeEF.'
@@ -106,6 +106,7 @@
   after(:all) do
     server_teardown(@driver, @pid, @pids)
     disconnect_all_active_record!
+    SpecActiveRecordConnection.restore!(@__ar_config_snapshot)
   end
 
   it 'can successfully hook a browser' do
diff --git a/spec/beef/core/main/network_stack/handlers/dynamic_reconstruction_spec.rb b/spec/beef/core/main/network_stack/handlers/dynamic_reconstruction_spec.rb
@@ -1,6 +1,7 @@
 RSpec.describe 'BeEF Dynamic Reconsturction' do
 
   before(:all) do
+    @__ar_config_snapshot = SpecActiveRecordConnection.snapshot
     @port = 2001
     config = {}
     config[:BindAddress] = '127.0.0.1'
@@ -25,6 +26,7 @@
 
   after(:all) do
     Process.kill("INT",@pid)
+    SpecActiveRecordConnection.restore!(@__ar_config_snapshot)
   end
 
   it 'delete' do
diff --git a/spec/beef/core/main/network_stack/handlers/redirector_spec.rb b/spec/beef/core/main/network_stack/handlers/redirector_spec.rb
@@ -1,6 +1,7 @@
 RSpec.describe 'BeEF Redirector' do
 
   before(:all) do
+    @__ar_config_snapshot = SpecActiveRecordConnection.snapshot
     @port = 2002
     config = {}
     config[:BindAddress] = '127.0.0.1'
@@ -26,6 +27,7 @@
 
   after(:all) do
     Process.kill("INT",@pid)
+    SpecActiveRecordConnection.restore!(@__ar_config_snapshot)
   end
 
   it 'redirects' do
diff --git a/spec/beef/extensions/requester_spec.rb b/spec/beef/extensions/requester_spec.rb
@@ -24,6 +24,7 @@
 
   xit 'requester works' do
     begin
+      ar_snapshot = SpecActiveRecordConnection.snapshot
       # Start beef server
       @config = BeEF::Core::Configuration.instance
       @config.set('beef.credentials.user', 'beef')
@@ -77,6 +78,7 @@
       BeEF::Core::Models::Http.where(hooked_browser_id: hb_session).delete_all if defined? hb_session
       Process.kill('KILL', @pid) if defined? @pid
       Process.kill('KILL', @pids) if defined? @pids
+      SpecActiveRecordConnection.restore!(ar_snapshot)
     end
   end
 end
diff --git a/spec/beef/extensions/websocket_hooked_browser_spec.rb b/spec/beef/extensions/websocket_hooked_browser_spec.rb
@@ -13,6 +13,7 @@
 
 RSpec.describe 'Browser hooking with Websockets', run_on_browserstack: true do
   before(:all) do
+    @__ar_config_snapshot = SpecActiveRecordConnection.snapshot
     @config = BeEF::Core::Configuration.instance
     # Grab DB file and regenerate if requested
     print_info 'Loading database'
@@ -104,6 +105,7 @@
   after(:all) do
     server_teardown(@driver, @pid, @pids)
     disconnect_all_active_record!
+    SpecActiveRecordConnection.restore!(@__ar_config_snapshot)
   end
 
   it 'confirms a websocket server has been started' do
diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb
@@ -12,6 +12,7 @@
 
 RSpec.describe 'BeEF Debug Command Modules:', run_on_browserstack: true do
   before(:all) do
+    @__ar_config_snapshot = SpecActiveRecordConnection.snapshot
     # Grab config and set creds in variables for ease of access
     @config = BeEF::Core::Configuration.instance
     @pids = []  # ensure defined for teardown consistency
@@ -128,6 +129,7 @@
   after(:all) do
     server_teardown(@driver, @pid, @pids)
     disconnect_all_active_record!
+    SpecActiveRecordConnection.restore!(@__ar_config_snapshot)
   end
 
   it 'The Test_beef.debug() command module successfully executes' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -271,6 +271,8 @@ def start_beef_server
     # Generate a token for the server to respond with
     BeEF::Core::Crypto::api_token
 
+    disconnect_all_active_record!
+
     # Initiate server start-up
     BeEF::API::Registrar.instance.fire(BeEF::API::Server, 'pre_http_start', http_hook_server)
     pid = fork do
@@ -322,4 +324,60 @@ def stop_beef_server(pid)
     pid = nil       
   end
 
+end
+
+# -------------------------------------------------------------------
+# ActiveRecord connection snapshot/restore helpers (test isolation)
+# Some specs disconnect ActiveRecord (fork safety), destroying the SQLite in-memory DB.
+# These helpers restore it for later specs.
+# -------------------------------------------------------------------
+module SpecActiveRecordConnection
+  module_function
+
+  def snapshot
+    # Capture the current AR connection configuration hash if possible.
+    if ActiveRecord::Base.respond_to?(:connection_db_config) && ActiveRecord::Base.connection_db_config
+      ActiveRecord::Base.connection_db_config.configuration_hash
+    else
+      ActiveRecord::Base.connection_config
+    end
+  rescue StandardError
+    nil
+  end
+
+  def restore!(config_hash)
+    # Ensure we don't leave AR disconnected for subsequent specs.
+    begin
+      handler = ActiveRecord::Base.connection_handler
+      if handler.respond_to?(:connection_pool_list)
+        handler.connection_pool_list.each { |pool| pool.disconnect! }
+      elsif handler.respond_to?(:connection_pools)
+        handler.connection_pools.each_value { |pool| pool.disconnect! }
+      else
+        ActiveRecord::Base.connection_pool.disconnect!
+      end
+    rescue StandardError
+      # ignore
+    end
+
+    if config_hash
+      OTR::ActiveRecord.configure_from_hash!(config_hash)
+    else
+      # Fallback to suite default
+      OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: ':memory:')
+    end
+
+    if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2')
+      OTR::ActiveRecord.establish_connection!
+    end
+    ActiveRecord::Schema.verbose = false
+
+    # Run migrations if the restored DB is empty/outdated
+    ActiveRecord::Migration.verbose = false
+    ActiveRecord::Migrator.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
+    context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths)
+    if context.needs_migration?
+      ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration, context.internal_metadata).migrate
+    end
+  end
 end
