metasploit-payloads 2.0.89 → 2.0.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1512f25f0931730fdd7b8d0fc1cefec0ab49569a47bd67833bd3c63a0703997
-  data.tar.gz: 3b4692895726086b8dd3440fb208c7864115bd8a06018b080b02acb05597e0b9
+  metadata.gz: 3548518c88c1c94964e8b420803bd3008b78c44ba92fc25355476e837342dea7
+  data.tar.gz: f30727fbcd19f43a8659c24c1038952106cec46a72bfa33acdfe6468b26eec2b
 SHA512:
-  metadata.gz: cbbc6b1258078e02123020dd12d982997bdb6a0d1f1fc1ab6de95bed70a3cc874907cde6ba8fccfc53c4bdc2f4e00cef22b4324ed86ff0068a75593af10713fa
-  data.tar.gz: 07b26d970f8f31803660e33bd4d4d688ddd4c897dae6c6267a89e0e429e06917c16f372bfcef47a9655627243795dca9860022bd629dbeb2a4dfa88a085c4242
+  metadata.gz: 0e96793869bfc073c060b9332bbb96c47d80c3113eb2db82e4ce89eb0986b9b1f11a6053f0d011c3ba7e3ec91c25ab433114bf7030bb26cd07e391f2047c3ef7
+  data.tar.gz: 85ec22c2c15083db8e8d3c7bbff045de6d3dd71a22db26f46aecc738b3c93c84f6f3e0821b6d9538d87de8f40f2e649f72d66d4a2971cca27adc732b968b67f3

data/data/meterpreter/meterpreter.py

@@ -1348,6 +1348,7 @@ class PythonMeterpreter(object):
                 channel = self.channels[channel_id]
                 data = bytes()
                 write_request_parts = []
+                close_channel = False
                 if isinstance(channel, MeterpreterProcess):
                     if channel_id in self.interact_channels:
                         proc_h = channel.proc_h
@@ -1355,9 +1356,9 @@ class PythonMeterpreter(object):
                             data += proc_h.stderr_reader.read()
                         if proc_h.stdout_reader.is_read_ready():
                             data += proc_h.stdout_reader.read()
+                    # Defer closing the channel until the data has been sent
                     if not channel.is_alive():
-                        self.handle_dead_resource_channel(channel_id)
-                        channel.close()
+                        close_channel = True
                 elif isinstance(channel, MeterpreterSocketTCPClient):
                     while select.select([channel.fileno()], [], [], 0)[0]:
                         try:
@@ -1400,9 +1401,15 @@ class PythonMeterpreter(object):
                     ])
                     self.send_packet(tlv_pack_request('core_channel_write', write_request_parts))
 
+                if close_channel:
+                    channel.close()
+                    self.handle_dead_resource_channel(channel_id)
+
     def handle_dead_resource_channel(self, channel_id):
         if channel_id in self.interact_channels:
             self.interact_channels.remove(channel_id)
+        if channel_id in self.channels:
+            del self.channels[channel_id]
         self.send_packet(tlv_pack_request('core_channel_close', [
             {'type': TLV_TYPE_CHANNEL_ID, 'value': channel_id},
         ]))
@@ -1641,8 +1648,6 @@ class PythonMeterpreter(object):
             return ERROR_FAILURE, response
         channel = self.channels[channel_id]
         status, response = channel.core_read(request, response)
-        if not channel.is_alive():
-            self.handle_dead_resource_channel(channel_id)
         return status, response
 
     def _core_channel_write(self, request, response):
@@ -1653,9 +1658,6 @@ class PythonMeterpreter(object):
         status = ERROR_FAILURE
         if channel.is_alive():
             status, response = channel.core_write(request, response)
-        # evaluate channel.is_alive() twice because it could have changed
-        if not channel.is_alive():
-            self.handle_dead_resource_channel(channel_id)
         return status, response
 
     def _core_channel_seek(self, request, response):

data/lib/metasploit-payloads/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-payloads
 version: !ruby/object:Gem::Version
-  version: 2.0.89
+  version: 2.0.90
 platform: ruby
 authors:
 - OJ Reeves
@@ -96,7 +96,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.sig

@@ -1,2 +1,4 @@
-�/�f�ٜ"�n�oڳ"�
-*\/GV_���D�u�w�x�ZC��Le��	�b�Խ"w� ���<Dj��+#޳�ݳ������zV앞��ޣWJ�y�.�(�M��/�AQ�n@m�cY6���ë�~��c�#��ުs
+�ǽr�
+e�rz�w8է�i�������k��p�U�*h�`'�e�#�����d2獯�*}/��M��ׄ�z$Y[(��z�Zʰ[�kv������d%�
+�mk�Q�����,�5Hd����y�6oX�*�Yt'�V�(i7�g�� �.���?n�.�X:L�p�O��-�oǔ9�	�v����8@�
+����f�)i	XG��%�8�V)��3��6}�gS�@