pwn 0.4.808 → 0.4.809

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4846c7ceb80b744dc61e124b07ccc35b887146ce49acb51ad5b4c87500f73d5
-  data.tar.gz: 4fe769081c0bb747d4429e545748f4df1b6f0fe8de08cbfabb87b116f1bdd348
+  metadata.gz: f3a66f4dc0df7d68e1b6e2c1514aff4642802973b5e0e9e7d082206befd69f07
+  data.tar.gz: f9944df718d590c7a1c1b591c9f7dd2eb3fdfc1d2014905fdb8ce2e7791f48de
 SHA512:
-  metadata.gz: cf4cdcf05d0302ce367463173bfb9cbe402026d70bdcdf36ce4ab97ea034a86186c4d73cdb678fe7a28eb157592dcb2e8f3647365ae310c3b08b3a0f9a2d4079
-  data.tar.gz: 0b1d06b8372eded16041b70e3f06f78fc7c6283dba26820c271ae6dd3f5990b68fb5f3cdfe0423345c02b291f42c391afe527aac70e74bf62b52b0bfeaa6e8be
+  metadata.gz: 7c05afa8cc33f4f03b289dd5f871a27070a5f24ecb6415aa393f21edd39fc57e4b1bd4baef368984944c39c648827e5ac9cb44186f120ec4198385eb303e4789
+  data.tar.gz: 4d426e821fc40814c897be419ac3ea575121aa6cd4f52606382ed7254d17324145c87cdb7adee89dbb3f8f422d75389c1114cf1340b0cd75cb7a325727f947e0

data/Gemfile

@@ -11,7 +11,7 @@ gemspec
 # In some circumstances custom flags are passed to gems in order
 # to build appropriately.  Defer to ./reinstall_pwn_gemset.sh
 # to review these custom flags (e.g. pg, serialport, etc).
-gem 'activesupport', '7.0.6'
+gem 'activesupport', '7.0.7'
 gem 'anemone', '0.7.2'
 gem 'authy', '3.0.1'
 gem 'aws-sdk', '3.1.0'
@@ -67,9 +67,9 @@ gem 'rex', '2.0.13'
 gem 'rmagick', '5.3.0'
 gem 'rspec', '3.12.0'
 gem 'rtesseract', '3.1.2'
-gem 'rubocop', '1.55.1'
+gem 'rubocop', '1.56.0'
 gem 'rubocop-rake', '0.6.0'
-gem 'rubocop-rspec', '2.23.0'
+gem 'rubocop-rspec', '2.23.2'
 gem 'ruby-audio', '1.6.1'
 gem 'ruby-nmap', '1.0.1'
 gem 'ruby-saml', '1.15.0'
@@ -77,7 +77,7 @@ gem 'rvm', '1.11.3.9'
 gem 'savon', '2.14.0'
 gem 'selenium-devtools', '0.115.0'
 gem 'serialport', '1.3.2'
-gem 'sinatra', '3.0.6'
+gem 'sinatra', '3.1.0'
 gem 'slack-ruby-client', '2.1.0'
 gem 'socksify', '1.7.1'
 gem 'spreadsheet', '1.3.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.808]:001 >>> PWN.help
+pwn[v0.4.809]: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.808]:001 >>> PWN.help
+pwn[v0.4.809]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_nmap_discover_tcp_udp

@@ -12,7 +12,11 @@ OptionParser.new do |options|
     #{$PROGRAM_NAME} [opts]
   "
 
-  options.on('-tRANGE', '--target-range=RANGE', '<Required - nmap supported host || ip range e.g. foo.bar, 192.168.1.1-20, 192.168.1.0/24, etc>') do |t|
+  options.on('-fFILE', '--target-file=FILE', '<Required if --target-range excluded - File containing one supported nmap target / line e.g. foo.bar, 10.1.1.1, 192.168.1.1-20, 192.168.1.0/24, etc>') do |f|
+    opts[:target_file] = f
+  end
+
+  options.on('-tRANGE', '--target-range=RANGE', '<Required if --target-file excluded - nmap supported host || ip range e.g. foo.bar, 10.1.1.1, 192.168.1.1-20, 192.168.1.0/24, etc>') do |t|
     opts[:target_range] = t
   end
 
