pwn 0.5.481 → 0.5.483

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8f0ace17ae36a1a8e60fd015ad3c0a37dcaa22fd3490806b4fc033bd974ae70
-  data.tar.gz: 4a3b5eb17658a0a7c63e6e49bd87cad5740112ed1c2d77207fd0cde9949a50d6
+  metadata.gz: d9089cde1713e79574b561791fc9e52331efdd9d4401f92f84a3cd78d3e9baa5
+  data.tar.gz: 810569d7a49f6ce75871431eafd90d5ba6377c8c0f8ba3031e82b07e1233264b
 SHA512:
-  metadata.gz: d97493c22667ef54489045fd1bdd5ff8940701fa266e923849f8784feacc546be605154bc215a15823b9c424a4ba025e6bd95d3a1b3e86eba3d70987bc55c6c0
-  data.tar.gz: 0636daf478dff9780efe1b14478d40d06e109927c955d8d8c50f8c1c8e5c1bd7faaad9cfc8f98254084f4f384cdaa90c4698d563e57d386be38449193600c2e4
+  metadata.gz: 6fcb0e4057e72824d1c18a3af03dc9826733ccb34d5e8153b1085850a3ce119915dedcb70d5bd172b91358c65d2e273d3086cccead5a1fe0c20acd98f9947b5f
+  data.tar.gz: c4543ab1b1ec9db5841b85f283353da453c971001b7f6a013a239afde1cdc715f07b80f54000b18c3faa207dfa73c7ba929c5f5d4ca89f61620669ebafb0a356

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.481]:001 >>> PWN.help
+pwn[v0.5.483]: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.4@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.5.481]:001 >>> PWN.help
+pwn[v0.5.483]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.4.4@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.5.481]:001 >>> PWN.help
+pwn[v0.5.483]: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/plugins/repl.rb

@@ -522,11 +522,11 @@ module PWN
             rx_win.addstr(rx_header)
             rx_win.attroff(Curses.color_pair(green) | Curses::A_BOLD)
             # Jump two lines below header before messages begin
-            rx_win.setpos(2, 1)
+            rx_win.setpos(2, 0)
             rx_win.attron(Curses.color_pair(cyan) | Curses::A_BOLD)
-            rx_header_bottom_line = "\u2014" * (Curses.cols - 2)
-            rx_header_bottom_line_pos = (Curses.cols / 2) - (rx_header_bottom_line.length / 2)
-            rx_win.addstr(rx_header_bottom_line)
+            header_line = "\u2014" * Curses.cols
+            rx_header_bottom_line_pos = (Curses.cols / 2) - (header_line.length / 2)
+            rx_win.addstr(header_line)
             rx_win.attroff(Curses.color_pair(cyan) | Curses::A_BOLD)
 
             rx_win.refresh
@@ -552,29 +552,27 @@ module PWN
                 mutex = PWN.const_get(:MeshMutex)
                 msg_input = pi.input.line_buffer.to_s
                 ts = Time.now.strftime('%H:%M:%S%z')
-                cursor_pos = (Readline.respond_to?(:point) ? Readline.point : msg_input.length)
+                cursor_pos = Readline.point
                 prefix = "[#{ts}] [TX] #{tx_prompt} "
                 base_line = "#{prefix}#{msg_input}"
                 cursor_abs_index = prefix.length + cursor_pos
                 current_line = base_line
                 if current_line != last_drawn
                   mutex.synchronize do
-                    # Only show draft if after_read hook hasn't just written final TX (heuristic)
                     tx_win.clear
                     tx_win.attron(Curses.color_pair(red) | Curses::A_BOLD)
-                    tx_header_bottom_line = "\u2014" * (Curses.cols - 2)
-                    tx_header_bottom_line_pos = (Curses.cols / 2) - (rx_header_bottom_line.length / 2)
-                    tx_win.addstr(rx_header_bottom_line)
+                    tx_header_line_pos = (Curses.cols / 2) - (header_line.length / 2)
+                    tx_win.addstr(header_line)
                     tx_win.attroff(Curses.color_pair(red) | Curses::A_BOLD)
