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

Merge branch 'master' of github.com:sqlmapproject/sqlmap

Browse Source
This commit is contained in:
Bernardo Damele 2013-02-15 17:12:09 +00:00
commit 6bacbdb031
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/core/common.py
View File

@ -829,6 +829,10 @@ def readInput(message, default=None, checkBatch=True):
elif message[-1] == ']': elif message[-1] == ']':
message += " " message += " "
if kb.prependFlag:
message = "\n%s" % message
kb.prependFlag = False
if conf.answers: if conf.answers:
for item in conf.answers.split(','): for item in conf.answers.split(','):
question = item.split('=')[0].strip() question = item.split('=')[0].strip()
@ -2814,7 +2818,7 @@ def safeSQLIdentificatorNaming(name, isTable=False):
if retVal.upper() in kb.keywords or not re.match(r"\A[A-Za-z0-9_@%s\$]+\Z" % ("." if _ else ""), retVal): # MsSQL is the only DBMS where we automatically prepend schema to table name (dot is normal) if retVal.upper() in kb.keywords or not re.match(r"\A[A-Za-z0-9_@%s\$]+\Z" % ("." if _ else ""), retVal): # MsSQL is the only DBMS where we automatically prepend schema to table name (dot is normal)
if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS): if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS):
retVal = "`%s`" % retVal.strip("`") retVal = "`%s`" % retVal.strip("`")
elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.PGSQL, DBMS.DB2): elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.DB2):
retVal = "\"%s\"" % retVal.strip("\"") retVal = "\"%s\"" % retVal.strip("\"")
elif Backend.getIdentifiedDbms() in (DBMS.MSSQL,): elif Backend.getIdentifiedDbms() in (DBMS.MSSQL,):
retVal = "[%s]" % retVal.strip("[]") retVal = "[%s]" % retVal.strip("[]")

4
lib/core/dump.py
View File

@ -579,9 +579,9 @@ class Dump(object):
for column in dbColumnsDict.keys(): for column in dbColumnsDict.keys():
if colConsider == "1": if colConsider == "1":
colConsiderStr = "s like '" + column + "' were" colConsiderStr = "s like '%s' were" % unsafeSQLIdentificatorNaming(column)
else: else:
colConsiderStr = " '%s' was" % column colConsiderStr = " '%s' was" % unsafeSQLIdentificatorNaming(column)
msg = "Column%s found in the " % colConsiderStr msg = "Column%s found in the " % colConsiderStr
msg += "following databases:" msg += "following databases:"

10
plugins/generic/databases.py
View File

@ -247,7 +247,7 @@ class Databases:
return tableExists(paths.COMMON_TABLES) return tableExists(paths.COMMON_TABLES)
infoMsg = "fetching tables for database" infoMsg = "fetching tables for database"
infoMsg += "%s: '%s'" % ("s" if len(dbs) > 1 else "", ", ".join(db if isinstance(db, basestring) else db[0] for db in sorted(dbs))) infoMsg += "%s: '%s'" % ("s" if len(dbs) > 1 else "", ", ".join(unsafeSQLIdentificatorNaming(unArrayizeValue(db)) for db in sorted(dbs)))
logger.info(infoMsg) logger.info(infoMsg)
rootQuery = queries[Backend.getIdentifiedDbms()].tables rootQuery = queries[Backend.getIdentifiedDbms()].tables
@ -261,7 +261,7 @@ class Databases:
query += " WHERE %s" % condition query += " WHERE %s" % condition
if conf.excludeSysDbs: if conf.excludeSysDbs:
infoMsg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList)) infoMsg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(unsafeSQLIdentificatorNaming(db) for db in self.excludeDbsList))
logger.info(infoMsg) logger.info(infoMsg)
query += " IN (%s)" % ",".join("'%s'" % unsafeSQLIdentificatorNaming(db) for db in sorted(dbs) if db not in self.excludeDbsList) query += " IN (%s)" % ",".join("'%s'" % unsafeSQLIdentificatorNaming(db) for db in sorted(dbs) if db not in self.excludeDbsList)
else: else:
@ -290,7 +290,7 @@ class Databases:
if not kb.data.cachedTables and isInferenceAvailable() and not conf.direct: if not kb.data.cachedTables and isInferenceAvailable() and not conf.direct:
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'" % unsafeSQLIdentificatorNaming(db)
logger.info(infoMsg) logger.info(infoMsg)
continue continue
@ -569,7 +569,7 @@ class Databases:
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'" % unsafeSQLIdentificatorNaming(conf.db)
logger.info(infoMsg) logger.info(infoMsg)
return {conf.db: kb.data.cachedColumns[conf.db]} return {conf.db: kb.data.cachedColumns[conf.db]}
@ -692,7 +692,7 @@ class Databases:
if not kb.data.cachedColumns: if not kb.data.cachedColumns:
warnMsg = "unable to retrieve column names for " warnMsg = "unable to retrieve column names for "
warnMsg += ("table '%s' " % tblList[0]) if len(tblList) == 1 else "any table " warnMsg += ("table '%s' " % unsafeSQLIdentificatorNaming(unArrayizeValue(tblList))) if len(tblList) == 1 else "any table "
warnMsg += "in database '%s'" % unsafeSQLIdentificatorNaming(conf.db) warnMsg += "in database '%s'" % unsafeSQLIdentificatorNaming(conf.db)
logger.warn(warnMsg) logger.warn(warnMsg)

