Implementing option '--where' (Issue #605)

lib/core/optiondict.py

@@ -129,6 +129,7 @@ optDict = {
                                "tbl":               "string",
                                "col":               "string",
                                "excludeCol":        "string",
+                               "dumpWhere":         "string",
                                "user":              "string",
                                "excludeSysDbs":     "boolean",
                                "limitStart":        "integer",

lib/parse/cmdline.py

@@ -424,6 +424,9 @@ def cmdLineParser():
                                help="Exclude DBMS system databases when "
                                     "enumerating tables")
 
+        enumeration.add_option("--where", dest="dumpWhere",
+                               help="Use WHERE condition while table dumping")
+
         enumeration.add_option("--start", dest="limitStart", type="int",
                                help="First query output entry to retrieve")
 

lib/utils/pivotdumptable.py

@@ -38,6 +38,7 @@ def pivotDumpTable(table, colList, count=None, blind=True):
 
     if count is None:
         query = dumpNode.count % table
+        query = whereQuery(query)
         count = inject.getValue(query, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS) if blind else inject.getValue(query, blind=False, time=False, expected=EXPECTED.INT)
 
     if isinstance(count, basestring) and count.isdigit():
@@ -83,6 +84,7 @@ def pivotDumpTable(table, colList, count=None, blind=True):
             logger.info(infoMsg)
 
             query = dumpNode.count2 % (column, table)
+            query = whereQuery(query)
             value = inject.getValue(query, blind=blind, union=not blind, error=not blind, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
 
             if isNumPosStrValue(value):
@@ -122,6 +124,8 @@ def pivotDumpTable(table, colList, count=None, blind=True):
                     else:
                         query = dumpNode.query2.replace("'%s'", "%s") % (agent.preprocessField(table, column), table, agent.preprocessField(table, colList[0]), unescaper.escape(pivotValue, False))
 
+                    query = whereQuery(query)
+
                     return unArrayizeValue(inject.getValue(query, blind=blind, time=blind, union=not blind, error=not blind))
 
                 value = _(pivotValue)
@@ -163,3 +167,18 @@ def pivotDumpTable(table, colList, count=None, blind=True):
         logger.critical(errMsg)
 
     return entries, lengths
+
+def whereQuery(query):
+    if conf.dumpWhere and query:
+        prefix, suffix = query.split(" ORDER BY ") if " ORDER BY " in query else (query, "")
+
+        if "%s)" % conf.tbl.upper() in prefix.upper():
+            prefix = re.sub(r"(?i)%s\)" % conf.tbl, "%s WHERE %s)" % (conf.tbl, conf.dumpWhere), prefix)
+        elif re.search(r"(?i)\bWHERE\b", prefix):
+            prefix += " AND %s" % conf.dumpWhere
+        else:
+            prefix += " WHERE %s" % conf.dumpWhere
+
+        query = "%s ORDER BY %s" % (prefix, suffix) if suffix else prefix
+
+    return query