sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-03 13:14:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert last commit

Browse Source
This commit is contained in:
Bernardo Damele 2010-03-16 13:56:36 +00:00
parent 1dfe558d3d
commit 3b3353e05b
4 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/controller/controller.py
View File

@ -31,8 +31,6 @@ from lib.controller.checks import checkRegexp
from lib.controller.checks import checkConnection from lib.controller.checks import checkConnection
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 pop
from lib.core.common import push
from lib.core.common import readInput from lib.core.common import readInput
from lib.core.data import conf from lib.core.data import conf
from lib.core.data import kb from lib.core.data import kb
@ -106,10 +104,6 @@ def start():
infoMsg = "sqlmap got a total of %d targets" % len(kb.targetUrls) infoMsg = "sqlmap got a total of %d targets" % len(kb.targetUrls)
logger.info(infoMsg) logger.info(infoMsg)
if conf.multipleTargets:
push(conf.raise404)
conf.raise404 = False
hostCount = 0 hostCount = 0
cookieStr = "" cookieStr = ""
setCookieAsInjectable = True setCookieAsInjectable = True
@ -273,12 +267,7 @@ def start():
logger.error(e) logger.error(e)
else: else:
logger.error(e) logger.error(e)
if conf.multipleTargets:
conf.raise404 = pop()
return return
if conf.multipleTargets:
conf.raise404 = pop()
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)

6
lib/core/common.py
View File

@ -939,9 +939,3 @@ def posixToNtSlashes(filepath):
def ntToPosixSlashes(filepath): def ntToPosixSlashes(filepath):
return filepath.replace('\\', '/') return filepath.replace('\\', '/')
def push(value):
conf.stack.append(value)
def pop():
return conf.stack.pop()

2
lib/core/option.py
View File

@ -957,14 +957,12 @@ def __setConfAttributes():
conf.path = None conf.path = None
conf.port = None conf.port = None
conf.progressWidth = 54 conf.progressWidth = 54
conf.raise404 = True
conf.retriesCount = 0 conf.retriesCount = 0
conf.scheme = None conf.scheme = None
#conf.seqMatcher = difflib.SequenceMatcher(lambda x: x in " \t") #conf.seqMatcher = difflib.SequenceMatcher(lambda x: x in " \t")
conf.seqMatcher = difflib.SequenceMatcher(None) conf.seqMatcher = difflib.SequenceMatcher(None)
conf.seqLock = None conf.seqLock = None
conf.sessionFP = None conf.sessionFP = None
conf.stack = []
conf.start = True conf.start = True
conf.threadContinue = True conf.threadContinue = True
conf.threadException = False conf.threadException = False

4
lib/request/connect.py
View File

@ -70,7 +70,7 @@ class Connect:
direct = kwargs.get('direct', False) direct = kwargs.get('direct', False)
multipart = kwargs.get('multipart', False) multipart = kwargs.get('multipart', False)
silent = kwargs.get('silent', False) silent = kwargs.get('silent', False)
raise404 = kwargs.get('raise404', None) raise404 = kwargs.get('raise404', True)
page = "" page = ""
cookieStr = "" cookieStr = ""
@ -181,7 +181,7 @@ class Connect:
errMsg = "not authorized, try to provide right HTTP " errMsg = "not authorized, try to provide right HTTP "
errMsg += "authentication type and valid credentials" errMsg += "authentication type and valid credentials"
raise sqlmapConnectionException, errMsg raise sqlmapConnectionException, errMsg
elif e.code == 404 and (raise404 or (raise404 is None and conf.raise404)): elif e.code == 404 and raise404:
errMsg = "page not found" errMsg = "page not found"
raise sqlmapConnectionException, errMsg raise sqlmapConnectionException, errMsg
else: else: