pwn 0.5.486 → 0.5.488

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a00e0d95c9e0be5169eab1f252c92cc8df842179dee67a42e344d6d5180ca15
-  data.tar.gz: 6790637bca216986e41e89958f596b583bc9a36dea307e5723cbfb6a4b538153
+  metadata.gz: 1c6b217ab3c5fdf16b2cacd41cfdbc77fdcc4fe4f2095490e831a172022bd8e4
+  data.tar.gz: 8855d5d95676a6779ec7f81a5c968ca82bbb09e0ffab2ae7bc35d146bce159d8
 SHA512:
-  metadata.gz: c5a75d88b69df64071efbf705a117e49d18b03a46aa895696133b6dac2bf7cb7572bbe8149f08e7440cdcf5a37324b2c167defa24239eff2009ec15007b73017
-  data.tar.gz: 0a9df8092b26b299908e04789474a45eef61a792edd1cd4ee76b9efb977e14a049135186ec232f5a801e89a9e3fb3c511a1faed29fcaa92a8744013cace766c7
+  metadata.gz: 17c944994ed32f740d1e2048598229deea593b1a657fe1a7e9e0928cc23052c31a07ccdff30f90242c395b28073ce5c584d8ab9f45a448b5bd0b3f152ab3a972
+  data.tar.gz: f1ad3887c815aaf1ebff5b7113c55ef0e255891f68fcb39a9b8348dc60db1c10f6e03c87802a6c36d5d51781ad0ae8990978232c6cf63fb08eed608455a6db81

data/.rubocop.yml

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

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.137'
+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.486]:001 >>> PWN.help
+pwn[v0.5.488]: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.486]:001 >>> PWN.help
+pwn[v0.5.488]: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.486]:001 >>> PWN.help
+pwn[v0.5.488]: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)
@@ -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,7 +547,6 @@ 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)
 
@@ -622,7 +630,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, ' ')
@@ -646,23 +654,24 @@ module PWN
                 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)
+                rx_body_win = PWN.const_get(:MeshRxBodyWin)
+                rx_body_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|
-                    rx_win.setpos(rx_win.cury, 0)
+                    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
                     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")
+                    rx_body_win.addstr(line)
                   end
-                  rx_win.refresh
+                  rx_body_win.refresh
                 end
-                rx_win.attroff(Curses.color_pair(pair) | Curses::A_REVERSE)
+                rx_body_win.attroff(Curses.color_pair(pair) | Curses::A_REVERSE)
 
                 last_from = from
               end
@@ -746,10 +755,16 @@ 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)

data/lib/pwn/version.rb

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

metadata

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