12
plugins/generic/entries.py
View File

@ -363,7 +363,7 @@ class Entries:
self.dumpTable() self.dumpTable()
except SqlmapNoneDataException: except SqlmapNoneDataException:
infoMsg = "skipping table '%s'" % table infoMsg = "skipping table '%s'" % unsafeSQLIdentificatorNaming(table)
logger.info(infoMsg) logger.info(infoMsg)
def dumpFoundColumn(self, dbs, foundCols, colConsider): def dumpFoundColumn(self, dbs, foundCols, colConsider):
@ -378,7 +378,7 @@ class Entries:
for db, tblData in dbs.items(): for db, tblData in dbs.items():
if tblData: if tblData:
message += "[%s]\n" % db message += "[%s]\n" % unsafeSQLIdentificatorNaming(db)
message += "[q]uit" message += "[q]uit"
test = readInput(message, default="a") test = readInput(message, default="a")
@ -396,7 +396,7 @@ class Entries:
conf.db = db conf.db = db
dumpFromTbls = [] dumpFromTbls = []
message = "which table(s) of database '%s'?\n" % db message = "which table(s) of database '%s'?\n" % unsafeSQLIdentificatorNaming(db)
message += "[a]ll (default)\n" message += "[a]ll (default)\n"
for tbl in tblData: for tbl in tblData:
@ -441,7 +441,7 @@ class Entries:
for db, tablesList in tables.items(): for db, tablesList in tables.items():
if tablesList: if tablesList:
message += "[%s]\n" % db message += "[%s]\n" % unsafeSQLIdentificatorNaming(db)
message += "[q]uit" message += "[q]uit"
test = readInput(message, default="a") test = readInput(message, default="a")
@ -459,11 +459,11 @@ class Entries:
conf.db = db conf.db = db
dumpFromTbls = [] dumpFromTbls = []
message = "which table(s) of database '%s'?\n" % db message = "which table(s) of database '%s'?\n" % unsafeSQLIdentificatorNaming(db)
message += "[a]ll (default)\n" message += "[a]ll (default)\n"
for tbl in tablesList: for tbl in tablesList:
message += "[%s]\n" % tbl message += "[%s]\n" % unsafeSQLIdentificatorNaming(tbl)
message += "[s]kip\n" message += "[s]kip\n"
message += "[q]uit" message += "[q]uit"

5
plugins/generic/search.py
View File

@ -508,7 +508,6 @@ class Search:
colQuery = colQuery % unsafeSQLIdentificatorNaming(column) colQuery = colQuery % unsafeSQLIdentificatorNaming(column)
for db in dbData: for db in dbData:
db = safeSQLIdentificatorNaming(db)
conf.db = origDb conf.db = origDb
conf.tbl = origTbl conf.tbl = origTbl
@ -519,7 +518,7 @@ class Search:
logger.info(infoMsg) logger.info(infoMsg)
query = rootQuery.blind.count2 query = rootQuery.blind.count2
query = query % db query = query % unsafeSQLIdentificatorNaming(db)
query += " AND %s" % colQuery query += " AND %s" % colQuery
query += whereTblsQuery query += whereTblsQuery
@ -545,7 +544,7 @@ class Search:
else: else:
query += " AND %s" % (colQuery + whereTblsQuery) query += " AND %s" % (colQuery + whereTblsQuery)
query = safeStringFormat(query, db) query = safeStringFormat(query, unsafeSQLIdentificatorNaming(db))
query = agent.limitQuery(index, query) query = agent.limitQuery(index, query)
tbl = unArrayizeValue(inject.getValue(query, union=False, error=False)) tbl = unArrayizeValue(inject.getValue(query, union=False, error=False))