PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2026-01-21 13:49:04 +00:00
Code Issues Projects Releases Wiki Activity

minor refactoring

Browse Source
This commit is contained in:
Miroslav Stampar
2012-06-14 13:38:53 +00:00
parent 1204eb00b2
commit 3a90105fbb
7 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/generic/enumeration.py
View File

@@ -20,6 +20,7 @@ from lib.core.common import filterPairValues
from lib.core.common import getLimitRange
from lib.core.common import getUnicode
from lib.core.common import isInferenceAvailable
from lib.core.common import isListLike
from lib.core.common import isNoneValue
from lib.core.common import isNumPosStrValue
from lib.core.common import isTechniqueAvailable
@@ -879,7 +880,7 @@ class Enumeration:
if not isNoneValue(value):
value = filter(None, arrayizeValue(value))
if len(value) > 0 and not isinstance(value[0], (list, tuple)):
if len(value) > 0 and not isListLike(value[0]):
value = map(lambda x: (dbs[0], x), value)
for db, table in filterPairValues(value):
@@ -1620,7 +1621,7 @@ class Enumeration:
entries = []
elif isinstance(entries, basestring):
entries = [entries]
elif not isinstance(entries, (list, tuple)):
elif not isListLike(entries):
entries = []
entriesCount = len(entries)
@@ -1630,7 +1631,7 @@ class Enumeration:
colLen = len(column)
if column not in kb.data.dumpedTable:
kb.data.dumpedTable[column] = {"length": colLen, "values": []}
kb.data.dumpedTable[column] = {"length": colLen, "values": BigArray()}
for entry in entries:
if entry is None or len(entry) == 0:

5
plugins/generic/filesystem.py
View File

@@ -15,6 +15,7 @@ from lib.core.agent import agent
from lib.core.common import dataToOutFile
from lib.core.common import Backend
from lib.core.common import isNumPosStrValue
from lib.core.common import isListLike
from lib.core.common import isTechniqueAvailable
from lib.core.common import randomStr
from lib.core.common import readInput
@@ -213,11 +214,11 @@ class Filesystem:
self.cleanup(onlyFileTbl=True)
return
elif isinstance(fileContent, (list, tuple, set)):
elif isListLike(fileContent):
newFileContent = ""
for chunk in fileContent:
if isinstance(chunk, (list, tuple, set)):
if isListLike(chunk):
if len(chunk) > 0:
chunk = chunk[0]
else: