CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-27 03:48:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert r32789 in favor of lib-level fixes

Browse source 
nmap.new_try() shouldn't be used in libraries. It results in Lua errors
being thrown that the script can't recover from without resorting to
pcall(). It has been replaced in proxy.lua with proper error handling
which did not require any changes to the scripts (http-open-proxy and
socks-open-proxy) that used it.
This commit is contained in:
dmiller 2014-04-07 18:10:10 +00:00
parent 1332949c3d
commit 413bbf6e96
2 changed files with 100 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/socks-open-proxy.nse
View file

@ -65,11 +65,8 @@ local function custom_test(host, port, test_url, pattern)
test_url = url_table.path
-- make requests
local err
err, status4, get_r4, cstatus4 = pcall(proxy.test_get, host, port, "socks4", test_url, hostname, pattern)
status4 = err and status4
err, status5, get_r5, cstatus5 = pcall(proxy.test_get, host, port, "socks5", test_url, hostname, pattern)
status5 = err and status5
status4, get_r4, cstatus4 = proxy.test_get(host, port, "socks4", test_url, hostname, pattern)
status5, get_r5, cstatus5 = proxy.test_get(host, port, "socks5", test_url, hostname, pattern)
fstatus = status4 or status5
if(cstatus4) then response[#response+1]="socks4" end
@ -108,11 +105,8 @@ local function default_test(host, port)
local test_url = "/"
local hostname = "www.google.com"
local pattern = "^server: gws"
local err
err, status4, get_r4, cstatus4 = pcall(proxy.test_get, host, port, "socks4", test_url, hostname, pattern)
status4 = err and status4
err, status5, get_r5, cstatus5 = pcall(proxy.test_get, host, port, "socks5", test_url, hostname, pattern)
status5 = err and status5
status4, get_r4, cstatus4 = proxy.test_get(host, port, "socks4", test_url, hostname, pattern)
status5, get_r5, cstatus5 = proxy.test_get(host, port, "socks5", test_url, hostname, pattern)
fstatus = status4 or status5
if(cstatus4) then response[#response+1]="socks4" end
@ -129,10 +123,8 @@ local function default_test(host, port)
test_url = "/"
hostname = "www.wikipedia.org"
pattern = "wikimedia"
err, status4, get_r4, cstatus4 = pcall(proxy.test_get, host, port, "socks4", test_url, hostname, pattern)
status4 = err and status4
err, status5, get_r5, cstatus5 = pcall(proxy.test_get, host, port, "socks5", test_url, hostname, pattern)
status5 = err and status5
status4, get_r4, cstatus4 = proxy.test_get(host, port, "socks4", test_url, hostname, pattern)
status5, get_r5, cstatus5 = proxy.test_get(host, port, "socks5", test_url, hostname, pattern)
if(status4) then fstatus = true; response[#response+1]="socks4" end
if(status5) then fstatus = true; response[#response+1]="socks5" end
@ -146,10 +138,8 @@ local function default_test(host, port)
test_url = "/"
hostname = "www.computerhistory.org"
pattern = "museum"
err, status4, get_r4, cstatus4 = pcall(proxy.test_get, host, port, "socks4", test_url, hostname, pattern)
status4 = err and status4
err, status5, get_r5, cstatus5 = pcall(proxy.test_get, host, port, "socks5", test_url, hostname, pattern)
status5 = err and status5
status4, get_r4, cstatus4 = proxy.test_get(host, port, "socks4", test_url, hostname, pattern)
status5, get_r5, cstatus5 = proxy.test_get(host, port, "socks5", test_url, hostname, pattern)
if(status4) then fstatus = true; response[#response+1]="socks4" end
if(status5) then fstatus = true; response[#response+1]="socks5" end