From bbffea2cbc20e733cadf5fa6fa615e0518982bf2 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 9 Dec 2010 17:10:22 +0000 Subject: [PATCH] bug fix --- lib/core/unescaper.py | 8 +++----- plugins/dbms/access/__init__.py | 3 +-- plugins/dbms/firebird/__init__.py | 3 +-- plugins/dbms/maxdb/__init__.py | 3 +-- plugins/dbms/mssqlserver/__init__.py | 3 +-- plugins/dbms/mysql/__init__.py | 3 +-- plugins/dbms/oracle/__init__.py | 3 +-- plugins/dbms/postgresql/__init__.py | 3 +-- plugins/dbms/sqlite/__init__.py | 3 +-- plugins/dbms/sybase/__init__.py | 3 +-- 10 files changed, 12 insertions(+), 23 deletions(-) diff --git a/lib/core/unescaper.py b/lib/core/unescaper.py index 8b9169396..0223c4db2 100644 --- a/lib/core/unescaper.py +++ b/lib/core/unescaper.py @@ -7,16 +7,14 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/) See the file 'doc/COPYING' for copying permission """ +from lib.core.data import kb from lib.core.datatype import advancedDict class Unescaper(advancedDict): def __init__(self): - self.__unescaper = None - - def setUnescape(self, unescapeFunction): - self.__unescaper = unescapeFunction + pass def unescape(self, expression, quote=True): - return self.__unescaper(expression, quote=quote) + return self[kb.dbms if kb.dbms else kb.misc.testedDbms](expression, quote=quote) unescaper = Unescaper() diff --git a/plugins/dbms/access/__init__.py b/plugins/dbms/access/__init__.py index c74d3d868..e14ab3cae 100644 --- a/plugins/dbms/access/__init__.py +++ b/plugins/dbms/access/__init__.py @@ -33,5 +33,4 @@ class AccessMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Tak Miscellaneous.__init__(self) Takeover.__init__(self) - unescaper[DBMS.ACCESS] = AccessMap.unescape - unescaper.setUnescape(AccessMap.unescape) + unescaper[DBMS.ACCESS] = Syntax.unescape diff --git a/plugins/dbms/firebird/__init__.py b/plugins/dbms/firebird/__init__.py index 887ef2955..8ff144093 100644 --- a/plugins/dbms/firebird/__init__.py +++ b/plugins/dbms/firebird/__init__.py @@ -33,5 +33,4 @@ class FirebirdMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, T Miscellaneous.__init__(self) Takeover.__init__(self) - unescaper[DBMS.FIREBIRD] = FirebirdMap.unescape - unescaper.setUnescape(FirebirdMap.unescape) + unescaper[DBMS.FIREBIRD] = Syntax.unescape diff --git a/plugins/dbms/maxdb/__init__.py b/plugins/dbms/maxdb/__init__.py index 89d790cb9..c058576da 100644 --- a/plugins/dbms/maxdb/__init__.py +++ b/plugins/dbms/maxdb/__init__.py @@ -33,5 +33,4 @@ class MaxDBMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Take Miscellaneous.__init__(self) Takeover.__init__(self) - unescaper[DBMS.MAXDB] = MaxDBMap.unescape - unescaper.setUnescape(MaxDBMap.unescape) + unescaper[DBMS.MAXDB] = Syntax.unescape diff --git a/plugins/dbms/mssqlserver/__init__.py b/plugins/dbms/mssqlserver/__init__.py index b01f5ccf9..6f2f1cb56 100644 --- a/plugins/dbms/mssqlserver/__init__.py +++ b/plugins/dbms/mssqlserver/__init__.py @@ -34,5 +34,4 @@ class MSSQLServerMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous Miscellaneous.__init__(self) Takeover.__init__(self) - unescaper[DBMS.MSSQL] = MSSQLServerMap.unescape - unescaper.setUnescape(MSSQLServerMap.unescape) + unescaper[DBMS.MSSQL] = Syntax.unescape diff --git a/plugins/dbms/mysql/__init__.py b/plugins/dbms/mysql/__init__.py index 6373c2faa..43d2c925a 100644 --- a/plugins/dbms/mysql/__init__.py +++ b/plugins/dbms/mysql/__init__.py @@ -39,5 +39,4 @@ class MySQLMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Take Miscellaneous.__init__(self) Takeover.__init__(self) - unescaper[DBMS.MYSQL] = MySQLMap.unescape - unescaper.setUnescape(MySQLMap.unescape) + unescaper[DBMS.MYSQL] = Syntax.unescape diff --git a/plugins/dbms/oracle/__init__.py b/plugins/dbms/oracle/__init__.py index a1d98e810..8326bf127 100644 --- a/plugins/dbms/oracle/__init__.py +++ b/plugins/dbms/oracle/__init__.py @@ -33,5 +33,4 @@ class OracleMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Tak Miscellaneous.__init__(self) Takeover.__init__(self) - unescaper[DBMS.ORACLE] = OracleMap.unescape - unescaper.setUnescape(OracleMap.unescape) + unescaper[DBMS.ORACLE] = Syntax.unescape diff --git a/plugins/dbms/postgresql/__init__.py b/plugins/dbms/postgresql/__init__.py index ed25ca692..ba4c616e2 100644 --- a/plugins/dbms/postgresql/__init__.py +++ b/plugins/dbms/postgresql/__init__.py @@ -40,5 +40,4 @@ class PostgreSQLMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Miscellaneous.__init__(self) Takeover.__init__(self) - unescaper[DBMS.PGSQL] = PostgreSQLMap.unescape - unescaper.setUnescape(PostgreSQLMap.unescape) + unescaper[DBMS.PGSQL] = Syntax.unescape diff --git a/plugins/dbms/sqlite/__init__.py b/plugins/dbms/sqlite/__init__.py index d9240e1d0..5227dd67a 100644 --- a/plugins/dbms/sqlite/__init__.py +++ b/plugins/dbms/sqlite/__init__.py @@ -33,5 +33,4 @@ class SQLiteMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Tak Miscellaneous.__init__(self) Takeover.__init__(self) - unescaper[DBMS.SQLITE] = SQLiteMap.unescape - unescaper.setUnescape(SQLiteMap.unescape) + unescaper[DBMS.SQLITE] = Syntax.unescape diff --git a/plugins/dbms/sybase/__init__.py b/plugins/dbms/sybase/__init__.py index afb2cee50..bde27220d 100644 --- a/plugins/dbms/sybase/__init__.py +++ b/plugins/dbms/sybase/__init__.py @@ -33,5 +33,4 @@ class SybaseMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Tak Miscellaneous.__init__(self) Takeover.__init__(self) - unescaper[DBMS.SYBASE] = SybaseMap.unescape - unescaper.setUnescape(SybaseMap.unescape) + unescaper[DBMS.SYBASE] = Syntax.unescape