From 1df856bd30f3075372011e21590511e0768597b4 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Wed, 22 Apr 2020 15:35:06 +1000 Subject: [PATCH] Attempt 1231829038102931 --- .../autorun_engine/autorun_engine_spec.rb | 24 +++++++++---------- .../handlers/browser_details_handler_spec.rb | 4 +--- .../modules/debug/test_beef_debugs_spec.rb | 2 -- spec/spec_helper.rb | 6 ++--- ...fig.yml => elcapitan_chrome_59.config.yml} | 4 ++-- ...fig.yml => elcapitan_chrome_81.config.yml} | 4 ++-- ...fig.yml => elcapitan_firefox_5.config.yml} | 6 ++--- ...yml => elcapitan_firefox_68esr.config.yml} | 4 ++-- ...ig.yml => elcapitan_firefox_75.config.yml} | 4 ++-- .../catalina_chrome_81.config.yml | 4 ++-- 10 files changed, 28 insertions(+), 34 deletions(-) rename spec/support/browserstack/osx/el_capitan/{catalina_chrome_59.config.yml => elcapitan_chrome_59.config.yml} (76%) rename spec/support/browserstack/osx/el_capitan/{catalina_chrome_81.config.yml => elcapitan_chrome_81.config.yml} (76%) rename spec/support/browserstack/osx/el_capitan/{catalina_firefox_11.config.yml => elcapitan_firefox_5.config.yml} (66%) rename spec/support/browserstack/osx/el_capitan/{catalina_firefox_68esr.config.yml => elcapitan_firefox_68esr.config.yml} (75%) rename spec/support/browserstack/osx/el_capitan/{catalina_firefox_75.config.yml => elcapitan_firefox_75.config.yml} (76%) 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 bdabffcf3..d087cd0fd 100644 --- a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb +++ b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb @@ -86,21 +86,19 @@ RSpec.describe 'AutoRunEngine test' do # Authenticate to REST API & pull the token from the response @response = RestClient.post "#{RESTAPI_ADMIN}/login", { 'username': "#{@username}", 'password': "#{@password}" }.to_json, :content_type => :json @token = JSON.parse(@response)['token'] + + # Hook new victim + print_info 'Hooking a new victim, waiting a few seconds...' + @victim = @driver.navigate.to "#{VICTIM_URL}" + + # Give time for browser hook to occur + sleep 2 + + # Identify Session ID of victim generated above + @hooks = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}" + @session = JSON.parse(@hooks)['hooked-browsers']['online']['0']['session'] end - before(:each) do - # Hook new victim - print_info 'Hooking a new victim, waiting a few seconds...' - @victim = @driver.navigate.to "#{VICTIM_URL}" - - # Give time for browser hook to occur - sleep 2 - - # Identify Session ID of victim generated above - @hooks = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}" - @session = JSON.parse(@hooks)['hooked-browsers']['online']['0']['session'] - end - after(:all) do print_info "Shutting down server" Process.kill("KILL",@pid) 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 e035a53b6..f940f6e3f 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -79,9 +79,7 @@ RSpec.describe 'Browser details handler' do # Authenticate to REST API & pull the token from the response @response = RestClient.post "#{RESTAPI_ADMIN}/login", { 'username': "#{@username}", 'password': "#{@password}" }.to_json, :content_type => :json @token = JSON.parse(@response)['token'] - end - before(:each) do # Hook new victim print_info 'Hooking a new victim, waiting a few seconds...' @victim = @driver.navigate.to "#{VICTIM_URL}" @@ -93,7 +91,7 @@ RSpec.describe 'Browser details handler' do @hooks = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}" @session = JSON.parse(@hooks)['hooked-browsers']['online']['0']['session'] end - + after(:all) do print_info "Shutting down server" Process.kill("KILL",@pid) diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index 0bd05daae..9bef39508 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -87,9 +87,7 @@ RSpec.describe 'BeEF Debug Command Modules:' do .map do |debug_mod| @debug_mod_names_ids[debug_mod[1]['class']] = debug_mod[0] end - end - before(:each) do # Hook new victim print_info 'Hooking a new victim, waiting a few seconds...' @victim = @driver.navigate.to "#{VICTIM_URL}" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cc3906c6c..111616565 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -69,9 +69,9 @@ RSpec.configure do |config| end end # BrowserStack - config.around(:test, :run_on_browserstack => true) do |test| + config.around(:example, :run_on_browserstack => true) do |example| @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID]) - @caps["name"] = ENV['name'] || test.metadata[:name] || test.metadata[:file_path].split('/').last.split('.').first + @caps["name"] = ENV['name'] || example.metadata[:name] || example.metadata[:file_path].split('/').last.split('.').first enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true" # Code to start browserstack local before start of test @@ -88,7 +88,7 @@ RSpec.configure do |config| :desired_capabilities => @caps) begin - test.run + example.run ensure @driver.quit # Code to stop browserstack local after end of test diff --git a/spec/support/browserstack/osx/el_capitan/catalina_chrome_59.config.yml b/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_59.config.yml similarity index 76% rename from spec/support/browserstack/osx/el_capitan/catalina_chrome_59.config.yml rename to spec/support/browserstack/osx/el_capitan/elcapitan_chrome_59.config.yml index e767c1bec..006c96d3d 100644 --- a/spec/support/browserstack/osx/el_capitan/catalina_chrome_59.config.yml +++ b/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_59.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX Catalina Chrome 59" + "build": "OSX El Capitan Chrome 59" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -11,4 +11,4 @@ browser_caps: "browser": "chrome" "browser_version": "59.0" "os": "osx" - "os_version": "catalina" \ No newline at end of file + "os_version": "el capitan" \ No newline at end of file diff --git a/spec/support/browserstack/osx/el_capitan/catalina_chrome_81.config.yml b/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_81.config.yml similarity index 76% rename from spec/support/browserstack/osx/el_capitan/catalina_chrome_81.config.yml rename to spec/support/browserstack/osx/el_capitan/elcapitan_chrome_81.config.yml index d92759ead..d3ffa7a1d 100644 --- a/spec/support/browserstack/osx/el_capitan/catalina_chrome_81.config.yml +++ b/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_81.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX Catalina Chrome 81" + "build": "OSX El Capitan Chrome 81" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -11,4 +11,4 @@ browser_caps: "browser": "chrome" "browser_version": "81.0" "os": "osx" - "os_version": "catalina" \ No newline at end of file + "os_version": "el capitan" \ No newline at end of file diff --git a/spec/support/browserstack/osx/el_capitan/catalina_firefox_11.config.yml b/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml similarity index 66% rename from spec/support/browserstack/osx/el_capitan/catalina_firefox_11.config.yml rename to spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml index d716c3d7c..9a5bbfaf4 100644 --- a/spec/support/browserstack/osx/el_capitan/catalina_firefox_11.config.yml +++ b/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX Catalina Firefox 11" + "build": "OSX El Capitan Firefox 5" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "11.0" + "browser_version": "5.0" "os": "osx" - "os_version": "catalina" \ No newline at end of file + "os_version": "el capitan" \ No newline at end of file diff --git a/spec/support/browserstack/osx/el_capitan/catalina_firefox_68esr.config.yml b/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_68esr.config.yml similarity index 75% rename from spec/support/browserstack/osx/el_capitan/catalina_firefox_68esr.config.yml rename to spec/support/browserstack/osx/el_capitan/elcapitan_firefox_68esr.config.yml index c32f1874e..998a63b59 100644 --- a/spec/support/browserstack/osx/el_capitan/catalina_firefox_68esr.config.yml +++ b/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_68esr.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX Catalina Firefox 68 ESR" + "build": "OSX El Capitan Firefox 68 ESR" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -11,4 +11,4 @@ browser_caps: "browser": "firefox" "browser_version": "68.0" "os": "osx" - "os_version": "catalina" \ No newline at end of file + "os_version": "el capitan" \ No newline at end of file diff --git a/spec/support/browserstack/osx/el_capitan/catalina_firefox_75.config.yml b/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_75.config.yml similarity index 76% rename from spec/support/browserstack/osx/el_capitan/catalina_firefox_75.config.yml rename to spec/support/browserstack/osx/el_capitan/elcapitan_firefox_75.config.yml index aa0c96f55..f851fbeb6 100644 --- a/spec/support/browserstack/osx/el_capitan/catalina_firefox_75.config.yml +++ b/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_75.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX Catalina Firefox 75" + "build": "OSX El Capitan Firefox 75" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -11,4 +11,4 @@ browser_caps: "browser": "firefox" "browser_version": "75.0" "os": "osx" - "os_version": "catalina" \ No newline at end of file + "os_version": "el capitan" \ No newline at end of file diff --git a/spec/support/browserstack/osx/snow_leopard/catalina_chrome_81.config.yml b/spec/support/browserstack/osx/snow_leopard/catalina_chrome_81.config.yml index d92759ead..999843e4c 100644 --- a/spec/support/browserstack/osx/snow_leopard/catalina_chrome_81.config.yml +++ b/spec/support/browserstack/osx/snow_leopard/catalina_chrome_81.config.yml @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "chrome" - "browser_version": "81.0" + "browser_version": "49.0" "os": "osx" - "os_version": "catalina" \ No newline at end of file + "os_version": "snow leopard" \ No newline at end of file