bug: Invalidate UAIDs that are not lowercase or contain dashes

Older UAIDs contain invalid characters and should be rejected. Closes #519
mozilla-services · Jul 16, 2016 · 1fc3425 · 1fc3425
1 parent 5816c3e
commit 1fc3425
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 55 deletions.
diff --git a/autopush/tests/test_db.py b/autopush/tests/test_db.py
@@ -104,6 +104,7 @@ def test_hasher(self):
         db.key_hash = ""
 
     def test_normalize_id(self):
+        # Note, yes, we forbid dashes in UAIDs, and we add them here.
         import autopush.db as db
         abnormal = "deadbeef00000000decafbad00000000"
         normal = "deadbeef-0000-0000-deca-fbad00000000"

diff --git a/autopush/tests/test_endpoint.py b/autopush/tests/test_endpoint.py
@@ -39,8 +39,8 @@
 from autopush.utils import (generate_hash, decipher_public_key)
 
 mock_dynamodb2 = mock_dynamodb2()
-dummy_uaid = str(uuid.UUID("abad1dea00000000aabbccdd00000000"))
-dummy_chid = str(uuid.UUID("deadbeef00000000decafbad00000000"))
+dummy_uaid = uuid.UUID("abad1dea00000000aabbccdd00000000").hex
+dummy_chid = str(uuid.UUID("deadbeef-0000-0000-deca-fbad00000000"))
 dummy_token = dummy_uaid + ":" + dummy_chid
 
 

diff --git a/autopush/tests/test_web_webpush.py b/autopush/tests/test_web_webpush.py
@@ -16,7 +16,7 @@
 from autopush.router.interface import IRouter, RouterResponse
 from autopush.settings import AutopushSettings
 
-dummy_request_id = "11111111-1234-1234-1234-567812345678"
+dummy_request_id = "11111111123412341234567812345678"
 dummy_uaid = str(uuid.UUID("abad1dea00000000aabbccdd00000000"))
 dummy_chid = str(uuid.UUID("deadbeef00000000decafbad00000000"))
 dummy_token = dummy_uaid + ":" + dummy_chid