pwn 0.5.514 → 0.5.515

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272a60702de23eed1c2e19a6abde33a36151b70afa71b7be490ce9b1645c1c4c
-  data.tar.gz: e79932a20866563d120069a22dea242af3cb654864161e736481958c53e6148c
+  metadata.gz: d607ee5ce171b1d6683a6930a6ef46e636b0ba79b38f636627ac7d3552dba740
+  data.tar.gz: c04ae0f7241c14ed7cff5b270ecac11f1558cc28070af7fd15b51a72db5252db
 SHA512:
-  metadata.gz: 81ca0bb428762f7263e2841144cb0aa98c7dbb08077ce14f67d9ad34a956503831e3a12e14e15b9fd583ec7587d3d41c5b3c62f918943451bd082bbaa3ccf8b1
-  data.tar.gz: d43a8edba7549e95cd18a416e5afe795923d033d7b04f8d53080e818b37c46bbb421785f17938ffb35df8dfaccbffa36c1434a45ebb806c6def90ab05880495f
+  metadata.gz: 99378a68ba8484746d057a7082064dfbd7c0011e15e6b85fd1c746fe3084f4811fa973d99d6c9d41da74fcc78bf56dbe9a8a98e12206e6f9f8de31ac3906aaa1
+  data.tar.gz: 7c9f89ff3be93b1914cfe20075a5f30c4062be1e5525d4a650c052ccaba4b10d7f884742baaffabb41cd956729e8a58dd4d0b55bd032e125c2bc7452d0db50b3

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.514]:001 >>> PWN.help
+pwn[v0.5.515]: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.514]:001 >>> PWN.help
+pwn[v0.5.515]: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.514]:001 >>> PWN.help
+pwn[v0.5.515]: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/lib/pwn/sdr/gqrx.rb

@@ -141,11 +141,7 @@ module PWN
           response.push(gqrx_sock.readline.chomp)
           # Drain any additional lines quickly
           loop do
-            # This is the main contributing factor to this scanner being slow.
-            # We're trading speed for accuracy here.
-            # break if gqrx_sock.wait_readable(0.0625).nil? && cmd == 'l STRENGTH'
-            break if gqrx_sock.wait_readable(0.04).nil? && cmd == 'l STRENGTH'
-            break if gqrx_sock.wait_readable(0.001).nil? && cmd != 'l STRENGTH'
+            break if gqrx_sock.wait_readable(0.0001).nil?
 
             response.push(gqrx_sock.readline.chomp)
           end
@@ -175,28 +171,72 @@ module PWN
 
       # Supported Method Parameters::
       # strength_db = PWN::SDR::GQRX.measure_signal_strength(
-      #   gqrx_sock: 'required - GQRX socket object returned from #connect method'
+      #   gqrx_sock: 'required - GQRX socket object returned from #connect method',
+      #   strength_lock: 'optional - Strength lock in dBFS to determine signal edges (defaults to -70.0)'
       # )
       private_class_method def self.measure_signal_strength(opts = {})
         gqrx_sock = opts[:gqrx_sock]
+        strength_lock = opts[:strength_lock] ||= -70.0
 
+        attempts = 0
         strength_db = -99.9
-        prev_strength_db = strength_db
-        # While strength_db is rising, keep measuring
+        prev_strength_db = -99.9
         loop do
+          attempts += 1
           strength_db = gqrx_cmd(gqrx_sock: gqrx_sock, cmd: 'l STRENGTH').to_f
-          print '$'
-          break if strength_db <= prev_strength_db
 
+          # Suprisingly accurate but takes longer
+          # `break if strength_db < prev_strength_db` || attempts >= 300
+          # is VERY accurate with
+          # `sleep 0.0001`
+          # but with more sampling == longer time
+          # break if attempts >= 100 && (strength_lock > strength_db || strength_db < prev_strength_db)
+
+          break if attempts >= 30 && strength_lock > strength_db
+
+          break if attempts >= 300 || strength_db < prev_strength_db
+
+          sleep 0.001
           prev_strength_db = strength_db
-          sleep 0.0001
         end
+        puts "Strength Measurement Attempts: #{attempts}"
 
         strength_db
       rescue StandardError => e
         raise e
       end
 
+      # Supported Method Parameters::
+      # tune_resp = PWN::SDR::GQRX.tune_to(
+      #   gqrx_sock: 'required - GQRX socket object returned from #connect method',
+      #   hz: 'required - Frequency to tune to'
+      # )
+      private_class_method def self.tune_to(opts = {})
+        gqrx_sock = opts[:gqrx_sock]
+        hz = opts[:hz].to_s.cast_to_raw_hz
+
+        current_freq = 0
+        attempts = 0
+        loop do
+          attempts += 1
+          gqrx_cmd(
+            gqrx_sock: gqrx_sock,
+            cmd: "F #{hz}",
+            resp_ok: 'RPRT 0'
+          )
+
+          current_freq = gqrx_cmd(
+            gqrx_sock: gqrx_sock,
+            cmd: 'f'
+          )
+
+          break if current_freq.to_s.cast_to_raw_hz == hz
+        end
+        # puts "Tuned to #{current_freq} in #{attempts} attempt(s)."
+      rescue StandardError => e
+        raise e
+      end
+
       # Supported Method Parameters::
       # candidate_signals = PWN::SDR::GQRX.edge_detection(
       #   gqrx_sock: 'required - GQRX socket object returned from #connect method',