@@ -49,7 +53,12 @@ banner = '-' * 64
 puts "\n\n\n#{banner}"
 puts "- STARTED: #{started_at} "
 
+target_file = opts[:target_file]
 target_range = opts[:target_range]
+if (target_file && target_range) || (!target_file && !target_range)
+  puts 'ERROR: Must specify --target-file OR --target-range'
+  exit 1
+end
 
 results_root = opts[:results_root]
 results_root ||= '/tmp'
@@ -144,7 +153,7 @@ discovery_sctp_ports = {
   sicc: 38_412
 }
 
-target_file = "#{results_root}/nmap_targets.txt"
+discovered_targets_file = "#{results_root}/nmap_discovery_results.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"
@@ -174,22 +183,23 @@ begin
   PWN::Plugins::NmapIt.port_scan do |nmap|
     if with_tor
       nmap.proxies = proxy
-      nmap.syn_discovery = discovery_tcp_ports.values
       nmap.ack_discovery = discovery_tcp_ports.values
     else
-      nmap.ping = true
-      nmap.arp_ping = true
-      nmap.icmp_echo_discovery = true
-      nmap.icmp_timestamp_discovery = true
       nmap.udp_discovery = discovery_udp_ports.values
-      nmap.sctp_init_ping = discovery_sctp_ports.values
     end
+    nmap.ping = true
+    nmap.arp_ping = true
+    nmap.icmp_echo_discovery = true
+    nmap.icmp_timestamp_discovery = true
+    nmap.syn_discovery = discovery_tcp_ports.values
+    nmap.sctp_init_ping = discovery_sctp_ports.values
     nmap.verbose = true
     nmap.exclude_file = exclude_file
     nmap.interface = interface
     nmap.insane_timing = true
     nmap.output_xml = latest_discovery_results
-    nmap.targets = target_range
+    nmap.targets = target_range if target_range
+    nmap.target_file = target_file if target_file
     nmap.randomize_hosts = true
     nmap.min_parallelism = 36
     nmap.max_retries = 3
@@ -198,7 +208,7 @@ begin
 
   # Generate targets.txt from discovery above
   # taking into consideration IPs to skip scans
-  File.open(target_file, 'w') do |f|
+  File.open(discovered_targets_file, 'w') do |f|
     PWN::Plugins::NmapIt.parse_xml_results(
       xml_file: latest_discovery_results
     ) do |xml|
@@ -212,13 +222,13 @@ begin
   end
 
   # Produce a good targets.txt redacting duplicates && sorting by IP
-  sorted_ips = File.readlines(target_file).uniq.map do |ip|
+  sorted_ips = File.readlines(discovered_targets_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|
+  File.open(discovered_targets_file, 'w') do |f|
     sorted_ips.each do |ip|
       PWN::Plugins::NmapIt.parse_xml_results(
         xml_file: latest_discovery_results
@@ -263,7 +273,7 @@ begin
       nmap.update_scriptdb = true
     end
     nmap.verbose = true
-    nmap.target_file = target_file
+    nmap.target_file = discovered_targets_file
     nmap.randomize_hosts = true
     nmap.show_reason = true
     nmap.exclude_file = exclude_file
@@ -310,7 +320,7 @@ begin
       nmap.update_scriptdb = true
     end
     nmap.verbose = true
-    nmap.target_file = target_file
+    nmap.target_file = discovered_targets_file
     nmap.fast = true
     nmap.randomize_hosts = true
     nmap.show_reason = true

data/lib/pwn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.808
+  version: 0.4.809
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-06 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.6
+        version: 7.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.6
+        version: 7.0.7
 - !ruby/object:Gem::Dependency
   name: anemone
   requirement: !ruby/object:Gem::Requirement
@@ -786,14 +786,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.55.1
+        version: 1.56.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.55.1
+        version: 1.56.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -814,14 +814,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.23.0
+        version: 2.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.23.0
+        version: 2.23.2
 - !ruby/object:Gem::Dependency
   name: ruby-audio
   requirement: !ruby/object:Gem::Requirement
@@ -926,14 +926,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement