From 7d709c7973a9167c4719c65d3c291da113eb8ed8 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Mon, 27 Apr 2020 09:58:59 +1000 Subject: [PATCH] Additional Edge fingerprinting fixes. Bumped min XP FF ver. --- .travis.yml | 8 ++++---- core/main/client/browser.js | 2 +- ...{xp_firefox_10.config.yml => xp_firefox_11.config.yml} | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename spec/support/browserstack/windows/xp/{xp_firefox_10.config.yml => xp_firefox_11.config.yml} (76%) diff --git a/.travis.yml b/.travis.yml index 358b8958d..e8c5c65e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: # - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml # - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml # - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml - - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml +# - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml # - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml # - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml # - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_6.config.yml @@ -37,7 +37,7 @@ env: # - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml # - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml # - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml - # - CONFIG_FILE=windows/win10/win10_edge_81.config.yml + - CONFIG_FILE=windows/win10/win10_edge_81.config.yml # - CONFIG_FILE=windows/win10/win10_ie_11.config.yml # - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml # - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml @@ -48,8 +48,8 @@ env: # - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml # - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml # - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_10.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_25.config.yml + - CONFIG_FILE=windows/xp/xp_firefox_11.config.yml +# - CONFIG_FILE=windows/xp/xp_firefox_25.config.yml # - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml # - CONFIG_FILE=windows/xp/xp_ie_7.config.yml # jobs: diff --git a/core/main/client/browser.js b/core/main/client/browser.js index d3ba2f48c..56fff23f8 100644 --- a/core/main/client/browser.js +++ b/core/main/client/browser.js @@ -127,7 +127,7 @@ beef.browser = { * @example: beef.browser.isEdge() */ isEdge: function () { - return !beef.browser.isIE() && !!window.StyleMedia && (window.navigator.userAgent.match(/Edg\/\d+\.\d/) || window.navigator.userAgent.match(/Edge\/\d+\.\d/)); + return !beef.browser.isIE() && !!window.styleMedia && (/Edg\/\d+\.\d/.test(window.navigator.userAgent) || /Edge\/\d+\.\d/.test(window.navigator.userAgent)); }, /** diff --git a/spec/support/browserstack/windows/xp/xp_firefox_10.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_11.config.yml similarity index 76% rename from spec/support/browserstack/windows/xp/xp_firefox_10.config.yml rename to spec/support/browserstack/windows/xp/xp_firefox_11.config.yml index dbc1acdbd..38bd677f4 100644 --- a/spec/support/browserstack/windows/xp/xp_firefox_10.config.yml +++ b/spec/support/browserstack/windows/xp/xp_firefox_11.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "Windows XP Firefox 10" + "build": "Windows XP Firefox 11" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "10.0" + "browser_version": "11.0" "os": "windows" "os_version": "xp" \ No newline at end of file