Minor bug fix for --privileges on PgSQL with error-based SQL inj technique

This commit is contained in:
Bernardo Damele 2011-03-11 15:24:25 +00:00
parent 5af7410cb1
commit 3cb0ca4b63
2 changed files with 1 additions and 2 deletions

View File

@ -690,7 +690,6 @@ class Agent:
limitedQuery += "NOT IN (%s" % (limitStr % num)
limitedQuery += "%s %s)" % (field, fromFrom)
if orderBy:
limitedQuery += orderBy

View File

@ -168,7 +168,7 @@ def errorUse(expression, expected=None, resumeValue=True, dump=False):
expression.upper() and ((Backend.getIdentifiedDbms() not in FROM_TABLE) \
or (Backend.getIdentifiedDbms() in FROM_TABLE and not \
expression.upper().endswith(FROM_TABLE[Backend.getIdentifiedDbms()]))) \
and "EXISTS(" not in expression.upper() and "(CASE" not in expression.upper()):
and "EXISTS(" not in expression.upper() and ("(CASE" not in expression.upper() or ("(CASE" in expression.upper() and "WHEN use" in expression))):
limitRegExp = re.search(queries[Backend.getIdentifiedDbms()].limitregexp.query, expression, re.I)
topLimit = re.search("TOP\s+([\d]+)\s+", expression, re.I)