Hiddenden/beef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add disconnect_all_active_record! calls before forking in multiple specs for improved SQL connection handling safety

Browse Source
This commit is contained in:
zinduolis
2025-08-25 23:30:54 +10:00
parent f9c630b5d6
commit e93dc28174
7 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spec/beef/core/main/autorun_engine/autorun_engine_spec.rb
View File

@@ -68,6 +68,9 @@ RSpec.describe 'AutoRunEngine Test', run_on_browserstack: true do
# Generate a token for the server to respond with
@token = BeEF::Core::Crypto.api_token
# ***** IMPORTANT: close any and all AR/OTR connections before forking *****
disconnect_all_active_record!
# Initiate server start-up
@pids = fork do
BeEF::API::Registrar.instance.fire(BeEF::API::Server, 'pre_http_start', http_hook_server)

3
spec/beef/core/main/handlers/browser_details_handler_spec.rb
View File

@@ -63,6 +63,9 @@ RSpec.describe 'Browser Details Handler', run_on_browserstack: true do
# Generate a token for the server to respond with
@token = BeEF::Core::Crypto.api_token
# ***** IMPORTANT: close any and all AR/OTR connections before forking *****
disconnect_all_active_record!
# Initiate server start-up
@pids = fork do
BeEF::API::Registrar.instance.fire(BeEF::API::Server, 'pre_http_start', http_hook_server)

4
spec/beef/core/main/network_stack/handlers/dynamic_reconstruction_spec.rb
View File

@@ -12,6 +12,10 @@ RSpec.describe 'BeEF Dynamic Reconsturction' do
@server = Thin::Server.new('127.0.0.1', @port.to_s, @rackApp)
trap("INT") { @server.stop }
trap("TERM") { @server.stop }
# ***** IMPORTANT: close any and all AR/OTR connections before forking *****
disconnect_all_active_record!
@pid = fork do
@server.start!
end

5
spec/beef/core/main/network_stack/handlers/redirector_spec.rb
View File

@@ -12,6 +12,11 @@ RSpec.describe 'BeEF Redirector' do
@server = Thin::Server.new('127.0.0.1', @port.to_s, @rackApp)
trap("INT") { @server.stop }
trap("TERM") { @server.stop }
# ***** IMPORTANT: close any and all AR/OTR connections before forking *****
disconnect_all_active_record!
@pid = fork do
@server.start!
end

5
spec/beef/extensions/websocket_hooked_browser_spec.rb
View File

@@ -59,6 +59,11 @@ RSpec.describe 'Browser hooking with Websockets', run_on_browserstack: true do
http_hook_server.prepare
# Generate a token for the server to respond with
@token = BeEF::Core::Crypto.api_token
# ***** IMPORTANT: close any and all AR/OTR connections before forking *****
disconnect_all_active_record!
# Initiate server start-up
@pids = fork do
BeEF::API::Registrar.instance.fire(BeEF::API::Server, 'pre_http_start', http_hook_server)

3
spec/beef/modules/debug/test_beef_debugs_spec.rb
View File

@@ -60,6 +60,9 @@ RSpec.describe 'BeEF Debug Command Modules:', run_on_browserstack: true do
# Generate a token for the server to respond with
@token = BeEF::Core::Crypto.api_token
# ***** IMPORTANT: close any and all AR/OTR connections before forking *****
disconnect_all_active_record!
# Initiate server start-up
@pids = fork do
BeEF::API::Registrar.instance.fire(BeEF::API::Server, 'pre_http_start', http_hook_server)

16
spec/spec_helper.rb
View File

@@ -193,14 +193,20 @@ RSpec.configure do |config|
# --- HARD fork-safety: disconnect every pool/adapter we can find ---
def disconnect_all_active_record!
print_info "Entering disconnect_all_active_record!"
if defined?(ActiveRecord::Base)
# Disconnect every connection pool explicitly
print_info "Disconnecting ActiveRecord connections"
handler = ActiveRecord::Base.connection_handler
handler.connection_pool_list.each { |pool| pool.disconnect! } if handler.respond_to?(:connection_pool_list)
ActiveRecord::Base.clear_active_connections!
ActiveRecord::Base.clear_all_connections!
if handler.respond_to?(:connection_pool_list)
print_info "Using connection_pool_list"
handler.connection_pool_list.each { |pool| pool.disconnect! }
elsif handler.respond_to?(:connection_pools)
print_info "Using connection_pools"
handler.connection_pools.each_value { |pool| pool.disconnect! }
end
else
print_info "ActiveRecord::Base not defined"
end
OTR::ActiveRecord.disconnect! if defined?(OTR::ActiveRecord)
end
def start_beef_server