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

Fix http.get_url with https. http://seclists.org/nmap-dev/2015/q3/336

Browse Source
This commit is contained in:
dmiller
2015-09-21 19:05:38 +00:00
parent 54bd372ccf
commit 0146739b87
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -1,5 +1,8 @@
# Nmap Changelog ($Id$); -*-text-*- # Nmap Changelog ($Id$); -*-text-*-
o [NSE] Fix http.get_url function when used with https scheme. Previously,
plaintext http to port 443 was attempted first. [jah]
o Use a mutex on Windows to avoid a hang when accessing WinPCAP driver. o Use a mutex on Windows to avoid a hang when accessing WinPCAP driver.
Reported by multiple users on Windows 8.1 and Windows Server 2012 R2. Reported by multiple users on Windows 8.1 and Windows Server 2012 R2.
Nmap hangs when the WinPCAP driver is accessed via OpenServiceA by multiple Nmap hangs when the WinPCAP driver is accessed via OpenServiceA by multiple

9
nselib/comm.lua
View File

@@ -175,7 +175,14 @@ local function bestoption(port)
end end
if port.version and port.version.service_tunnel and port.version.service_tunnel == "ssl" then return "ssl","tcp" end if port.version and port.version.service_tunnel and port.version.service_tunnel == "ssl" then return "ssl","tcp" end
if port.version and port.version.name_confidence and port.version.name_confidence > 6 then return "tcp","ssl" end if port.version and port.version.name_confidence and port.version.name_confidence > 6 then return "tcp","ssl" end
if is_ssl(port) then return "ssl","tcp" end local _port = {
number = port.number,
service = port.service,
protocol = port.protocol or "tcp",
state = port.state or "open",
version = port.version or {}
}
if is_ssl(_port) then return "ssl","tcp" end
elseif type(port) == 'number' then elseif type(port) == 'number' then
if is_ssl({number=port, protocol="tcp", state="open", version={}}) then return "ssl","tcp" end if is_ssl({number=port, protocol="tcp", state="open", version={}}) then return "ssl","tcp" end
end end

1
nselib/http.lua
View File

@@ -1666,7 +1666,6 @@ function get_url( u, options )
port.service = parsed.scheme port.service = parsed.scheme
port.number = parsed.port port.number = parsed.port
port.state = "open"
if not port.number then if not port.number then
if parsed.scheme == 'https' then if parsed.scheme == 'https' then