mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-01-23 15:54:24 +03:00
careful at merging pull requests with TABs (#466)
This commit is contained in:
parent
a53823f9b7
commit
cae108d9fc
|
@ -114,8 +114,8 @@ class Xp_cmdshell:
|
||||||
errMsg += "--tmp-path switch or you will not be able to retrieve "
|
errMsg += "--tmp-path switch or you will not be able to retrieve "
|
||||||
errMsg += "the commands output"
|
errMsg += "the commands output"
|
||||||
logger.error(errMsg)
|
logger.error(errMsg)
|
||||||
elif isNoneValue(output):
|
elif isNoneValue(output):
|
||||||
logger.error("unable to retrieve xp_cmdshell output")
|
logger.error("unable to retrieve xp_cmdshell output")
|
||||||
else:
|
else:
|
||||||
logger.info("xp_cmdshell extended procedure is usable")
|
logger.info("xp_cmdshell extended procedure is usable")
|
||||||
|
|
||||||
|
@ -208,12 +208,12 @@ class Xp_cmdshell:
|
||||||
self.delRemoteFile(self.tmpFile)
|
self.delRemoteFile(self.tmpFile)
|
||||||
|
|
||||||
query = "SELECT %s FROM %s ORDER BY id" % (self.tblField, self.cmdTblName)
|
query = "SELECT %s FROM %s ORDER BY id" % (self.tblField, self.cmdTblName)
|
||||||
|
output = None
|
||||||
|
|
||||||
output = None
|
|
||||||
if any(isTechniqueAvailable(_) for _ in (PAYLOAD.TECHNIQUE.UNION, PAYLOAD.TECHNIQUE.ERROR, PAYLOAD.TECHNIQUE.QUERY)) or conf.direct:
|
if any(isTechniqueAvailable(_) for _ in (PAYLOAD.TECHNIQUE.UNION, PAYLOAD.TECHNIQUE.ERROR, PAYLOAD.TECHNIQUE.QUERY)) or conf.direct:
|
||||||
output = inject.getValue(query, resumeValue=False, blind=False, time=False)
|
output = inject.getValue(query, resumeValue=False, blind=False, time=False)
|
||||||
|
|
||||||
if (output is None) or len(output)==0 or output[0] is None:
|
if (output is None) or len(output)==0 or output[0] is None:
|
||||||
output = []
|
output = []
|
||||||
count = inject.getValue("SELECT COUNT(id) FROM %s" % self.cmdTblName, resumeValue=False, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
|
count = inject.getValue("SELECT COUNT(id) FROM %s" % self.cmdTblName, resumeValue=False, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user