metasploit-payloads 2.0.80 → 2.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7456ccae14e3b22a2a81c1f32e19c314f29573ffefa3160286e8908c78ee199
-  data.tar.gz: 6a881b8cc4ab8cff5144437fbe5409b9ba1f7b050f939992002984f5359e4ca9
+  metadata.gz: 5bada1b6d0abc330b3beec97b3a5213d631733c3eb4b2854c905f6baddf5ba6a
+  data.tar.gz: 600940a8425bf4bf99972f2cfe741669c5d689ac95cb3bbfa02e06b6c77cd142
 SHA512:
-  metadata.gz: 2aa53bab619e0a69473f9eaa743b0866f2f6b7a721ec20331db636e9a7c91d2ff40a9697f89e9f627dd2fdc134fb35c10c32ddea40c418c176563cb9d98334cb
-  data.tar.gz: 5c3670cee95b8d600146d3311e59325c9135a5cfcddbdeb15bdc2851a3100641b4d262d15eb881ef06bf66edda1703355bfff020f9efef8db40359543b835047
+  metadata.gz: b8d2872d2583e1ebf5d000747a71bd356917b098b7fb97beaa6316d4f8e3497d043e8ed4f9252e8f392362a7c3534e9dfc0abf021fc01538ab5a81ffe9e15c20
+  data.tar.gz: 4e1062004bf16a2bbbd191ccf8d92cff86c0f9cdcd17ad43894cd2e2007e482e6abf41d6a1c07aa3965689d5835da562b4953e2bd8f0428184e140028fcd6123

data/data/meterpreter/ext_server_stdapi.php

@@ -979,7 +979,9 @@ function close_process($proc) {
         # real harm in that, so go ahead and just always make sure they get
         # closed.
         foreach ($proc['pipes'] as $f) {
+          if (is_resource($f)) {
             @fclose($f);
+          }
         }
         if (is_callable('proc_get_status')) {
             $status = proc_get_status($proc['handle']);
@@ -1412,7 +1414,3 @@ function channel_create_stdapi_net_udp_client($req, &$pkt) {
     return ERROR_SUCCESS;
 }
 }
-
-
-
-

data/data/meterpreter/meterpreter.php

@@ -42,8 +42,31 @@ function register_command($c, $i) {
   }
 }
 
+# Debugging payload definitions
+define("MY_DEBUGGING", false);
+define("MY_DEBUGGING_LOG_FILE_PATH", false);
+
+function my_logfile($str) {
+  if (MY_DEBUGGING && MY_DEBUGGING_LOG_FILE_PATH) {
+    if (!isset($GLOBALS['logfile'])) {
+      $GLOBALS['logfile'] = fopen(MY_DEBUGGING_LOG_FILE_PATH, 'a');
+
+      if (!$GLOBALS['logfile']) {
+        my_print("Failed to open debug log file");
+      }
+    }
+
+    if ($GLOBALS['logfile']) {
+      fwrite($GLOBALS['logfile'], "$str\n");
+    }
+  }
+}
+
 function my_print($str) {
-  #error_log($str);
+  if (MY_DEBUGGING) {
+    error_log($str);
+    my_logfile($str);
+  }
 }
 
 my_print("Evaling main meterpreter stage");
@@ -1411,11 +1434,13 @@ function remove_reader($resource) {
 
 ob_implicit_flush();
 
-# For debugging
-#error_reporting(E_ALL);
 # Turn off error reporting so we don't leave any ugly logs.  Why make an
 # administrator's job easier if we don't have to?  =)
-error_reporting(0);
+if (MY_DEBUGGING) {
+  error_reporting(E_ALL);
+} else {
+  error_reporting(0);
+}
 
 @ignore_user_abort(true);
 # Has no effect in safe mode, but try anyway

data/data/meterpreter/meterpreter.py

@@ -59,6 +59,7 @@ random.seed()
 
 # these values will be patched, DO NOT CHANGE THEM
 DEBUGGING = False
+DEBUGGING_LOG_FILE_PATH = None
 TRY_TO_FORK = True
 HTTP_CONNECTION_URL = None
 HTTP_PROXY = None
@@ -352,6 +353,14 @@ COMMAND_IDS = (
 )
 # ---------------------------------------------------------------
 
+if DEBUGGING:
+    import logging
+    logging.basicConfig(level=logging.DEBUG)
+    if DEBUGGING_LOG_FILE_PATH:
+        file_handler = logging.FileHandler(DEBUGGING_LOG_FILE_PATH)
+        file_handler.setLevel(logging.DEBUG)
+        logging.getLogger().addHandler(file_handler)
+
 class SYSTEM_INFO(ctypes.Structure):
     _fields_ = [("wProcessorArchitecture", ctypes.c_uint16),
         ("wReserved", ctypes.c_uint16),
@@ -427,14 +436,14 @@ def crc16(data):
 @export
 def debug_print(msg):
     if DEBUGGING:
-        print(msg)
+        logging.debug(msg)
 
 @export
 def debug_traceback(msg=None):
     if DEBUGGING:
         if msg:
-            print(msg)
-        traceback.print_exc(file=sys.stderr)
+            debug_print(msg)
+        debug_print(traceback.format_exc())
 
 @export
 def error_result(exception=None):

data/lib/metasploit-payloads/version.rb

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

data.tar.gz.sig

@@ -1,2 +1,3 @@
-W���|͓#�A���w�|&҉-Y���b!�i�ѺH&�+��bB&���?G6f
��ű������������-��|Gḵ9E�w�V�0��ڳm�Z��A�T�:�z���+#~k�d�B�

-R�|���c�$���+�5ƒ̒�2�Wg�m5������_��S�a������G�V�:R��@�������
+_�ۋ�m+J
+q\��������q�G�c��l�^O%o��(|0�-D�B5df�#�����P�ŝǨ_���?H �Q��)c99ܒD�p��
+���Z���I����cz9��ª�r݉���uo��i���~�	]���"�𚄮���T�r_�I�+�J!=�ϵ�

metadata

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