From 87d108aab5cf6fd48737be27e1088f0e5e1630cc Mon Sep 17 00:00:00 2001 From: cgranleese-r7 Date: Mon, 2 Oct 2023 16:21:12 +0100 Subject: [PATCH] Removes Meterpreter logic --- modules/post/windows/gather/enum_computers.rb | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/modules/post/windows/gather/enum_computers.rb b/modules/post/windows/gather/enum_computers.rb index 7b79c1c4351f..8253016b2fb0 100644 --- a/modules/post/windows/gather/enum_computers.rb +++ b/modules/post/windows/gather/enum_computers.rb @@ -56,7 +56,7 @@ def run list_computers(netbios_domain_name, hostname_list) end - # Takes the host name and makes use of nsloopup to resolve the IP + # Takes the host name and makes use of nslookup to resolve the IP # # @param [String] host Hostname # @return [String] ip The resolved IP @@ -65,24 +65,14 @@ def resolve_host(host) return host if Rex::Socket.dotted_ip?(host) ip = [] - if client.respond_to?(:net) && client.commands.include?(Rex::Post::Meterpreter::Extensions::Stdapi::COMMAND_ID_STDAPI_NET_RESOLVE_HOST) - begin - # client.net.resolve.resolve_host returns an exception in the scenario of non-existent host names - result = client.net.resolve.resolve_host(host) - rescue Rex::Post::Meterpreter::RequestError - return 'Not resolvable' - end - ip << result[:ip] - else - data = cmd_exec("nslookup #{host}") - if data =~ /Name/ - # Remove unnecessary data and get the section with the addresses - returned_data = data.split(/Name:/)[1] - # check each element of the array to see if they are IP - returned_data.gsub(/\r\n\t |\r\n|Aliases:|Addresses:|Address:/, ' ').split(' ').each do |e| - if Rex::Socket.dotted_ip?(e) - ip << e - end + data = cmd_exec("nslookup #{host}") + if data =~ /Name/ + # Remove unnecessary data and get the section with the addresses + returned_data = data.split(/Name:/)[1] + # check each element of the array to see if they are IP + returned_data.gsub(/\r\n\t |\r\n|Aliases:|Addresses:|Address:/, ' ').split(' ').each do |e| + if Rex::Socket.dotted_ip?(e) + ip << e end end end