Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit aae1400

Browse files
bdamelebdamele
committed
SVN roll back, DB2 patch will be recommitted after testing:
$ svn merge https://svn.sqlmap.org/sqlmap/trunk/sqlmap@HEAD https://svn.sqlmap.org/sqlmap/trunk/sqlmap@3847 .
1 parent 42bca80 commit aae1400

17 files changed

Lines changed: 30 additions & 505 deletions

File tree

‎lib/controller/handler.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
from lib.core.settings import FIREBIRD_ALIASES
2424
from lib.core.settings import MAXDB_ALIASES
2525
from lib.core.settings import SYBASE_ALIASES
26-
from lib.core.settings import DB2_ALIASES
2726

2827
from plugins.dbms.mssqlserver import MSSQLServerMap
2928
from plugins.dbms.mssqlserver.connector import Connector as MSSQLServerConn
@@ -43,8 +42,6 @@
4342
from plugins.dbms.maxdb.connector import Connector as MaxDBConn
4443
from plugins.dbms.sybase import SybaseMap
4544
from plugins.dbms.sybase.connector import Connector as SybaseConn
46-
from plugins.dbms.db2 import DB2Map
47-
from plugins.dbms.db2.connector import Connector as DB2Conn
4845

4946
def setHandler():
5047
"""
@@ -53,7 +50,7 @@ def setHandler():
5350
"""
5451

5552
count = 0
56-
dbmsNames = ( "MySQL", "Oracle", "PostgreSQL", "Microsoft SQL Server", "SQLite", "Microsoft Access", "Firebird", "SAP MaxDB", "Sybase", "DB2" )
53+
dbmsNames = ( "MySQL", "Oracle", "PostgreSQL", "Microsoft SQL Server", "SQLite", "Microsoft Access", "Firebird", "SAP MaxDB", "Sybase" )
5754
dbmsObj = [
5855
( MYSQL_ALIASES, MySQLMap, MySQLConn ),
5956
( ORACLE_ALIASES, OracleMap, OracleConn ),
@@ -64,7 +61,6 @@ def setHandler():
6461
( FIREBIRD_ALIASES, FirebirdMap, FirebirdConn ),
6562
( MAXDB_ALIASES, MaxDBMap, MaxDBConn ),
6663
( SYBASE_ALIASES, SybaseMap, SybaseConn ),
67-
( DB2_ALIASES, DB2Map, DB2Conn )
6864
]
6965

7066
if Backend.getIdentifiedDbms() is not None:

‎lib/core/agent.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ def simpleConcatQuery(self, query1, query2):
407407
if Backend.isDbms(DBMS.MYSQL):
408408
concatenatedQuery = "CONCAT(%s,%s)" % (query1, query2)
409409

410-
elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.ORACLE, DBMS.SQLITE, DBMS.DB2):
410+
elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.ORACLE, DBMS.SQLITE):
411411
concatenatedQuery = "%s||%s" % (query1, query2)
412412

413413
elif Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE):
@@ -466,7 +466,7 @@ def concatQuery(self, query, unpack=True):
466466
elif fieldsNoSelect:
467467
concatenatedQuery = "CONCAT('%s',%s,'%s')" % (kb.misc.start, concatenatedQuery, kb.misc.stop)
468468

469-
elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.ORACLE, DBMS.SQLITE, DBMS.DB2):
469+
elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.ORACLE, DBMS.SQLITE):
470470
if fieldsExists:
471471
concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'||" % kb.misc.start, 1)
472472
concatenatedQuery += "||'%s'" % kb.misc.stop
@@ -643,7 +643,7 @@ def limitQuery(self, num, query, field=None, uniqueField=None):
643643
limitStr = queries[Backend.getIdentifiedDbms()].limit.query % (num+1, num+1)
644644
limitedQuery += " %s" % limitStr
645645

646-
elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2):
646+
elif Backend.isDbms(DBMS.ORACLE):
647647
if " ORDER BY " in limitedQuery and "(SELECT " in limitedQuery:
648648
orderBy = limitedQuery[limitedQuery.index(" ORDER BY "):]
649649
limitedQuery = limitedQuery[:limitedQuery.index(" ORDER BY ")]

‎lib/core/common.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2546,7 +2546,7 @@ def safeSQLIdentificatorNaming(name, isTable=False):
25462546
if not re.match(r"\A[A-Za-z0-9_]+\Z", parts[i]):
25472547
if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS):
25482548
parts[i] = "`%s`" % parts[i].strip("`")
2549-
elif Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.ORACLE, DBMS.PGSQL, DBMS.DB2):
2549+
elif Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.ORACLE, DBMS.PGSQL):
25502550
parts[i] = "\"%s\"" % parts[i].strip("\"")
25512551

25522552
retVal = ".".join(parts)
@@ -2563,7 +2563,7 @@ def unsafeSQLIdentificatorNaming(name):
25632563
if isinstance(name, basestring):
25642564
if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS):
25652565
retVal = name.replace("`", "")
2566-
elif Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.ORACLE, DBMS.PGSQL, DBMS.DB2):
2566+
elif Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.ORACLE, DBMS.PGSQL):
25672567
retVal = name.replace("\"", "")
25682568
if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE):
25692569
prefix = "%s." % DEFAULT_MSSQL_SCHEMA

