sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 17:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:sqlmapproject/sqlmap

Browse Source
This commit is contained in:
Bernardo Damele 2012-12-19 14:25:35 +00:00
commit 326ff404fc
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/core/testing.py
View File

@ -9,6 +9,7 @@ import doctest
import os import os
import re import re
import shutil import shutil
import StringIO
import sys import sys
import tempfile import tempfile
import time import time
@ -21,8 +22,8 @@ from lib.core.common import readXmlFile
from lib.core.data import conf from lib.core.data import conf
from lib.core.data import logger from lib.core.data import logger
from lib.core.data import paths from lib.core.data import paths
from lib.core.log import LOGGER_HANDLER
from lib.core.option import init from lib.core.option import init
from lib.core.option import setVerbosity
from lib.core.optiondict import optDict from lib.core.optiondict import optDict
from lib.parse.cmdline import cmdLineParser from lib.parse.cmdline import cmdLineParser
@ -129,7 +130,7 @@ def liveTest():
if case.hasAttribute("name"): if case.hasAttribute("name"):
name = case.getAttribute("name") name = case.getAttribute("name")
if conf.runCase and ((conf.runCase.isdigit() and conf.runCase != count) or not re.search(conf.runCase, name, re.DOTALL | re.I)): if conf.runCase and ((conf.runCase.isdigit() and conf.runCase != count) or not re.search(conf.runCase, name, re.DOTALL)):
continue continue
if case.getElementsByTagName("switches"): if case.getElementsByTagName("switches"):
@ -151,7 +152,10 @@ def liveTest():
if result: if result:
logger.info("test passed") logger.info("test passed")
else: else:
logger.error("test failed at parsing item: %s" % failedItem) errMsg = "test failed "
if failedItem:
errMsg += "at parsing item: %s" % failedItem
logger.error(errMsg)
beep() beep()
if conf.stopFail is True: if conf.stopFail is True:
return retVal return retVal
@ -186,22 +190,37 @@ def initCase(switches=None):
cmdLineOptions.__dict__[key] = value cmdLineOptions.__dict__[key] = value
init(cmdLineOptions, True) init(cmdLineOptions, True)
conf.verbose = 0
setVerbosity()
def cleanCase(): def cleanCase():
shutil.rmtree(paths.SQLMAP_OUTPUT_PATH, True) shutil.rmtree(paths.SQLMAP_OUTPUT_PATH, True)
conf.verbose = 1
setVerbosity()
def runCase(switches=None, parse=None): def runCase(switches=None, parse=None):
retVal = True retVal = True
global failedItem global failedItem
initCase(switches) initCase(switches)
result = start()
if result == False: # if None, ignore exception = None
result = False
console = ""
stdout = sys.stdout
LOGGER_HANDLER.stream = sys.stdout = StringIO.StringIO()
try:
result = start()
except KeyboardInterrupt:
raise
except Exception, ex:
exception = ex
finally:
sys.stdout.seek(0)
console = sys.stdout.read()
LOGGER_HANDLER.stream = sys.stdout = stdout
if exception:
logger.error("unhandled exception occurred ('%s')" % str(exception))
retVal = False
elif result == False: # if None, ignore
logger.error("the test did not run") logger.error("the test did not run")
retVal = False retVal = False