pwn 0.5.522 → 0.5.524

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdfddfe63cad8cfc8c772f5b707ed85efa6a21a0d4e2a2adf6d37b6ee28dd9be
-  data.tar.gz: 7a780cfdeb09e7be623721a21e8d8e8b1c0fcdf2fa5e86f6943cc2a30651026a
+  metadata.gz: 1ba5da2e21124d877eb9573e143517004d8b0552c4f8baee4146c772af9b61a5
+  data.tar.gz: 3a327348c4ced35e77609f0a6cef0f8ff301875c2d738a01bce1f3bc38ba7d60
 SHA512:
-  metadata.gz: ae2149620b8190678ccf34927e21888db85013cf4b337ac12e06200974f8dd28cda34cd667ed34675ba13ebdb045bfce9728e5d7fed9969e3b374cf41bfceb74
-  data.tar.gz: 05cde7fa6c6bafc71a6d6c6d1be9f556bd66b3876f7e4d95a19fdb0bb48f49cfb667bca267fa3fbff2abc3e74e5d945d5cc22452b07126706f384182832830a7
+  metadata.gz: 944ed01471d1f104e1c6278d5b91a8ec76f3f04ee1b37d35225a889c3a81564410a1c8fe7aad99697e6149545d0bfe5cec21ac5505dd04f1a93525a303031a07
+  data.tar.gz: 7b6a072f10b55a4a062e084c968b68a6668e2ed663cdf0164fd02f6d187f6a80da33b6e1820cb42576654d17f4add73afbaaa96ba3415a3215b96cc05759a810

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.522]:001 >>> PWN.help
+pwn[v0.5.524]: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.522]:001 >>> PWN.help
+pwn[v0.5.524]: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.522]:001 >>> PWN.help
+pwn[v0.5.524]: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

@@ -5,7 +5,7 @@ require 'pwn'
 
 opts = PWN::Env[:driver_opts]
 PWN::Driver::Parser.new do |options|
-  options.on('-aPROFILE', '--assume-profile=PROFILE', '<Required if "--target-freq" is Nil - Profile to assume for common radio protocols.  Use "--list-profiles" to display supported protocols (Defaults to nil)') do |p|
+  options.on('-aPROFILE', '--assume-profile=PROFILE', '<Required if "--target-freq" is Nil - Profile to assume for common radio protocols.  Use "--list-scan-profiles" to display supported protocols (Defaults to nil)') do |p|
     opts[:profile] = p
   end
 
@@ -37,10 +37,6 @@ PWN::Driver::Parser.new do |options|
     opts[:bandwidth] = b
   end
 
-  options.on('-OLAP', '--overlap-protection', '<Optional - Enable Overlap Protection to prevent false positives when scanning (Defaults to false)>') do |o|
-    opts[:overlap_protection] = o
-  end
-
   options.on('-DMODE', '--demodulator-mode=MODE', '<Optional - Set Demodulator Mode OFF | RAW | AM | FM | WFM | WFM_ST | WFM_ST_OIRT | LSB | USB | CW | CWL | CWU (Defaults to WFM_ST)>') do |d|
     opts[:demodulator_mode] = d
   end
@@ -53,10 +49,6 @@ PWN::Driver::Parser.new do |options|
     opts[:strength_lock] = s
   end
 
-  options.on('-LFLOAT', '--lock-freq-duration=FLOAT', '<Optional - Duration to lock onto Freqency when Strength < --strength-lock value (Defaults to 0.04)>') do |l|
-    opts[:lock_freq_duration] = l
-  end
-
   options.on('-QFLOAT', '--squelch=FLOAT', '<Optional - Squelch Threshold -150.0 to 0 (Defaults to --strength-lock - 3)>') do |q|
     opts[:squelch] = q
   end
@@ -77,9 +69,13 @@ PWN::Driver::Parser.new do |options|
     opts[:scan_log] = l
   end
 
-  options.on('-LOC', '--location', '<Optional - Location string to include in AI analysis (e.g. "New York, NY", 90210, GPS coords, etc.)>') do |l|
+  options.on('-wLOC', '--location=LOC', '<Optional - Location string to include in AI analysis (e.g. "New York, NY", 90210, GPS coords, etc.)>') do |l|
     opts[:location] = l
   end
