pwn 0.5.512 → 0.5.513

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7b1030cb5ce3e024a16630a46f404f8919da6d799e385133be3be4da8286e9
-  data.tar.gz: e19976ea7a052f608f9b17e50e76e06e070926146749bed674a30e39f91dccce
+  metadata.gz: 82756fa89b985658783dd6a2f59ec1e4c591959dd0ea349e8f68ca5e74fc8715
+  data.tar.gz: 34f2cc9edcc4eb8a35ad7d91b16fbb760d4a220a3a9d556efe682f009573abcf
 SHA512:
-  metadata.gz: 69ce103c6b63b5691adb551adb86540373671f15455a2614d94230f7530c80f8d24b2e46503c52852208e428d015d86185b64df1cd8fcf29e18c75e7b9103287
-  data.tar.gz: 99d2a4f9b47e9f2e3226c81539854a102b22b3956d36be70dbd75c62b5d0bd09c36563589e590d2796cec9ddef9b68736fb2649bb1d2320d666bac844f97524a
+  metadata.gz: 9bf3f13770d43feeab86c59ab32b389a02e11727b888e7a002248dd8754769c00c1e5e2a335c316db1d1ccc1ad846fc9a39d463bde22a0e9c3f467a69e2d4e55
+  data.tar.gz: db2d0be522131762b6214e6fb3e4e79500bf4b8bfb25510785ac0eaa3eca81c0984c58d9a7a1dc9d195c1d8873b2a1cc559f0ff0a2085d9f3217341fb03042a3

data/.rubocop.yml

@@ -16,7 +16,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 158
 Metrics/MethodLength:
-  Max: 652
+  Max: 733
 Metrics/ModuleLength:
   Max: 1563
 Metrics/PerceivedComplexity:

data/Gemfile

@@ -73,7 +73,7 @@ gem 'pry-doc', '1.6.0'
 gem 'rake', '13.3.1'
 gem 'rb-readline', '0.5.5'
 gem 'rbvmomi2', '3.8.0'
-gem 'rdoc', '6.17.0'
+gem 'rdoc', '7.0.1'
 gem 'rest-client', '2.1.0'
 gem 'rex', '2.0.13'
 gem 'rmagick', '6.1.4'

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.512]:001 >>> PWN.help
+pwn[v0.5.513]: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.4.7@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.5.512]:001 >>> PWN.help
+pwn[v0.5.513]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.4.7@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.5.512]:001 >>> PWN.help
+pwn[v0.5.513]:001 >>> PWN.help
 ```
 
 PWN periodically upgrades to the latest version of Ruby which is reflected in `/opt/pwn/.ruby-version`.  The easiest way to upgrade to the latest version of Ruby from a previous PWN installation is to run the following script:

data/bin/pwn_gqrx_scanner

@@ -45,6 +45,10 @@ PWN::Driver::Parser.new do |options|
     opts[:demodulator_mode] = d
   end
 
+  options.on('-rRDS', '--rds', '<Optional - Enable RDS Decoding when in WFM or WFM_ST Demodulator Mode (Defaults to false)>') do |r|
+    opts[:rds] = r
+  end
+
   options.on('-PINT', '--precision=INT', '<Optional - Precision of Frequency 1-12 (Defaults to 5)>') do |p|
     opts[:precision] = p
   end
@@ -69,7 +73,7 @@ PWN::Driver::Parser.new do |options|
     opts[:intermediate_gain] = i
   end
 
-  options.on('-BFLOAT', '--basedband-gain=FLOAT', '<Optional - Baseband Gain 0.0-62.0 (Defaults to 10.0)>') do |b|
+  options.on('-BFLOAT', '--baseband-gain=FLOAT', '<Optional - Baseband Gain 0.0-62.0 (Defaults to 10.0)>') do |b|
     opts[:baseband_gain] = b
   end
 
@@ -109,11 +113,10 @@ begin
 
   host = opts[:host]
   port = opts[:port]
-
-  puts "Connecting to GQRX at #{host}:#{port}..."
   gqrx_sock = PWN::SDR::GQRX.connect(target: host, port: port)
 
   demodulator_mode = opts[:demodulator_mode]
+  rds = opts[:rds]
   bandwidth = opts[:bandwidth]
   overlap_protection = opts[:overlap_protection]
 
@@ -143,18 +146,20 @@ begin
   scan_log = opts[:scan_log]
   location = opts[:location]
 
+  # Merge opts again to ensure we override profile values with CLI values
   PWN::SDR::GQRX.scan_range(
     gqrx_sock: gqrx_sock,
     start_freq: start_freq,
     target_freq: target_freq,
     demodulator_mode: demodulator_mode,
+    rds: rds,
     bandwidth: bandwidth,
     overlap_protection: overlap_protection,
+    audio_gain_db: audio_gain_db,
+    squelch: squelch,
     precision: precision,
-    lock_freq_duration: lock_freq_duration,
     strength_lock: strength_lock,
-    squelch: squelch,
-    audio_gain_db: audio_gain_db,
+    lock_freq_duration: lock_freq_duration,
     rf_gain: rf_gain,
     intermediate_gain: intermediate_gain,
     baseband_gain: baseband_gain,
@@ -165,7 +170,7 @@ begin
 rescue StandardError => e
   raise e
 rescue Interrupt, SystemExit
-  puts "\nGoodbye."
+  puts "\nCTRL+C detected - goodbye."
 ensure
-  gqrx_sock = PWN::SDR::GQRX.disconnect(gqrx_sock: gqrx_sock) unless gqrx_sock.nil?
+  PWN::SDR::GQRX.disconnect(gqrx_sock: gqrx_sock) unless gqrx_sock.closed?
 end

data/lib/pwn/plugins/sock.rb

@@ -229,10 +229,20 @@ module PWN
 
       public_class_method def self.disconnect(opts = {})
         sock_obj = opts[:sock_obj]
+        return unless sock_obj.respond_to?(:close)
+
+        # Shutdown both directions to terminate flows immediately
+        # sock_obj.shutdown(Socket::SHUT_RDWR)
+
+        # Set SO_LINGER=0 to force RST (skips TIME_WAIT; ideal for fuzzing)
+        # linger = [1, 0].pack('ii')
+        # sock_obj.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger)
+
         sock_obj.close
-        sock_obj = nil
       rescue StandardError => e
         raise e
+      ensure
+        sock_obj = nil
       end
 
       # Author(s):: 0day Inc. <support@0dayinc.com>