pwn 0.4.991 → 0.4.993

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ecf9fa3d872261c7c0cb2bc084cb9c13186b60bf12eb5fdf87add74575a4b64
-  data.tar.gz: 4957a0b3ea98c7150134bed70f458fb991af3174902d6b2f8b59aef23b776696
+  metadata.gz: 84008b06b85408aed7b64e9ee6ae23d392d7713028b21b7f6f85ddf20433d9fa
+  data.tar.gz: 6a7749cb6897c478325ef819039a3790cbc5a126b3da0e907ab8e9ca145737ba
 SHA512:
-  metadata.gz: c91e809d196b2fbf524c27c3436d05b0005ae36803b31ebcd5fe88c9f2edebea45c88e24f3b8dc92099fbd8f21cb5818d477a9db9aabad0fc69b2f69d97dad78
-  data.tar.gz: 6f06c9520d19cb7ab9c5006a21f939bfb279df01e9539c6f62f213a5983fd413eb35ac7c858b1864fcbc0fa33bd807b2c4081059d97700e6192bd03a57e584ef
+  metadata.gz: 681a65c0de2438a658cefb719e3d9d009bc295eaf5af5f54e7ef7710994113809b72279549c535dd89efdd621561ec3eb93e0d0d4f941360f4cd20dc1788587a
+  data.tar.gz: 802a27fd787dd8745c6e20de8cabcf7f76cae6bd6fea9d2431f9a8ea3b11574016ef03925855c7e6c712c37fbd366aaddd8f70fd513905f4e81fe530096e1e44

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.4.991]:001 >>> PWN.help
+pwn[v0.4.993]: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.991]:001 >>> PWN.help
+pwn[v0.4.993]: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.991]:001 >>> PWN.help
+pwn[v0.4.993]: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/xxd.rb

@@ -6,11 +6,13 @@ module PWN
     module XXD
       # Supported Method Parameters::
       # PWN::Plugins::XXD.dump(
-      #   file: 'required - path to binary file to dump'
+      #   file: 'required - path to binary file to dump',
+      #   hashed: 'optional - return hexdump as hash instead of string (default: false)'
       # )
 
       public_class_method def self.dump(opts = {})
         file = opts[:file]
+        hashed = opts[:hashed] ||= false
 
         raise ArgumentError, 'file is required' if file.nil?
 
@@ -19,24 +21,36 @@ module PWN
         input = File.binread(file)
 
         io = StringIO.new
+        hashed_hexdump = {}
         res = input.bytes.each_slice(2).each_slice(8).with_index do |row, index|
-          io.write(
-            format(
-              "%<s1>07x0: %<s2>-40s %<s3>-16s\n",
-              s1: index,
-              s2: row.map { |pair| pair.map { |b| b.to_s(16).rjust(2, '0') }.join }.join(' '),
-              s3: row.flat_map { |pair| pair.map { |b| (b >= 32 && b < 127 ? b.chr : '.') } }.flatten.join
-            )
+          fmt_row = format(
+            "%<s1>07x0: %<s2>-40s %<s3>-16s\n",
+            s1: index,
+            s2: row.map { |pair| pair.map { |b| b.to_s(16).rjust(2, '0') }.join }.join(' '),
+            s3: row.flat_map { |pair| pair.map { |b| (b >= 32 && b < 127 ? b.chr : '.') } }.flatten.join
           )
+
+          io.write(fmt_row)
+
+          if hashed
+            hashed_hexdump["#{fmt_row.split.first.delete(':')}"] = {
+              hex: fmt_row.split[1..8],
+              ascii: fmt_row.split[9..-1].join
+            }
+          end
         end
 
-        io.string
+        if hashed
+          return hashed_hexdump
+        else
+          return io.string
+        end
       rescue StandardError => e
         raise e
       end
 
       # Supported Method Parameters::
-      # PWN::Plugins::XXD.dump(
+      # PWN::Plugins::XXD.reverse_dump(
       #   hexdump: 'required - hexdump string to reverse dump'
       #   file: 'required - path to binary file to dump'
       # )
@@ -50,7 +64,10 @@ module PWN
 
         # TODO: fix this block as it is not working as expected
         binary_data = hexdump.lines.map do |line|
-          line.chars[10..-19].join.split.map do |hex|
+          # Works but overly complicated
+          # line.chars[10..-19].join.split.map do |hex|
+          # More simple better
+          line.split[1..8].map do |hex|
             [hex].pack('H*')
           end.join
         end.join
@@ -73,7 +90,8 @@ module PWN
       public_class_method def self.help
         puts "USAGE:
           #{self}.dump(
-            file: 'required - path to binary file to dump'
+            file: 'required - path to binary file to dump',
+            hashed: 'optional - return hexdump as hash instead of string (default: false)'
           )
 
           #{self}.reverse_dump(

data/lib/pwn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.991
+  version: 0.4.993
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport