pwn 0.4.990 → 0.4.992

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af3ee5fb9ea7c8c0e53013a291f99f22aa3c19b2ff00b72c59acb574d5dfdecd
-  data.tar.gz: 341d6d21ef6d1476f909404daf0ec259a430cde3598d22185a62e16ac6248fd8
+  metadata.gz: c4cfb474de933ef8da17ef86e6277a9591f60e76f61f83da12120ef2a44516f6
+  data.tar.gz: 3beeaed5e19e992145068084da485d8155db075326122acd32cb2d4fac48a33f
 SHA512:
-  metadata.gz: 9468a3b230402f31fb9caec77acca6dcec10646bab6e350d00e680a68c848524e87dce423c5a21abfb6fcf795ad1c832f189dae8ebd6e7162811aa1851f9fcc3
-  data.tar.gz: d4359349f2c51cdcfc361de00a069069203cb3c1e53601e311f22e1377039666f1a3dca42ab5267bb7472b4504ebd1294d42611abf1f50af7ce09ae4cd9001cf
+  metadata.gz: 23a5a2308ecf58cc24b6ab3a2d64b8dd3ea780541049f80ef28bc0d4c28913db4b482376cbbc1a07cc4f51ab545f4ae562cfe13e3fbc522073322f4e7f34dc3c
+  data.tar.gz: 307bec354fe8b1d333b53325d21d28be20f55f2a1a9e077bd84686ec00cb7a711de054807eeca50b11034848eb1d5aad7ceaf79121b5818b405227ef9e3ccc74

data/Gemfile

@@ -86,7 +86,7 @@ gem 'serialport', '1.3.2'
 gem 'slack-ruby-client', '2.2.0'
 gem 'socksify', '1.7.1'
 gem 'spreadsheet', '1.3.1'
-gem 'sqlite3', '1.7.0'
+gem 'sqlite3', '1.7.1'
 gem 'thin', '1.8.2'
 gem 'tty-prompt', '0.23.1'
 gem 'tty-spinner', '0.9.3'

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.4.990]:001 >>> PWN.help
+pwn[v0.4.992]: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.990]:001 >>> PWN.help
+pwn[v0.4.992]: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.990]:001 >>> PWN.help
+pwn[v0.4.992]: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/black_duck_binary_analysis.rb

@@ -60,14 +60,13 @@ module PWN
 
         when :post, :put
           if http_body.is_a?(Hash)
-            case http_body.key?
-            when :multipart
-              headers[:content_type] = 'multipart/form-data'
-            when :raw
+            if http_body.key?(:raw)
               headers[:content_type] = nil
               http_body = http_body[:file]
+            elsif http_body.key?(:multipart)
+              headers[:content_type] = 'multipart/form-data'
             else
-              http_body = http_body.to_json unless http_body.key?(:multipart)
+              http_body = http_body.to_json
             end
           end
 

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',
+      #   hexdump_arr: 'optional - return array of hashes instead of string (default: false)'
       # )
 
       public_class_method def self.dump(opts = {})
         file = opts[:file]
+        hexdump_arr = opts[:hexdump_arr] ||= false
 
         raise ArgumentError, 'file is required' if file.nil?
 
@@ -19,24 +21,36 @@ module PWN
         input = File.binread(file)
 
         io = StringIO.new
+        hex_arr = [] if hexdump_arr
         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 hexdump_arr
+            fmt_row_hash = {
+              address: fmt_row.split.first.delete(':'),
+              hex: fmt_row.split[1..8],
+              ascii: fmt_row.split[9..-1].join
+            }
+
+            hex_arr.push(fmt_row_hash)
+          end
         end
 
-        io.string
+        hex_arr if hexdump_arr
+        io.string unless hexdump_arr
       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',
+            hexdump_arr: 'optional - return array of hashes 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.990'
+  VERSION = '0.4.992'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.990
+  version: 0.4.992
 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
@@ -1038,14 +1038,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement