pwn 0.5.485 → 0.5.487

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f662cf26231142d1817f7d294a040e75dd4251b5cde89db91a29fedbe4016a56
-  data.tar.gz: 9e5a446bfadf5e27f9f8f5337269f0ddc25f7efaa271549b7ff435c7eb1bfb33
+  metadata.gz: 39f11158eacd6a873c2699f6f642591ed8b4de2ba64ce73f96b84f56f35a81e8
+  data.tar.gz: '08b0fb7f0b619bfb20e1fb97b083a180c215a662f90383a43b22785e2e57e5fd'
 SHA512:
-  metadata.gz: 12c6f3426b3ade8f9149c3de4f741bbd776290471ac1ab24427ba4e690eb2578eb3d420427b5682523c807a1cca8f5f129307ba6f58556872f88935c9b9ead3b
-  data.tar.gz: fbafe45d436da4952b621d39e3ff9ef65b7252dba8c1bdcb11a9b26418795e88e942323315742e4ccda09621757568215464ed20acce71d00587256f74949871
+  metadata.gz: fc7d789f23c35d20ab41229e87903c8a618da4fef1518b51291fe534b888a3d0cfcb36af7f824bef116f224034ba8e9d071a7e88fa1a7ad2cdb6b418fe2498db
+  data.tar.gz: b36f00d2e5a3118c561415be867d14eae5b2ec54b6dac67c32840bc434585fac9a1f1633b2f81178b495f3900ee5f567b7c63c5b4402779826b1cd952fa63b64

data/Gemfile

@@ -49,7 +49,7 @@ gem 'jwt', '3.1.2'
 gem 'libusb', '0.7.2'
 gem 'luhn', '3.0.0'
 gem 'mail', '2.9.0'
-gem 'meshtastic', '0.0.136'
+gem 'meshtastic', '0.0.139'
 gem 'metasm', '1.0.5'
 gem 'mongo', '2.21.3'
 gem 'msfrpc-client', '1.1.2'

data/README.md

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

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'meshtastic'
 require 'pry'
 require 'tty-prompt'
+require 'unicode/display_width'
 require 'yaml'
 
 module PWN
@@ -433,7 +434,6 @@ module PWN
             PWN.send(:remove_const, :MqttObj) if PWN.const_defined?(:MqttObj)
             PWN.send(:remove_const, :MeshRxWin) if PWN.const_defined?(:MeshRxWin)
             PWN.send(:remove_const, :MeshTxWin) if PWN.const_defined?(:MeshTxWin)
-            PWN.send(:remove_const, :MeshPi) if PWN.const_defined?(:MeshPi)
             PWN.send(:remove_const, :MeshMutex) if PWN.const_defined?(:MeshMutex)
             PWN.send(:remove_const, :MqttSubThread) if PWN.const_defined?(:MqttSubThread)
 
@@ -541,7 +541,6 @@ module PWN
             PWN.const_set(:MeshRxWin, rx_win)
             PWN.const_set(:MeshTxWin, tx_win)
             PWN.const_set(:MeshMutex, Mutex.new)
-            PWN.const_set(:MeshPi, pi)
 
             # Live typing echo thread (idempotent)
             tx_prompt = "#{region}/#{topic} >>>"
@@ -642,18 +641,25 @@ module PWN
                   pair = pair_choices.sample
                   PWN.const_set(:MeshLastPair, pair)
                 end
-                rx_win.attron(Curses.color_pair(pair) | Curses::A_REVERSE)
 
                 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
-                  content = current_line.sub(/\A\n/, '')
-                  segments = content.scan(/.{1,#{inner_width}}/)
+                  segments = current_line.scan(/.{1,#{inner_width}}/)
                   segments.each do |seg|
-                    # rx_win.addstr("\n")
+                    # 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)
                   end
@@ -753,7 +759,6 @@ module PWN
             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, :MeshPi) if PWN.const_defined?(:MeshPi)
             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.485'
+  VERSION = '0.5.487'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.485
+  version: 0.5.487
 platform: ruby
 authors:
 - 0day Inc.
@@ -533,14 +533,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.136
+        version: 0.0.139
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.136
+        version: 0.0.139
 - !ruby/object:Gem::Dependency
   name: metasm
   requirement: !ruby/object:Gem::Requirement