pwn 0.4.680 → 0.4.682

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e73bd67263ace8f9f5aa216fe0c0196bbfa25be71769a6ca481e05019c5c0ff
-  data.tar.gz: 3f613847407a0f17ea04cc9ef1e96160cc43377bf31e08345f36a92681615cc6
+  metadata.gz: ff2630dcb10e95139743093026f1f2210bb4735a241abacf2d87682bb5ed0f4b
+  data.tar.gz: 11df6a65e5956837bac3a84a6ad6f35af63626c1e8f0cd10f076cb0eeb9166e2
 SHA512:
-  metadata.gz: e3605d4a97ba12d392a9a6b359bbcffd598d83d193ae4f66788b59915017b057c2bbf119ae526318e189cda9a51599e8962e9ee64e15dc0aef429df038896ee4
-  data.tar.gz: c3666977f6a9286b156e0360012c7674e2c1fb68eb988b26305c34d9ba0cef25d2545986f01627da368585028fa4610f3a597a3b9d7511a346227319e1895d0b
+  metadata.gz: 2b71de5e43b85215cfc389d46f3aaff7ebbbf7d5c10a4e3a5cf064d5f3c6bfba1d541e99ac0739961ea83ac104852e150ac3de116d12f26e16e93d8f5edab030
+  data.tar.gz: 7fad3ff770bbd8337a548890a713d6c7176783950f43f6abb8d57b25be111a0ed86b5db062cb7bee45c121f04d1d067f37a2a630bfcf5cd688c737de3ddb8f78

data/Gemfile

@@ -66,7 +66,7 @@ gem 'rspec', '3.12.0'
 gem 'rtesseract', '3.1.2'
 gem 'rubocop', '1.50.2'
 gem 'rubocop-rake', '0.6.0'
-gem 'rubocop-rspec', '2.21.0'
+gem 'rubocop-rspec', '2.22.0'
 gem 'ruby-audio', '1.6.1'
 gem 'ruby-nmap', '1.0.1'
 gem 'ruby-saml', '1.15.0'

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.680]:001 >>> PWN.help
+pwn[v0.4.682]: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.680]:001 >>> PWN.help
+pwn[v0.4.682]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_diff_csv_files_w_column_exclude

@@ -42,6 +42,17 @@ if opts.empty?
   exit 1
 end
 
+def ommit_columns_by_indices(opts = {})
+  csv = opts[:csv]
+  columns_index_arr = opts[:columns_index_arr]
+
+  csv.each do |line_arr|
+    line_arr.delete_if.with_index do |_, index|
+      columns_index_arr.include?(index)
+    end
+  end
+end
+
 def csv_diff(opts = {})
   c1_path = opts[:c1_path]
   c2_path = opts[:c2_path]
@@ -77,24 +88,22 @@ def csv_diff(opts = {})
   end
 
   if columns_index_arr.any?
-    larger_csv.each do |line_arr|
-      line_arr.delete_if.with_index do |_, index|
-        columns_index_arr.include?(index)
-      end
-    end
-
-    smaller_csv.each do |line_arr|
-      line_arr.delete_if.with_index do |_, index|
-        columns_index_arr.include?(index)
-      end
-    end
+    larger_csv = ommit_columns_by_indices(
+      csv: larger_csv,
+      columns_index_arr: columns_index_arr
+    )
+
+    smaller_csv = ommit_columns_by_indices(
+      csv: smaller_csv,
+      columns_index_arr: columns_index_arr
+    )
   end
 
   # Write diff with redacted columns (to find differences we care about)
   File.open(diff_path, 'w') do |f|
     larger_csv.each do |line_arr|
       line = line_arr.join(',')
-      f.puts line unless smaller_csv.include?(line_arr)
+      f.puts line unless smaller_csv.select { |sc| sc.join(',') == line }
     end
   end
   diff_csv = CSV.read(diff_path)
@@ -105,13 +114,13 @@ def csv_diff(opts = {})
     if no_headers
       larger_csv_orig.each do |line_arr|
         line = line_arr.join(',')
-        f.puts line if diff_csv.include?(line_arr)
+        f.puts line if diff_csv.select { |dc| dc.join(',') == line }
       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)
+        f.puts line if diff_csv.select { |dc| dc.join(',') == line }
       end
     end
   end

data/bin/pwn_nmap_discover_tcp_udp

@@ -15,7 +15,7 @@ OptionParser.new do |options|
     opts[:target_range] = t
   end
 
-  options.on('-eFILE', '--target-exclude-file=FILE', '<Optional - nmap excludes file>') do |e|
+  options.on('-eFILE', '--target-exclude-file=FILE', '<Optional - IP excludes file>') do |e|
     opts[:exclude_file] = e
   end
 
@@ -23,6 +23,10 @@ OptionParser.new do |options|
     opts[:interface] = i
   end
 
+  options.on('-rDIR', '--results-root=DIR', '<Optional - nmap results root (Default: /tmp)>') do |r|
+    opts[:results_root] = r
+  end
+
   options.on('-T', '--tor', '<Optional - Source Scans from Tor Nodes>') do |t|
     opts[:with_tor] = t
   end
@@ -41,22 +45,28 @@ puts "\n\n\n#{banner}"
 puts "- STARTED: #{started_at} "
 
 target_range = opts[:target_range]
+
+results_root = opts[:results_root]
+results_root ||= '/tmp'
+FileUtils.mkdir_p results_root
+puts "Results Saved in: #{results_root}"
+
 exclude_file = opts[:exclude_file]
-exclude_file ||= '/tmp/nmap_targets_exclude.txt'
+exclude_file ||= "#{results_root}/nmap_targets_exclude.txt"
+# We create an exclude file (even if its empty)
+File.new(exclude_file, 'w') unless File.exist?(exclude_file)
+
 interface = opts[:interface]
 interface ||= 'eth0'
+
 with_tor = true if opts[:with_tor]
 with_tor ||= false
+
 if with_tor
   tor_obj = PWN::Plugins::Tor.start
   proxy = ["socks4://#{tor_obj[:ip]}:#{tor_obj[:port]}"]
 end
 
-File.new(exclude_file, 'w') unless File.exist?(exclude_file)
-nmap_results_root = File.dirname(exclude_file)
-FileUtils.mkdir_p nmap_results_root
-puts "nmap Results Saved in: #{nmap_results_root}"
-
 discovery_tcp_ports = {
   ftp: 21,
   ssh: 22,
@@ -126,10 +136,10 @@ discovery_sctp_ports = {
   sicc: 38_412
 }
 
-target_file = "#{nmap_results_root}/nmap_targets.txt"
-latest_discovery_results = "#{nmap_results_root}/nmap_discovery_results.xml"
-latest_tcp_results = "#{nmap_results_root}/nmap_tcp_results"
-latest_udp_results = "#{nmap_results_root}/nmap_udp_results"
+target_file = "#{results_root}/nmap_targets.txt"
+latest_discovery_results = "#{results_root}/nmap_discovery_results.xml"
+latest_tcp_results = "#{results_root}/nmap_tcp_results"
+latest_udp_results = "#{results_root}/nmap_udp_results"
 
 begin
   # Per man nmap:

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.4.680'
+  VERSION = '0.4.682'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.680
+  version: 0.4.682
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -786,14 +786,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.21.0
+        version: 2.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.21.0
+        version: 2.22.0
 - !ruby/object:Gem::Dependency
   name: ruby-audio
   requirement: !ruby/object:Gem::Requirement