pwn 0.4.671 → 0.4.672

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da5c11247c09b3a6355dd825d5b200c7b54845d2b02b4a91a2b651ac6e0f693
-  data.tar.gz: 8ae730c8dcc7af833543ac7b999fb075dd53e64cfb8a348791caadc03bf16c4a
+  metadata.gz: 9c947c88a2f7794cdb7116df8766315e92e2beed8d2911998848ef522d065174
+  data.tar.gz: e04d20bc854c1f8e39fba70bd70c9da49623b1242a05a667886914bff1658186
 SHA512:
-  metadata.gz: 7480b0859bedc2c26bc36fef113eeb0981169f500edfe0d3ece6a69b36a5c5e10bffc052c0640d705620e456233254224df1d5a8bb904b3301189572d8d0a2d9
-  data.tar.gz: 6486d7ffa7d468d772639c8666594e21b326de1a5acbafad7fdc966746237df97ed43e7883016d98df3692ad2c0b0a7b623a73162885da0f196f0b1260050375
+  metadata.gz: 3c79d2adde425d48c119519c791376ac73ab5b30d2de7018b5fc0efc58ae28d1ca7c9c7d1d0adde3532ce9708c67c02054428d0beedf99058717a261412a4f3c
+  data.tar.gz: 98197ecaf90a52bf701faf8c96005eff4dc142682e2c0a8ae00ea7eea93dadfd3cdc1c1bad5119613eecb343532438935e73d7a272927322af8f77ea20455b7f

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

data/bin/pwn_nmap_discover_tcp_udp

@@ -2,7 +2,6 @@
 # frozen_string_literal: false
 
 require 'optparse'
-require 'nokogiri'
 require 'pwn'
 
 opts = {}
@@ -42,7 +41,7 @@ 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]}"
+  proxy = ["socks4://#{tor_obj[:ip]}:#{tor_obj[:port]}"]
 end
 
 File.new(exclude_file, 'w') unless File.exist?(exclude_file)
@@ -106,11 +105,29 @@ latest_tcp_results = "#{nmap_results_root}/nmap_latest_tcp_results"
 latest_udp_results = "#{nmap_results_root}/nmap_latest_udp_results"
 
 begin
+  # Per man nmap:
+  # The main effects of T0 are serializing the scan so only one port
+  # is scanned at a time, and waiting five minutes between sending
+  # each probe.
+  # T1 and T2 are similar but they only wait 15 seconds and 0.4 seconds,
+  # respectively, between probes.
+  # T3 is Nmap's default behavior, which includes parallelization.
+  # T4 does the equivalent of --max-rtt-timeout 1250ms --min-rtt-timeout 100ms
+  # --initial-rtt-timeout 500ms --max-retries 6 and sets the maximum TCP and
+  # SCTP scan delay to 10ms.
+  # T5 does the equivalent of --max-rtt-timeout 300ms --min-rtt-timeout 50ms
+  # --initial-rtt-timeout 250ms --max-retries 2 --host-timeout 15m
+  # --script-timeout 10m --max-scan-delay as well as setting the maximum TCP
+  # and SCTP scan delay to 5ms. Maximum UDP scan delay is not set by T4 or T5,
+  # but it can be set with the --max-scan-delay option.
+
   # Target Discovery Scan
+  # Using -T5 template to reduce number of
+  # retransmission attempts on filtered ports.
   PWN::Plugins::NmapIt.port_scan do |nmap|
     nmap.exclude_file = exclude_file
     nmap.interface = interface
-    nmap.aggressive_timing = true
+    nmap.insane_timing = true
     nmap.ping = true
     nmap.arp_ping = true
     nmap.icmp_echo_discovery = true
@@ -121,6 +138,7 @@ begin
     nmap.sctp_init_ping = discovery_ports.values
     nmap.output_all = latest_discovery_results
     nmap.targets = ip_range
+    nmap.randomize_hosts = true
     nmap.proxies = proxy if with_tor
   end
 
@@ -135,19 +153,24 @@ begin
       end
     end
   end
+  sorted_targets = File.readlines(target_file).sort.join
+  File.write(target_file, sorted_targets)
 
   # Switch Tor Exit Node if with_tor
   PWN::Plugins::Tor.switch_exit_node(tor_obj: tor_obj) if with_tor
 
   # TCP Scan
+  # Using -T5 template to reduce number of
+  # retransmission attempts on filtered ports.
   PWN::Plugins::NmapIt.port_scan do |nmap|
     nmap.target_file = target_file
+    nmap.randomize_hosts = true
     nmap.show_reason = true
     nmap.exclude_file = exclude_file
     nmap.interface = interface
     nmap.min_host_group = 3
     nmap.host_timeout = '999m'
-    nmap.aggressive_timing = true
+    nmap.insane_timing = true
     nmap.skip_discovery = true
     nmap.syn_scan = true
     nmap.default_script = true
@@ -166,14 +189,17 @@ begin
   PWN::Plugins::Tor.switch_exit_node(tor_obj: tor_obj) if with_tor
 
   # UDP Scan
+  # Using -T5 template to reduce number of
+  # retransmission attempts on filtered ports.
   PWN::Plugins::NmapIt.port_scan do |nmap|
     nmap.target_file = target_file
+    nmap.randomize_hosts = true
     nmap.show_reason = true
     nmap.exclude_file = exclude_file
     nmap.interface = interface
     nmap.min_host_group = 3
     nmap.host_timeout = '999m'
-    nmap.aggressive_timing = true
+    nmap.insane_timing = true
     nmap.skip_discovery = true
     nmap.udp_scan = true
     nmap.default_script = true

data/lib/pwn/version.rb

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

metadata

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