Merge pull request #257 from ninp0/master

PWN::Plugins::Tor module - initial commit && #bugfix in pwn_diff_csv_files_w_column_exclude Driver

Author: ninp0

Gemfile

@@ -72,7 +72,7 @@ gem 'ruby-nmap', '1.0.1'
 gem 'ruby-saml', '1.15.0'
 gem 'rvm', '1.11.3.9'
 gem 'savon', '2.14.0'
-gem 'selenium-devtools', '0.112.0'
+gem 'selenium-devtools', '0.113.0'
 gem 'serialport', '1.3.2'
 gem 'sinatra', '3.0.6'
 gem 'slack-ruby-client', '2.1.0'

README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.2.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.667]:001 >>> PWN.help
+pwn[v0.4.669]: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.667]:001 >>> PWN.help
+pwn[v0.4.669]:001 >>> PWN.help
 ```
 
 

bin/pwn

@@ -297,6 +297,5 @@ begin
     prompt: prompt
   )
 rescue StandardError => e
-  puts 1111 if Pry.config.chat_gpt
   raise e
 end

bin/pwn_diff_csv_files_w_column_exclude

@@ -46,7 +46,7 @@ def csv_diff(opts = {})
   c1_path = opts[:c1_path]
   c2_path = opts[:c2_path]
   diff_path = opts[:diff_path]
-  include_csv_headers = opts[:include_csv_headers]
+  no_headers = opts[:no_headers]
   column_names_to_exclude = opts[:column_names_to_exclude].to_s.split(',')
 
   csv1 = CSV.read(c1_path)
@@ -102,10 +102,17 @@ def csv_diff(opts = {})
   # Write diff again with all columns.
   csv_headers_orig = larger_csv_orig.first.join(',')
   File.open(diff_path, 'w') do |f|
-    f.puts csv_headers_orig if include_csv_headers
-    larger_csv_orig.each do |line_arr|
-      line = line_arr.join(',')
-      f.puts line if diff_csv.include?(line_arr)
+    if no_headers
+      larger_csv_orig.each do |line_arr|
+        line = line_arr.join(',')
+        f.puts line if diff_csv.include?(line_arr)
+      end
+    else
+      f.puts csv_headers_orig
+      larger_csv_orig[1..-1].each do |line_arr|
+        line = line_arr.join(',')
+        f.puts line if diff_csv.include?(line_arr)
+      end
     end
   end
 end
@@ -115,14 +122,14 @@ c2_path = opts[:c2_path]
 diff_path = opts[:diff_path]
 column_names_to_exclude = opts[:column_names_to_exclude]
 
-include_csv_headers = false if opts[:no_headers]
-include_csv_headers ||= true
+no_headers = true if opts[:no_headers]
+no_headers ||= false
 
 # Compare which two is larger
 csv_diff(
   c1_path: c1_path,
   c2_path: c2_path,
   diff_path: diff_path,
-  include_csv_headers: include_csv_headers,
+  no_headers: no_headers,
   column_names_to_exclude: column_names_to_exclude
 )

bin/pwn_domain_reversewhois

@@ -20,13 +20,9 @@ OptionParser.new do |options|
     opts[:output_results] = o
   end
 
-  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy>') do |p|
+  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy || :tor>') do |p|
     opts[:proxy] = p
   end
-
-  options.on('-T', '--[no-]with-tor', '<Optional - Proxy w/ TOR (Defaults to false)>') do |w|
-    opts[:with_tor] = w
-  end
 end.parse!
 
 if opts.empty?
@@ -37,13 +33,13 @@ end
 registrant_filter = opts[:registrant_filter].to_s.strip.chomp.scrub
 output_results = opts[:output_results].to_s.strip.chomp.scrub
 proxy = opts[:proxy].to_s.scrub.strip.chomp unless opts[:proxy].nil?
-with_tor = opts[:with_tor]
 
 begin
-  if proxy != '' && with_tor
-    browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :headless, proxy: proxy, with_tor: true)
-  elsif proxy != '' && with_tor.nil?
-    browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :headless, proxy: proxy)
+  if proxy
+    browser_obj = PWN::Plugins::TransparentBrowser.open(
+      browser_type: :headless,
+      proxy: proxy
+    )
   else
     browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :headless)
   end

bin/pwn_pastebin_sample_filter

@@ -14,13 +14,9 @@ OptionParser.new do |options|
     opts[:regex] = r
   end
 
-  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy>') do |p|
+  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy || :tor>') do |p|
     opts[:proxy] = p
   end
-
-  options.on('-T', '--[no-]with-tor', '<Optional - Proxy w/ TOR (Defaults to false)>') do |w|
-    opts[:with_tor] = w
-  end
 end.parse!
 
 if opts.empty?
@@ -29,13 +25,11 @@ if opts.empty?
 end
 
 proxy = opts[:proxy]
-with_tor = opts[:with_tor]
 regex = opts[:regex]
 
 browser_obj = PWN::WWW::Pastebin.open(
   browser_type: :headless,
-  proxy: proxy,
-  with_tor: with_tor
+  proxy: proxy
 )
 
 begin

bin/pwn_web_cache_deception

@@ -38,13 +38,9 @@ OptionParser.new do |options|
     opts[:mfa] = f
   end
 
-  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy>') do |p|
+  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy || :tor>') do |p|
     opts[:proxy] = p
   end
-
-  options.on('-T', '--[no-]with-tor', '<Optional - Proxy w/ TOR (Defaults to false)>') do |w|
-    opts[:with_tor] = w
-  end
 end.parse!
 
 if opts.empty?
@@ -88,7 +84,6 @@ else
 end
 
 proxy = opts[:proxy].to_s.scrub.strip.chomp unless opts[:proxy].nil?
-with_tor = opts[:with_tor]
 
 begin
   def get_web_cache_deception(opts = {})
@@ -157,18 +152,10 @@ begin
 
     puts "#{@green}Leveraging PWN::WWW::#{pwn_www_mod_str} to Obtain a Post AuhN State...#{@end_of_color}"
     if proxy
-      if with_tor
-        browser_obj = pwn_www_mod.open(
-          browser_type: :chrome,
-          proxy: proxy,
-          with_tor: true
-        )
-      else
-        browser_obj = pwn_www_mod.open(
-          browser_type: :chrome,
-          proxy: proxy
-        )
-      end
+      browser_obj = pwn_www_mod.open(
+        browser_type: :chrome,
+        proxy: proxy
+      )
     else
       browser_obj = pwn_www_mod.open(browser_type: :chrome)
     end
@@ -181,18 +168,10 @@ begin
     )
     puts "#{@green}complete.#{@end_of_color}\n\n\n"
   elsif pwn_www_mod_str == '' && proxy
-    if with_tor
-      browser_obj = PWN::Plugins::TransparentBrowser.open(
-        browser_type: :chrome,
-        proxy: proxy,
-        with_tor: true
-      )
-    else
-      browser_obj = PWN::Plugins::TransparentBrowser.open(
-        browser_type: :chrome,
-        proxy: proxy
-      )
-    end
+    browser_obj = PWN::Plugins::TransparentBrowser.open(
+      browser_type: :chrome,
+      proxy: proxy
+    )
   else
     browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :chrome)
   end

bin/pwn_www_checkip

@@ -10,28 +10,24 @@ OptionParser.new do |options|
     #{$PROGRAM_NAME} [opts]
   "
 
-  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy>') do |p|
+  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy || :tor>') do |p|
     opts[:proxy] = p
   end
 
-  options.on('-T', '--[no-]with-tor', '<Optional - Proxy w/ TOR (Defaults to false)>') do |w|
-    opts[:with_tor] = w
-  end
-
   options.on('-i', '--[no-]ipinfo', '<Optional - Return Details about Public IP Returned from CheckIP>') do |i|
     opts[:ipinfo] = i
   end
 end.parse!
 
 proxy = opts[:proxy].to_s.scrub.strip.chomp unless opts[:proxy].nil?
-with_tor = opts[:with_tor]
 ipinfo = opts[:ipinfo]
 
 begin
-  if proxy != '' && with_tor
-    browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest, proxy: proxy, with_tor: true)::Request
-  elsif proxy != '' && with_tor.nil?
-    browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest, proxy: proxy)::Request
+  if proxy
+    browser_obj = PWN::Plugins::TransparentBrowser.open(
+      browser_type: :rest,
+      proxy: proxy
+    )::Request
   else
     browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)::Request
   end

bin/pwn_xss_dom_vectors

@@ -26,14 +26,10 @@ OptionParser.new do |options|
     opts[:browser_type] = b
   end
 
-  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy>') do |p|
+  options.on('-pPROXY', '--proxy=PROXY', '<Optional - HTTP or Socks Proxy || :tor>') do |p|
     opts[:proxy] = p
   end
 
-  options.on('-T', '--[no-]with-tor', '<Optional - Proxy w/ TOR (Defaults to false)>') do |w|
-    opts[:with_tor] = w
-  end
-
   options.on('-S', '--[no-]spider-fqdn', '<Optional - Spider Target FQDN>') do |s|
     opts[:spider] = s
   end
@@ -56,7 +52,6 @@ else
 end
 
 proxy = opts[:proxy].to_s.scrub.strip.chomp unless opts[:proxy].nil?
-with_tor = opts[:with_tor]
 
 if opts[:spider]
   spider = true
@@ -109,18 +104,10 @@ begin
   end
 
   if proxy
-    if with_tor
-      browser_obj = PWN::Plugins::TransparentBrowser.open(
-        browser_type: browser_type,
-        proxy: proxy,
-        with_tor: true
-      )
-    else
-      browser_obj = PWN::Plugins::TransparentBrowser.open(
-        browser_type: browser_type,
-        proxy: proxy
-      )
-    end
+    browser_obj = PWN::Plugins::TransparentBrowser.open(
+      browser_type: browser_type,
+      proxy: proxy
+    )
   else
     browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: browser_type)
   end

lib/pwn/plugins.rb

@@ -58,6 +58,7 @@ module Plugins
     autoload :Spider, 'pwn/plugins/spider'
     autoload :SSN, 'pwn/plugins/ssn'
     autoload :ThreadPool, 'pwn/plugins/thread_pool'
+    autoload :Tor, 'pwn/plugins/tor'
     autoload :TransparentBrowser, 'pwn/plugins/transparent_browser'
     autoload :TwitterAPI, 'pwn/plugins/twitter_api'
     autoload :URIScheme, 'pwn/plugins/uri_scheme'