瀏覽代碼

chore(api): remove now obsolete handling of legacy auth action codes

introduced by 1e3c3c873aafb49912b63057da2027a6c3455b6a (#511)
Peter Thomassen 4 年之前
父節點
當前提交
aa430dbcf7
共有 1 個文件被更改,包括 2 次插入7 次删除
  1. 2 7
      api/desecapi/serializers.py

+ 2 - 7
api/desecapi/serializers.py

@@ -2,7 +2,7 @@ import binascii
 import copy
 import copy
 import json
 import json
 import re
 import re
-from base64 import urlsafe_b64decode, b64encode
+from base64 import b64encode
 
 
 import django.core.exceptions
 import django.core.exceptions
 from captcha.audio import AudioCaptcha
 from captcha.audio import AudioCaptcha
@@ -710,17 +710,12 @@ class AuthenticatedActionSerializer(serializers.ModelSerializer):
         return code.rstrip('=')
         return code.rstrip('=')
 
 
     @classmethod
     @classmethod
-    def _unpack_code(cls, code, *, ttl, _retry=True):
+    def _unpack_code(cls, code, *, ttl):
         code += -len(code) % 4 * '='
         code += -len(code) % 4 * '='
         try:
         try:
             payload = crypto.decrypt(code.encode(), context='desecapi.serializers.AuthenticatedActionSerializer',
             payload = crypto.decrypt(code.encode(), context='desecapi.serializers.AuthenticatedActionSerializer',
                                      ttl=ttl)
                                      ttl=ttl)
             return json.loads(payload.decode())
             return json.loads(payload.decode())
-        except ValueError:  # TODO remove this once all urlsafe_b64encode'd codes have expired (~30d after deployment)
-            if _retry:
-                return cls._unpack_code(urlsafe_b64decode(code.encode()).decode(), ttl=ttl, _retry=False)
-            else:
-                raise
         except (TypeError, UnicodeDecodeError, UnicodeEncodeError, json.JSONDecodeError, binascii.Error):
         except (TypeError, UnicodeDecodeError, UnicodeEncodeError, json.JSONDecodeError, binascii.Error):
             raise ValueError
             raise ValueError