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

some fixes

Browse Source
This commit is contained in:
Miroslav Stampar 2011-06-16 14:27:44 +00:00
parent 6b1d5a0ab8
commit d27afaed7e
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/techniques/brute/use.py
View File

@ -66,7 +66,7 @@ def tableExists(tableFile, regex=None):
while kb.threadContinue: while kb.threadContinue:
kb.locks.countLock.acquire() kb.locks.countLock.acquire()
if threadData.shared.count < threadData.shared.limit: if threadData.shared.count < threadData.shared.limit:
table = safeSQLIdentificatorNaming(tables[threadData.shared.count]) table = safeSQLIdentificatorNaming(tables[threadData.shared.count], True)
threadData.shared.count += 1 threadData.shared.count += 1
kb.locks.countLock.release() kb.locks.countLock.release()
else: 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) table = "%s%s%s" % (conf.db, '..' if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE) else '.', conf.tbl)
else: else:
table = conf.tbl table = conf.tbl
table = safeSQLIdentificatorNaming(table) table = safeSQLIdentificatorNaming(table, True)
infoMsg = "checking column existence using items from '%s'" % columnFile infoMsg = "checking column existence using items from '%s'" % columnFile
logger.info(infoMsg) logger.info(infoMsg)

4
plugins/dbms/maxdb/enumeration.py
View File

@ -129,8 +129,8 @@ class Enumeration(GenericEnumeration):
for tbl in tblList: for tbl in tblList:
if conf.db is not None and len(kb.data.cachedColumns) > 0 \ if conf.db is not None and len(kb.data.cachedColumns) > 0 \
and conf.db in kb.data.cachedColumns and tbl in \ and conf.db in kb.data.cachedColumns and tbl in \
kb.data.cachedColumns[conf.db]: kb.data.cachedColumns[conf.db]:
infoMsg = "fetched tables' columns on " infoMsg = "fetched tables' columns on "
infoMsg += "database '%s'" % conf.db infoMsg += "database '%s'" % conf.db
logger.info(infoMsg) logger.info(infoMsg)

7
plugins/dbms/mssqlserver/enumeration.py
View File

@ -299,7 +299,9 @@ class Enumeration(GenericEnumeration):
conf.col = column conf.col = column
self.getColumns(onlyColNames=True) 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]) dbs[db][foundTbl].update(kb.data.cachedColumns[db][foundTbl])
kb.data.cachedColumns = {} kb.data.cachedColumns = {}
else: else:
@ -355,7 +357,8 @@ class Enumeration(GenericEnumeration):
self.getColumns(onlyColNames=True) 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 = {} kb.data.cachedColumns = {}
else: else:
dbs[db][tbl][column] = None dbs[db][tbl][column] = None

6
plugins/generic/enumeration.py
View File

@ -2144,7 +2144,8 @@ class Enumeration:
self.getColumns(onlyColNames=True) 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 = {} kb.data.cachedColumns = {}
else: else:
dbs[foundDb][foundTbl][column] = None dbs[foundDb][foundTbl][column] = None
@ -2240,7 +2241,8 @@ class Enumeration:
self.getColumns(onlyColNames=True) 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 = {} kb.data.cachedColumns = {}
else: else:
dbs[db][tbl][column] = None dbs[db][tbl][column] = None