metasploit-payloads 2.0.62 → 2.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f11c89ff68506ca3906f6bf9be54f30a50b8ecb28b5c20f97457b3fe65e9d691
-  data.tar.gz: 9fb91f65b221c56d0b9378a17af6a1ec011bc6470ecd6afd706ec02b9bcfe9cf
+  metadata.gz: 70fb6b8c214c2032e3f506341d7f9b069e93639b6abf7afbd3fd279ea087d9e6
+  data.tar.gz: a2541c9ad2051533ee66ea252f3fa1d84774f7dbea2dbe823fa45b50e8add977
 SHA512:
-  metadata.gz: 13abd29d883b5165e51baff0e3c5402a4b350dd0c964d3b4028a031c116fa2980d52fc647a0eda358f5255ae495e173577ebc500dd66b3b8e116d2dec2f2d49b
-  data.tar.gz: d437c893d638680d064f902c0cd142aa3771049d456967f5ded448dd5f0fe827877879571bed4b64322c7c33e5ab70f7314948676d42bfe2a7c70a3e659297a4
+  metadata.gz: 8938435f3345901ff7d6401ae487ae12117f09035c8fd4cc74d733eebb56a1d731b045321b5ad6aaac42ade9a884e284ab36358589857bd195443ae8e5ae9db1
+  data.tar.gz: ac0be6bedfaf25d2b3c102f42f020625d110d63d559b8361ae2b1f8199ad1df214e489bd3dbb0e251ec4c10d50e6df61a4839f929b868ba74a1cc0214677d1b5

data/data/meterpreter/ext_server_stdapi.py

@@ -1147,6 +1147,8 @@ def stdapi_sys_process_close(request, response):
     proc_h_id = proc_h_id['value']
     if proc_h_id in meterpreter.processes:
         del meterpreter.processes[proc_h_id]
+    if not meterpreter.close_channel(proc_h_id):
+        return ERROR_FAILURE, response
     return ERROR_SUCCESS, response
 
 @register_function

data/data/meterpreter/meterpreter.py

@@ -1242,6 +1242,21 @@ class PythonMeterpreter(object):
         self.next_process_id += 1
         return idx
 
+    def close_channel(self, channel_id):
+        if channel_id not in self.channels:
+            return False
+        channel = self.channels[channel_id]
+        try:
+            channel.close()
+        except Exception:
+            debug_traceback('[-] failed to close channel id: ' + str(channel_id))
+            return False
+        del self.channels[channel_id]
+        if channel_id in self.interact_channels:
+            self.interact_channels.remove(channel_id)
+        debug_print('[*] closed and removed channel id: ' + str(channel_id))
+        return True
+
     def get_packet(self):
         pkt = self.transport.get_packet()
         if pkt is None and self.transport.should_retire:
@@ -1570,16 +1585,9 @@ class PythonMeterpreter(object):
 
     def _core_channel_close(self, request, response):
         channel_id = packet_get_tlv(request, TLV_TYPE_CHANNEL_ID)['value']
-        if channel_id not in self.channels:
+        if not self.close_channel(channel_id):
             return ERROR_FAILURE, response
-        channel = self.channels[channel_id]
-        status, response = channel.core_close(request, response)
-        if status == ERROR_SUCCESS:
-            del self.channels[channel_id]
-            if channel_id in self.interact_channels:
-                self.interact_channels.remove(channel_id)
-            debug_print('[*] closed and removed channel id: ' + str(channel_id))
-        return status, response
+        return ERROR_SUCCESS, response
 
     def _core_channel_eof(self, request, response):
         channel_id = packet_get_tlv(request, TLV_TYPE_CHANNEL_ID)['value']

data/lib/metasploit-payloads/version.rb

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

metadata

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