pwn 0.4.679 → 0.4.680

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98918a56d63ac8ef47261e94f0b9d00e42b90e0c60ccaaeecfa0f1c28591af50
-  data.tar.gz: 55e972d187270c847d7729278ee155a99afbe3d348b72202125becbaeaa584af
+  metadata.gz: 6e73bd67263ace8f9f5aa216fe0c0196bbfa25be71769a6ca481e05019c5c0ff
+  data.tar.gz: 3f613847407a0f17ea04cc9ef1e96160cc43377bf31e08345f36a92681615cc6
 SHA512:
-  metadata.gz: c8ad1f6d63ad8d3162c74b31ee24e0be22360dc739039a236f6dfd00bf53cdb8a8e91f630d42d27f5300537c06a06ffaca59f943eb6827caa68cb822722b1004
-  data.tar.gz: 987790249425f4580f251a11ae284c78b2b0f88278e0fd4be7ac22c91700a8fb70cf4f1da854bd4d7eab56542ac6810578b9e3ddeadd59fce5456f30982ab918
+  metadata.gz: e3605d4a97ba12d392a9a6b359bbcffd598d83d193ae4f66788b59915017b057c2bbf119ae526318e189cda9a51599e8962e9ee64e15dc0aef429df038896ee4
+  data.tar.gz: c3666977f6a9286b156e0360012c7674e2c1fb68eb988b26305c34d9ba0cef25d2545986f01627da368585028fa4610f3a597a3b9d7511a346227319e1895d0b

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.680]: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.680]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_nmap_discover_tcp_udp

@@ -151,7 +151,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 +188,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.680'
 end

metadata

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