-                    tx_win.attron(Curses.color_pair(yellow) | Curses::A_BOLD)
 
-                    inner_width = Curses.cols - 2
+                    tx_win.attron(Curses.color_pair(yellow) | Curses::A_BOLD)
+                    inner_width = Curses.cols
                     segments = current_line.chars.each_slice(inner_width).map(&:join)
-                    available_rows = tx_win.maxy - 2
+                    available_rows = tx_win.maxy - 1
                     segments.first(available_rows).each_with_index do |seg, idx|
-                      tx_win.setpos(1 + idx, 1)
+                      tx_win.setpos(1 + idx, 0)
                       start_index = idx * inner_width
-                      end_index = start_index + inner_width - 1
+                      end_index = start_index + inner_width
                       if cursor_abs_index.between?(start_index, end_index)
                         cursor_col = cursor_abs_index - start_index
                         (0..inner_width).each do |col|
@@ -596,7 +594,7 @@ module PWN
                   end
                   last_drawn = current_line
                 end
-                sleep 0.005
+                sleep 0.0001
               end
             end
             echo_thread.abort_on_exception = false
@@ -609,6 +607,7 @@ module PWN
               max_threads: 1,
               detach: true
             ) do |_|
+              last_from = nil
               Meshtastic::MQTT.subscribe(
                 mqtt_obj: mqtt_obj,
                 region: region,
@@ -625,7 +624,7 @@ module PWN
                 rx_win = PWN.const_get(:MeshRxWin)
                 mutex = PWN.const_get(:MeshMutex)
 
-                from = packet[:node_id_from]
+                from = packet[:node_id_from].to_s.ljust(9, ' ')
                 absolute_topic = "#{region}/#{topic.gsub('#', from)}"
                 to = packet[:node_id_to]
                 rx_text = decoded[:payload]
@@ -634,28 +633,33 @@ module PWN
                 # Select a random color pair different from the last used one
                 colors_arr = PWN.const_get(:MeshColors)
                 last_pair = PWN.const_get(:MeshLastPair)
-                PWN.send(:remove_const, :MeshLastPair)
-                pair_choices = colors_arr.reject { |c| c == last_pair }
-                pair = pair_choices.sample
-                PWN.const_set(:MeshLastPair, pair)
+                pair = last_pair
+                unless last_from == from
+                  PWN.send(:remove_const, :MeshLastPair)
+                  pair_choices = colors_arr.reject { |c| c == last_pair }
+                  pair = pair_choices.sample
+                  PWN.const_set(:MeshLastPair, pair)
+                end
                 rx_win.attron(Curses.color_pair(pair) | Curses::A_REVERSE)
 
                 current_line = "\n[#{ts}] [RX] #{absolute_topic} >>> #{rx_text}"
                 current_line = "\n[#{ts}] [RX][DM INTERCEPTED] #{absolute_topic} to: #{to} >>> #{rx_text}" unless to == '!ffffffff'
 
                 mutex.synchronize do
-                  inner_width = Curses.cols - 2
+                  inner_width = Curses.cols
                   content = current_line.sub(/\A\n/, '')
                   segments = content.scan(/.{1,#{inner_width}}/)
                   segments.each do |seg|
-                    rx_win.addstr("\n")
-                    rx_win.setpos(rx_win.cury, 1)
+                    # rx_win.addstr("\n")
+                    rx_win.setpos(rx_win.cury, 0)
                     line = seg.ljust(inner_width)
                     rx_win.addstr(line)
                   end
                   rx_win.refresh
                 end
                 rx_win.attroff(Curses.color_pair(pair) | Curses::A_REVERSE)
+
+                last_from = from
               end
             end
           rescue StandardError => e

data/lib/pwn/version.rb

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

metadata

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