pwn 0.5.35 → 0.5.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f41a4c6cbab245a2f57337769fd1ea372c76c23e4a6201f5537ebe7b0490d11
-  data.tar.gz: 331cdf2b24514db9a043d86d0694973320fbcebed6b2921e25287ca196c3d9b6
+  metadata.gz: 7fc386dcce50c0d17eebb357f6b44360e451c00abf7bfc4178fbc24ff3413054
+  data.tar.gz: f561d8b9b85c4ada994325c264fad7535cbac380b711804037b013ea721faab8
 SHA512:
-  metadata.gz: 7c3c16d7e8e78092772c587dcb25203d33fc56d055f436e11683c255281ff7c26073d1abf1dde98cb4a89c8f9ca244431d0cf7d740af90e05b2324de274b9b2c
-  data.tar.gz: 8150d8a01bd4c416a34910e1d52c431362232e1b1f1f22252e60ffbece533ad8809f9e8a4b2b93e607a7ae9c54dd031ab01b38057480c7da3daf07d84062b56b
+  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.35]: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.35]: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.35]: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,19 +35,30 @@ module PWN
           raise "Unsupported architecture: #{arch}"
         end
 
-        # TOOD: Still needs a fix if opcodes is passed in as:
+        # 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.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")
-
+        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*') if opcodes.length.even? && opcodes.length != opcodes_orig_len
+        opcodes = [opcodes].pack('H*')
         # puts opcodes.inspect
 
         Metasm::Shellcode.disassemble(arch_obj, opcodes).to_s
@@ -65,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.35'
+  VERSION = '0.5.36'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.35
+  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