From 18c41c2373ddb4cf7bdbf01a04d2f8dbc9b210c7 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 29 Oct 2024 08:38:21 -0700 Subject: [PATCH] Just remove auth tokens --- .../management/commands/document_exporter.py | 21 +------------------ src/documents/management/commands/mixins.py | 7 ------- .../tests/test_management_exporter.py | 6 ------ 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index 2095be024..79d7cca6f 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/src/documents/management/commands/document_exporter.py @@ -24,7 +24,6 @@ from django.utils import timezone from filelock import FileLock from guardian.models import GroupObjectPermission from guardian.models import UserObjectPermission -from rest_framework.authtoken.models import Token if TYPE_CHECKING: from django.db.models import QuerySet @@ -285,20 +284,6 @@ class Command(CryptMixin, BaseCommand): serializers.serialize("json", manifest_key_to_object_query[key]), ) - # Add the auth tokens to the manifest, serialized manually - manifest_dict["auth_tokens"] = [ - { - "model": "authtoken.token", - "pk": t.pk, - "fields": { - "key": t.key, - "user": t.user_id, - "created": t.created.isoformat(), - }, - } - for t in Token.objects.all() - ] - self.encrypt_secret_fields(manifest_dict) # These are treated specially and included in the per-document manifest @@ -583,11 +568,7 @@ class Command(CryptMixin, BaseCommand): value=manifest_record["fields"][field], ) - elif ( - MailAccount.objects.count() > 0 - or SocialToken.objects.count() > 0 - or Token.objects.count() > 0 - ): + elif MailAccount.objects.count() > 0 or SocialToken.objects.count() > 0: self.stdout.write( self.style.NOTICE( "No passphrase was given, sensitive fields will be in plaintext", diff --git a/src/documents/management/commands/mixins.py b/src/documents/management/commands/mixins.py index be0256ed6..a2ad326e4 100644 --- a/src/documents/management/commands/mixins.py +++ b/src/documents/management/commands/mixins.py @@ -108,13 +108,6 @@ class CryptMixin: "token_secret", ], }, - { - "exporter_key": "auth_tokens", - "model_name": "authtoken.token", - "fields": [ - "key", - ], - }, ] def get_crypt_params(self) -> dict[str, dict[str, str | int]]: diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py index b95b901e0..9697f0c03 100644 --- a/src/documents/tests/test_management_exporter.py +++ b/src/documents/tests/test_management_exporter.py @@ -23,7 +23,6 @@ from django.utils import timezone from guardian.models import GroupObjectPermission from guardian.models import UserObjectPermission from guardian.shortcuts import assign_perm -from rest_framework.authtoken.models import Token from documents.management.commands import document_exporter from documents.models import Correspondent @@ -878,8 +877,6 @@ class TestCryptExportImport( password="mypassword", ) - Token.objects.create(user=User.objects.first()) - app = SocialApp.objects.create( provider="test", name="test", @@ -935,9 +932,6 @@ class TestCryptExportImport( self.assertIsNotNone(account) self.assertEqual(account.password, "mypassword") - token = Token.objects.first() - self.assertIsNotNone(token) - social_token = SocialToken.objects.first() self.assertIsNotNone(social_token)