github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-03-18 15:14:10 +01:00
Code Releases Activity

Fix order of closing channels

Browse Source
This commit is contained in:
sjanusz 2022-04-29 13:38:46 +01:00
parent ccc84459bb
commit d289909fac
No known key found for this signature in database
GPG Key ID: 62086A0F9E2BB842
1 changed files with 9 additions and 7 deletions

16
python/meterpreter/meterpreter.py

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