sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-06-16 02:53:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixes #370 (the bug was introduced with commit edb977a74e)#

Browse Source
This commit is contained in:
Bernardo Damele 2013-01-23 13:00:58 +00:00
parent 7ee07d031a
commit 45af22872a
1 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
plugins/generic/search.py
View File

@ -56,6 +56,7 @@ class Search:
dbConsider, dbCondParam = self.likeOrExact("database") dbConsider, dbCondParam = self.likeOrExact("database")
for db in dbList: for db in dbList:
values = []
db = safeSQLIdentificatorNaming(db) db = safeSQLIdentificatorNaming(db)
if Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2): if Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2):
@ -93,7 +94,7 @@ class Search:
value = safeSQLIdentificatorNaming(value) value = safeSQLIdentificatorNaming(value)
foundDbs.append(value) foundDbs.append(value)
if len(foundDbs) == 0 and isInferenceAvailable() and not conf.direct: if not values and isInferenceAvailable() and not conf.direct:
infoMsg = "fetching number of database" infoMsg = "fetching number of database"
if dbConsider == "1": if dbConsider == "1":
infoMsg += "s like" infoMsg += "s like"
@ -166,6 +167,7 @@ class Search:
tblConsider, tblCondParam = self.likeOrExact("table") tblConsider, tblCondParam = self.likeOrExact("table")
for tbl in tblList: for tbl in tblList:
values = []
tbl = safeSQLIdentificatorNaming(tbl, True) tbl = safeSQLIdentificatorNaming(tbl, True)
if Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2, DBMS.FIREBIRD): if Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2, DBMS.FIREBIRD):
@ -219,49 +221,53 @@ class Search:
else: else:
foundTbls[foundDb] = [foundTbl] foundTbls[foundDb] = [foundTbl]
if len(foundTbls) == 0 and isInferenceAvailable() and not conf.direct: if not values and isInferenceAvailable() and not conf.direct:
if Backend.getIdentifiedDbms() not in (DBMS.SQLITE, DBMS.FIREBIRD): if Backend.getIdentifiedDbms() not in (DBMS.SQLITE, DBMS.FIREBIRD):
infoMsg = "fetching number of databases with table" if len(whereDbsQuery) == 0:
if tblConsider == "1": infoMsg = "fetching number of databases with table"
infoMsg += "s like"
infoMsg += " '%s'" % unsafeSQLIdentificatorNaming(tbl)
logger.info(infoMsg)
query = rootQuery.blind.count
query += tblQuery
query += whereDbsQuery
count = inject.getValue(query, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
if not isNumPosStrValue(count):
warnMsg = "no databases have table"
if tblConsider == "1": if tblConsider == "1":
warnMsg += "s like" infoMsg += "s like"
warnMsg += " '%s'" % unsafeSQLIdentificatorNaming(tbl) infoMsg += " '%s'" % unsafeSQLIdentificatorNaming(tbl)
logger.warn(warnMsg) logger.info(infoMsg)
continue query = rootQuery.blind.count
indexRange = getLimitRange(count)
for index in indexRange:
query = rootQuery.blind.query
query += tblQuery query += tblQuery
query += whereDbsQuery query += whereDbsQuery
if Backend.isDbms(DBMS.DB2): count = inject.getValue(query, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
query += ") AS foobar"
query = agent.limitQuery(index, query)
foundDb = unArrayizeValue(inject.getValue(query, union=False, error=False)) if not isNumPosStrValue(count):
foundDb = safeSQLIdentificatorNaming(foundDb) warnMsg = "no databases have table"
if tblConsider == "1":
warnMsg += "s like"
warnMsg += " '%s'" % unsafeSQLIdentificatorNaming(tbl)
logger.warn(warnMsg)
if foundDb not in foundTbls: continue
foundTbls[foundDb] = []
indexRange = getLimitRange(count)
for index in indexRange:
query = rootQuery.blind.query
query += tblQuery
query += whereDbsQuery
if Backend.isDbms(DBMS.DB2):
query += ") AS foobar"
query = agent.limitQuery(index, query)
foundDb = unArrayizeValue(inject.getValue(query, union=False, error=False))
foundDb = safeSQLIdentificatorNaming(foundDb)
if foundDb not in foundTbls:
foundTbls[foundDb] = []
if tblConsider == "2":
foundTbls[foundDb].append(tbl)
if tblConsider == "2": if tblConsider == "2":
foundTbls[foundDb].append(tbl) continue
else:
if tblConsider == "2": for db in conf.db.split(","):
continue foundTbls[db] = []
else: else:
dbName = "SQLite" if Backend.isDbms(DBMS.SQLITE) else "Firebird" dbName = "SQLite" if Backend.isDbms(DBMS.SQLITE) else "Firebird"
foundTbls["%s%s" % (dbName, METADB_SUFFIX)] = [] foundTbls["%s%s" % (dbName, METADB_SUFFIX)] = []
@ -364,6 +370,7 @@ class Search:
colConsider, colCondParam = self.likeOrExact("column") colConsider, colCondParam = self.likeOrExact("column")
for column in colList: for column in colList:
values = []
column = safeSQLIdentificatorNaming(column) column = safeSQLIdentificatorNaming(column)
conf.db = origDb conf.db = origDb
conf.tbl = origTbl conf.tbl = origTbl
@ -449,7 +456,7 @@ class Search:
kb.data.cachedColumns = {} kb.data.cachedColumns = {}
if len(dbs) == 0 and isInferenceAvailable() and not conf.direct: if not values and isInferenceAvailable() and not conf.direct:
if not conf.db: if not conf.db:
infoMsg = "fetching number of databases with tables containing column" infoMsg = "fetching number of databases with tables containing column"
if colConsider == "1": if colConsider == "1":