rex-exploitation 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db83c76f7bf06ed1b44befaf6ea881c32b07f73d
-  data.tar.gz: 3c57b994f8c5484e25e6bf7dd17da346227dac29
+  metadata.gz: 3a9908242d2efc6117d8624bf750b6f7155b7499
+  data.tar.gz: feb396f96d5edaaeb2dcdf142b9de516b95136e3
 SHA512:
-  metadata.gz: 777be5970698c74ba085fe7fcc7c5db0f5ddb2c1745d77dc2ab581c3d6622ed23ce2498b09539d1511aa093a15da699894b415cd073acd38ef0994515c7d7bb8
-  data.tar.gz: cff271b09dd699abc5df5b30e366c7bd1f678022d7a720a03bda41e1fbce3fb1b15da0a8ea0eca9f50d791223fcd718ddfbb02cec203005eaea2c2c3f57d0753
+  metadata.gz: 57f496dc9e7b45e3fb8024456265d1a8d884cc8dd77532cf46458b5cd26e4c956fbec3ef32c294116244c4f17f4bf3cf7aeeb0a52a0d710340693d1aa8be1882
+  data.tar.gz: b61a3b3b5a470135cd7a5b58b99a194e17fb887b59b3d110162a22e9e9b36e51a436dc9b3093d7db9cd71a1c53a917a17b6788a4dd51cfd62c7edf59a045c0bb

data/.gitignore

@@ -8,4 +8,9 @@
 /spec/reports/
 /tmp/
 /.ruby-version
-/.ruby-gemset
+/.ruby-gemset
+.DS_Store
+*.swp
+*.orig
+*.rej
+*~

data/lib/rex/exploitation/cmdstager/echo.rb

@@ -10,8 +10,10 @@ module Exploitation
 class CmdStagerEcho < CmdStagerBase
 
   ENCODINGS = {
-    'hex'   => "\\\\x",
-    'octal' => "\\\\"
+    'hex'                 => "\\\\x",
+    'octal'               => "\\\\",
+    'hex_double_quoted'   => "\\x",
+    'hex_single_quoted'   => "\\x",
   }
 
   def initialize(exe)
@@ -55,6 +57,9 @@ class CmdStagerEcho < CmdStagerBase
 
     @cmd_end   = ">>#{@tempdir}#{@var_elf}"
     xtra_len = @cmd_start.length + @cmd_end.length
+    if opts[:enc_format].to_s =~ /quoted/
+      xtra_len += 2
+    end
     opts.merge!({ :extra => xtra_len })
 
     @prefix = opts[:prefix] || ENCODINGS[opts[:enc_format]]
@@ -92,7 +97,13 @@ class CmdStagerEcho < CmdStagerBase
     parts.map do |p|
       cmd = ''
       cmd << @cmd_start
-      cmd << p
+      if opts[:enc_format] == 'hex_double_quoted'
+        cmd << %Q{"#{p}"}
+      elsif opts[:enc_format] == 'hex_single_quoted'
+        cmd << %Q{'#{p}'}
+      else
+        cmd << p
+      end
       cmd << @cmd_end
       cmd
     end
@@ -146,6 +157,10 @@ class CmdStagerEcho < CmdStagerBase
       while (fixed_part.length > 0 && fixed_part[-5, @prefix.length] != @prefix)
         fixed_part.chop!
       end
+    when /hex_.*_quoted/
+      while (fixed_part.length > 0 && fixed_part[-4, @prefix.length] != @prefix)
+        fixed_part.chop!
+      end
     when 'octal'
       if remaining.length > fixed_part.length and remaining[fixed_part.length, @prefix.length] != @prefix
         pos = fixed_part.rindex('\\')

data/lib/rex/exploitation/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Exploitation
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-exploitation
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - David Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler