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

Re-wrote withindomain and withinhost functions

Browse Source
This commit is contained in:
patrik
2012-03-06 15:49:48 +00:00
parent 33fa3fae76
commit 344a39e3ac
1 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
nselib/httpspider.lua
View File

@@ -57,6 +57,7 @@
module(... or "httpspider", package.seeall) module(... or "httpspider", package.seeall)
require 'url'
require 'http' require 'http'
local LIBRARY_NAME = "httpspider" local LIBRARY_NAME = "httpspider"
@@ -77,26 +78,36 @@ Options = {
o.blacklist = o.blacklist or {} o.blacklist = o.blacklist or {}
if ( o.withinhost == true or o.withindomain == true ) then if ( o.withinhost == true or o.withindomain == true ) then
local host_match, domain_match
if ( ( o.base_url:getProto() == 'https' and o.base_url:getPort() == 443 ) or
( o.base_url:getProto() == 'http' and o.base_url:getPort() == 80 ) ) then
if ( o.withinhost ) then
host_match = ("^%s://%s"):format(o.base_url:getProto(), o.base_url:getHost())
elseif ( o.withindomain ) then
domain_match = ("^%s://.*%s/"):format(o.base_url:getProto(), o.base_url:getDomain())
end
else
if ( o.withinhost ) then
host_match = ("^%s://%s:%d"):format(o.base_url:getProto(), o.base_url:getHost(), o.base_url:getPort() )
elseif( o.withindomain ) then
domain_match = ("^%s://.*%s/"):format(o.base_url:getProto(), o.base_url:getDomain() )
end
end
-- set up the appropriate matching functions -- set up the appropriate matching functions
if ( o.withinhost ) then if ( o.withinhost ) then
o.withinhost = function(url) return string.match(tostring(url), host_match) end o.withinhost = function(u)
local parsed_u = url.parse(tostring(u))
if ( o.base_url:getPort() ~= 80 and o.base_url:getPort() ~= 443 ) then
if ( parsed_u.port ~= o.base_url:getPort() ) then
return false
end
elseif ( parsed_u.scheme ~= o.base_url:getProto() ) then
return false
elseif ( parsed_u.host:lower() ~= o.base_url:getHost():lower() ) then
return false
end
return true
end
else else
o.withindomain = function(url) return string.match(tostring(url), domain_match) end o.withindomain = function(u)
local parsed_u = url.parse(tostring(u))
if ( o.base_url:getPort() ~= 80 and o.base_url:getPort() ~= 443 ) then
if ( parsed_u.port ~= o.base_url:getPort() ) then
return false
end
elseif ( parsed_u.scheme ~= o.base_url:getProto() ) then
return false
elseif ( parsed_u.host:sub(-#o.base_url:getDomain()):lower() ~= o.base_url:getDomain():lower() ) then
return false
end
return true
end
end end
end end
setmetatable(o, self) setmetatable(o, self)
@@ -721,13 +732,19 @@ Crawler = {
if ( nil == b ) then if ( nil == b ) then
return return
end end
assert("string" == type(b) or "boolean" == type(b), "httpspider: tobool failed, unsupported type") assert("string" == type(b) or "boolean" == type(b) or "number" == type(b), "httpspider: tobool failed, unsupported type")
if ( "string" == type(b) ) then if ( "string" == type(b) ) then
if ( "true" == b ) then if ( "true" == b ) then
return true return true
else else
return false return false
end end
elseif ( "number" == type(b) ) then
if ( 1 == b ) then
return true
else
return false
end
end end
return b return b
end end
@@ -738,7 +755,11 @@ Crawler = {
self.options.noblacklist = tobool(self.options.noblacklist) self.options.noblacklist = tobool(self.options.noblacklist)
if ( self.options.withinhost == nil ) then if ( self.options.withinhost == nil ) then
self.options.withinhost = true if ( self.options.withindomain ~= true ) then
self.options.withinhost = true
else
self.options.withinhost = false
end
end end
if ( self.options.withindomain == nil ) then if ( self.options.withindomain == nil ) then
self.options.withindomain = false self.options.withindomain = false