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

code refactoring

Browse Source
This commit is contained in:
Bernardo Damele 2013-01-14 10:22:38 +00:00
parent 4acb281414
commit 8125fe90a7
3 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_sqlmap.py
View File

@ -27,7 +27,7 @@ from lib.core.data import kb
from lib.core.data import logger
from lib.core.data import paths
from lib.core.common import unhandledExceptionMessage
from lib.core.exception import exceptionsTuple
from lib.core.exception import SqlmapBaseException
from lib.core.exception import SqlmapSilentQuitException
from lib.core.exception import SqlmapUserQuitException
from lib.core.option import init
@ -79,7 +79,7 @@ def main():
except (SqlmapSilentQuitException, bdb.BdbQuit):
pass
except exceptionsTuple, e:
except SqlmapBaseException, e:
e = getUnicode(e)
logger.critical(e)
sys.exit(1)

4
lib/controller/controller.py
View File

@ -41,7 +41,7 @@ from lib.core.enums import HEURISTIC_TEST
from lib.core.enums import HTTPMETHOD
from lib.core.enums import PAYLOAD
from lib.core.enums import PLACE
from lib.core.exception import exceptionsTuple
from lib.core.exception import SqlmapBaseException
from lib.core.exception import SqlmapNoneDataException
from lib.core.exception import SqlmapNotVulnerableException
from lib.core.exception import SqlmapSilentQuitException
@ -591,7 +591,7 @@ def start():
except SqlmapSilentQuitException:
raise
except exceptionsTuple, e:
except SqlmapBaseException, e:
e = getUnicode(e)
if conf.multipleTargets:

59
lib/core/exception.py
View File

@ -5,79 +5,62 @@ Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/)
See the file 'doc/COPYING' for copying permission
"""
class SqlmapCompressionException(Exception):
class SqlmapBaseException(Exception):
pass
class SqlmapConnectionException(Exception):
class SqlmapCompressionException(SqlmapBaseException):
pass
class SqlmapDataException(Exception):
class SqlmapConnectionException(SqlmapBaseException):
pass
class SqlmapFilePathException(Exception):
class SqlmapDataException(SqlmapBaseException):
pass
class SqlmapGenericException(Exception):
class SqlmapFilePathException(SqlmapBaseException):
pass
class SqlmapMissingDependence(Exception):
class SqlmapGenericException(SqlmapBaseException):
pass
class SqlmapMissingMandatoryOptionException(Exception):
class SqlmapMissingDependence(SqlmapBaseException):
pass
class SqlmapMissingPrivileges(Exception):
class SqlmapMissingMandatoryOptionException(SqlmapBaseException):
pass
class SqlmapNoneDataException(Exception):
class SqlmapMissingPrivileges(SqlmapBaseException):
pass
class SqlmapNotVulnerableException(Exception):
class SqlmapNoneDataException(SqlmapBaseException):
pass
class SqlmapSilentQuitException(Exception):
class SqlmapNotVulnerableException(SqlmapBaseException):
pass
class SqlmapUserQuitException(Exception):
class SqlmapSilentQuitException(SqlmapBaseException):
pass
class SqlmapRegExprException(Exception):
class SqlmapUserQuitException(SqlmapBaseException):
pass
class SqlmapSyntaxException(Exception):
class SqlmapRegExprException(SqlmapBaseException):
pass
class SqlmapThreadException(Exception):
class SqlmapSyntaxException(SqlmapBaseException):
pass
class SqlmapUndefinedMethod(Exception):
class SqlmapThreadException(SqlmapBaseException):
pass
class SqlmapUnsupportedDBMSException(Exception):
class SqlmapUndefinedMethod(SqlmapBaseException):
pass
class SqlmapUnsupportedFeatureException(Exception):
class SqlmapUnsupportedDBMSException(SqlmapBaseException):
pass
class SqlmapValueException(Exception):
class SqlmapUnsupportedFeatureException(SqlmapBaseException):
pass
exceptionsTuple = (
SqlmapCompressionException,
SqlmapConnectionException,
SqlmapDataException,
SqlmapFilePathException,
SqlmapGenericException,
SqlmapMissingDependence,
SqlmapMissingMandatoryOptionException,
SqlmapNoneDataException,
SqlmapRegExprException,
SqlmapSyntaxException,
SqlmapUndefinedMethod,
SqlmapMissingPrivileges,
SqlmapNotVulnerableException,
SqlmapThreadException,
SqlmapUnsupportedDBMSException,
SqlmapUnsupportedFeatureException,
SqlmapValueException,
)
class SqlmapValueException(SqlmapBaseException):
pass