metasploit-payloads 2.0.61 → 2.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4188f80b9a7c91f79f4085ca10626ec6b13ab0b3b7e65c4573791e4a66382d27
-  data.tar.gz: 7ad4dd897102be313e08336e50cfd74396c52f8c2e3b925ab7aa3da2b7664929
+  metadata.gz: f11c89ff68506ca3906f6bf9be54f30a50b8ecb28b5c20f97457b3fe65e9d691
+  data.tar.gz: 9fb91f65b221c56d0b9378a17af6a1ec011bc6470ecd6afd706ec02b9bcfe9cf
 SHA512:
-  metadata.gz: a946d5504af1f234e03442151f52293cbd497788dcfbc26486c2ba2f107701cf122f80e9f075485c1426119b4f6d567de36bdf540d300f6f049bd9d27af67f4a
-  data.tar.gz: 41424d3e1c558e3b8c8036c226074e89185f3c45864db86dac4e98e1aa9d0bc13a0222830221823878f0759e0e7d3899f7aa11860568ae172a4da49e6378517d
+  metadata.gz: 13abd29d883b5165e51baff0e3c5402a4b350dd0c964d3b4028a031c116fa2980d52fc647a0eda358f5255ae495e173577ebc500dd66b3b8e116d2dec2f2d49b
+  data.tar.gz: d437c893d638680d064f902c0cd142aa3771049d456967f5ded448dd5f0fe827877879571bed4b64322c7c33e5ab70f7314948676d42bfe2a7c70a3e659297a4

data/data/meterpreter/ext_server_stdapi.php

@@ -461,7 +461,8 @@ function resolve_host($hostname, $family) {
     } elseif ($family == AF_INET6) {
         $dns_family = DNS_AAAA;
     } else {
-        throw new Exception('invalid family, must be AF_INET or AF_INET6');
+        my_print('invalid family, must be AF_INET or AF_INET6');
+        return NULL;
     }
 
     $dns = dns_get_record($hostname, $dns_family);
@@ -1224,15 +1225,18 @@ if (!function_exists('stdapi_net_resolve_host')) {
 register_command('stdapi_net_resolve_host', COMMAND_ID_STDAPI_NET_RESOLVE_HOST);
 function stdapi_net_resolve_host($req, &$pkt) {
     my_print("doing stdapi_net_resolve_host");
-    $hostname = packet_get_tlv($req, TLV_TYPE_HOST_NAME)['value'];
-    $family = packet_get_tlv($req, TLV_TYPE_ADDR_TYPE)['value'];
+    $hostname_tlv = packet_get_tlv($req, TLV_TYPE_HOST_NAME);
+    $hostname = $hostname['value'];
+    $family_tlv = packet_get_tlv($req, TLV_TYPE_ADDR_TYPE);
+    $family = $family['value'];
 
     if ($family == WIN_AF_INET) {
         $family = AF_INET;
     } elseif ($family == WIN_AF_INET6) {
         $family = AF_INET6;
     } else {
-        throw new Exception('invalid family');
+        my_print('invalid family, must be AF_INET or AF_INET6');
+        return ERROR_FAILURE;
     }
 
     $ret = ERROR_FAILURE;
@@ -1250,14 +1254,16 @@ if (!function_exists('stdapi_net_resolve_hosts')) {
 register_command('stdapi_net_resolve_hosts', COMMAND_ID_STDAPI_NET_RESOLVE_HOSTS);
 function stdapi_net_resolve_hosts($req, &$pkt) {
     my_print("doing stdapi_net_resolve_hosts");
-    $family = packet_get_tlv($req, TLV_TYPE_ADDR_TYPE)['value'];
+    $family_tlv = packet_get_tlv($req, TLV_TYPE_ADDR_TYPE);
+    $family = $family_tlv['value'];
 
     if ($family == WIN_AF_INET) {
         $family = AF_INET;
     } elseif ($family == WIN_AF_INET6) {
         $family = AF_INET6;
     } else {
-        throw new Exception('invalid family');
+        my_print('invalid family, must be AF_INET or AF_INET6');
+        return ERROR_FAILURE;
     }
 
     $hostname_tlvs = packet_get_all_tlvs($req, TLV_TYPE_HOST_NAME);

data/lib/metasploit-payloads/version.rb

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

metadata

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