From 192c666fc8308f860ee4156807ae8119d9177d08 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Wed, 29 Apr 2020 13:56:46 +1000 Subject: [PATCH] Reverted to previous method of auth rather than just pulling API token directly when generated by BeEF. --- spec/beef/core/main/autorun_engine/autorun_engine_spec.rb | 5 ++++- spec/beef/core/main/handlers/browser_details_handler_spec.rb | 5 ++++- spec/beef/modules/debug/test_beef_debugs_spec.rb | 5 ++++- 3 files changed, 12 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 cf56913bc..fac2af5ab 100644 --- a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb +++ b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb @@ -69,7 +69,7 @@ RSpec.describe 'AutoRunEngine Test', :run_on_browserstack => true do http_hook_server.prepare # Generate a token for the server to respond with - @token = BeEF::Core::Crypto::api_token + BeEF::Core::Crypto::api_token # Initiate server start-up @pids = fork do @@ -79,6 +79,9 @@ RSpec.describe 'AutoRunEngine Test', :run_on_browserstack => true do http_hook_server.start end + @response = RestClient.post "#{RESTAPI_ADMIN}/login", { 'username': "#{@username}", 'password': "#{@password}" }.to_json, :content_type => :json + @token = JSON.parse(@response)['token'] + @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID]) @caps["name"] = self.class.description || ENV['name'] || 'no-name' @caps["browserstack.local"] = true 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 542933615..c883e88fe 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -63,7 +63,7 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do http_hook_server.prepare # Generate a token for the server to respond with - @token = BeEF::Core::Crypto::api_token + BeEF::Core::Crypto::api_token # Initiate server start-up @pids = fork do @@ -76,6 +76,9 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do # Give the server time to start-up sleep 1 + @response = RestClient.post "#{RESTAPI_ADMIN}/login", { 'username': "#{@username}", 'password': "#{@password}" }.to_json, :content_type => :json + @token = JSON.parse(@response)['token'] + @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID]) @caps["name"] = self.class.description || ENV['name'] || 'no-name' @caps["browserstack.local"] = true diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index b958b0d4e..8a55f3ac4 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -62,7 +62,7 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do http_hook_server.prepare # Generate a token for the server to respond with - @token = BeEF::Core::Crypto::api_token + BeEF::Core::Crypto::api_token # Initiate server start-up @pids = fork do @@ -75,6 +75,9 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do # Give the server time to start-up sleep 1 + @response = RestClient.post "#{RESTAPI_ADMIN}/login", { 'username': "#{@username}", 'password': "#{@password}" }.to_json, :content_type => :json + @token = JSON.parse(@response)['token'] + @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID]) @caps["name"] = self.class.description || ENV['name'] || 'no-name' @caps["browserstack.local"] = true