mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-22 17:46:37 +03:00
some fixes
This commit is contained in:
parent
6b1d5a0ab8
commit
d27afaed7e
|
@ -66,7 +66,7 @@ def tableExists(tableFile, regex=None):
|
|||
while kb.threadContinue:
|
||||
kb.locks.countLock.acquire()
|
||||
if threadData.shared.count < threadData.shared.limit:
|
||||
table = safeSQLIdentificatorNaming(tables[threadData.shared.count])
|
||||
table = safeSQLIdentificatorNaming(tables[threadData.shared.count], True)
|
||||
threadData.shared.count += 1
|
||||
kb.locks.countLock.release()
|
||||
else:
|
||||
|
@ -137,7 +137,7 @@ def columnExists(columnFile, regex=None):
|
|||
table = "%s%s%s" % (conf.db, '..' if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE) else '.', conf.tbl)
|
||||
else:
|
||||
table = conf.tbl
|
||||
table = safeSQLIdentificatorNaming(table)
|
||||
table = safeSQLIdentificatorNaming(table, True)
|
||||
|
||||
infoMsg = "checking column existence using items from '%s'" % columnFile
|
||||
logger.info(infoMsg)
|
||||
|
|
|
@ -129,8 +129,8 @@ class Enumeration(GenericEnumeration):
|
|||
|
||||
for tbl in tblList:
|
||||
if conf.db is not None and len(kb.data.cachedColumns) > 0 \
|
||||
and conf.db in kb.data.cachedColumns and tbl in \
|
||||
kb.data.cachedColumns[conf.db]:
|
||||
and conf.db in kb.data.cachedColumns and tbl in \
|
||||
kb.data.cachedColumns[conf.db]:
|
||||
infoMsg = "fetched tables' columns on "
|
||||
infoMsg += "database '%s'" % conf.db
|
||||
logger.info(infoMsg)
|
||||
|
|
|
@ -299,7 +299,9 @@ class Enumeration(GenericEnumeration):
|
|||
conf.col = column
|
||||
|
||||
self.getColumns(onlyColNames=True)
|
||||
if kb.data.cachedColumns[db][foundTbl] != {None: None}:
|
||||
|
||||
if db in kb.data.cachedColumns and foundTbl in kb.data.cachedColumns[db]\
|
||||
and not isNoneValue(kb.data.cachedColumns[db][foundTbl]):
|
||||
dbs[db][foundTbl].update(kb.data.cachedColumns[db][foundTbl])
|
||||
kb.data.cachedColumns = {}
|
||||
else:
|
||||
|
@ -355,7 +357,8 @@ class Enumeration(GenericEnumeration):
|
|||
|
||||
self.getColumns(onlyColNames=True)
|
||||
|
||||
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])
|
||||
if db in kb.data.cachedColumns and tbl in kb.data.cachedColumns[db]:
|
||||
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])
|
||||
kb.data.cachedColumns = {}
|
||||
else:
|
||||
dbs[db][tbl][column] = None
|
||||
|
|
|
@ -2144,7 +2144,8 @@ class Enumeration:
|
|||
|
||||
self.getColumns(onlyColNames=True)
|
||||
|
||||
dbs[foundDb][foundTbl].update(kb.data.cachedColumns[foundDb][foundTbl])
|
||||
if foundDb in kb.data.cachedColumns and foundTbl in kb.data.cachedColumns[foundDb]:
|
||||
dbs[foundDb][foundTbl].update(kb.data.cachedColumns[foundDb][foundTbl])
|
||||
kb.data.cachedColumns = {}
|
||||
else:
|
||||
dbs[foundDb][foundTbl][column] = None
|
||||
|
@ -2240,7 +2241,8 @@ class Enumeration:
|
|||
|
||||
self.getColumns(onlyColNames=True)
|
||||
|
||||
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])
|
||||
if db in kb.data.cachedColumns and tbl in kb.data.cachedColumns[db]:
|
||||
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])
|
||||
kb.data.cachedColumns = {}
|
||||
else:
|
||||
dbs[db][tbl][column] = None
|
||||
|
|
Loading…
Reference in New Issue
Block a user