pwn 0.5.484 → 0.5.486

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ad0028363f72fece4022b5631f68a8142b19ab7af00e7987fc43dd773e169a4
-  data.tar.gz: 27dd8ecef89a6decfc44e312e3690f4a73e93b42bfc0f9742ab67f0f0dc82a77
+  metadata.gz: 6a00e0d95c9e0be5169eab1f252c92cc8df842179dee67a42e344d6d5180ca15
+  data.tar.gz: 6790637bca216986e41e89958f596b583bc9a36dea307e5723cbfb6a4b538153
 SHA512:
-  metadata.gz: 11bfb6d3dd4e440cb18ee3dbf7a00fa2dfe8a984e636aa24e0fca70f797a9ee3b8a30a165c1db2f9c321104d535eb5424285a9a7279b3acea6d16776555fddc8
-  data.tar.gz: 050ed304623fe6a629223fb930bad5d76920baba5541f6aceeb02bf44986c84e3a8e11a87c122793f2a2c9bc512c2231c6f7b381ccfa7fcfa7ff621af84c03cd
+  metadata.gz: c5a75d88b69df64071efbf705a117e49d18b03a46aa895696133b6dac2bf7cb7572bbe8149f08e7440cdcf5a37324b2c167defa24239eff2009ec15007b73017
+  data.tar.gz: 0a9df8092b26b299908e04789474a45eef61a792edd1cd4ee76b9efb977e14a049135186ec232f5a801e89a9e3fb3c511a1faed29fcaa92a8744013cace766c7

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.137'
 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.484]:001 >>> PWN.help
+pwn[v0.5.486]: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.484]:001 >>> PWN.help
+pwn[v0.5.486]: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.484]:001 >>> PWN.help
+pwn[v0.5.486]: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)
 
@@ -509,7 +509,8 @@ module PWN
 
             rx_height = Curses.lines - 4
             rx_win = Curses::Window.new(rx_height, Curses.cols, 0, 0)
-            rx_win.scrollok(false)
+            # 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)
 
@@ -540,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} >>>"
@@ -625,11 +625,11 @@ module PWN
                 rx_win = PWN.const_get(:MeshRxWin)
                 mutex = PWN.const_get(:MeshMutex)
 
-                from = "#{packet[:node_id_from]} ".ljust(11, '>')
+                from = "#{packet[:node_id_from]} ".ljust(9, ' ')
                 absolute_topic = "#{region}/#{topic.gsub('#', from)}"
                 to = packet[:node_id_to]
                 rx_text = decoded[:payload]
-                ts = Time.now.strftime('%H:%M:%S%z')
+                ts = Time.now.strftime('%Y-%m-%d %H:%M:%S%z')
 
                 # Select a random color pair different from the last used one
                 colors_arr = PWN.const_get(:MeshColors)
@@ -641,20 +641,24 @@ module PWN
                   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'
+                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_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")
                     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)
+                    # rx_win.addstr("Inner Width: #{inner_width} width_diff: #{width_diff} display_width: #{display_width} seg.length: #{seg.length}\n")
                   end
                   rx_win.refresh
                 end
@@ -752,7 +756,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.484'
+  VERSION = '0.5.486'
 end

metadata

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