pwn 0.5.482 → 0.5.484

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f08d37f0ef017a76ac0b7bfea02093a55aebd68954ac13761b6969d4937e44f6
-  data.tar.gz: e187138d17aac3845fb86a3166bd7b31013110cd93113227bde83ede9cf4041d
+  metadata.gz: 8ad0028363f72fece4022b5631f68a8142b19ab7af00e7987fc43dd773e169a4
+  data.tar.gz: 27dd8ecef89a6decfc44e312e3690f4a73e93b42bfc0f9742ab67f0f0dc82a77
 SHA512:
-  metadata.gz: cd0f3d1caa5a0cc98d79daeb267a7577a1ef2fa1ec40eff5a707743206c9c2cbf4fa6c5fcba124be4bddef90331e91466bbddb94de776df605a72f5f3510e52a
-  data.tar.gz: 1dac1bc3dac0ab48b2572d43c1dee10e6c9f89c4389c43acfae4ffff4f8d546e7c29c8f77e95a9cf6d2b23df39fd3303ef85065d7f892037a636051d432378c1
+  metadata.gz: 11bfb6d3dd4e440cb18ee3dbf7a00fa2dfe8a984e636aa24e0fca70f797a9ee3b8a30a165c1db2f9c321104d535eb5424285a9a7279b3acea6d16776555fddc8
+  data.tar.gz: 050ed304623fe6a629223fb930bad5d76920baba5541f6aceeb02bf44986c84e3a8e11a87c122793f2a2c9bc512c2231c6f7b381ccfa7fcfa7ff621af84c03cd

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.482]:001 >>> PWN.help
+pwn[v0.5.484]: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.482]:001 >>> PWN.help
+pwn[v0.5.484]: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.482]:001 >>> PWN.help
+pwn[v0.5.484]: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,7 +509,7 @@ module PWN
 
             rx_height = Curses.lines - 4
             rx_win = Curses::Window.new(rx_height, Curses.cols, 0, 0)
-            rx_win.scrollok(true)
+            rx_win.scrollok(false)
             rx_win.nodelay = true
             rx_win.attron(Curses.color_pair(cyan) | Curses::A_BOLD)
 
@@ -531,7 +531,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
@@ -594,7 +595,7 @@ module PWN
                   end
                   last_drawn = current_line
                 end
-                sleep 0.001
+                sleep 0.0001
               end
             end
             echo_thread.abort_on_exception = false
@@ -624,7 +625,7 @@ module PWN
                 rx_win = PWN.const_get(:MeshRxWin)
                 mutex = PWN.const_get(:MeshMutex)
 
-                from = packet[:node_id_from]
+                from = "#{packet[:node_id_from]} ".ljust(11, '>')
                 absolute_topic = "#{region}/#{topic.gsub('#', from)}"
                 to = packet[:node_id_to]
                 rx_text = decoded[:payload]
@@ -633,26 +634,25 @@ module PWN
                 # Select a random color pair different from the last used one
                 colors_arr = PWN.const_get(:MeshColors)
                 last_pair = PWN.const_get(:MeshLastPair)
-                PWN.send(:remove_const, :MeshLastPair)
-                if last_from != from
+                pair = last_pair
+                unless last_from == from
+                  PWN.send(:remove_const, :MeshLastPair)
                   pair_choices = colors_arr.reject { |c| c == last_pair }
                   pair = pair_choices.sample
-                else
-                  pair = last_pair
+                  PWN.const_set(:MeshLastPair, pair)
                 end
-                PWN.const_set(:MeshLastPair, pair)
                 rx_win.attron(Curses.color_pair(pair) | Curses::A_REVERSE)
 
-                current_line = "\n[#{ts}] [RX] #{absolute_topic} >>> #{rx_text}"
+                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'
 
                 mutex.synchronize do
-                  inner_width = Curses.cols - 2
+                  inner_width = Curses.cols
                   content = current_line.sub(/\A\n/, '')
                   segments = content.scan(/.{1,#{inner_width}}/)
                   segments.each do |seg|
-                    rx_win.addstr("\n")
-                    rx_win.setpos(rx_win.cury, 1)
+                    # rx_win.addstr("\n")
+                    rx_win.setpos(rx_win.cury, 0)
                     line = seg.ljust(inner_width)
                     rx_win.addstr(line)
                   end

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.482
+  version: 0.5.484
 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