PWN::Plugins::XXD module - implement optional parameter to return a hexdump as a single hash instead of an array of hashes in #dump method #bugfix

Author: ninp0

README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.4.995]:001 >>> PWN.help
+pwn[v0.4.996]: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.3.0@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.995]:001 >>> PWN.help
+pwn[v0.4.996]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.3.0@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.4.995]:001 >>> PWN.help
+pwn[v0.4.996]: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:

lib/pwn/plugins/xxd.rb

@@ -33,10 +33,28 @@ module XXD
           io.write(fmt_row)
 
           if hashed
-            hashed_hexdump[fmt_row.split.first.delete(':').to_s] = {
-              hex: fmt_row.split[1..8],
-              ascii: fmt_row.split[9..-1].join
+            # TODO: Fix NoMethodError: undefined method `join' for nil
+            # when fmt_row looks like:
+            # 000f4b20: 0000 0000 0000 0000                      ........
+            # fmt_row_col_len = fmt_row.split.length
+            # if fmt_row_col_len > 10
+            #   fmt_row.split[9..-1].join
+            # end
+            this_key = fmt_row.split.first.delete(':').to_s
+            hashed_hexdump[this_key] = {
+              hex: fmt_row.split[1..-2],
+              ascii: fmt_row.split[-1]
             }
+
+            hhh_len = hashed_hexdump[this_key][:hex].length
+            # TODO: address last line if the hashed_hexdump[this_key][:hex] length is less than 8
+            if hhh_len > 8
+              mov_to_ascii = (hhh_len - 8) * -1
+              last_ascii = hashed_hexdump[this_key][:ascii]
+              hashed_hexdump[this_key][:hex][-1] = "#{hashed_hexdump[this_key][:hex].last}\s"
+              hashed_hexdump[this_key][:ascii] = "#{hashed_hexdump[this_key][:hex][mov_to_ascii..-1].join(' ')}#{last_ascii}"
+              hashed_hexdump[this_key][:hex] = hashed_hexdump[this_key][:hex][0..7]
+            end
           end
         end
 

lib/pwn/version.rb

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