CERBERUS/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2026-08-03 22:31:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix regarding proper string isinstance checking (including unicode)

Browse source
This commit is contained in:
Miroslav Stampar 2010-05-25 10:09:35 +00:00
parent d2c03c12fd
commit dc83f794ea
13 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/generic/enumeration.py
View file

@ -718,7 +718,7 @@ class Enumeration:
if value:
if kb.dbms == "SQLite":
if isinstance(value, str):
if isinstance(value, basestring):
value = [[ "SQLite", value ]]
elif isinstance(value, (list, tuple, set)):
newValue = []
@ -1040,7 +1040,7 @@ class Enumeration:
entries = inject.getValue(query, blind=False, dump=True)
if entries:
if isinstance(entries, str):
if isinstance(entries, basestring):
entries = [ entries ]
entriesCount = len(entries)
@ -1053,7 +1053,7 @@ class Enumeration:
kb.data.dumpedTable[column] = { "length": 0, "values": [] }
for entry in entries:
if isinstance(entry, str):
if isinstance(entry, basestring):
colEntry = entry
else:
colEntry = entry[index]
@ -1295,7 +1295,7 @@ class Enumeration:
values = inject.getValue(query, blind=False)
if values:
if isinstance(values, str):
if isinstance(values, basestring):
values = [ values ]
for value in values:
@ -1380,7 +1380,7 @@ class Enumeration:
values = inject.getValue(query, blind=False)
if values:
if isinstance(values, str):
if isinstance(values, basestring):
values = [ values ]
for foundDb, foundTbl in values:
@ -1501,7 +1501,7 @@ class Enumeration:
values = inject.getValue(query, blind=False)
if values:
if isinstance(values, str):
if isinstance(values, basestring):
values = [ values ]
for foundDb, foundTbl in values:

2
plugins/generic/takeover.py
View file

@ -114,7 +114,7 @@ class Takeover(Abstraction, Metasploit, Registry, Miscellaneous):
while True:
choice = readInput(msg, default=1)
if isinstance(choice, str) and choice.isdigit() and int(choice) in ( 1, 2 ):
if isinstance(choice, basestring) and choice.isdigit() and int(choice) in ( 1, 2 ):
choice = int(choice)
break