pwn 0.5.483 → 0.5.485

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9089cde1713e79574b561791fc9e52331efdd9d4401f92f84a3cd78d3e9baa5
-  data.tar.gz: 810569d7a49f6ce75871431eafd90d5ba6377c8c0f8ba3031e82b07e1233264b
+  metadata.gz: f662cf26231142d1817f7d294a040e75dd4251b5cde89db91a29fedbe4016a56
+  data.tar.gz: 9e5a446bfadf5e27f9f8f5337269f0ddc25f7efaa271549b7ff435c7eb1bfb33
 SHA512:
-  metadata.gz: 6fcb0e4057e72824d1c18a3af03dc9826733ccb34d5e8153b1085850a3ce119915dedcb70d5bd172b91358c65d2e273d3086cccead5a1fe0c20acd98f9947b5f
-  data.tar.gz: c4543ab1b1ec9db5841b85f283353da453c971001b7f6a013a239afde1cdc715f07b80f54000b18c3faa207dfa73c7ba929c5f5d4ca89f61620669ebafb0a356
+  metadata.gz: 12c6f3426b3ade8f9149c3de4f741bbd776290471ac1ab24427ba4e690eb2578eb3d420427b5682523c807a1cca8f5f129307ba6f58556872f88935c9b9ead3b
+  data.tar.gz: fbafe45d436da4952b621d39e3ff9ef65b7252dba8c1bdcb11a9b26418795e88e942323315742e4ccda09621757568215464ed20acce71d00587256f74949871

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.132'
+gem 'meshtastic', '0.0.136'
 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.483]:001 >>> PWN.help
+pwn[v0.5.485]: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.483]:001 >>> PWN.help
+pwn[v0.5.485]: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.483]:001 >>> PWN.help
+pwn[v0.5.485]: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

@@ -509,6 +509,7 @@ module PWN
 
             rx_height = Curses.lines - 4
             rx_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)
@@ -531,7 +532,8 @@ module PWN
 
             rx_win.refresh
 
-            tx_win = Curses::Window.new(4, Curses.cols, rx_height, 0)
+            tx_height = rx_height - 1
+            tx_win = Curses::Window.new(4, Curses.cols, tx_height, 0)
             tx_win.scrollok(false)
             tx_win.nodelay = true
             tx_win.refresh
@@ -624,11 +626,11 @@ module PWN
                 rx_win = PWN.const_get(:MeshRxWin)
                 mutex = PWN.const_get(:MeshMutex)
 
-                from = packet[:node_id_from].to_s.ljust(9, ' ')
+                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)
@@ -642,9 +644,9 @@ module PWN
                 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}"
                 mutex.synchronize do
                   inner_width = Curses.cols
                   content = current_line.sub(/\A\n/, '')

data/lib/pwn/version.rb

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

metadata

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