fix: catch InvalidToken exceptions from fernet

autopush/tests/test_web_validation.py

@@ -5,6 +5,7 @@
 from boto.dynamodb2.exceptions import (
     ItemNotFound,
 )
+from cryptography.fernet import InvalidToken
 from jose import jws
 from marshmallow import Schema, fields
 from mock import Mock
@@ -343,6 +344,19 @@ def throw_item(*args, **kwargs):
 
         eq_(cm.exception.errno, 102)
 
+    def test_invalid_fernet_token(self):
+        schema = self._makeFUT()
+
+        def throw_item(*args, **kwargs):
+            raise InvalidToken
+
+        schema.context["settings"].parse_endpoint.side_effect = throw_item
+
+        with assert_raises(InvalidRequest) as cm:
+            schema.load(self._make_test_data())
+
+        eq_(cm.exception.errno, 102)
+
     def test_invalid_uaid_not_found(self):
         schema = self._makeFUT()
         schema.context["settings"].parse_endpoint.return_value = dict(

autopush/web/validation.py

@@ -7,6 +7,7 @@
 from boto.dynamodb2.exceptions import (
     ItemNotFound,
 )
+from cryptography.fernet import InvalidToken
 from marshmallow import (
     Schema,
     fields,
@@ -194,7 +195,7 @@ def extract_subscription(self, d):
                 version=d["api_ver"],
                 ckey_header=d["ckey_header"],
             )
-        except InvalidTokenException:
+        except (InvalidTokenException, InvalidToken):
             raise InvalidRequest("invalid token", errno=102)
         return result