Make sure datastore.query filter is a list

truenas · Jul 26, 2016 · 521f649 · 521f649
1 parent 86c28db
commit 521f649
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/middlewared/middlewared/plugins/datastore.py b/src/middlewared/middlewared/plugins/datastore.py
@@ -30,10 +30,12 @@ def _filters_to_queryset(self, filters):
 
         rv = []
         for f in filters:
+            if not isinstance(f, (list, tuple)):
+                raise ValueError('Filter must be a list: {0}'.format(f))
             if len(f) == 3:
                 name, op, value = f
                 if op not in opmap:
-                    raise Exception("Invalid operation {0}".format(op))
+                    raise Exception("Invalid operation: {0}".format(op))
                 q = Q(**{'{0}__{1}'.format(name, opmap[op]): value})
                 if op == '!=':
                     q.negate()