pwn 0.5.487 → 0.5.489

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f11158eacd6a873c2699f6f642591ed8b4de2ba64ce73f96b84f56f35a81e8
-  data.tar.gz: '08b0fb7f0b619bfb20e1fb97b083a180c215a662f90383a43b22785e2e57e5fd'
+  metadata.gz: 0bd30ef667258a8c6d6f5b2f64b7a5d39791b79b2f70e874c15ea2f846cfc543
+  data.tar.gz: 43d46bd61ce79485b22640c37ede4e67ac44462d8f03c31c6bdeae40433fcd49
 SHA512:
-  metadata.gz: fc7d789f23c35d20ab41229e87903c8a618da4fef1518b51291fe534b888a3d0cfcb36af7f824bef116f224034ba8e9d071a7e88fa1a7ad2cdb6b418fe2498db
-  data.tar.gz: b36f00d2e5a3118c561415be867d14eae5b2ec54b6dac67c32840bc434585fac9a1f1633b2f81178b495f3900ee5f567b7c63c5b4402779826b1cd952fa63b64
+  metadata.gz: 61f58c0a487e678a1a33c9df4f75b5bf5b5360845fb5ab9a16acaa629c678df17430e1d99c75a0d6c94126b3aa3711de1f4d247af22789aed073570fcb63e1d2
+  data.tar.gz: 1c46a44f7590948fe513e063836a9b82db47ba455e05e0fab7b47c2d19cf58b394dc337d92c5edeb247d280c70ed198fce385c6fb9b23408df8387653dbd5b4d

data/.rubocop.yml

@@ -6,7 +6,7 @@ Layout/LineLength:
 Lint/UselessRescue:
   Enabled: false
 Metrics/AbcSize:
-  Max: 552.3
+  Max: 562.2
 Metrics/BlockLength:
   Max: 292
 Metrics/BlockNesting:

data/README.md

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

@@ -432,7 +432,8 @@ module PWN
 
             PWN.send(:remove_const, :MeshTxEchoThread) if PWN.const_defined?(:MeshTxEchoThread)
             PWN.send(:remove_const, :MqttObj) if PWN.const_defined?(:MqttObj)
-            PWN.send(:remove_const, :MeshRxWin) if PWN.const_defined?(:MeshRxWin)
+            PWN.send(:remove_const, :MeshRxHeaderWin) if PWN.const_defined?(:MeshRxHeaderWin)
+            PWN.send(:remove_const, :MeshRxBodyWin) if PWN.const_defined?(:MeshRxBodyWin)
             PWN.send(:remove_const, :MeshTxWin) if PWN.const_defined?(:MeshTxWin)
             PWN.send(:remove_const, :MeshMutex) if PWN.const_defined?(:MeshMutex)
             PWN.send(:remove_const, :MqttSubThread) if PWN.const_defined?(:MqttSubThread)
@@ -486,7 +487,7 @@ module PWN
               Curses.init_pair(color_id, color_fg, color_bg)
             end
             PWN.const_set(:MeshColors, (1..mesh_highlight_colors.length).to_a)
-            PWN.const_set(:MeshLastPair, PWN::MeshColors.sample)
+            PWN.const_set(:MeshLastColor, PWN::MeshColors.sample)
 
             mesh_ui_colors = []
             mesh_highlight_colors.each_with_index do |hl_hash, idx|
@@ -508,29 +509,37 @@ module PWN
             white = mesh_ui_colors[6][:color_id]
 
             rx_height = Curses.lines - 4
-            rx_win = Curses::Window.new(rx_height, Curses.cols, 0, 0)
+            rx_header_win = Curses::Window.new(rx_height, Curses.cols, 0, 0)
             # TODO: Scrollable but should stay below header_line
-            rx_win.scrollok(true)
-            rx_win.nodelay = true
-            rx_win.attron(Curses.color_pair(cyan) | Curses::A_BOLD)
+            rx_header_win.scrollok(false)
+            rx_header_win.nodelay = true
+            rx_header_win.attron(Curses.color_pair(cyan) | Curses::A_BOLD)
 
             # Make rx_header bold and green
