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

some fixes

Browse Source
This commit is contained in:
Miroslav Stampar 2010-12-22 11:46:18 +00:00
parent 5be9c04e44
commit c89021f0bb
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
plugins/generic/enumeration.py
View File

@ -749,23 +749,37 @@ class Enumeration:
rootQuery = queries[kb.dbms].tables rootQuery = queries[kb.dbms].tables
if conf.db:
if "," in conf.db:
dbs = conf.db.split(",")
else:
dbs = [conf.db]
else:
if not len(kb.data.cachedDbs):
dbs = self.getDbs()
else:
dbs = kb.data.cachedDbs
if kb.unionPosition is not None or conf.direct: if kb.unionPosition is not None or conf.direct:
query = rootQuery.inband.query query = rootQuery.inband.query
condition = rootQuery.inband.condition condition = rootQuery.inband.condition if 'condition' in rootQuery.inband else None
if conf.db and kb.dbms != DBMS.SQLITE: if condition:
if "," in conf.db: if conf.db and kb.dbms != DBMS.SQLITE:
dbs = conf.db.split(",") if "," in conf.db:
dbs = conf.db.split(",")
query += " WHERE "
query += " OR ".join("%s = '%s'" % (condition, db) for db in dbs)
else:
query += " WHERE %s='%s'" % (condition, conf.db)
elif conf.excludeSysDbs:
query += " WHERE " query += " WHERE "
query += " OR ".join("%s = '%s'" % (condition, db) for db in dbs) query += " AND ".join("%s != '%s'" % (condition, db) for db in self.excludeDbsList)
else: infoMsg = "skipping system databases '%s'" % ", ".join(db for db in self.excludeDbsList)
query += " WHERE %s='%s'" % (condition, conf.db) logger.info(infoMsg)
elif conf.excludeSysDbs:
query += " WHERE "
query += " AND ".join("%s != '%s'" % (condition, db) for db in self.excludeDbsList)
infoMsg = "skipping system databases '%s'" % ", ".join(db for db in self.excludeDbsList)
logger.info(infoMsg)
if kb.dbms in (DBMS.MSSQL, DBMS.SYBASE):
query = safeStringFormat(query, conf.db)
value = inject.getValue(query, blind=False, error=False) value = inject.getValue(query, blind=False, error=False)
if value: if value:
@ -787,17 +801,6 @@ class Enumeration:
kb.data.cachedTables[db].append(table) kb.data.cachedTables[db].append(table)
if not kb.data.cachedTables and not conf.direct: if not kb.data.cachedTables and not conf.direct:
if conf.db:
if "," in conf.db:
dbs = conf.db.split(",")
else:
dbs = [conf.db]
else:
if not len(kb.data.cachedDbs):
dbs = self.getDbs()
else:
dbs = kb.data.cachedDbs
for db in dbs: for db in dbs:
if conf.excludeSysDbs and db in self.excludeDbsList: if conf.excludeSysDbs and db in self.excludeDbsList:
infoMsg = "skipping system database '%s'" % db infoMsg = "skipping system database '%s'" % db