metasploit-payloads 2.0.75 → 2.0.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fc521c5aff17d0ac9d9feed495073c05fa79cbcafb45f86f333475a93d5cb3e
-  data.tar.gz: dec88c7fc6526db7146d9eb07dfadd60b641fc4e10c38c35d554c9dc1d0186df
+  metadata.gz: 7e6ea335006907066f4bffdddc7b300abeda44390b76c6229b963280e2b6b40e
+  data.tar.gz: dc944a58cc08b728961bf4036cf74859750ba442e89fc86edf6b5cd6247d4449
 SHA512:
-  metadata.gz: 3d7a0578218e7174a743561c7d6f3106d299f18ffdcb391354cb6febb5fa06cbdbac2e6d6db3ee420bf7970a5dcad8f2c2886c5d185874114560c18cd7f5f475
-  data.tar.gz: b5cd7ce32806f0781a09c389e4f16af243ab98a44892392706333dceceb159ec6ad76c7f391f27f279c109db1cb8475e96e1e99d3c5eb87e02cb2e48d54915c9
+  metadata.gz: cade4c7f2f79d7d41bbbbcf7004d6cb38232e4d7f35eda067751c2e59d247edd42459ccb91dab04e71a7eae4915571dea4e5633cee74502f43e3748c6bf52ac9
+  data.tar.gz: 2274c694533f7c0eb7fa2575fe1121ae5ef3267bb589832c5b81f00acf12ed3323a4bfee50e09a106a26e1318c9bfef56f0ff926555553649cf18801407a06e5

data/data/meterpreter/meterpreter.py

@@ -677,7 +677,7 @@ class MeterpreterProcess(MeterpreterChannel):
                 pass
 
     def is_alive(self):
-        return self.proc_h.poll() is None
+        return self.proc_h.is_alive()
 
     def read(self, length):
         data = bytes()
@@ -777,6 +777,7 @@ class STDProcessBuffer(threading.Thread):
         self.is_alive = is_alive
         self.data = bytes()
         self.data_lock = threading.RLock()
+        self._is_reading = True
 
     def _read1(self):
         try:
@@ -785,12 +786,18 @@ class STDProcessBuffer(threading.Thread):
             return bytes()
 
     def run(self):
-        byte = self._read1()
-        while len(byte):
-            self.data_lock.acquire()
-            self.data += byte
-            self.data_lock.release()
+        try:
             byte = self._read1()
+            while len(byte) > 0:
+                self.data_lock.acquire()
+                self.data += byte
+                self.data_lock.release()
+                byte = self._read1()
+        finally:
+            self._is_reading = False
+
+    def is_reading(self):
+        return self._is_reading or self.is_read_ready()
 
     def is_read_ready(self):
         return len(self.data) != 0
@@ -821,7 +828,11 @@ class STDProcess(subprocess.Popen):
         self.ptyfd = None
 
     def is_alive(self):
-        return self.poll() is None
+        is_proc_alive = self.poll() is None
+        is_stderr_reading = self.stderr_reader.is_reading()
+        is_stdout_reading = self.stdout_reader.is_reading()
+
+        return is_proc_alive or is_stderr_reading or is_stdout_reading
 
     def start(self):
         self.stdout_reader = STDProcessBuffer(self.stdout, self.is_alive, name='STDProcessBuffer.stdout')

data/lib/metasploit-payloads/version.rb

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

metadata

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