sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-07-29 17:39:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 68f44078c5 into e42b63f51c

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/core/option.py
View File

@ -331,7 +331,12 @@ def _feedTargetsDict(reqFile, addedTargetUrls):
elif not scheme and port == "443": elif not scheme and port == "443":
scheme = "https" 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" scheme = "https"
port = port or "443" port = port or "443"

8
lib/request/connect.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*-
""" """
Copyright (c) 2006-2017 sqlmap developers (http://sqlmap.org/) Copyright (c) 2006-2017 sqlmap developers (http://sqlmap.org/)
@ -596,8 +597,11 @@ class Connect(object):
raise SqlmapConnectionException(errMsg) raise SqlmapConnectionException(errMsg)
elif ex.code == httplib.NOT_FOUND: elif ex.code == httplib.NOT_FOUND:
if raise404: if raise404:
errMsg = "page not found (%d)" % code if re.search(r"(not found)|(404)|(页面不存在)|(未找到页面)",page,re.I):
raise SqlmapConnectionException(errMsg) # 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: else:
debugMsg = "page not found (%d)" % code debugMsg = "page not found (%d)" % code
singleTimeLogMessage(debugMsg, logging.DEBUG) singleTimeLogMessage(debugMsg, logging.DEBUG)