+
+  options.on('-k', '--keep-looping', '<Optional - Keep looping over the scan range indefinitely until CTRL+C is caught (Defaults to false)>') do |k|
+    opts[:keep_looping] = k
+  end
 end.parse!
 
 begin
@@ -113,7 +109,6 @@ begin
 
   demodulator_mode = opts[:demodulator_mode]
   bandwidth = opts[:bandwidth]
-  overlap_protection = opts[:overlap_protection]
 
   audio_gain_db = opts[:audio_gain_db]
   audio_gain_db = audio_gain_db.to_f unless audio_gain_db.nil?
@@ -125,7 +120,6 @@ begin
   precision = precision.to_i
   raise "ERROR: Invalid precision: #{precision}" unless (1..12).include?(precision)
 
-  lock_freq_duration = opts[:lock_freq_duration]
   strength_lock = opts[:strength_lock]
   strength_lock = strength_lock.to_f unless strength_lock.nil?
 
@@ -141,27 +135,34 @@ begin
   scan_log = opts[:scan_log]
   decoder = opts[:decoder]
   location = opts[:location]
+  keep_looping = opts[:keep_looping] ||= false
 
   # 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,
-    bandwidth: bandwidth,
-    overlap_protection: overlap_protection,
-    audio_gain_db: audio_gain_db,
-    squelch: squelch,
-    precision: precision,
-    strength_lock: strength_lock,
-    lock_freq_duration: lock_freq_duration,
-    rf_gain: rf_gain,
-    intermediate_gain: intermediate_gain,
-    baseband_gain: baseband_gain,
-    scan_log: scan_log,
-    decoder: decoder,
-    location: location
-  )
+  loop_count = 1
+  loop do
+    PWN::SDR::GQRX.scan_range(
+      gqrx_sock: gqrx_sock,
+      start_freq: start_freq,
+      target_freq: target_freq,
+      demodulator_mode: demodulator_mode,
+      bandwidth: bandwidth,
+      audio_gain_db: audio_gain_db,
+      squelch: squelch,
+      precision: precision,
+      strength_lock: strength_lock,
+      rf_gain: rf_gain,
+      intermediate_gain: intermediate_gain,
+      baseband_gain: baseband_gain,
+      scan_log: scan_log,
+      decoder: decoder,
+      location: location
+    )
+    break unless keep_looping
+
+    loop_count += 1
+    log_timestamp = Time.now.strftime('%Y-%m-%d')
+    scan_log = "/tmp/pwn_sdr_gqrx_scan_#{PWN::SDR.hz_to_s(start_freq)}-#{PWN::SDR.hz_to_s(target_freq)}_#{log_timestamp}-l#{loop_count}.json"
+  end
   puts 'Scan Complete.'
 rescue StandardError => e
   raise e

data/lib/pwn/sdr/decoder/rds.rb

@@ -22,7 +22,7 @@ module PWN
           skip_rds = "\n"
           puts JSON.pretty_generate(freq_obj)
           puts "\n*** FM Radio RDS Decoder ***"
-          puts '(Press [ENTER] to continue)...'
+          puts 'Press [ENTER] to continue...'
 
           # Toggle RDS off and on to reset the decoder
           PWN::SDR::GQRX.gqrx_cmd(

data/lib/pwn/sdr/frequency_allocation.rb

@@ -74,7 +74,7 @@ module PWN
           amateur_6m: {
             start_freq: '50.000.000',
             target_freq: '54.000.000',
-            demodulator_mode: :FM,
+            demodulator_mode: :USB,
             bandwidth: '2.700',
             precision: 6
           },

data/lib/pwn/sdr/gqrx.rb

@@ -805,8 +805,11 @@ module PWN
               prev_freq_obj = init_freq(
                 gqrx_sock: gqrx_sock,
                 freq: best_freq,
-                suppress_details: true,
+                demodulator_mode: demodulator_mode,
+                bandwidth: bandwidth,
+                squelch: squelch,
                 decoder: decoder,
+                suppress_details: true,
                 keep_alive: true
               )
               prev_freq_obj[:strength_lock] = strength_lock

data/lib/pwn/version.rb

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

metadata

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