‎lib/core/data.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from lib.core.settings import FIREBIRD_ALIASES
2020
from lib.core.settings import MAXDB_ALIASES
2121
from lib.core.settings import SYBASE_ALIASES
22-
from lib.core.settings import DB2_ALIASES
2322

2423
# sqlmap paths
2524
paths = advancedDict()

‎lib/core/dicts.py‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,3 @@
9898
"R": "REFERENCES",
9999
"E": "EXECUTE"
100100
}
101-
102-
db2Privs = {
103-
1:"CONTROLAUTH",
104-
2:"ALTERAUTH",
105-
3:"DELETEAUTH",
106-
4:"INDEXAUTH",
107-
5:"INSERTAUTH",
108-
6:"REFAUTH",
109-
7:"SELECTAUTH",
110-
8:"UPDATEAUTH"
111-
}

‎lib/core/enums.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class DBMS:
3434
PGSQL = "PostgreSQL"
3535
SQLITE = "SQLite"
3636
SYBASE = "Sybase"
37-
DB2 = "IBM DB2"
3837

3938
class OS:
4039
LINUX = "Linux"

‎lib/core/option.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
from lib.core.settings import FIREBIRD_ALIASES
9090
from lib.core.settings import MAXDB_ALIASES
9191
from lib.core.settings import SYBASE_ALIASES
92-
from lib.core.settings import DB2_ALIASES
9392
from lib.core.settings import BURP_SPLITTER
9493
from lib.core.settings import MAX_NUMBER_OF_THREADS
9594
from lib.core.settings import TIME_DEFAULT_DELAY
@@ -683,7 +682,7 @@ def __setDBMS():
683682

684683
for aliases in (MSSQL_ALIASES, MYSQL_ALIASES, PGSQL_ALIASES, \
685684
ORACLE_ALIASES, SQLITE_ALIASES, ACCESS_ALIASES, \
686-
FIREBIRD_ALIASES, MAXDB_ALIASES, SYBASE_ALIASES, DB2_ALIASES):
685+
FIREBIRD_ALIASES, MAXDB_ALIASES, SYBASE_ALIASES):
687686
if conf.dbms in aliases:
688687
conf.dbms = aliases[0]
689688

‎lib/core/settings.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@
147147
"RDB$TRIGGER_MESSAGES", "RDB$TYPES", "RDB$USER_PRIVILEGES", "RDB$VIEW_RELATIONS" )
148148
MAXDB_SYSTEM_DBS = ( "SYSINFO", "DOMAIN" )
149149
SYBASE_SYSTEM_DBS = ( "master", "model", "sybsystemdb", "sybsystemprocs" )
150-
DB2_SYSTEM_DBS = ( "NULLID", "SQLJ", "SYSCAT", "SYSFUN", "SYSIBM", "SYSIBMADM", "SYSIBMINTERNAL", "SYSIBMTS", "SYSPROC", "SYSPUBLIC",\
151-
"SYSSTAT", "SYSTOOLS" )
152150

153151
MSSQL_ALIASES = [ "microsoft sql server", "mssqlserver", "mssql", "ms" ]
154152
MYSQL_ALIASES = [ "mysql", "my" ]
@@ -159,9 +157,8 @@
159157
FIREBIRD_ALIASES = [ "firebird", "mozilla firebird", "interbase", "ibase", "fb" ]
160158
MAXDB_ALIASES = [ "maxdb", "sap maxdb", "sap db" ]
161159
SYBASE_ALIASES = [ "sybase", "sybase sql server" ]
162-
DB2_ALIASES = [ "ibm db2", "db2" ]
163160

164-
SUPPORTED_DBMS = MSSQL_ALIASES + MYSQL_ALIASES + PGSQL_ALIASES + ORACLE_ALIASES + SQLITE_ALIASES + ACCESS_ALIASES + FIREBIRD_ALIASES + MAXDB_ALIASES + SYBASE_ALIASES + DB2_ALIASES
161+
SUPPORTED_DBMS = MSSQL_ALIASES + MYSQL_ALIASES + PGSQL_ALIASES + ORACLE_ALIASES + SQLITE_ALIASES + ACCESS_ALIASES + FIREBIRD_ALIASES + MAXDB_ALIASES + SYBASE_ALIASES
165162
SUPPORTED_OS = ( "linux", "windows" )
166163

167164
DBMS_DICT = { DBMS.MSSQL: [MSSQL_ALIASES, "python-pymssql", "http://pymssql.sourceforge.net/"],
@@ -172,8 +169,7 @@
172169
DBMS.ACCESS: [ACCESS_ALIASES, "python-pyodbc", "http://pyodbc.googlecode.com/"],
173170
DBMS.FIREBIRD: [FIREBIRD_ALIASES, "python-kinterbasdb", "http://kinterbasdb.sourceforge.net/"],
174171
DBMS.MAXDB: [MAXDB_ALIASES, None, None],
175-
DBMS.SYBASE: [SYBASE_ALIASES, "python-pymssql", "http://pymssql.sourceforge.net/"],
176-
DBMS.DB2: [DB2_ALIASES, None, None]
172+
DBMS.SYBASE: [SYBASE_ALIASES, "python-pymssql", "http://pymssql.sourceforge.net/"]
177173
}
178174

179175
REFERER_ALIASES = ( "ref", "referer", "referrer" )

‎plugins/dbms/db2/__init__.py‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎plugins/dbms/db2/connector.py‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)