This commit is contained in:
3xp10it 2017-08-23 07:52:40 +00:00 committed by GitHub
commit 41a0893b28
2 changed files with 12 additions and 3 deletions

View File

@ -331,7 +331,12 @@ def _feedTargetsDict(reqFile, addedTargetUrls):
elif not scheme and port == "443":
scheme = "https"
if conf.forceSSL:
hostPattern=host.replace(".","\.")
if (conf.forceSSL or re.search(r"host:[^\n\r]*%s:%s[\s\S]*referer:[^\n\r]*https://%s:%s.*" %
(hostPattern, port, hostPattern, port), request, re.I)
or (port != "80"
and re.search(r"host:[^\n\r]*%s:%s[\s\S]*referer:[^\n\r]*https://.*cdn.*" %
(hostPattern, port), request, re.I))):
scheme = "https"
port = port or "443"

View File

@ -1,4 +1,5 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
Copyright (c) 2006-2017 sqlmap developers (http://sqlmap.org/)
@ -596,8 +597,11 @@ class Connect(object):
raise SqlmapConnectionException(errMsg)
elif ex.code == httplib.NOT_FOUND:
if raise404:
errMsg = "page not found (%d)" % code
raise SqlmapConnectionException(errMsg)
if re.search(r"(not found)|(404)|(页面不存在)|(未找到页面)",page,re.I):
# If both code=404 and page content has 404's features,then url is 404 url
# If not as upon,only code=404 can not determin the url is 404 url,because waf always return 404 code
errMsg = "page not found (%d)" % code
raise SqlmapConnectionException(errMsg)
else:
debugMsg = "page not found (%d)" % code
singleTimeLogMessage(debugMsg, logging.DEBUG)