Merge 19d4f3f into 9fd3146

readinglist/resource.py

@@ -133,7 +133,11 @@ def _extract_filters(self, queryparams):
             if param in self.known_fields:
                 filters.append((param, value, '=='))
             if param == '_since':
-                filters.append((self.modified_field, value, '>='))
+                if isinstance(value, six.integer_types):
+                    filters.append((self.modified_field, value, '>='))
+                else:
+                    error_msg = 'Invalid value for _since'
+                    self.request.errors.add('querystring', param, error_msg)
 
         return filters
 

readinglist/tests/test_views_article.py

@@ -83,6 +83,11 @@ def test_string_filters_naively_by_value(self):
         resp = self.app.get('/articles?title=MoFo', headers=self.headers)
         self.assertEqual(len(resp.json['items']), 6)
 
+    def test_filter_considers_string_if_syntaxically_invalid(self):
+        url = '/articles?status=1.2.3'
+        resp = self.app.get(url, headers=self.headers)
+        self.assertEqual(len(resp.json['items']), 0)
+
 
 class ArticleFilterModifiedTest(BaseWebTest, unittest.TestCase):
 
@@ -104,6 +109,10 @@ def test_filter_works_with_empty_list(self):
         }
         self.app.get('/articles?unread=true', headers=self.headers)
 
+    def test_filter_with_since_rejects_non_numeric_value(self):
+        url = '/articles?_since=1.2'
+        self.app.get(url, headers=self.headers, status=400)
+
 
 class ArticleSortingTest(BaseWebTest, unittest.TestCase):
     def setUp(self):

readinglist/utils.py

@@ -18,7 +18,7 @@ def native_value(value):
         value = False
     try:
         return ast.literal_eval(value)
-    except ValueError:
+    except (ValueError, SyntaxError):
         return value