PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-08 21:51:28 +00:00
Code Issues Projects Releases Wiki Activity

Add http-alt and https-alt to the services handled by html-title.nse

Browse Source 
Modified http.request() to connect using ssl for the https-alt service.
html-title.nse can now deal with a redirect which changes the url scheme
as long as a port is present in the url and it is the port being scanned.
This commit is contained in:
jah
2008-11-17 22:06:58 +00:00
parent 5464198f6b
commit fece92c4f7
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nselib/http.lua
View File

@@ -105,8 +105,9 @@ end
-- host table passed to a portrule or hostrule. The second argument is either -- host table passed to a portrule or hostrule. The second argument is either
-- the port number or a table like the port table passed to a portrule or -- the port number or a table like the port table passed to a portrule or
-- hostrule. SSL is used for the request if <code>port.service</code> is -- hostrule. SSL is used for the request if <code>port.service</code> is
-- <code>"https"</code> or <code>port.version.service_tunnel</code> is -- <code>"https"</code> or <code>"https-alt"</code> or
-- <code>"ssl"</code>. The third argument is the request. The fourth argument is -- <code>port.version.service_tunnel</code> is <code>"ssl"</code>.
-- The third argument is the request. The fourth argument is
-- a table for further options. -- a table for further options.
-- @param host The host to query. -- @param host The host to query.
-- @param port The port on the host. -- @param port The port on the host.
@@ -127,7 +128,7 @@ request = function( host, port, data, options )
stdnse.print_debug(1, "http.request() supports the TCP protocol only, your request to %s cannot be completed.", host) stdnse.print_debug(1, "http.request() supports the TCP protocol only, your request to %s cannot be completed.", host)
return nil return nil
end end
if port.service == 'https' or ( port.version and port.version.service_tunnel == 'ssl' ) then if port.service == 'https' or port.service == 'https-alt' or ( port.version and port.version.service_tunnel == 'ssl' ) then
protocol = 'ssl' protocol = 'ssl'
end end
port = port.number port = port.number

36
scripts/html-title.nse
View File

@@ -27,15 +27,18 @@ local ipOps = require 'ipOps'
local stdnse = require 'stdnse' local stdnse = require 'stdnse'
portrule = function(host, port) portrule = function(host, port)
if port.protocol ~= 'tcp' or not (port.service == 'http' or port.service == 'https') then local svc = { std = { ["http"] = 1, ["http-alt"] = 1 },
return false ssl = { ["https"] = 1, ["https-alt"] = 1 } }
end if port.protocol ~= 'tcp'
-- Don't bother running on SSL ports if we don't have SSL. or not ( svc.std[port.service] or svc.ssl[port.service] ) then
if (port.service == 'https' or port.version.service_tunnel == 'ssl') return false
and not nmap.have_ssl() then end
return false -- Don't bother running on SSL ports if we don't have SSL.
end if (svc.ssl[port.service] or port.version.service_tunnel == 'ssl')
return true and not nmap.have_ssl() then
return false
end
return true
end end
action = function(host, port) action = function(host, port)
@@ -51,7 +54,7 @@ action = function(host, port)
local loc = redirect_ok( url, host, port ) local loc = redirect_ok( url, host, port )
if loc then if loc then
-- follow redirect -- follow redirect
redir = ("Requested resource was %s://%s%s"):format( url.scheme or port.service, loc.host, loc.path ) redir = ("Requested resource was %s://%s%s%s"):format( url.scheme or port.service, loc.host, (url.port and (":%s"):format(url.port)) or "", loc.path )
data = http.get( loc.host, loc.port, loc.path ) data = http.get( loc.host, loc.port, loc.path )
else else
loc = nil -- killed so we know we didn't follow a redirect loc = nil -- killed so we know we didn't follow a redirect
@@ -91,12 +94,6 @@ function redirect_ok(url, host, port)
-- A battery of tests a URL is subjected to in order to decide if it may be -- A battery of tests a URL is subjected to in order to decide if it may be
-- redirected to. They incrementally fill in loc.host, loc.port, and loc.path. -- redirected to. They incrementally fill in loc.host, loc.port, and loc.path.
local rules = { local rules = {
function (loc, url, host, port)
-- if url.scheme is present then it must match the scanned port
if url.scheme and url.scheme ~= port.service then return false end
return true
end,
function (loc, url, host, port) function (loc, url, host, port)
-- bail if userinfo is present -- bail if userinfo is present
return ( url.userinfo and false ) or true return ( url.userinfo and false ) or true
@@ -130,6 +127,13 @@ function redirect_ok(url, host, port)
return false return false
end, end,
function (loc, url, host, port)
-- if url.scheme is present then it must match the scanned port
if url.scheme and url.port then return true end
if url.scheme and url.scheme ~= port.service then return false end
return true
end,
function (loc, url, host, port) function (loc, url, host, port)
-- path cannot be unchanged unless host has changed -- path cannot be unchanged unless host has changed
-- loc.path must be set if returning true -- loc.path must be set if returning true