pwn 0.4.701 → 0.4.702

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceb1cedbe92d94c3dca89d70f85bb9981dfd3ec76ea31587f32d16ffa3cda7b3
-  data.tar.gz: ae4ec69d69bfc2c0ccaf00fdd45106c2f44aab3d128f26c4b26b766db821ade4
+  metadata.gz: 2ed1a0adc6438474f96321a77062d0ae6179b023a399d89455317c968e319411
+  data.tar.gz: f6e92b7c81b4a95c1386d28fbfd312251a44c7f1c0d5d87f8c35c6fc71b21131
 SHA512:
-  metadata.gz: 0ba4707ce699ada3695d8c3259776b9fc73d4725b50f1a8481103b31ce5a85e8ee839438e2adef538027cff6008ff46374cb63cfd63d1d1611c2bfe7dc73c902
-  data.tar.gz: 7fbc0b3c7a169116a73edbd0dea37d7c653cb380bc57a51838850cea3769a6105ef9e80cbc3ea7ff80836231fc5b35ebacb28d3d5dac93db00e7c3503df0b18a
+  metadata.gz: 8e1febea97aca0637a6ab1151c4308edee84c2e1566ad2d84a5dd0eedfdd35c9f29fe5bb119e90a222f1c2696e42e4f8997e693960359e71cfc32aa9d785a88b
+  data.tar.gz: 8a32dc2f9eecf7a052ef52202bab7ab04d88e70d8cce2cd18220c69f211610e8d6aa42c01c40c63123bb783a37144b3d0d0cbb56267ea2df5fdf118b9f466448

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.2.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.701]:001 >>> PWN.help
+pwn[v0.4.702]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.2.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.701]:001 >>> PWN.help
+pwn[v0.4.702]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_burp_suite_pro_active_scan

@@ -72,7 +72,8 @@ begin
   # support JavaScript, DOM-based XSS vuln attempts are
   # possible as well since we have a DOM to interact w/
   # (Burp's DOM-XSS checks are based on static code analysis)
-  browser = burp_obj[:burp_browser]
+  browser_obj = burp_obj[:burp_browser]
+  browser = browser_obj[:browser]
   browser.goto(target_url)
 
   File.read(navigation_instruct).each_line do |instruction|

data/bin/pwn_domain_reversewhois

@@ -44,10 +44,11 @@ begin
     browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :headless)
   end
 
-  browser_obj.goto("https://viewdns.info/reversewhois/?q=#{CGI.escape(registrant_filter)}")
+  browser = browser_obj[:browser]
+  browser.goto("https://viewdns.info/reversewhois/?q=#{CGI.escape(registrant_filter)}")
 
   # Consume Results Table and Convert to CSV :)
-  reversewhois_xp_resp = Nokogiri::HTML(browser_obj.html).xpath('//*[@id="null"]/tbody/tr[3]/td/font/table/tbody/tr')
+  reversewhois_xp_resp = Nokogiri::HTML(browser.html).xpath('//*[@id="null"]/tbody/tr[3]/td/font/table/tbody/tr')
   CSV.open(output_results, 'w', col_sep: ',', quote_char: "'", force_quotes: true) do |csv|
     reversewhois_xp_resp.each do |row|
       tarray = []
@@ -59,16 +60,16 @@ begin
   end
 
   # Ok, now let's append domain bigdata.com
-  browser_obj.goto('https://domainbigdata.com')
+  browser.goto('https://domainbigdata.com')
 
   # Type Registrant Filter in Char-by-Char to Ensure Everyone is Happy ;)
   PWN::Plugins::TransparentBrowser.type_as_human(string: registrant_filter) do |char|
-    browser_obj.text_field(id: 'txtSearchTopPage').wait_until(&:present?).send_keys(char)
+    browser.text_field(id: 'txtSearchTopPage').wait_until(&:present?).send_keys(char)
   end
-  browser_obj.button(id: 'btnTopSearch').wait_until(&:present?).click
+  browser.button(id: 'btnTopSearch').wait_until(&:present?).click
 
   # Consume Results Table and Convert to CSV :)
