pwn 0.4.679 → 0.4.681

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98918a56d63ac8ef47261e94f0b9d00e42b90e0c60ccaaeecfa0f1c28591af50
-  data.tar.gz: 55e972d187270c847d7729278ee155a99afbe3d348b72202125becbaeaa584af
+  metadata.gz: 717524d6d611b962be2b71ffb95c427abd3c173347b651904b2a1b1294fd807b
+  data.tar.gz: 894b9128466217e15befedcc67296d47de56e61640eb88c119512994a9db98f1
 SHA512:
-  metadata.gz: c8ad1f6d63ad8d3162c74b31ee24e0be22360dc739039a236f6dfd00bf53cdb8a8e91f630d42d27f5300537c06a06ffaca59f943eb6827caa68cb822722b1004
-  data.tar.gz: 987790249425f4580f251a11ae284c78b2b0f88278e0fd4be7ac22c91700a8fb70cf4f1da854bd4d7eab56542ac6810578b9e3ddeadd59fce5456f30982ab918
+  metadata.gz: e129b34830468a21f9fa339af587f3c8428cd0328dfa27c8dc5b1e78dc76264dba7398a2341c47f558f072cc36a6024c93ada70564b97fe8b9cbfbd440aa34bc
+  data.tar.gz: 6e9383ba997f1146c6196720e4d2ff0c33b8b982814d37d373eb7888b1a4a21d721e0d35aeb629da10e4c93c497ce7716120220769e131f41eb13415125dc720

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

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:
@@ -151,7 +161,7 @@ begin
   # Target Discovery Scan
   # Using -T5 template to reduce number of
   # retransmission attempts on filtered ports.
-  puts "\n\n\n#{banner}"
+  puts banner
   puts '- PHASE 1: Target Discovery'
   PWN::Plugins::NmapIt.port_scan do |nmap|
     if with_tor
@@ -188,16 +198,32 @@ begin
         next if File.read(exclude_file).include?(host.ip) ||
                 host.status.state != :up
 
-        hosts_arr = host.hostnames.map { |h| h[:name] }
-        f.print host.ip
-        f.puts " # { \"hostnames\": #{hosts_arr}}, \"mac\": \"#{host.mac}\" }"
+        f.puts host.ip
       end
     end
   end
 
-  # Produce a good targets.txt redacting duplicates
-  sorted_targets = File.readlines(target_file).sort.join
-  File.write(target_file, sorted_targets)
+  # Produce a good targets.txt redacting duplicates && sorting by IP
+  sorted_ips = File.readlines(target_file).uniq.map do |ip|
+    IPAddr.new(ip.chomp)
+  end
+  sorted_ips = sorted_ips.sort_by(&:hton)
+
+  # Now Add additional info about the IP as a comment
+  File.open(target_file, 'w') do |f|
+    sorted_ips.each do |ip|
+      PWN::Plugins::NmapIt.parse_xml_results(
+        xml_file: latest_discovery_results
+      ) do |xml|
+        xml.each_host do |host|
+          next unless host.ip.to_s == ip.to_s
+
+          hosts_arr = host.hostnames.map { |h| h[:name] }
+          f.puts "#{ip} # { \"hostnames\": #{hosts_arr}}, \"mac\": \"#{host.mac}\" }"
+        end
+      end
+    end
+  end
 
   phase1_ended_at = Time.now.strftime(ftimestr)
   phase1_ended_at_parse = Time.parse(phase1_ended_at)

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.679
+  version: 0.4.681
 platform: ruby
 authors:
 - 0day Inc.