pwn 0.5.33 → 0.5.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b53951502ff747ce5dcb1b0dea5ffdfc2c48aaad64af272c1e49091c26a27c23
-  data.tar.gz: 1f7e8b51e925ffd5df4a7cea3cab15817c2bfebdbf79c538c2408cfe844c98e8
+  metadata.gz: 8f41a4c6cbab245a2f57337769fd1ea372c76c23e4a6201f5537ebe7b0490d11
+  data.tar.gz: 331cdf2b24514db9a043d86d0694973320fbcebed6b2921e25287ca196c3d9b6
 SHA512:
-  metadata.gz: 64602514e14c0e6984499480911de341caeca50804b27e637d9dd15310138bbfc2b2d9861b5a42bcf3e71f792f9119730b54e9ad1e7ff63b665e614c5057b795
-  data.tar.gz: 12c4215d65ddfc8c607015003fa8fc156157892666e3145034cf61f29c7dc9f3a3fee000d9c7e48bb505b51c5b1e3db053deced00a085d48f80fe359320ec383
+  metadata.gz: 7c3c16d7e8e78092772c587dcb25203d33fc56d055f436e11683c255281ff7c26073d1abf1dde98cb4a89c8f9ca244431d0cf7d740af90e05b2324de274b9b2c
+  data.tar.gz: 8150d8a01bd4c416a34910e1d52c431362232e1b1f1f22252e60ffbece533ad8809f9e8a4b2b93e607a7ae9c54dd031ab01b38057480c7da3daf07d84062b56b

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.33]:001 >>> PWN.help
+pwn[v0.5.35]: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.33]:001 >>> PWN.help
+pwn[v0.5.35]: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.33]:001 >>> PWN.help
+pwn[v0.5.35]: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,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'metasm'
-require 'tempfile'
 
 module PWN
   module Plugins
@@ -19,38 +18,39 @@ module PWN
         arch = opts[:arch] ||= PWN::Plugins::DetectOS.arch
         endian = opts[:endian] ||= :little
 
-        pwn_asm_tmp = Tempfile.new('pwn_asm')
-
         raise 'ERROR: opcodes parameter is required.' if opcodes.nil?
 
         case arch
-        when 'amd64', 'i386', 'i686', 'x86', 'x86_64'
-          arch = 'i386'
+        when 'i386', 'i686', 'x86'
+          arch_obj = Metasm::Ia32.new(endian)
+        when 'amd64', 'x86_64'
+          arch_obj = Metasm::X86_64.new(endian)
         when 'armv4l', 'armv4b', 'armv5l', 'armv5b', 'armv6l', 'armv6b', 'armv7b', 'armv7l', 'arm', 'armhf'
-          arch = 'arm'
+          arch_obj = Metasm::ARM.new(endian)
         when 'aarch64', 'arm64'
-          arch = 'aarch64'
+          arch_obj = Metasm::ARM64.new(endian)
         else
           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?
-
-        File.binwrite(pwn_asm_tmp.path, opcodes)
-        `objdump -D -b binary -m #{arch} -M intel --endian #{endian} #{pwn_asm_tmp.path}`
+        # TOOD: Still needs a fix if opcodes is passed in as:
+        # '\x90\x90\x90' (not to be confused w/ "\x90\x90\x90")
+        # '909090'
+        opcodes_orig_len = opcodes.length
+        opcodes = opcodes.map { |code| [code].pack('H*') }.join if opcodes.is_a?(Array)
+        opcodes.delete!('\x') if opcodes.include?('\x')
+        opcodes.delete!('"') if opcodes.include?('"')
+        opcodes.delete!("'") if opcodes.include?("'")
+        opcodes.delete!(',') if opcodes.include?(',')
+        opcodes.delete!("\s") if opcodes.include?("\s")
+
+        # puts opcodes.inspect
+        opcodes = [opcodes].pack('H*') if opcodes.length.even? && opcodes.length != opcodes_orig_len
+        # puts opcodes.inspect
+
+        Metasm::Shellcode.disassemble(arch_obj, opcodes).to_s
       rescue StandardError => e
         raise e
-      ensure
-        tmp_file = [pwn_asm_tmp.path]
-        FileUtils.rm_f(tmp_file) if File.exist?(pwn_asm_tmp.path)
       end
 
       # Supported Method Parameters::

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.33
+  version: 0.5.35
 platform: ruby
 authors:
 - 0day Inc.