From 7decd7a53defc0b8be8192526792630925f77df6 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Wed, 29 Apr 2020 13:20:15 +1000 Subject: [PATCH] Adding some handling for potential issue in BeEF recognising hooks --- spec/beef/core/main/autorun_engine/autorun_engine_spec.rb | 5 ++++- spec/beef/core/main/handlers/browser_details_handler_spec.rb | 1 - spec/beef/modules/debug/test_beef_debugs_spec.rb | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb index abefec532..d10fb8b6d 100644 --- a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb +++ b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb @@ -95,7 +95,6 @@ RSpec.describe 'AutoRunEngine Test', :run_on_browserstack => true do # Give time for browser hook to occur wait = Selenium::WebDriver::Wait.new(:timeout => 30) # seconds wait.until { @driver.execute_script("return window.beef.session.get_hook_session_id().length") > 0} - puts @driver.execute_script("return window.beef.session.get_hook_session_id()") @hooks = JSON.parse(RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}") if @hooks['hooked-browsers']['online'].empty? @@ -114,9 +113,13 @@ RSpec.describe 'AutoRunEngine Test', :run_on_browserstack => true do end it 'AutoRunEngine is working' do + puts @hooks['hooked-browsers']['online'] + puts @hooks['hooked-browsers']['online'].empty? if @hooks['hooked-browsers']['online'].empty? + puts 'in browser block' expect(BeEF::Filters.is_valid_hook_session_id?(@driver.execute_script("return window.beef.session.get_hook_session_id()"))).to eq true else + puts 'in api block' expect(@hooks['hooked-browsers']['online']).not_to be_empty end end diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb index fc9b2c4b0..789801943 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -92,7 +92,6 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do # Give time for browser hook to occur wait = Selenium::WebDriver::Wait.new(:timeout => 30) # seconds wait.until { @driver.execute_script("return window.beef.session.get_hook_session_id().length") > 0} - puts @driver.execute_script("return window.beef.session.get_hook_session_id()") @hooks = JSON.parse(RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}") if @hooks['hooked-browsers']['online'].empty? diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index 4ec2a808c..b958b0d4e 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -91,7 +91,6 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do # Give time for browser hook to occur wait = Selenium::WebDriver::Wait.new(:timeout => 30) # seconds wait.until { @driver.execute_script("return window.beef.session.get_hook_session_id().length") > 0} - puts @driver.execute_script("return window.beef.session.get_hook_session_id()") @hooks = JSON.parse(RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}") if @hooks['hooked-browsers']['online'].empty?