pwn 0.5.34 → 0.5.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f879ebdd5ad454c5a57dab480906a255c1a1c9551c33895b346417f26b320784
-  data.tar.gz: e78218a0680ed4982aad8a13e5368bfac5fc5b04b548a1bd2410389ce2945c0a
+  metadata.gz: 7fc386dcce50c0d17eebb357f6b44360e451c00abf7bfc4178fbc24ff3413054
+  data.tar.gz: f561d8b9b85c4ada994325c264fad7535cbac380b711804037b013ea721faab8
 SHA512:
-  metadata.gz: d94948a701a5716491c3c058168c34ffd16038e07c048a4284f4471c47a00b8a79122c4562e47a068ff249c24fbcd4575bc8df7b81518c589c9648ca2f8d6c03
-  data.tar.gz: 1b9d36a3f3ee1f4a54a7cb7cce7a40ecbd47eff55593dd38f479604d7ed21c8bc8a17e4fcdd4db1f252b87052d985eac468d31420a14b51df0eb6fae47c7e191
+  metadata.gz: 874c5b729cdc6fd42c3ae9fd8a7c1af238e4676ad06a5770e865096829992e90d87c58bf7f99bec0c84f4747dad5abb2d1177f005a537a73067da3394413fca0
+  data.tar.gz: 53df7f807a7aca90c853031ec0cbf708a4397bcf03125535cc98d9f14b15e376e1cc3f38843fc2179ac128e59365a07c64843a30e3132a2aa13f87f3e1165d59

data/README.md

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'cgi'
 require 'metasm'
+require 'tempfile'
 
 module PWN
   module Plugins
@@ -33,15 +35,31 @@ module PWN
           raise "Unsupported architecture: #{arch}"
         end
 
-        #  TOOD: Fix this
-        # If opcodes appear to be '"90", "90", "90"' then convert to "\x90\x90\x90"
-        # opcodes = opcodes.split(',').map { |x| format('\x%02x', x.gsub('"', '').to_i(16)) }.join if opcodes.include?('"') && opcodes.include?(',')
-
-        # If opcodes appear to be '90 90 90' then convert to "\x90\x90\x90"
-        # opcodes = opcodes.split.map { |x| format('\x%02x', x.to_i(16)) }.join if opcodes.include?(' ')
-
-        # If opcodes appear to be '909090' then convert to "\x90\x90\x90"
-        # opcodes = opcodes.chars.each_slice(2).map(&:join).map { |x| format('\x%02x', x.to_i(16)) }.join if opcodes.length.even?
+        # TOOD: Still needs a fix if opcodes are passed in as:
+        # '\x90\x90\x90' (not to be confused w/ "\x90\x90\x90")
+        # '909090'
+        opcodes_orig_len = opcodes.length
+        opcodes = opcodes.join(',') if opcodes.is_a?(Array)
+        opcodes = CGI.escape(opcodes)
+        # puts opcodes.inspect
+        # Doesnt work with sommething like: "'ff', 'e4'"
+        # known to work with:
+        # 'ffe4'
+        # 'ff,e4'
+        # "ff,e4"
+        # ['ff', 'e4']
+        # ["ff", "e4"]
+        # '\xff\xe4'
+        # "\xff\xe4"
+        opcodes.delete!('%5Cx') if opcodes.include?('%5Cx')
+        opcodes.delete!('%2C') if opcodes.include?('%2C')
+        opcodes.delete!('%22') if opcodes.include?('%22')
+        opcodes.delete!('%27') if opcodes.include?('%27')
+        opcodes.delete!('+') if opcodes.include?('+')
+        opcodes.delete!('%') if opcodes.include?('%')
+        # puts opcodes.inspect
+        opcodes = [opcodes].pack('H*')
+        # puts opcodes.inspect
 
         Metasm::Shellcode.disassemble(arch_obj, opcodes).to_s
       rescue StandardError => e
@@ -60,6 +78,8 @@ module PWN
         arch = opts[:arch] ||= PWN::Plugins::DetectOS.arch
         endian = opts[:endian] ||= :little
 
+        asm_tmp = Tempfile.new('pwn_asm')
+
         raise 'ERROR: asm parameter is required.' if asm.nil?
 
         case arch

data/lib/pwn/version.rb

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

metadata

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