From 862395ced13de67b5ac355a92ad20f54ef04a563 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 8 Nov 2010 09:20:02 +0000 Subject: [PATCH] further refactoring (all enumerations are now put into enums.py) --- lib/controller/handler.py | 2 +- lib/core/agent.py | 4 +-- lib/core/common.py | 4 +-- lib/core/enums.py | 35 +++++++++++++++++++++++++ lib/core/option.py | 2 +- lib/core/place.py | 15 ----------- lib/core/priority.py | 17 ------------ lib/core/session.py | 2 +- lib/core/settings.py | 11 -------- lib/parse/banner.py | 2 +- lib/request/connect.py | 2 +- lib/request/direct.py | 2 +- lib/request/inject.py | 2 +- lib/takeover/abstraction.py | 2 +- lib/takeover/metasploit.py | 2 +- lib/takeover/udf.py | 2 +- lib/techniques/blind/inference.py | 2 +- lib/techniques/error/use.py | 2 +- lib/techniques/inband/union/test.py | 2 +- lib/techniques/inband/union/use.py | 2 +- lib/utils/resume.py | 2 +- plugins/dbms/access/enumeration.py | 2 +- plugins/dbms/access/fingerprint.py | 2 +- plugins/dbms/firebird/enumeration.py | 2 +- plugins/dbms/firebird/fingerprint.py | 2 +- plugins/dbms/maxdb/enumeration.py | 2 +- plugins/dbms/maxdb/fingerprint.py | 2 +- plugins/dbms/mssqlserver/enumeration.py | 2 +- plugins/dbms/mssqlserver/fingerprint.py | 2 +- plugins/dbms/mysql/enumeration.py | 2 +- plugins/dbms/mysql/filesystem.py | 2 +- plugins/dbms/mysql/fingerprint.py | 2 +- plugins/dbms/oracle/enumeration.py | 2 +- plugins/dbms/oracle/fingerprint.py | 2 +- plugins/dbms/postgresql/enumeration.py | 2 +- plugins/dbms/postgresql/fingerprint.py | 2 +- plugins/dbms/sqlite/enumeration.py | 2 +- plugins/dbms/sqlite/fingerprint.py | 2 +- plugins/dbms/sybase/enumeration.py | 2 +- plugins/dbms/sybase/fingerprint.py | 2 +- plugins/generic/enumeration.py | 2 +- plugins/generic/filesystem.py | 2 +- plugins/generic/misc.py | 2 +- plugins/generic/takeover.py | 2 +- tamper/between.py | 2 +- tamper/charencode.py | 2 +- tamper/charunicodeencode.py | 2 +- tamper/ifnull2ifisnull.py | 2 +- tamper/randomcase.py | 2 +- tamper/randomcomments.py | 2 +- tamper/space2comment.py | 2 +- tamper/space2plus.py | 2 +- tamper/space2randomblank.py | 2 +- tamper/urlencode.py | 2 +- 54 files changed, 87 insertions(+), 95 deletions(-) create mode 100644 lib/core/enums.py delete mode 100644 lib/core/place.py delete mode 100644 lib/core/priority.py diff --git a/lib/controller/handler.py b/lib/controller/handler.py index 9f9316fc3..daca6edaa 100644 --- a/lib/controller/handler.py +++ b/lib/controller/handler.py @@ -12,7 +12,7 @@ from lib.core.common import pushValue from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger -from lib.core.settings import DBMS +from lib.core.enums import DBMS from lib.core.settings import MSSQL_ALIASES from lib.core.settings import MYSQL_ALIASES from lib.core.settings import ORACLE_ALIASES diff --git a/lib/core/agent.py b/lib/core/agent.py index 9410c1f52..516abfe7d 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -20,9 +20,9 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import queries from lib.core.datatype import advancedDict +from lib.core.enums import DBMS +from lib.core.enums import PLACE from lib.core.exception import sqlmapNoneDataException -from lib.core.place import PLACE -from lib.core.settings import DBMS from lib.core.settings import PAYLOAD_DELIMITER class Agent: diff --git a/lib/core/common.py b/lib/core/common.py index 188b16d74..a54e0f92c 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -43,14 +43,14 @@ from lib.core.data import paths from lib.core.data import queries from lib.core.convert import htmlunescape from lib.core.convert import urlencode +from lib.core.enums import DBMS +from lib.core.enums import PLACE from lib.core.exception import sqlmapFilePathException from lib.core.exception import sqlmapGenericException from lib.core.exception import sqlmapNoneDataException from lib.core.exception import sqlmapMissingDependence from lib.core.exception import sqlmapSyntaxException from lib.core.optiondict import optDict -from lib.core.place import PLACE -from lib.core.settings import DBMS from lib.core.settings import DESCRIPTION from lib.core.settings import IS_WIN from lib.core.settings import PLATFORM diff --git a/lib/core/enums.py b/lib/core/enums.py new file mode 100644 index 000000000..49852d36b --- /dev/null +++ b/lib/core/enums.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python + +""" +$Id$ + +Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) +See the file 'doc/COPYING' for copying permission +""" + +class PRIORITY: + LOWEST = -100 + LOWER = -50 + LOW = -10 + NORMAL = 0 + HIGH = 10 + HIGHER = 50 + HIGHEST = 100 + +class DBMS: + MYSQL = "MySQL" + ORACLE = "Oracle" + POSTGRESQL = "PostgreSQL" + MSSQL = "Microsoft SQL Server" + SQLITE = "SQLite" + ACCESS = "Microsoft Access" + FIREBIRD = "Firebird" + MAXDB = "SAP MaxDB" + SYBASE = "Sybase" + +class PLACE: + GET = "GET" + POST = "POST" + URI = "URI" + COOKIE = "Cookie" + UA = "User-Agent" diff --git a/lib/core/option.py b/lib/core/option.py index 8c9b85393..87d8a0de2 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -42,6 +42,7 @@ from lib.core.data import logger from lib.core.data import paths from lib.core.data import queries from lib.core.datatype import advancedDict +from lib.core.enums import PRIORITY from lib.core.exception import sqlmapFilePathException from lib.core.exception import sqlmapGenericException from lib.core.exception import sqlmapMissingDependence @@ -51,7 +52,6 @@ from lib.core.exception import sqlmapSyntaxException from lib.core.exception import sqlmapUnsupportedDBMSException from lib.core.exception import sqlmapUserQuitException from lib.core.optiondict import optDict -from lib.core.priority import PRIORITY from lib.core.settings import IS_WIN from lib.core.settings import PLATFORM from lib.core.settings import PYVERSION diff --git a/lib/core/place.py b/lib/core/place.py deleted file mode 100644 index 7ed00d312..000000000 --- a/lib/core/place.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python - -""" -$Id$ - -Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) -See the file 'doc/COPYING' for copying permission -""" - -class PLACE: - GET = "GET" - POST = "POST" - URI = "URI" - COOKIE = "Cookie" - UA = "User-Agent" diff --git a/lib/core/priority.py b/lib/core/priority.py deleted file mode 100644 index 9685230b0..000000000 --- a/lib/core/priority.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python - -""" -$Id$ - -Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) -See the file 'doc/COPYING' for copying permission -""" - -class PRIORITY: - LOWEST = -100 - LOWER = -50 - LOW = -10 - NORMAL = 0 - HIGH = 10 - HIGHER = 50 - HIGHEST = 100 diff --git a/lib/core/session.py b/lib/core/session.py index c7119fc73..edb0f3d9d 100644 --- a/lib/core/session.py +++ b/lib/core/session.py @@ -15,7 +15,7 @@ from lib.core.common import readInput from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger -from lib.core.place import PLACE +from lib.core.enums import PLACE from lib.core.settings import MSSQL_ALIASES from lib.core.settings import MYSQL_ALIASES from lib.core.settings import PGSQL_ALIASES diff --git a/lib/core/settings.py b/lib/core/settings.py index 4ff1e3882..da762061d 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -90,17 +90,6 @@ SYBASE_ALIASES = [ "sybase", "sybase sql server" ] SUPPORTED_DBMS = MSSQL_ALIASES + MYSQL_ALIASES + PGSQL_ALIASES + ORACLE_ALIASES + SQLITE_ALIASES + ACCESS_ALIASES + FIREBIRD_ALIASES + MAXDB_ALIASES + SYBASE_ALIASES SUPPORTED_OS = ( "linux", "windows" ) -class DBMS: - MYSQL = "MySQL" - ORACLE = "Oracle" - POSTGRESQL = "PostgreSQL" - MSSQL = "Microsoft SQL Server" - SQLITE = "SQLite" - ACCESS = "Microsoft Access" - FIREBIRD = "Firebird" - MAXDB = "SAP MaxDB" - SYBASE = "Sybase" - SQL_STATEMENTS = { "SQL SELECT statement": ( "select ", diff --git a/lib/parse/banner.py b/lib/parse/banner.py index 157c3b76c..100e7a0a7 100644 --- a/lib/parse/banner.py +++ b/lib/parse/banner.py @@ -17,7 +17,7 @@ from lib.core.common import parseXmlFile from lib.core.common import sanitizeStr from lib.core.data import kb from lib.core.data import paths -from lib.core.settings import DBMS +from lib.core.enums import DBMS from lib.parse.handler import FingerprintHandler class MSSQLBannerHandler(ContentHandler): diff --git a/lib/request/connect.py b/lib/request/connect.py index 3d0452d1b..33f5f2504 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -26,8 +26,8 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.common import sanitizeAsciiString +from lib.core.enums import PLACE from lib.core.exception import sqlmapConnectionException -from lib.core.place import PLACE from lib.request.basic import decodePage from lib.request.basic import forgeHeaders from lib.request.basic import parseResponse diff --git a/lib/request/direct.py b/lib/request/direct.py index a5edb0082..9826ce3d0 100644 --- a/lib/request/direct.py +++ b/lib/request/direct.py @@ -16,7 +16,7 @@ from lib.core.convert import utf8decode from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger -from lib.core.settings import DBMS +from lib.core.enums import DBMS from lib.core.settings import SQL_STATEMENTS from lib.utils.timeout import timeout diff --git a/lib/request/inject.py b/lib/request/inject.py index 42dbe9ad4..256135bb5 100644 --- a/lib/request/inject.py +++ b/lib/request/inject.py @@ -26,7 +26,7 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries -from lib.core.settings import DBMS +from lib.core.enums import DBMS from lib.core.unescaper import unescaper from lib.request.connect import Connect as Request from lib.request.direct import direct diff --git a/lib/takeover/abstraction.py b/lib/takeover/abstraction.py index 3b426fe9c..250667844 100644 --- a/lib/takeover/abstraction.py +++ b/lib/takeover/abstraction.py @@ -12,8 +12,8 @@ from lib.core.common import readInput from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.exception import sqlmapUnsupportedFeatureException -from lib.core.settings import DBMS from lib.core.shell import autoCompletion from lib.takeover.udf import UDF from lib.takeover.web import Web diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py index 1caa84ea7..6e721c422 100644 --- a/lib/takeover/metasploit.py +++ b/lib/takeover/metasploit.py @@ -30,9 +30,9 @@ from lib.core.common import readInput from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.exception import sqlmapDataException from lib.core.exception import sqlmapFilePathException -from lib.core.settings import DBMS from lib.core.subprocessng import blockingReadFromFD from lib.core.subprocessng import blockingWriteToFD from lib.core.subprocessng import pollProcess diff --git a/lib/takeover/udf.py b/lib/takeover/udf.py index 1dc93ce7a..9f5913cf5 100644 --- a/lib/takeover/udf.py +++ b/lib/takeover/udf.py @@ -16,11 +16,11 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries +from lib.core.enums import DBMS from lib.core.exception import sqlmapFilePathException from lib.core.exception import sqlmapMissingMandatoryOptionException from lib.core.exception import sqlmapUnsupportedFeatureException from lib.core.exception import sqlmapUserQuitException -from lib.core.settings import DBMS from lib.core.unescaper import unescaper from lib.request import inject from lib.techniques.outband.stacked import stackedTest diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py index 631f8c361..012fa8ee5 100644 --- a/lib/techniques/blind/inference.py +++ b/lib/techniques/blind/inference.py @@ -26,12 +26,12 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries +from lib.core.enums import DBMS from lib.core.exception import sqlmapConnectionException from lib.core.exception import sqlmapValueException from lib.core.exception import sqlmapThreadException from lib.core.exception import unhandledException from lib.core.progress import ProgressBar -from lib.core.settings import DBMS from lib.core.unescaper import unescaper from lib.request.connect import Connect as Request diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py index 7639adbdd..e2a396ab3 100644 --- a/lib/techniques/error/use.py +++ b/lib/techniques/error/use.py @@ -19,8 +19,8 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries +from lib.core.enums import DBMS from lib.core.session import setError -from lib.core.settings import DBMS from lib.core.unescaper import unescaper from lib.request.connect import Connect as Request from lib.utils.resume import resume diff --git a/lib/techniques/inband/union/test.py b/lib/techniques/inband/union/test.py index 9da5233cf..4d19bb647 100644 --- a/lib/techniques/inband/union/test.py +++ b/lib/techniques/inband/union/test.py @@ -13,8 +13,8 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries +from lib.core.enums import DBMS from lib.core.session import setUnion -from lib.core.settings import DBMS from lib.core.unescaper import unescaper from lib.parse.html import htmlParser from lib.request.connect import Connect as Request diff --git a/lib/techniques/inband/union/use.py b/lib/techniques/inband/union/use.py index c87ec8869..c0cf85003 100644 --- a/lib/techniques/inband/union/use.py +++ b/lib/techniques/inband/union/use.py @@ -18,7 +18,7 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries -from lib.core.settings import DBMS +from lib.core.enums import DBMS from lib.core.unescaper import unescaper from lib.request.connect import Connect as Request from lib.techniques.inband.union.test import unionTest diff --git a/lib/utils/resume.py b/lib/utils/resume.py index e78ec2a37..8c5c4ea02 100644 --- a/lib/utils/resume.py +++ b/lib/utils/resume.py @@ -20,9 +20,9 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries +from lib.core.enums import DBMS from lib.core.unescaper import unescaper from lib.techniques.blind.inference import bisection -from lib.core.settings import DBMS from lib.core.settings import DUMP_START_MARKER from lib.core.settings import DUMP_STOP_MARKER from lib.core.settings import DUMP_DEL_MARKER diff --git a/plugins/dbms/access/enumeration.py b/plugins/dbms/access/enumeration.py index 4b36c9c7a..c408bac28 100644 --- a/plugins/dbms/access/enumeration.py +++ b/plugins/dbms/access/enumeration.py @@ -8,7 +8,7 @@ See the file 'doc/COPYING' for copying permission """ from lib.core.data import logger -from lib.core.settings import DBMS +from lib.core.enums import DBMS from plugins.generic.enumeration import Enumeration as GenericEnumeration diff --git a/plugins/dbms/access/fingerprint.py b/plugins/dbms/access/fingerprint.py index a625959eb..76e686a9e 100644 --- a/plugins/dbms/access/fingerprint.py +++ b/plugins/dbms/access/fingerprint.py @@ -19,8 +19,8 @@ from lib.core.common import wasLastRequestError from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.session import setDbms -from lib.core.settings import DBMS from lib.core.settings import ACCESS_ALIASES from lib.request.connect import Connect as Request diff --git a/plugins/dbms/firebird/enumeration.py b/plugins/dbms/firebird/enumeration.py index a40b5db15..b0df8b52b 100644 --- a/plugins/dbms/firebird/enumeration.py +++ b/plugins/dbms/firebird/enumeration.py @@ -8,7 +8,7 @@ See the file 'doc/COPYING' for copying permission """ from lib.core.data import logger -from lib.core.settings import DBMS +from lib.core.enums import DBMS from plugins.generic.enumeration import Enumeration as GenericEnumeration diff --git a/plugins/dbms/firebird/fingerprint.py b/plugins/dbms/firebird/fingerprint.py index 2dc68ce73..139f2b73c 100644 --- a/plugins/dbms/firebird/fingerprint.py +++ b/plugins/dbms/firebird/fingerprint.py @@ -19,8 +19,8 @@ from lib.core.common import randomRange from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.session import setDbms -from lib.core.settings import DBMS from lib.core.settings import FIREBIRD_ALIASES from lib.request.connect import Connect as Request diff --git a/plugins/dbms/maxdb/enumeration.py b/plugins/dbms/maxdb/enumeration.py index b2afa70b2..11bc72d7e 100644 --- a/plugins/dbms/maxdb/enumeration.py +++ b/plugins/dbms/maxdb/enumeration.py @@ -9,7 +9,7 @@ See the file 'doc/COPYING' for copying permission from lib.core.data import kb from lib.core.data import logger -from lib.core.settings import DBMS +from lib.core.enums import DBMS from plugins.generic.enumeration import Enumeration as GenericEnumeration diff --git a/plugins/dbms/maxdb/fingerprint.py b/plugins/dbms/maxdb/fingerprint.py index 7278d90df..44968d492 100644 --- a/plugins/dbms/maxdb/fingerprint.py +++ b/plugins/dbms/maxdb/fingerprint.py @@ -19,8 +19,8 @@ from lib.core.common import randomRange from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.session import setDbms -from lib.core.settings import DBMS from lib.core.settings import MAXDB_ALIASES from lib.request.connect import Connect as Request diff --git a/plugins/dbms/mssqlserver/enumeration.py b/plugins/dbms/mssqlserver/enumeration.py index 9872b574b..15843e9eb 100644 --- a/plugins/dbms/mssqlserver/enumeration.py +++ b/plugins/dbms/mssqlserver/enumeration.py @@ -13,8 +13,8 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries +from lib.core.enums import DBMS from lib.core.exception import sqlmapNoneDataException -from lib.core.settings import DBMS from lib.request import inject from plugins.generic.enumeration import Enumeration as GenericEnumeration diff --git a/plugins/dbms/mssqlserver/fingerprint.py b/plugins/dbms/mssqlserver/fingerprint.py index 1e6399dcd..4ae17940d 100644 --- a/plugins/dbms/mssqlserver/fingerprint.py +++ b/plugins/dbms/mssqlserver/fingerprint.py @@ -16,8 +16,8 @@ from lib.core.common import randomInt from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.session import setDbms -from lib.core.settings import DBMS from lib.core.settings import MSSQL_ALIASES from lib.request import inject from lib.request.connect import Connect as Request diff --git a/plugins/dbms/mysql/enumeration.py b/plugins/dbms/mysql/enumeration.py index 3ada23a9c..e08480bd3 100644 --- a/plugins/dbms/mysql/enumeration.py +++ b/plugins/dbms/mysql/enumeration.py @@ -7,7 +7,7 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) See the file 'doc/COPYING' for copying permission """ -from lib.core.settings import DBMS +from lib.core.enums import DBMS from plugins.generic.enumeration import Enumeration as GenericEnumeration class Enumeration(GenericEnumeration): diff --git a/plugins/dbms/mysql/filesystem.py b/plugins/dbms/mysql/filesystem.py index bffb8cb38..9dfc3fbe8 100644 --- a/plugins/dbms/mysql/filesystem.py +++ b/plugins/dbms/mysql/filesystem.py @@ -11,8 +11,8 @@ from lib.core.common import randomStr from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import PLACE from lib.core.exception import sqlmapNoneDataException -from lib.core.place import PLACE from lib.request import inject from lib.techniques.inband.union.test import unionTest from lib.techniques.inband.union.use import unionUse diff --git a/plugins/dbms/mysql/fingerprint.py b/plugins/dbms/mysql/fingerprint.py index 490712ee4..b0fab96cf 100644 --- a/plugins/dbms/mysql/fingerprint.py +++ b/plugins/dbms/mysql/fingerprint.py @@ -18,8 +18,8 @@ from lib.core.common import randomInt from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.session import setDbms -from lib.core.settings import DBMS from lib.core.settings import MYSQL_ALIASES from lib.request import inject from lib.request.connect import Connect as Request diff --git a/plugins/dbms/oracle/enumeration.py b/plugins/dbms/oracle/enumeration.py index fcb171a94..990a7166a 100644 --- a/plugins/dbms/oracle/enumeration.py +++ b/plugins/dbms/oracle/enumeration.py @@ -13,8 +13,8 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries +from lib.core.enums import DBMS from lib.core.exception import sqlmapNoneDataException -from lib.core.settings import DBMS from lib.request import inject from plugins.generic.enumeration import Enumeration as GenericEnumeration diff --git a/plugins/dbms/oracle/fingerprint.py b/plugins/dbms/oracle/fingerprint.py index 3f327038b..65dd69ea3 100644 --- a/plugins/dbms/oracle/fingerprint.py +++ b/plugins/dbms/oracle/fingerprint.py @@ -16,8 +16,8 @@ from lib.core.common import getHtmlErrorFp from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.session import setDbms -from lib.core.settings import DBMS from lib.core.settings import ORACLE_ALIASES from lib.request import inject from lib.request.connect import Connect as Request diff --git a/plugins/dbms/postgresql/enumeration.py b/plugins/dbms/postgresql/enumeration.py index a98726acb..b9a07c495 100644 --- a/plugins/dbms/postgresql/enumeration.py +++ b/plugins/dbms/postgresql/enumeration.py @@ -7,7 +7,7 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) See the file 'doc/COPYING' for copying permission """ -from lib.core.settings import DBMS +from lib.core.enums import DBMS from plugins.generic.enumeration import Enumeration as GenericEnumeration class Enumeration(GenericEnumeration): diff --git a/plugins/dbms/postgresql/fingerprint.py b/plugins/dbms/postgresql/fingerprint.py index 12fccd336..bfa4720d3 100644 --- a/plugins/dbms/postgresql/fingerprint.py +++ b/plugins/dbms/postgresql/fingerprint.py @@ -18,8 +18,8 @@ from lib.core.common import randomInt from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.session import setDbms -from lib.core.settings import DBMS from lib.core.settings import PGSQL_ALIASES from lib.core.settings import PGSQL_SYSTEM_DBS from lib.request import inject diff --git a/plugins/dbms/sqlite/enumeration.py b/plugins/dbms/sqlite/enumeration.py index 2b0aecd41..2b317e8c3 100644 --- a/plugins/dbms/sqlite/enumeration.py +++ b/plugins/dbms/sqlite/enumeration.py @@ -9,8 +9,8 @@ See the file 'doc/COPYING' for copying permission from lib.core.data import conf from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.exception import sqlmapUnsupportedFeatureException -from lib.core.settings import DBMS from plugins.generic.enumeration import Enumeration as GenericEnumeration diff --git a/plugins/dbms/sqlite/fingerprint.py b/plugins/dbms/sqlite/fingerprint.py index a1a85891b..ec3890f12 100644 --- a/plugins/dbms/sqlite/fingerprint.py +++ b/plugins/dbms/sqlite/fingerprint.py @@ -14,8 +14,8 @@ from lib.core.common import getHtmlErrorFp from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.session import setDbms -from lib.core.settings import DBMS from lib.core.settings import SQLITE_ALIASES from lib.request import inject from lib.request.connect import Connect as Request diff --git a/plugins/dbms/sybase/enumeration.py b/plugins/dbms/sybase/enumeration.py index a5ddea132..2d9f69564 100644 --- a/plugins/dbms/sybase/enumeration.py +++ b/plugins/dbms/sybase/enumeration.py @@ -9,8 +9,8 @@ See the file 'doc/COPYING' for copying permission from lib.core.data import conf from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.exception import sqlmapUnsupportedFeatureException -from lib.core.settings import DBMS from plugins.generic.enumeration import Enumeration as GenericEnumeration diff --git a/plugins/dbms/sybase/fingerprint.py b/plugins/dbms/sybase/fingerprint.py index c38d6233b..75bdbed5b 100644 --- a/plugins/dbms/sybase/fingerprint.py +++ b/plugins/dbms/sybase/fingerprint.py @@ -15,8 +15,8 @@ from lib.core.common import randomInt from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.session import setDbms -from lib.core.settings import DBMS from lib.core.settings import SYBASE_ALIASES from lib.request import inject from lib.request.connect import Connect as Request diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py index 116d2eb2f..31d925467 100644 --- a/plugins/generic/enumeration.py +++ b/plugins/generic/enumeration.py @@ -30,12 +30,12 @@ from lib.core.data import kb from lib.core.data import logger from lib.core.data import paths from lib.core.data import queries +from lib.core.enums import DBMS from lib.core.exception import sqlmapMissingMandatoryOptionException from lib.core.exception import sqlmapNoneDataException from lib.core.exception import sqlmapUnsupportedFeatureException from lib.core.exception import sqlmapUserQuitException from lib.core.session import setOs -from lib.core.settings import DBMS from lib.core.settings import SQL_STATEMENTS from lib.core.shell import autoCompletion from lib.core.unescaper import unescaper diff --git a/plugins/generic/filesystem.py b/plugins/generic/filesystem.py index bacab0ce0..2f1cbd266 100644 --- a/plugins/generic/filesystem.py +++ b/plugins/generic/filesystem.py @@ -18,8 +18,8 @@ from lib.core.common import readInput from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.exception import sqlmapUndefinedMethod -from lib.core.settings import DBMS from lib.request import inject from lib.techniques.outband.stacked import stackedTest diff --git a/plugins/generic/misc.py b/plugins/generic/misc.py index bb05dd009..5b4005bd4 100644 --- a/plugins/generic/misc.py +++ b/plugins/generic/misc.py @@ -18,10 +18,10 @@ from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.data import queries +from lib.core.enums import DBMS from lib.core.exception import sqlmapNoneDataException from lib.core.exception import sqlmapUnsupportedFeatureException from lib.core.session import setRemoteTempPath -from lib.core.settings import DBMS from lib.request import inject from lib.techniques.outband.stacked import stackedTest diff --git a/plugins/generic/takeover.py b/plugins/generic/takeover.py index 6829f2669..1241a8c81 100644 --- a/plugins/generic/takeover.py +++ b/plugins/generic/takeover.py @@ -14,13 +14,13 @@ from lib.core.common import runningAsAdmin from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger +from lib.core.enums import DBMS from lib.core.exception import sqlmapMissingDependence from lib.core.exception import sqlmapMissingMandatoryOptionException from lib.core.exception import sqlmapMissingPrivileges from lib.core.exception import sqlmapNotVulnerableException from lib.core.exception import sqlmapUndefinedMethod from lib.core.exception import sqlmapUnsupportedDBMSException -from lib.core.settings import DBMS from lib.takeover.abstraction import Abstraction from lib.takeover.icmpsh import ICMPsh from lib.takeover.metasploit import Metasploit diff --git a/tamper/between.py b/tamper/between.py index bb910c631..0d1eef357 100644 --- a/tamper/between.py +++ b/tamper/between.py @@ -7,7 +7,7 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) See the file 'doc/COPYING' for copying permission """ -from lib.core.priority import PRIORITY +from lib.core.enums import PRIORITY __priority__ = PRIORITY.HIGHEST diff --git a/tamper/charencode.py b/tamper/charencode.py index 668a3b5df..f90c1a206 100644 --- a/tamper/charencode.py +++ b/tamper/charencode.py @@ -9,8 +9,8 @@ See the file 'doc/COPYING' for copying permission import string +from lib.core.enums import PRIORITY from lib.core.exception import sqlmapUnsupportedFeatureException -from lib.core.priority import PRIORITY __priority__ = PRIORITY.LOWEST diff --git a/tamper/charunicodeencode.py b/tamper/charunicodeencode.py index 465099482..d316e8a7d 100644 --- a/tamper/charunicodeencode.py +++ b/tamper/charunicodeencode.py @@ -9,8 +9,8 @@ See the file 'doc/COPYING' for copying permission import string +from lib.core.enums import PRIORITY from lib.core.exception import sqlmapUnsupportedFeatureException -from lib.core.priority import PRIORITY __priority__ = PRIORITY.LOWEST diff --git a/tamper/ifnull2ifisnull.py b/tamper/ifnull2ifisnull.py index c56b20f0d..7b4e752f5 100644 --- a/tamper/ifnull2ifisnull.py +++ b/tamper/ifnull2ifisnull.py @@ -7,7 +7,7 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) See the file 'doc/COPYING' for copying permission """ -from lib.core.priority import PRIORITY +from lib.core.enums import PRIORITY __priority__ = PRIORITY.HIGHEST diff --git a/tamper/randomcase.py b/tamper/randomcase.py index ee4af2a19..67193db60 100644 --- a/tamper/randomcase.py +++ b/tamper/randomcase.py @@ -11,7 +11,7 @@ import re from lib.core.common import randomRange from lib.core.data import kb -from lib.core.priority import PRIORITY +from lib.core.enums import PRIORITY __priority__ = PRIORITY.NORMAL diff --git a/tamper/randomcomments.py b/tamper/randomcomments.py index 949cd93ce..8057dc3d6 100644 --- a/tamper/randomcomments.py +++ b/tamper/randomcomments.py @@ -11,7 +11,7 @@ import re from lib.core.common import randomRange from lib.core.data import kb -from lib.core.priority import PRIORITY +from lib.core.enums import PRIORITY __priority__ = PRIORITY.LOW diff --git a/tamper/space2comment.py b/tamper/space2comment.py index 522b52e03..11bb23309 100644 --- a/tamper/space2comment.py +++ b/tamper/space2comment.py @@ -7,7 +7,7 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) See the file 'doc/COPYING' for copying permission """ -from lib.core.priority import PRIORITY +from lib.core.enums import PRIORITY __priority__ = PRIORITY.LOW diff --git a/tamper/space2plus.py b/tamper/space2plus.py index 1295d21d2..9e84d1ba1 100644 --- a/tamper/space2plus.py +++ b/tamper/space2plus.py @@ -7,7 +7,7 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) See the file 'doc/COPYING' for copying permission """ -from lib.core.priority import PRIORITY +from lib.core.enums import PRIORITY __priority__ = PRIORITY.LOW diff --git a/tamper/space2randomblank.py b/tamper/space2randomblank.py index 76948916a..6a5bf1684 100644 --- a/tamper/space2randomblank.py +++ b/tamper/space2randomblank.py @@ -9,7 +9,7 @@ See the file 'doc/COPYING' for copying permission import random -from lib.core.priority import PRIORITY +from lib.core.enums import PRIORITY __priority__ = PRIORITY.LOW diff --git a/tamper/urlencode.py b/tamper/urlencode.py index 6fe131d5a..2e0d3db01 100644 --- a/tamper/urlencode.py +++ b/tamper/urlencode.py @@ -8,8 +8,8 @@ See the file 'doc/COPYING' for copying permission """ from lib.core.convert import urlencode +from lib.core.enums import PRIORITY from lib.core.exception import sqlmapUnsupportedFeatureException -from lib.core.priority import PRIORITY __priority__ = PRIORITY.LOWER