metasploit-payloads 2.0.64 → 2.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f272266198457eb06192d32b735b1c22c32f6a722df20db02bd585e0f996a6b
-  data.tar.gz: e18a08cb3266b3dc44c769c0e8554887b6b1303eda27fee7c57bcac82d3c4cbc
+  metadata.gz: f6b1b882a053964467109860e5dceb0641a31697767d8aa61bd9304f79155ce7
+  data.tar.gz: ef94c0ba6c8e5ce15fe8dd091fb2d554c4456729bdd2c97c4adc553abb9be4e4
 SHA512:
-  metadata.gz: 867b63c6e25a79327f30e176c608c552b8e67135ed5c39a4d75145323f7d91653db857f4859431aa3f34e49190b6c7d7af89a827f36a2e68c42f6a8e14348704
-  data.tar.gz: 7cc1991f554d5b24c5859c28efef171e4bfe17a318d7e2aea670c581c59e1a48c3edba1cf172e35ed3aee97b394040a3b91a3e4189e90a4591792be3d390d795
+  metadata.gz: 46a845b63fa4ed140919bdd679427b3293b2b512c8015872ba931323cf4b4f7c00fdb63b2b7a38aca71c92ea5a592c8eac8a0da6965909abd4def94bc5768d64
+  data.tar.gz: 58a2d3ca3998f891b8dfe9c6da3aa0a8bb69d19cf412cd9030a3b805d562c2e803ee43430aacca3ee7c4b35d877235f16f8f3960a9e8bb96208780f52c6dc93f

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

@@ -1494,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.64'
+  VERSION = '2.0.68'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-payloads
 version: !ruby/object:Gem::Version
-  version: 2.0.64
+  version: 2.0.68
 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