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

Couple of drei updates

Browse Source
This commit is contained in:
Miroslav Stampar 2019-05-15 10:30:47 +02:00
parent c3f15ef309
commit cc9711ef5b
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/settings.py
View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty import six from thirdparty import six
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.5.91" VERSION = "1.3.5.92"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

2
lib/techniques/union/use.py
View File

@ -352,7 +352,7 @@ def unionUse(expression, unpack=True, dump=False):
key = re.sub(r"[^A-Za-z0-9]", "", item).lower() key = re.sub(r"[^A-Za-z0-9]", "", item).lower()
if key not in filtered or re.search(r"[^A-Za-z0-9]", item): if key not in filtered or re.search(r"[^A-Za-z0-9]", item):
filtered[key] = item filtered[key] = item
items = list(filtered.values()) items = list(six.itervalues(filtered))
items = [items] items = [items]
index = None index = None
for index in xrange(1 + len(threadData.shared.buffered)): for index in xrange(1 + len(threadData.shared.buffered)):

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

@ -49,7 +49,7 @@ class Enumeration(GenericEnumeration):
retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.schemaname' % kb.aliasName], blind=True) retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.schemaname' % kb.aliasName], blind=True)
if retVal: if retVal:
kb.data.cachedDbs = list(retVal[0].values())[0] kb.data.cachedDbs = six.itervalues(retVal[0]).next()
if kb.data.cachedDbs: if kb.data.cachedDbs:
kb.data.cachedDbs.sort() kb.data.cachedDbs.sort()
@ -134,7 +134,7 @@ class Enumeration(GenericEnumeration):
if len(kb.data.cachedTables) > 0: if len(kb.data.cachedTables) > 0:
tblList = list(kb.data.cachedTables.values()) tblList = list(kb.data.cachedTables.values())
if isListLike(tblList[0]): if tblList and isListLike(tblList[0]):
tblList = tblList[0] tblList = tblList[0]
else: else:
errMsg = "unable to retrieve the tables " errMsg = "unable to retrieve the tables "

8
plugins/dbms/sybase/enumeration.py
View File

@ -103,7 +103,7 @@ class Enumeration(GenericEnumeration):
retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.name' % kb.aliasName], blind=blind, alias=kb.aliasName) retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.name' % kb.aliasName], blind=blind, alias=kb.aliasName)
if retVal: if retVal:
kb.data.cachedDbs = list(retVal[0].values())[0] kb.data.cachedDbs = six.itervalues(retVal[0]).next()
break break
if kb.data.cachedDbs: if kb.data.cachedDbs:
@ -147,7 +147,7 @@ class Enumeration(GenericEnumeration):
retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.name' % kb.aliasName], blind=blind, alias=kb.aliasName) retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.name' % kb.aliasName], blind=blind, alias=kb.aliasName)
if retVal: if retVal:
for table in list(retVal[0].values())[0]: for table in six.itervalues(retVal[0]).next():
if db not in kb.data.cachedTables: if db not in kb.data.cachedTables:
kb.data.cachedTables[db] = [table] kb.data.cachedTables[db] = [table]
else: else:
@ -196,9 +196,9 @@ class Enumeration(GenericEnumeration):
self.getTables() self.getTables()
if len(kb.data.cachedTables) > 0: if len(kb.data.cachedTables) > 0:
tblList = list(kb.data.cachedTables.values()) tblList = list(six.itervalues(kb.data.cachedTables))
if isListLike(tblList[0]): if tblList and isListLike(tblList[0]):
tblList = tblList[0] tblList = tblList[0]
else: else:
errMsg = "unable to retrieve the tables " errMsg = "unable to retrieve the tables "

4
plugins/generic/databases.py
View File

@ -478,9 +478,9 @@ class Databases:
if conf.db in kb.data.cachedTables: if conf.db in kb.data.cachedTables:
tblList = kb.data.cachedTables[conf.db] tblList = kb.data.cachedTables[conf.db]
else: else:
tblList = list(kb.data.cachedTables.values()) tblList = list(six.itervalues(kb.data.cachedTables))
if isListLike(tblList[0]): if tblList and isListLike(tblList[0]):
tblList = tblList[0] tblList = tblList[0]
tblList = list(tblList) tblList = list(tblList)

4
plugins/generic/entries.py
View File

@ -93,9 +93,9 @@ class Entries:
self.getTables() self.getTables()
if len(kb.data.cachedTables) > 0: if len(kb.data.cachedTables) > 0:
tblList = list(kb.data.cachedTables.values()) tblList = list(six.itervalues(kb.data.cachedTables))
if isListLike(tblList[0]): if tblList and isListLike(tblList[0]):
tblList = tblList[0] tblList = tblList[0]
elif not conf.search: elif not conf.search:
errMsg = "unable to retrieve the tables " errMsg = "unable to retrieve the tables "