-  reversewhois_xp_resp = Nokogiri::HTML(browser_obj.html).xpath('//*[@id="domain-same-ip"]/div/div/table/tbody/tr')
+  reversewhois_xp_resp = Nokogiri::HTML(browser.html).xpath('//*[@id="domain-same-ip"]/div/div/table/tbody/tr')
   CSV.open(output_results, 'a', col_sep: ',', quote_char: "'", force_quotes: true) do |csv|
     reversewhois_xp_resp.each do |row|
       tarray = []

data/bin/pwn_owasp_zap_active_scan

@@ -77,10 +77,11 @@ begin
 
   logger.info(zap_obj)
 
-  browser = PWN::Plugins::TransparentBrowser.open(
+  browser_obj = PWN::Plugins::TransparentBrowser.open(
     browser_type: browser_type,
     proxy: proxy
   )
+  browser = browser_obj[:browser]
 
   if browser_type == :rest
     browser.get(target_url)
@@ -129,5 +130,5 @@ rescue StandardError => e
   raise e
 ensure
   PWN::Plugins::OwaspZap.stop(zap_obj: zap_obj) unless zap_obj.nil?
-  browser = PWN::Plugins::TransparentBrowser.close(browser_obj: browser) unless browser.nil?
+  browser_obj = PWN::Plugins::TransparentBrowser.close(browser_obj: browser_obj) unless browser_obj.nil?
 end

data/bin/pwn_pastebin_sample_filter

@@ -32,12 +32,14 @@ browser_obj = PWN::WWW::Pastebin.open(
   proxy: proxy
 )
 
+browser = browser_obj[:browser]
+
 begin
   loop do
-    browser_obj.div(id: 'menu_2').links[0].click
-    code_frame = browser_obj.div(id: 'code_frame').text
+    browser.div(id: 'menu_2').links[0].click
+    code_frame = browser.div(id: 'code_frame').text
     if code_frame.match?(/#{regex}/mi)
-      puts "\nCurrent Link: #{browser_obj.url}"
+      puts "\nCurrent Link: #{browser.url}"
       puts "#{code_frame}\n\n\n"
     else
       print '.'

data/bin/pwn_web_cache_deception

@@ -92,8 +92,9 @@ begin
     payload = opts[:payload].to_s.scrub.chomp.strip
 
     # Browse to original page to compare response lengths
-    browser_obj.goto(target_url)
-    orig_url_response_length = browser_obj.html.length
+    browser = browser_obj[:browser]
+    browser.goto(target_url)
+    orig_url_response_length = browser.html.length
 
     http_result = ''
     if target_url.include?('?')
@@ -102,8 +103,8 @@ begin
       injected_target_url.path = "#{injected_target_url.path.to_s.chomp('/')}/wcd.#{payload}"
       web_cache_deception_url = injected_target_url.to_s
 
-      browser_obj.goto(injected_target_url.to_s)
-      injected_url_response_length = browser_obj.html.length
+      browser.goto(injected_target_url.to_s)
+      injected_url_response_length = browser.html.length
 
       if injected_url_response_length == orig_url_response_length
         # TODO: Add incognito Chrome browser
@@ -115,8 +116,8 @@ begin
       end
     else
       web_cache_deception_url = "#{target_url.chomp('/')}/wcd.#{payload}"
-      browser_obj.goto(web_cache_deception_url)
-      wcd_url_response_length = browser_obj.html.length
+      browser.goto(web_cache_deception_url)
+      wcd_url_response_length = browser.html.length
 
       if orig_url_response_length == wcd_url_response_length
         # TODO: Add incognito Chrome browser
@@ -176,8 +177,10 @@ begin
     browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :chrome)
   end
 
+  browser = browser_obj[:browser]
+
   puts "#{@green}Navigating to Target URL: #{target_url}#{@end_of_color}\n\n\n"
-  browser_obj.goto(target_url)
+  browser.goto(target_url)
 
   web_cache_deception_payload_arr = %w[
     aif aiff au avi bin bmp cab carb cct cdf class css doc dcr dtd gcf gff gif grv hdml hqx ico ini jpeg jpg js mov mp3 mp4 nc pct ppc pws swa swf txt vbs w32 wav wbmp wml wmlc wmls wmlsc xsd zip

data/bin/pwn_www_checkip

@@ -27,19 +27,20 @@ begin
     browser_obj = PWN::Plugins::TransparentBrowser.open(
       browser_type: :rest,
       proxy: proxy
-    )::Request
+    )
   else
-    browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+    browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
   end
+  browser = browser_obj[:browser]::Request
 
   if proxy
-    public_ip_address = browser_obj.execute(
+    public_ip_address = browser.execute(
       method: :get,
       url: 'https://checkip.amazonaws.com',
       verify_ssl: false
     ).to_s.chomp
   else
-    public_ip_address = browser_obj.execute(
+    public_ip_address = browser.execute(
       method: :get,
       url: 'https://checkip.amazonaws.com'
     ).to_s.chomp

data/bin/pwn_www_uri_buster

@@ -67,15 +67,16 @@ def request_path(opts = {})
     print '.'
     http_uri = "#{target_url}/#{wordlist_line}"
     if proxy
-      rest_client = PWN::Plugins::TransparentBrowser.open(
+      browser_obj = PWN::Plugins::TransparentBrowser.open(
         browser_type: :rest,
         proxy: proxy
-      )::Request
+      )
     else
-      rest_client = PWN::Plugins::TransparentBrowser.open(
+      browser_obj = PWN::Plugins::TransparentBrowser.open(
         browser_type: :rest
-      )::Request
+      )
     end
+    rest_client = browser_obj[:browser]::Request
 
     headers = nil
     if http_request_headers

data/bin/pwn_xss_dom_vectors

@@ -73,9 +73,10 @@ begin
     target_page = opts[:url].to_s.scrub.chomp.strip
     output_dir = opts[:output_dir].to_s.scrub.chomp.strip
 
+    browser = browser_obj[:browser]
     puts "#{@green}Navigating to Page #{target_page}#{@end_of_color}"
-    browser_obj.goto(target_page)
-    browser_obj.scripts.each do |script|
+    browser.goto(target_page)
+    browser.scripts.each do |script|
       if script.src == ''
         # Save a copy of the outer_html
         puts "#{@yellow}Saving OuterHTML of Native '<script>' Element#{@end_of_color}"
@@ -87,15 +88,15 @@ begin
       else
         # Save a copy of the script
         puts "#{@yellow}Navigating to #{script.src}#{@end_of_color}"
-        browser_obj.goto(script.src)
-        sha256_hexdigest = OpenSSL::Digest::SHA256.hexdigest(browser_obj.text)
-        uri = URI.parse(browser_obj.url)
+        browser.goto(script.src)
+        sha256_hexdigest = OpenSSL::Digest::SHA256.hexdigest(browser.text)
+        uri = URI.parse(browser.url)
         script_filename = File.basename(uri.path)
         script_results = "#{output_dir}/#{File.basename(script_filename, '.*')}-#{sha256_hexdigest}#{File.extname(script_filename)}".to_s.scrub.chomp.strip
         File.open(script_results, 'w') do |f|
-          f.puts browser_obj.text
+          f.puts browser.text
         end
-        browser_obj.back
+        browser.back
       end
       puts "#{@green}Saved #{script_results}#{@end_of_color}\n\n\n"
     end
@@ -112,8 +113,10 @@ begin
     browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: browser_type)
   end
 
+  browser = browser_obj[:browser]
+
   puts "#{@green}Navigating to Target FQDN: #{target_fqdn}#{@end_of_color}\n\n\n"
-  browser_obj.goto(target_fqdn)
+  browser.goto(target_fqdn)
 
   if spider
     if File.exist?(spider_results)

data/lib/pwn/plugins/baresip.rb

@@ -25,9 +25,10 @@ module PWN
         begin
           conn_attempt += 1
 
-          rest_client = PWN::Plugins::TransparentBrowser.open(
+          browser_obj = PWN::Plugins::TransparentBrowser.open(
             browser_type: :rest
-          )::Request
+          )
+          rest_client = browser_obj[:browser]::Request
 
           response = rest_client.execute(
             method: :get,

data/lib/pwn/plugins/beef.rb

@@ -39,7 +39,9 @@ module PWN
         auth_payload[:password] = password
 
         @@logger.info("Logging into BeEF REST API: #{beef_ip}")
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
+
         response = rest_client.execute(
           method: :post,
           url: "#{base_beef_api_uri}/admin/login",
@@ -85,7 +87,8 @@ module PWN
         base_beef_api_uri = "http://#{beef_ip}:#{beef_port}/api".to_s.scrub
         api_token = beef_obj[:api_token]
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
 
         case http_method
         when :get

data/lib/pwn/plugins/burp_suite.rb

@@ -37,7 +37,9 @@ module PWN
         # Construct burp_obj
         burp_obj = {}
         burp_obj[:pid] = Process.spawn(burp_cmd_string)
-        rest_browser = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        browser_obj1 = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_browser = browser_obj1[:browser]
+
         # random_mitm_port = PWN::Plugins::Sock.get_random_unused_port
         # random_bb_port = random_mitm_port
         # random_bb_port = PWN::Plugins::Sock.get_random_unused_port while random_bb_port == random_mitm_port
@@ -46,12 +48,12 @@ module PWN
         burp_obj[:rest_browser] = rest_browser
 
         # Proxy always listens on localhost...use SSH tunneling if remote access is required
-        burp_browser = PWN::Plugins::TransparentBrowser.open(
+        browser_obj2 = PWN::Plugins::TransparentBrowser.open(
           browser_type: browser_type,
           proxy: "http://#{burp_obj[:mitm_proxy]}"
         )
 
-        burp_obj[:burp_browser] = burp_browser
+        burp_obj[:burp_browser] = browser_obj2
 
         # Wait for TCP 8001 to open prior to returning burp_obj
         loop do
@@ -278,10 +280,10 @@ module PWN
 
       public_class_method def self.stop(opts = {})
         burp_obj = opts[:burp_obj]
-        burp_browser = burp_obj[:burp_browser]
+        browser_obj = burp_obj[:burp_browser]
         burp_pid = burp_obj[:pid]
 
-        burp_browser = PWN::Plugins::TransparentBrowser.close(browser_obj: burp_browser)
+        browser_obj = PWN::Plugins::TransparentBrowser.close(browser_obj: browser_obj)
         Process.kill('TERM', burp_pid)
 
         burp_obj = nil

data/lib/pwn/plugins/defect_dojo.rb

@@ -67,15 +67,17 @@ module PWN
         api_version = dd_obj[:api_version]
         base_dd_api_uri = "#{url}/api/#{api_version}".to_s.scrub
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
 
         if dd_obj[:proxy]
-          rest_client = PWN::Plugins::TransparentBrowser.open(
+          browser_obj = PWN::Plugins::TransparentBrowser.open(
             browser_type: :rest,
             proxy: dd_obj[:proxy]
-          )::Request
+          )
         end
 
+        rest_client = browser_obj[:browser]::Request
+
         case http_method
         when :get
           response = rest_client.execute(

data/lib/pwn/plugins/github.rb

@@ -28,7 +28,8 @@ module PWN
         http_body = opts[:http_body].to_s.scrub
         base_gist_api_uri = 'https://api.github.com'
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
 
         case http_method
         when :get

data/lib/pwn/plugins/hacker_one.rb

@@ -35,7 +35,8 @@ module PWN
         basic_auth_header = "Basic #{base64_encoded_auth}"
 
         @@logger.info("Logging into HackerOne REST API: #{base_h1_api_uri}")
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
         response = rest_client.execute(
           method: :get,
           url: base_h1_api_uri,
@@ -80,7 +81,8 @@ module PWN
         base_h1_api_uri = 'https://api.hackerone.com/v1/'.to_s.scrub
         api_token = h1_obj[:api_token]
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        rest_client = browser_obj[:browser]::Request
 
         case http_method
         when :get

data/lib/pwn/plugins/ibm_appscan.rb

@@ -33,7 +33,9 @@ module PWN
                    end
 
         @@logger.info("Logging into IBM Appscan Enterprise Server: #{appscan_ip}")
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
+
         response = rest_client.execute(
           method: :post,
           url: "#{base_appscan_api_uri}/login",
@@ -91,7 +93,8 @@ module PWN
         base_appscan_api_uri = "https://#{appscan_ip}/ase/services".to_s.scrub
         retry_count = 3
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
 
         case http_method
         when :get
@@ -694,7 +697,9 @@ module PWN
 
         # First Get request
         uri = URI.parse(report_link)
-        rb = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rb = browser_obj[:browser]
+
         res = rb.get(report_link, 'Cookie' => appscan_obj[:cookie], :verify_ssl => OpenSSL::SSL::VERIFY_NONE)
         location = "https://#{uri.host}#{res.headers['location']}"
 
@@ -736,9 +741,11 @@ module PWN
         # verify the output path actually exists
         return @@logger.error("Output directory does not exist: #{output_path}") unless File.directory?(output_path)
 
-        # REMEMBER TO CHANGE BROWSER TYPE BACK TO HEADLESS!!!!
-        h_browser = PWN::Plugins::TransparentBrowser.open(browser_type: :firefox,
-                                                          proxy: 'http://127.0.0.1:8080')
+        browser_obj = PWN::Plugins::TransparentBrowser.open(
+          browser_type: :headless,
+          proxy: 'http://127.0.0.1:8080'
+        )
+        h_browser = browser_obj[:browser]
 
         # log into the system
         h_browser.goto login_uri.to_s.to_s.scrub

data/lib/pwn/plugins/ip_info.rb

@@ -20,10 +20,12 @@ module PWN
 
         if IPAddress.valid?(ip)
           if proxy
-            rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest, proxy: proxy)
+            browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest, proxy: proxy)
           else
-            rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+            browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
           end
+          rest_client = browser_obj[:browser]
+
           ip_resp_str = rest_client.get("http://ip-api.com/json/#{ip}?fields=country,countryCode,region,regionName,city,zip,lat,lon,timezone,isp,org,as,reverse,mobile,proxy,query,status,message")
           ip_resp_json = JSON.parse(
             ip_resp_str,

data/lib/pwn/plugins/jira_server.rb

@@ -36,7 +36,8 @@ module PWN
 
         token = opts[:token]
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
 
         spinner = TTY::Spinner.new
         spinner.auto_spin

data/lib/pwn/plugins/nessus_cloud.rb

@@ -30,7 +30,8 @@ module PWN
         secret_key = nessus_obj[:secret_key]
         base_nessus_cloud_api_uri = 'https://cloud.tenable.com'
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
 
         case http_method
         when :get

data/lib/pwn/plugins/open_ai.rb

@@ -35,7 +35,9 @@ module PWN
 
         content_type = 'application/json; charset=UTF-8'
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
+
         spinner = TTY::Spinner.new
         spinner.auto_spin
 

data/lib/pwn/plugins/owasp_zap.rb

@@ -34,7 +34,8 @@ module PWN
         port = zap_obj[:port]
         base_zap_api_uri = "http://#{host}:#{port}"
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
 
         case http_method
         when :get

data/lib/pwn/plugins/shodan.rb

@@ -33,7 +33,8 @@ module PWN
         base_shodan_api_uri = 'https://api.shodan.io'
         api_key = opts[:api_key]
 
-        rest_client = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
+        browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        rest_client = browser_obj[:browser]::Request
 
         case http_method
         when :get

data/lib/pwn/plugins/transparent_browser.rb

@@ -9,20 +9,9 @@ require 'openssl'
 require 'em/pure_ruby'
 require 'faye/websocket'
 
-# Monkey Patch Watir
-module Watir
-  # Browser Class to allow tor_obj from PWN::Plugins::Tor.start
-  # to populate attr_accessor :tor_obj
-  # This was done this way soley to maintain backwards compatibility
-  # with how browser_obj is returned.
-  class Browser
-    attr_accessor :tor_obj
-  end
-end
-
 module PWN
   module Plugins
-    # This plugin rocks. Chrome, Firefox, PhantomJS, IE, REST Client,
+    # This plugin rocks. Chrome, Firefox, headless, REST Client,
     # all from the comfort of one plugin.  Proxy support (e.g. Burp
     # Suite Professional) is completely available for all browsers
     # except for limited functionality within IE (IE has interesting
@@ -39,14 +28,16 @@ module PWN
       # )
 
       public_class_method def self.open(opts = {})
-        this_browser = nil
         browser_type = opts[:browser_type]
         proxy = opts[:proxy].to_s unless opts[:proxy].nil?
 
+        browser_obj = {}
+
         tor_obj = nil
         if opts[:proxy] == 'tor'
           tor_obj = PWN::Plugins::Tor.start
           proxy = "socks5://#{tor_obj[:ip]}:#{tor_obj[:port]}"
+          browser_obj[:tor_obj] = tor_obj
         end
 
         opts[:with_devtools] ? (with_devtools = true) : (with_devtools = false)
@@ -114,7 +105,7 @@ module PWN
           options.profile = this_profile
           # driver = Selenium::WebDriver.for(:firefox, capabilities: options)
           driver = Selenium::WebDriver.for(:firefox, options: options)
-          this_browser = Watir::Browser.new(driver)
+          browser_obj[:browser] = Watir::Browser.new(driver)
 
         when :chrome
           this_profile = Selenium::WebDriver::Chrome::Profile.new
@@ -143,7 +134,7 @@ module PWN
           options.profile = this_profile
           # driver = Selenium::WebDriver.for(:chrome, capabilities: options)
           driver = Selenium::WebDriver.for(:chrome, options: options)
-          this_browser = Watir::Browser.new(driver)
+          browser_obj[:browser] = Watir::Browser.new(driver)
 
         when :headless, :headless_firefox
           this_profile = Selenium::WebDriver::Firefox::Profile.new
@@ -200,7 +191,7 @@ module PWN
           options = Selenium::WebDriver::Firefox::Options.new(args: ['-headless'], accept_insecure_certs: true)
           options.profile = this_profile
           driver = Selenium::WebDriver.for(:firefox, options: options)
-          this_browser = Watir::Browser.new(driver)
+          browser_obj[:browser] = Watir::Browser.new(driver)
 
         when :headless_chrome
           this_profile = Selenium::WebDriver::Chrome::Profile.new
@@ -224,16 +215,16 @@ module PWN
 
           options.profile = this_profile
           driver = Selenium::WebDriver.for(:chrome, options: options)
-          this_browser = Watir::Browser.new(driver)
+          browser_obj[:browser] = Watir::Browser.new(driver)
 
         when :rest
-          this_browser = RestClient
+          browser_obj[:browser] = RestClient
           if proxy
             if tor_obj
               TCPSocket.socks_server = tor_obj[:ip]
               TCPSocket.socks_port = tor_obj[:port]
             else
-              this_browser.proxy = proxy
+              browser_obj[:browser].proxy = proxy
             end
           end
 
@@ -245,7 +236,7 @@ module PWN
             end
             proxy_opts = { origin: proxy }
             tls_opts = { verify_peer: false }
-            this_browser = Faye::WebSocket::Client.new(
+            browser_obj[:browser] = Faye::WebSocket::Client.new(
               '',
               [],
               {
@@ -254,15 +245,14 @@ module PWN
               }
             )
           else
-            this_browser = Faye::WebSocket::Client.new('')
+            browser_obj[:browser] = Faye::WebSocket::Client.new('')
           end
         else
           puts 'Error: browser_type only supports :firefox, :chrome, :headless, :rest, or :websocket'
           return nil
         end
 
-        this_browser.tor_obj = tor_obj if tor_obj
-        this_browser
+        browser_obj
       rescue StandardError => e
         raise e
       end
@@ -273,13 +263,13 @@ module PWN
       # )
 
       public_class_method def self.linkout(opts = {})
-        this_browser_obj = opts[:browser_obj]
+        browser_obj = opts[:browser_obj]
 
-        this_browser_obj.links.each do |link|
+        browser_obj[:browser].links.each do |link|
           @@logger.info("#{link.text} => #{link.href}\n\n\n") unless link.text == ''
         end
 
-        this_browser_obj
+        browser_obj
       rescue StandardError => e
         raise e
       end
@@ -313,16 +303,16 @@ module PWN
       # )
 
       public_class_method def self.close(opts = {})
-        this_browser_obj = opts[:browser_obj]
+        browser_obj = opts[:browser_obj]
 
-        if this_browser_obj.respond_to?('tor_obj')
-          tor_obj = this_browser_obj.tor_obj
-          PWN::Plugins::Tor.stop(tor_obj: tor_obj)
+        unless browser_obj[:tor_obj].nil?
+          tor_obj = browser_obj[:tor_obj]
+          PWN::Plugins::Tor.stop(tor_obj: browser_obj[:tor_obj])
         end
 
-        unless this_browser_obj.to_s.include?('RestClient')
+        unless browser_obj[:browser].to_s.include?('RestClient')
           # Close the browser unless this_browser_obj.nil? (thus the &)
-          this_browser_obj&.close
+          this_browser_obj[:browser]&.close
         end
         nil
       rescue StandardError => e