-            rx_win.attron(Curses.color_pair(green) | Curses::A_BOLD)
+            rx_header_win.attron(Curses.color_pair(green) | Curses::A_BOLD)
             rx_header = "<<< #{host}:#{port} | #{region}/#{topic} | ch:#{channel_num} >>>"
             rx_header_len = rx_header.length
             rx_header_pos = (Curses.cols / 2) - (rx_header_len / 2)
-            rx_win.setpos(1, rx_header_pos)
-            rx_win.addstr(rx_header)
-            rx_win.attroff(Curses.color_pair(green) | Curses::A_BOLD)
+            rx_header_win.setpos(1, rx_header_pos)
+            rx_header_win.addstr(rx_header)
+            rx_header_win.attroff(Curses.color_pair(green) | Curses::A_BOLD)
             # Jump two lines below header before messages begin
-            rx_win.setpos(2, 0)
-            rx_win.attron(Curses.color_pair(cyan) | Curses::A_BOLD)
+            rx_header_win.setpos(2, 0)
+            rx_header_win.attron(Curses.color_pair(cyan) | Curses::A_BOLD)
             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
+            rx_header_win.addstr(header_line)
+            rx_header_win.attroff(Curses.color_pair(cyan) | Curses::A_BOLD)
+            rx_header_win.refresh
+            PWN.const_set(:MeshRxHeaderWin, rx_header_win)
+
+            body_start_row = 3
+            body_height = rx_height - body_start_row
+            rx_body_win = Curses::Window.new(body_height, Curses.cols, body_start_row, 0)
+            rx_body_win.scrollok(true)
+            rx_body_win.nodelay = true
+            rx_body_win.refresh
+            PWN.const_set(:MeshRxBodyWin, rx_body_win)
 
             tx_height = rx_height - 1
             tx_win = Curses::Window.new(4, Curses.cols, tx_height, 0)
@@ -538,14 +547,13 @@ module PWN
             tx_win.nodelay = true
             tx_win.refresh
 
-            PWN.const_set(:MeshRxWin, rx_win)
             PWN.const_set(:MeshTxWin, tx_win)
             PWN.const_set(:MeshMutex, Mutex.new)
 
             # Live typing echo thread (idempotent)
             tx_prompt = "#{region}/#{topic} >>>"
             echo_thread = Thread.new do
-              last_drawn = nil
+              last_line = nil
               loop do
                 break unless pi.config.pwn_mesh
 
@@ -558,7 +566,7 @@ module PWN
                 base_line = "#{prefix}#{msg_input}"
                 cursor_abs_index = prefix.length + cursor_pos
                 current_line = base_line
-                if current_line != last_drawn
+                if last_line != current_line
                   mutex.synchronize do
                     tx_win.clear
                     tx_win.attron(Curses.color_pair(red) | Curses::A_BOLD)
@@ -593,9 +601,9 @@ module PWN
                     tx_win.attroff(Curses.color_pair(yellow) | Curses::A_BOLD)
                     tx_win.refresh
                   end
-                  last_drawn = current_line
+                  last_line = current_line
                 end
-                sleep 0.0001
+                sleep 0.00001
               end
             end
             echo_thread.abort_on_exception = false
@@ -609,6 +617,7 @@ module PWN
               detach: true
             ) do |_|
               last_from = nil
+              last_line = nil
               Meshtastic::MQTT.subscribe(
                 mqtt_obj: mqtt_obj,
                 region: region,
@@ -622,7 +631,7 @@ module PWN
                 decoded = packet[:decoded]
                 next unless decoded.key?(:portnum) && decoded[:portnum] == :TEXT_MESSAGE_APP
 
-                rx_win = PWN.const_get(:MeshRxWin)
+                # rx_header_win = PWN.const_get(:MeshRxHeaderWin)
                 mutex = PWN.const_get(:MeshMutex)
 
                 from = "#{packet[:node_id_from]} ".ljust(9, ' ')
@@ -631,43 +640,43 @@ module PWN
                 rx_text = decoded[:payload]
                 ts = Time.now.strftime('%Y-%m-%d %H:%M:%S%z')
 
-                # Select a random color pair different from the last used one
+                # Select a random color different from the last used one
                 colors_arr = PWN.const_get(:MeshColors)
-                last_pair = PWN.const_get(:MeshLastPair)
-                pair = last_pair
+                last_color = PWN.const_get(:MeshLastColor)
+                color = last_color
                 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)
