Handle invalid AutoFilter field names (#345)

Author: rpkilby

rest_framework_filters/filterset.py

@@ -141,7 +141,11 @@ def get_fields(cls):
         for name, lookups in fields.items():
             if lookups == filters.ALL_LOOKUPS:
                 field = get_model_field(cls._meta.model, name)
-                fields[name] = utils.lookups_for_field(field)
+                if field is not None:
+                    fields[name] = utils.lookups_for_field(field)
+                else:
+                    # FilterSet will handle invalid name
+                    fields[name] = []
 
         return fields
 

tests/test_filterset.py

@@ -1,6 +1,8 @@
 import sys
+import unittest
 import warnings
 
+import django_filters
 from django.test import TestCase
 from django_filters.filters import BaseInFilter
 from rest_framework.test import APIRequestFactory
@@ -134,6 +136,28 @@ class Meta:
             'pk': filters.NumberFilter,
         })
 
+    @unittest.skipIf(django_filters.VERSION < (2, 2), 'requires django-filter 2.2')
+    def test_autofilter_invalid_field(self):
+        msg = "'Meta.fields' must not contain non-model field names: xyz"
+        with self.assertRaisesMessage(TypeError, msg):
+            class F(FilterSet):
+                pk = filters.AutoFilter(field_name='xyz', lookups=['exact'])
+
+                class Meta:
+                    model = Note
+                    fields = []
+
+    @unittest.skipIf(django_filters.VERSION < (2, 2), 'requires django-filter 2.2')
+    def test_all_lookups_invalid_field(self):
+        msg = "'Meta.fields' must not contain non-model field names: xyz"
+        with self.assertRaisesMessage(TypeError, msg):
+            class F(FilterSet):
+                class Meta:
+                    model = Note
+                    fields = {
+                        'xyz': '__all__',
+                    }
+
     def test_relatedfilter_doesnt_expand_declared(self):
         # See: https://github.com/philipn/django-rest-framework-filters/issues/234
         class F(FilterSet):