added support for displaying HTTP error codes (particularly interesting ones are 403 and 406 which screw up data retrieval and DBMS fingerprinting badly)

This commit is contained in:
Miroslav Stampar 2011-01-02 07:37:47 +00:00
parent ec4440108b
commit da138c46c1
5 changed files with 27 additions and 10 deletions

View File

@ -23,6 +23,7 @@ from lib.core.common import getUnicode
from lib.core.common import paramToDict from lib.core.common import paramToDict
from lib.core.common import parseTargetUrl from lib.core.common import parseTargetUrl
from lib.core.common import readInput from lib.core.common import readInput
from lib.core.common import showHttpErrorCodes
from lib.core.data import conf from lib.core.data import conf
from lib.core.data import kb from lib.core.data import kb
from lib.core.data import logger from lib.core.data import logger
@ -432,6 +433,9 @@ def start():
logger.critical(e) logger.critical(e)
return False return False
finally:
showHttpErrorCodes()
if conf.loggedToOut: if conf.loggedToOut:
logger.info("Fetched data logged to text files under '%s'" % conf.outputPath) logger.info("Fetched data logged to text files under '%s'" % conf.outputPath)

View File

@ -21,6 +21,7 @@ import urlparse
import ntpath import ntpath
import posixpath import posixpath
import subprocess import subprocess
import httplib
from ConfigParser import DEFAULTSECT from ConfigParser import DEFAULTSECT
from ConfigParser import RawConfigParser from ConfigParser import RawConfigParser
@ -419,9 +420,8 @@ def filePathToString(filePath):
return strRepl return strRepl
def dataToStdout(data, forceOutput=False): def dataToStdout(data, forceOutput=False):
if (forceOutput or conf.verbose > 0)\ if not ('threadException' in kb and kb.threadException):
and not ('threadException' in kb and kb.threadException)\ if forceOutput or (conf.verbose > 0) and not ('disableStdOut' in kb and kb.disableStdOut):
and not ('disableStdOut' in kb and kb.disableStdOut):
try: try:
sys.stdout.write(data) sys.stdout.write(data)
sys.stdout.flush() sys.stdout.flush()
@ -1956,3 +1956,11 @@ def unicodeToSafeHTMLValue(value):
def getErrorParsedDBMS(): def getErrorParsedDBMS():
return kb.htmlFp[0] if kb.htmlFp else None return kb.htmlFp[0] if kb.htmlFp else None
def showHttpErrorCodes():
if kb.httpErrorCodes:
warnMsg = "HTTP error codes detected during testing:\n"
warnMsg += ", ".join("%d (%s) - %d times" % (code, httplib.responses[code]\
if code in httplib.responses else '?', count)\
for code, count in kb.httpErrorCodes.items())
logger.warn(warnMsg)

View File

@ -1156,6 +1156,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
kb.docRoot = None kb.docRoot = None
kb.dynamicMarkings = [] kb.dynamicMarkings = []
kb.endDetection = False kb.endDetection = False
kb.httpErrorCodes = {}
kb.errorIsNone = True kb.errorIsNone = True
kb.formNames = [] kb.formNames = []
kb.headersCount = 0 kb.headersCount = 0

View File

@ -252,6 +252,10 @@ class Connect:
threadData.lastHTTPError = (threadData.lastRequestUID, code) threadData.lastHTTPError = (threadData.lastRequestUID, code)
if code not in kb.httpErrorCodes:
kb.httpErrorCodes[code] = 0
kb.httpErrorCodes[code] += 1
try: try:
page = e.read() page = e.read()
responseHeaders = e.info() responseHeaders = e.info()

View File

@ -115,10 +115,10 @@ def main():
closeDumper(True) closeDumper(True)
finally: finally:
dataToStdout("\n[*] shutting down at: %s\n\n" % time.strftime("%X"), forceOutput=True)
kb.threadContinue = False kb.threadContinue = False
kb.threadException = True kb.threadException = True
dataToStdout("\n[*] shutting down at: %s\n\n" % time.strftime("%X"), forceOutput=True)
if __name__ == "__main__": if __name__ == "__main__":
main() main()