+                  PWN.send(:remove_const, :MeshLastColor)
+                  color_choices = colors_arr.reject { |c| c == last_color }
+                  color = color_choices.sample
+                  PWN.const_set(:MeshLastColor, color)
                 end
 
                 to_label = 'To'
                 to_label = 'DM' unless to == '!ffffffff'
                 current_line = "\nDate: #{ts}\nFrom: #{from}\n#{to_label}: #{to}\nTopic: #{absolute_topic}\n> #{rx_text}"
 
-                rx_win.attron(Curses.color_pair(pair) | Curses::A_REVERSE)
-                mutex.synchronize do
-                  inner_height = Curses.lines - 5
-                  inner_width = Curses.cols
-                  segments = current_line.scan(/.{1,#{inner_width}}/)
-                  segments.each do |seg|
-                    # TODO: Show new messages without scrolling above header line
-                    rx_win.scroll if rx_win.cury >= (inner_height - 1)
-
-                    rx_win.setpos(rx_win.cury, 0)
-                    # Handle wide Unicode characters for proper alignment
-                    display_width = Unicode::DisplayWidth.of(seg)
-                    width_diff = seg.length - display_width
-                    inner_width = Curses.cols + width_diff
-                    line = seg.ljust(inner_width)
-                    rx_win.addstr(line)
+                if last_line != current_line
+                  rx_body_win = PWN.const_get(:MeshRxBodyWin)
+                  mutex.synchronize do
+                    inner_height = rx_body_win.maxy - 5
+                    inner_width = rx_body_win.maxx
+                    segments = current_line.scan(/.{1,#{inner_width}}/)
+                    rx_body_win.attron(Curses.color_pair(color) | Curses::A_REVERSE)
+                    segments.each do |seg|
+                      rx_body_win.setpos(rx_body_win.cury, 0)
+                      # Handle wide Unicode characters for proper alignment
+                      display_width = Unicode::DisplayWidth.of(seg)
+                      width_diff = seg.length - display_width
+                      shift_width = inner_width + width_diff
+                      line = seg.ljust(shift_width)
+                      rx_body_win.addstr(line)
+                    end
+                    rx_body_win.attroff(Curses.color_pair(color) | Curses::A_REVERSE)
+                    rx_body_win.refresh
                   end
-                  rx_win.refresh
+                  last_line = current_line
+                  last_from = from
                 end
-                rx_win.attroff(Curses.color_pair(pair) | Curses::A_REVERSE)
-
-                last_from = from
               end
             end
           rescue StandardError => e
@@ -749,16 +758,22 @@ module PWN
               PWN.send(:remove_const, :MqttObj)
             end
 
-            if PWN.const_defined?(:MeshRxWin)
-              PWN.const_get(:MeshRxWin).close
-              PWN.send(:remove_const, :MeshRxWin)
+            if PWN.const_defined?(:MeshRxHeaderWin)
+              PWN.const_get(:MeshRxHeaderWin).close
+              PWN.send(:remove_const, :MeshRxHeaderWin)
             end
+
+            if PWN.const_defined?(:MeshRxBodyWin)
+              PWN.const_get(:MeshRxBodyWin).close
+              PWN.send(:remove_const, :MeshRxBodyWin)
+            end
+
             if PWN.const_defined?(:MeshTxWin)
               PWN.const_get(:MeshTxWin).close
               PWN.send(:remove_const, :MeshTxWin)
             end
             PWN.send(:remove_const, :MeshColors) if PWN.const_defined?(:MeshColors)
-            PWN.send(:remove_const, :MeshLastPair) if PWN.const_defined?(:MeshLastPair)
+            PWN.send(:remove_const, :MeshLastColor) if PWN.const_defined?(:MeshLastColor)
             PWN.send(:remove_const, :MeshMutex) if PWN.const_defined?(:MeshMutex)
             PWN.send(:remove_const, :MqttSubThread) if PWN.const_defined?(:MqttSubThread)
             Curses.close_screen

data/lib/pwn/version.rb

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

metadata

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