mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-25 11:03:47 +03:00
Better approach for #1320
This commit is contained in:
parent
bcb25823e6
commit
e623ee66ad
|
@ -1298,7 +1298,7 @@ def checkConnection(suppressOutput=False):
|
||||||
raise SqlmapConnectionException(errMsg)
|
raise SqlmapConnectionException(errMsg)
|
||||||
except socket.error, ex:
|
except socket.error, ex:
|
||||||
errMsg = "problem occurred while "
|
errMsg = "problem occurred while "
|
||||||
errMsg += "resolving a host name '%s' ('%s')" % (conf.hostname, getUnicode(ex))
|
errMsg += "resolving a host name '%s' ('%s')" % (conf.hostname, ex.message)
|
||||||
raise SqlmapConnectionException(errMsg)
|
raise SqlmapConnectionException(errMsg)
|
||||||
|
|
||||||
if not suppressOutput and not conf.dummy and not conf.offline:
|
if not suppressOutput and not conf.dummy and not conf.offline:
|
||||||
|
|
|
@ -876,7 +876,7 @@ def dataToOutFile(filename, data):
|
||||||
f.write(data)
|
f.write(data)
|
||||||
except IOError, ex:
|
except IOError, ex:
|
||||||
errMsg = "something went wrong while trying to write "
|
errMsg = "something went wrong while trying to write "
|
||||||
errMsg += "to the output file ('%s')" % getUnicode(ex)
|
errMsg += "to the output file ('%s')" % ex.message
|
||||||
raise SqlmapGenericException(errMsg)
|
raise SqlmapGenericException(errMsg)
|
||||||
|
|
||||||
return retVal
|
return retVal
|
||||||
|
@ -3662,7 +3662,7 @@ def evaluateCode(code, variables=None):
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
raise
|
raise
|
||||||
except Exception, ex:
|
except Exception, ex:
|
||||||
errMsg = "an error occurred while evaluating provided code ('%s') " % getUnicode(ex)
|
errMsg = "an error occurred while evaluating provided code ('%s') " % ex.message
|
||||||
raise SqlmapGenericException(errMsg)
|
raise SqlmapGenericException(errMsg)
|
||||||
|
|
||||||
def serializeObject(object_):
|
def serializeObject(object_):
|
||||||
|
|
|
@ -74,7 +74,7 @@ class Dump(object):
|
||||||
try:
|
try:
|
||||||
self._outputFP.write(text)
|
self._outputFP.write(text)
|
||||||
except IOError, ex:
|
except IOError, ex:
|
||||||
errMsg = "error occurred while writing to log file ('%s')" % getUnicode(ex)
|
errMsg = "error occurred while writing to log file ('%s')" % ex.message
|
||||||
raise SqlmapGenericException(errMsg)
|
raise SqlmapGenericException(errMsg)
|
||||||
|
|
||||||
if kb.get("multiThreadMode"):
|
if kb.get("multiThreadMode"):
|
||||||
|
@ -94,7 +94,7 @@ class Dump(object):
|
||||||
try:
|
try:
|
||||||
self._outputFP = openFile(self._outputFile, "ab" if not conf.flushSession else "wb")
|
self._outputFP = openFile(self._outputFile, "ab" if not conf.flushSession else "wb")
|
||||||
except IOError, ex:
|
except IOError, ex:
|
||||||
errMsg = "error occurred while opening log file ('%s')" % getUnicode(ex)
|
errMsg = "error occurred while opening log file ('%s')" % ex.message
|
||||||
raise SqlmapGenericException(errMsg)
|
raise SqlmapGenericException(errMsg)
|
||||||
|
|
||||||
def getOutputFile(self):
|
def getOutputFile(self):
|
||||||
|
|
|
@ -1521,7 +1521,7 @@ def _createTemporaryDirectory():
|
||||||
os.makedirs(tempfile.gettempdir())
|
os.makedirs(tempfile.gettempdir())
|
||||||
except IOError, ex:
|
except IOError, ex:
|
||||||
errMsg = "there has been a problem while accessing "
|
errMsg = "there has been a problem while accessing "
|
||||||
errMsg += "system's temporary directory location(s) ('%s'). Please " % getUnicode(ex)
|
errMsg += "system's temporary directory location(s) ('%s'). Please " % ex.message
|
||||||
errMsg += "make sure that there is enough disk space left. If problem persists, "
|
errMsg += "make sure that there is enough disk space left. If problem persists, "
|
||||||
errMsg += "try to set environment variable 'TEMP' to a location "
|
errMsg += "try to set environment variable 'TEMP' to a location "
|
||||||
errMsg += "writeable by the current user"
|
errMsg += "writeable by the current user"
|
||||||
|
|
|
@ -862,7 +862,7 @@ def cmdLineParser():
|
||||||
for arg in shlex.split(command):
|
for arg in shlex.split(command):
|
||||||
argv.append(getUnicode(arg, encoding=sys.stdin.encoding))
|
argv.append(getUnicode(arg, encoding=sys.stdin.encoding))
|
||||||
except ValueError, ex:
|
except ValueError, ex:
|
||||||
raise SqlmapSyntaxException, "something went wrong during command line parsing ('%s')" % getUnicode(ex)
|
raise SqlmapSyntaxException, "something went wrong during command line parsing ('%s')" % ex.message
|
||||||
|
|
||||||
# Hide non-basic options in basic help case
|
# Hide non-basic options in basic help case
|
||||||
for i in xrange(len(argv)):
|
for i in xrange(len(argv)):
|
||||||
|
|
|
@ -73,7 +73,7 @@ def configFileParser(configFile):
|
||||||
config = UnicodeRawConfigParser()
|
config = UnicodeRawConfigParser()
|
||||||
config.readfp(configFP)
|
config.readfp(configFP)
|
||||||
except Exception, ex:
|
except Exception, ex:
|
||||||
errMsg = "you have provided an invalid and/or unreadable configuration file ('%s')" % getUnicode(ex)
|
errMsg = "you have provided an invalid and/or unreadable configuration file ('%s')" % ex.message
|
||||||
raise SqlmapSyntaxException(errMsg)
|
raise SqlmapSyntaxException(errMsg)
|
||||||
|
|
||||||
if not config.has_section("Target"):
|
if not config.has_section("Target"):
|
||||||
|
|
|
@ -770,7 +770,7 @@ def dictionaryAttack(attack_dict):
|
||||||
|
|
||||||
except Exception, ex:
|
except Exception, ex:
|
||||||
warnMsg = "there was a problem while loading dictionaries"
|
warnMsg = "there was a problem while loading dictionaries"
|
||||||
warnMsg += " ('%s')" % getUnicode(ex)
|
warnMsg += " ('%s')" % ex.message
|
||||||
logger.critical(warnMsg)
|
logger.critical(warnMsg)
|
||||||
|
|
||||||
message = "do you want to use common password suffixes? (slow!) [y/N] "
|
message = "do you want to use common password suffixes? (slow!) [y/N] "
|
||||||
|
|
|
@ -341,13 +341,13 @@ class Entries:
|
||||||
attackDumpedTable()
|
attackDumpedTable()
|
||||||
except (IOError, OSError), ex:
|
except (IOError, OSError), ex:
|
||||||
errMsg = "an error occurred while attacking "
|
errMsg = "an error occurred while attacking "
|
||||||
errMsg += "table dump ('%s')" % getUnicode(ex)
|
errMsg += "table dump ('%s')" % ex.message
|
||||||
logger.critical(errMsg)
|
logger.critical(errMsg)
|
||||||
conf.dumper.dbTableValues(kb.data.dumpedTable)
|
conf.dumper.dbTableValues(kb.data.dumpedTable)
|
||||||
|
|
||||||
except SqlmapConnectionException, ex:
|
except SqlmapConnectionException, ex:
|
||||||
errMsg = "connection exception detected in dumping phase "
|
errMsg = "connection exception detected in dumping phase "
|
||||||
errMsg += "('%s')" % getUnicode(ex)
|
errMsg += "('%s')" % ex.message
|
||||||
logger.critical(errMsg)
|
logger.critical(errMsg)
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user