PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-26 17:39:03 +00:00
Code Issues Projects Releases Wiki Activity

Convert more bin.lua packings

Browse Source
This commit is contained in:
dmiller
2018-09-06 16:00:46 +00:00
parent 201ee75059
commit f62d39f801
7 changed files with 46 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
nselib/proxy.lua
View File

@@ -7,7 +7,6 @@
-- @author Joao Correa <joao@livewire.com.br>
-- @copyright Same as Nmap--See https://nmap.org/book/man-legal.html
local bin = require "bin"
local dns = require "dns"
local ipOps = require "ipOps"
local nmap = require "nmap"
@@ -141,25 +140,6 @@ function test_connect(host, port, proxyType, hostname)
return test(socket, req, false)
end
--- Function that resolves IP address for hostname and
--- returns it as hex values
--@param hostname Hostname to resolve
--@return Ip address of hostname in hex
function hex_resolve(hostname)
local a, b, c, d;
local dns_status, ip = dns.query(hostname)
if not dns_status then
return false
end
local t, err = ipOps.get_parts_as_number(ip)
if t and not err
then a, b, c, d = table.unpack(t)
else return false
end
local sip = string.format("%.2x ", a) .. string.format("%.2x ", b) .. string.format("%.2x ", c) .. string.format("%.2x ",d)
return true, sip
end
--- Checks if any parameter was used in old or new syntax
-- and return the parameters
-- @return url the proxy.url parameter
@@ -211,14 +191,12 @@ end
-- @return socket A socket with the handshake already done, or an error if
-- status is false
function socksHandshake(socket, version, hostname)
local resolve, sip, paystring, payload
resolve, sip = hex_resolve(hostname)
if not resolve then
local status, ip = dns.query(hostname)
if not status then
return false, "Unable to resolve hostname"
end
if version == 4 then
paystring = '04 01 00 50 ' .. sip .. ' 6e 6d 61 70 00'
payload = bin.pack("H",paystring)
local payload = '\x04\x01\x00\x50' .. ipOps.ip_to_str(ip) .. '\x6e\x6d\x61\x70\x00'
local status, response = socket:send(payload)
if not status then
socket:close()
@@ -250,7 +228,7 @@ function socksHandshake(socket, version, hostname)
return false, err
end
if version == 5 then
local payload = bin.pack("H",'05 01 00')
local payload = '\x05\x01\x00'
local status, err = socket:send(payload)
if not status then
socket:close()
@@ -267,8 +245,7 @@ function socksHandshake(socket, version, hostname)
-- If no Auth is required, try to establish connection
stdnse.debug1("Socks5: No authentication required")
-- Socks5 second payload: Version, Command, Null, Address type, Ip-Address, Port number
paystring = '05 01 00 01 ' .. sip .. '00 50'
payload = bin.pack("H",paystring)
payload = '\x05\x01\x00\x01' .. ipOps.ip_to_str(ip) .. '\x00\x50'
status, err = socket:send(payload)
if not status then
socket:close()