metasploit-payloads 2.0.63 → 2.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fb6b8c214c2032e3f506341d7f9b069e93639b6abf7afbd3fd279ea087d9e6
-  data.tar.gz: a2541c9ad2051533ee66ea252f3fa1d84774f7dbea2dbe823fa45b50e8add977
+  metadata.gz: 90c2a75643ab01b1891d8b9448ff7cc5dd2299b7704758fd27e19e52a391b7c6
+  data.tar.gz: 7252b2cbea153b4ec9b83afb29c31977ebb09d193803b6f8130c09c779acfdb5
 SHA512:
-  metadata.gz: 8938435f3345901ff7d6401ae487ae12117f09035c8fd4cc74d733eebb56a1d731b045321b5ad6aaac42ade9a884e284ab36358589857bd195443ae8e5ae9db1
-  data.tar.gz: ac0be6bedfaf25d2b3c102f42f020625d110d63d559b8361ae2b1f8199ad1df214e489bd3dbb0e251ec4c10d50e6df61a4839f929b868ba74a1cc0214677d1b5
+  metadata.gz: e01f9397aa045bdcae9200b15e6dcbbac096af8c16548dd3e9eac7ffc34ac2b26c097f5704d1c113f27b2574ef26c1a99bbd9c60fdaef1aa71aca4719de950c3
+  data.tar.gz: 7d63434137f517b4fda170529e674d5391386869b2c962d5ad89857ee0b6846afbadf005da82cb880a236eb1be5bc989ac7f0893f703dd4a96d29300f050c167

data/data/meterpreter/ext_server_stdapi.php

@@ -628,8 +628,10 @@ function stdapi_fs_ls($req, &$pkt) {
                 packet_add_tlv($pkt, create_tlv(TLV_TYPE_FILE_NAME, $file));
                 packet_add_tlv($pkt, create_tlv(TLV_TYPE_FILE_PATH, $path . DIRECTORY_SEPARATOR . $file));
                 $st_buf = add_stat_buf($path . DIRECTORY_SEPARATOR . $file);
-                if ($st_buf)
-                    packet_add_tlv($pkt, $st_buf);
+                if (!$st_buf) {
+                    $st_buf = create_tlv(TLV_TYPE_STAT_BUF32, '');
+                }
+                packet_add_tlv($pkt, $st_buf);
             }
         }
         closedir($dir_handle);

data/data/meterpreter/ext_server_stdapi.py

@@ -1163,7 +1163,9 @@ def stdapi_sys_process_execute(request, response):
     if len(cmd) == 0:
         return ERROR_FAILURE, response
     if os.path.isfile('/bin/sh') and (flags & PROCESS_EXECUTE_FLAG_SUBSHELL):
-        args = ['/bin/sh', '-c', cmd, raw_args]
+        if raw_args:
+            cmd = cmd + ' ' + raw_args
+        args = ['/bin/sh', '-c', cmd]
     else:
         args = [cmd]
         args.extend(shlex.split(raw_args))
@@ -1492,7 +1494,11 @@ def stdapi_fs_ls(request, response):
         file_path = os.path.join(path, file_name)
         response += tlv_pack(TLV_TYPE_FILE_NAME, file_name)
         response += tlv_pack(TLV_TYPE_FILE_PATH, file_path)
-        response += tlv_pack(TLV_TYPE_STAT_BUF, get_stat_buffer(file_path))
+        try:
+            st_buf = get_stat_buffer(file_path)
+        except OSError:
+            st_buf = bytes()
+        response += tlv_pack(TLV_TYPE_STAT_BUF, st_buf)
     return ERROR_SUCCESS, response
 
 @register_function

data/data/meterpreter/meterpreter.py

@@ -680,10 +680,13 @@ class MeterpreterProcess(MeterpreterChannel):
         return self.proc_h.poll() is None
 
     def read(self, length):
-        data = ''
+        data = bytes()
+        stderr_reader = self.proc_h.stderr_reader
         stdout_reader = self.proc_h.stdout_reader
-        if stdout_reader.is_read_ready():
-            data = stdout_reader.read(length)
+        if stderr_reader.is_read_ready() and length > 0:
+            data += stderr_reader.read(length)
+        if stdout_reader.is_read_ready() and (length - len(data)) > 0:
+            data += stdout_reader.read(length - len(data))
         return data
 
     def write(self, data):
@@ -1329,9 +1332,9 @@ class PythonMeterpreter(object):
                     if channel_id in self.interact_channels:
                         proc_h = channel.proc_h
                         if proc_h.stderr_reader.is_read_ready():
-                            data = proc_h.stderr_reader.read()
-                        elif proc_h.stdout_reader.is_read_ready():
-                            data = proc_h.stdout_reader.read()
+                            data += proc_h.stderr_reader.read()
+                        if proc_h.stdout_reader.is_read_ready():
+                            data += proc_h.stdout_reader.read()
                     if not channel.is_alive():
                         self.handle_dead_resource_channel(channel_id)
                         channel.close()

data/lib/metasploit-payloads/version.rb

@@ -1,6 +1,6 @@
 # -*- coding:binary -*-
 module MetasploitPayloads
-  VERSION = '2.0.63'
+  VERSION = '2.0.67'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-payloads
 version: !ruby/object:Gem::Version
-  version: 2.0.63
+  version: 2.0.67
 platform: ruby
 authors:
 - OJ Reeves
@@ -96,7 +96,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake