metasploit-payloads 2.0.137 → 2.0.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2710a15097fc270b4471dea272eb303035dcab535ec793e329d0fdb3c3337fd
-  data.tar.gz: 3042209c7939928007790905a7e9bdb07e994296976217366b6a987a10349673
+  metadata.gz: 4138cce4505e337152c4f0aaa4d101f791c6046dc3b9f00246ed0523eacdd1e7
+  data.tar.gz: 3f952c9d9a8f9df0e564b593158fa3a499f8d940921bedc8d835d632d216f33c
 SHA512:
-  metadata.gz: dd3953605d7c31b56d492fdbc708e4f5b61b2fe35bb1b0c5fc1dd7f16084aaa23d83ce96fed4ddb8a1395f5a3a6f2ea91577ea77dd1ecf8efdbf3b31dd6b44b9
-  data.tar.gz: 25bddc59e5b1617afdf98a731d25b6d2a7692917517954f5ea1c882894dd40f4a66353fa08c61919b814bab1b6ea7b81ef9f0bf87a8b14622b4f4e4d86527269
+  metadata.gz: 8829f24b4c721d317db45e2919c9c9990caaf04a6eb770e91e7bda6cf2ea8e99f606d15b40d75208909788707d252af5b55125e2ea10dbcabb5165f733effffa
+  data.tar.gz: 4dba11675a2b4c1549a395fd5e0266b6f76161336ac9e320c59c62e3e5e1ea3e2424be9762d0b44e047bf0ed1d8dc5071bdedfa3247536396e0e72789fcd4eee

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-eߘ�� ���e@3�ߙ����%�%�yAdXk�
��͍݁}+���'�����'��
-˱���ca\�
-1��K��fі�n�y�f��j�nt� �[��?̃��B��vAG.��4�+$d{B���
:Ҝ�_)n3��+`,�?p/�MJ�ֽ�LăHK���'&R8��u��L���	��Wzp ��{a��Q
+���C40oM�H����u�_�7����|���f�ZL�U�I���4����֤T�MO����*��z�M\���gG�O�|>y��;;
+?�œ���W_n6l��h�

data/data/meterpreter/ext_server_stdapi.py

@@ -879,6 +879,14 @@ def ctstruct_unpack(structure, raw_data):
     ctypes.memmove(ctypes.byref(structure), raw_data, ctypes.sizeof(structure))
     return structure
 
+def get_process_output(args):
+    proc_h = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = proc_h.communicate()
+
+    if proc_h.wait():
+        raise Exception(args[0] + ' exited with non-zero status')
+    return str(stdout)
+
 def get_stat_buffer(path):
     si = os.stat(path)
     rdev = 0
@@ -1550,12 +1558,11 @@ def stdapi_sys_process_get_processes_via_proc(request, response):
     return ERROR_SUCCESS, response
 
 def stdapi_sys_process_get_processes_via_ps(request, response):
-    ps_args = ['ps', 'ax', '-w', '-o', 'pid,ppid,user,command']
-    proc_h = subprocess.Popen(ps_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    ps_output = str(proc_h.stdout.read())
-    ps_output = ps_output.split('\n')
-    ps_output.pop(0)
-    for process in ps_output:
+    ps_output = get_process_output(['ps', 'ax', '-w', '-o', 'pid,ppid,user,command'])
+
+    output = ps_output.split('\n')
+    output.pop(0)
+    for process in output:
         process = process.split()
         if len(process) < 4:
             break
@@ -2269,11 +2276,7 @@ def stdapi_net_config_get_interfaces_via_netlink():
     return interfaces.values()
 
 def stdapi_net_config_get_interfaces_via_osx_ifconfig():
-    proc_h = subprocess.Popen('/sbin/ifconfig', stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    if proc_h.wait():
-        raise Exception('ifconfig exited with non-zero status')
-    output = str(proc_h.stdout.read())
-
+    output = get_process_output(['/sbin/ifconfig'])
     interfaces = []
     iface = {}
     for line in output.split('\n'):
@@ -2486,11 +2489,7 @@ def stdapi_net_config_get_routes_via_netlink():
     return routes
 
 def stdapi_net_config_get_routes_via_osx_netstat():
-    proc_h = subprocess.Popen(['/usr/sbin/netstat', '-rn'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    if proc_h.wait():
-        raise Exception('netstat exited with non-zero status')
-    output = str(proc_h.stdout.read())
-
+    output = get_process_output(['/usr/sbin/netstat', '-rn'])
     routes = []
     state = None
     has_refs = None

data/lib/metasploit-payloads/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-payloads
 version: !ruby/object:Gem::Version
-  version: 2.0.137
+  version: 2.0.138
 platform: ruby
 authors:
 - OJ Reeves