metasploit-payloads 2.0.137 → 2.0.139

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2710a15097fc270b4471dea272eb303035dcab535ec793e329d0fdb3c3337fd
-  data.tar.gz: 3042209c7939928007790905a7e9bdb07e994296976217366b6a987a10349673
+  metadata.gz: c8c6276a7aacf1c65f43085b785c364baed91cc26d262eb721c75e700c615fbe
+  data.tar.gz: 58671cce1ef1343e6cbf66f4fd2956549699e81ae26f7d885128ad4be832fc4f
 SHA512:
-  metadata.gz: dd3953605d7c31b56d492fdbc708e4f5b61b2fe35bb1b0c5fc1dd7f16084aaa23d83ce96fed4ddb8a1395f5a3a6f2ea91577ea77dd1ecf8efdbf3b31dd6b44b9
-  data.tar.gz: 25bddc59e5b1617afdf98a731d25b6d2a7692917517954f5ea1c882894dd40f4a66353fa08c61919b814bab1b6ea7b81ef9f0bf87a8b14622b4f4e4d86527269
+  metadata.gz: e035b833a8e7408487479c3581081fd3eee4921f674703e33eaf30aa10066cb4a88f4a5ecee0ec3587a13e7848283b4491a51f4c4199e5099e0d3f316231ba60
+  data.tar.gz: 304a0b5232ac9ea5859ebfaf294c20a9d5258081509402c376481c9884e172bd436c2b704278256427557301bdbefd83ad4b6e9cea5025a84e943f73b975ef46

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
@@ -2526,7 +2525,7 @@ def stdapi_net_config_get_routes_via_osx_netstat():
             continue
         if destination == 'default':
             destination = all_nets
-        if re.match('link#\\d+', gateway) or re.match('([0-9a-f]{1,2}:){5}[0-9a-f]{1,2}', gateway):
+        if re.match('link#\\d+', gateway) or re.match('([0-9a-f]{1,2}:){5}[0-9a-f]{1,2}', gateway) or re.match('([0-9a-f]{1,2}.){5}[0-9a-f]{1,2}', gateway):
             gateway = all_nets[:-2]
         if '/' in destination:
             destination, netmask_bits = destination.rsplit('/', 1)

data/lib/metasploit-payloads/version.rb

@@ -1,6 +1,6 @@
 # -*- coding:binary -*-
 module MetasploitPayloads
-  VERSION = '2.0.137'
+  VERSION = '2.0.139'
 
   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.139
 platform: ruby
 authors:
 - OJ Reeves