@@ -218,15 +258,11 @@ module PWN
         strength_db = 99.9
         puts 'Finding Beginning Edge of Signal...'
         while strength_db >= strength_lock
-          gqrx_cmd(gqrx_sock: gqrx_sock, cmd: "F #{hz}")
-          current_freq = 0
-          while current_freq.to_s.cast_to_raw_hz != hz.to_s.cast_to_raw_hz
-            current_freq = gqrx_cmd(
-              gqrx_sock: gqrx_sock,
-              cmd: 'f'
-            )
-          end
-          strength_db = measure_signal_strength(gqrx_sock: gqrx_sock)
+          tune_to(gqrx_sock: gqrx_sock, hz: hz)
+          strength_db = measure_signal_strength(
+            gqrx_sock: gqrx_sock,
+            strength_lock: strength_lock
+          )
           candidate = {
             hz: hz.to_s.cast_to_raw_hz,
             freq: hz.to_i.cast_to_pretty_hz,
@@ -247,15 +283,11 @@ module PWN
         strength_db = 99.9
         puts 'Finding Ending Edge of Signal...'
         while strength_db >= strength_lock
-          gqrx_cmd(gqrx_sock: gqrx_sock, cmd: "F #{hz}")
-          current_freq = 0
-          while current_freq.to_s.cast_to_raw_hz != hz.to_s.cast_to_raw_hz
-            current_freq = gqrx_cmd(
-              gqrx_sock: gqrx_sock,
-              cmd: 'f'
-            )
-          end
-          strength_db = measure_signal_strength(gqrx_sock: gqrx_sock)
+          tune_to(gqrx_sock: gqrx_sock, hz: hz)
+          strength_db = measure_signal_strength(
+            gqrx_sock: gqrx_sock,
+            strength_lock: strength_lock
+          )
           candidate = {
             hz: hz.to_s.cast_to_raw_hz,
             freq: hz.to_i.cast_to_pretty_hz,
@@ -441,24 +473,16 @@ module PWN
           )
         end
 
-        change_freq_resp = gqrx_cmd(
-          gqrx_sock: gqrx_sock,
-          cmd: "F #{freq.to_s.cast_to_raw_hz}",
-          resp_ok: 'RPRT 0'
+        tune_to(gqrx_sock: gqrx_sock, hz: freq)
+        strength_db = measure_signal_strength(
+          gqrx_sock: gqrx_sock
         )
 
-        current_freq = 0
-        while current_freq.to_s.cast_to_raw_hz != freq.to_s.cast_to_raw_hz
-          current_freq = gqrx_cmd(
-            gqrx_sock: gqrx_sock,
-            cmd: 'f'
-          )
-        end
-
         freq_obj = {
           bandwidth: bandwidth,
           demodulator_mode: demodulator_mode,
           rds: rds,
+          strength_db: strength_db,
           freq: freq
         }
 
@@ -473,8 +497,6 @@ module PWN
             cmd: 'l AF'
           ).to_f
 
-          strength_db = measure_signal_strength(gqrx_sock: gqrx_sock)
-
           squelch = gqrx_cmd(
             gqrx_sock: gqrx_sock,
             cmd: 'l SQL'
@@ -504,7 +526,6 @@ module PWN
           freq_obj[:if_gain] = if_gain
           freq_obj[:rf_gain] = rf_gain
           freq_obj[:squelch] = squelch
-          freq_obj[:strength_db] = strength_db
           freq_obj[:rds] = rds_resp
         end
 
@@ -709,8 +730,11 @@ module PWN
             start_hz_direction.step(by: step_hz_direction, to: end_hz_direction) do |hz|
               print '>' if direction_up
               print '<' unless direction_up
-              gqrx_cmd(gqrx_sock: gqrx_sock, cmd: "F #{hz}")
-              strength_db = measure_signal_strength(gqrx_sock: gqrx_sock)
+              tune_to(gqrx_sock: gqrx_sock, hz: hz)
+              strength_db = measure_signal_strength(
+                gqrx_sock: gqrx_sock,
+                strength_lock: strength_lock
+              )
               samples.push({ hz: hz, strength_db: strength_db })
 
               # current_hz = gqrx_cmd(gqrx_sock: gqrx_sock, cmd: 'f').to_s.cast_to_raw_hz
@@ -789,16 +813,11 @@ module PWN
         signals_arr = []
         hz = hz_start
         while hz <= hz_target
-          gqrx_cmd(gqrx_sock: gqrx_sock, cmd: "F #{hz}")
-          current_freq = 0
-          while current_freq.to_s.cast_to_raw_hz != hz.to_s.cast_to_raw_hz
-            current_freq = gqrx_cmd(
-              gqrx_sock: gqrx_sock,
-              cmd: 'f'
-            )
-          end
-
-          strength_db = measure_signal_strength(gqrx_sock: gqrx_sock)
+          tune_to(gqrx_sock: gqrx_sock, hz: hz)
+          strength_db = measure_signal_strength(
+            gqrx_sock: gqrx_sock,
+            strength_lock: strength_lock
+          )
 
           if strength_db >= strength_lock
             puts '-' * 86

data/lib/pwn/version.rb

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

metadata

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