diff options
Diffstat (limited to 'users')
| -rw-r--r-- | users/models/identity.py | 12 | ||||
| -rw-r--r-- | users/views/activitypub.py | 19 |
2 files changed, 22 insertions, 9 deletions
diff --git a/users/models/identity.py b/users/models/identity.py index 510b947..c80d9d9 100644 --- a/users/models/identity.py +++ b/users/models/identity.py @@ -176,12 +176,17 @@ class Identity(StatorModel): return None @classmethod - def by_actor_uri(cls, uri, create=False) -> "Identity": + def by_actor_uri(cls, uri, create=False, transient=False) -> "Identity": try: return cls.objects.get(actor_uri=uri) except cls.DoesNotExist: if create: - return cls.objects.create(actor_uri=uri, local=False) + if transient: + # Some code (like inbox fetching) doesn't need this saved + # to the DB until the fetch succeeds + return cls(actor_uri=uri, local=False) + else: + return cls.objects.create(actor_uri=uri, local=False) else: raise cls.DoesNotExist(f"No identity found with actor_uri {uri}") @@ -329,7 +334,8 @@ class Identity(StatorModel): return False if response.status_code == 410: # Their account got deleted, so let's do the same. - await Identity.objects.filter(pk=self.pk).adelete() + if self.pk: + await Identity.objects.filter(pk=self.pk).adelete() return False if response.status_code >= 400: return False diff --git a/users/views/activitypub.py b/users/views/activitypub.py index 2719f17..c0fcd98 100644 --- a/users/views/activitypub.py +++ b/users/views/activitypub.py @@ -8,6 +8,7 @@ from django.views.decorators.csrf import csrf_exempt from django.views.generic import View from activities.models import Post +from core import exceptions from core.ld import canonicalise from core.models import Config from core.signatures import ( @@ -131,22 +132,26 @@ class Inbox(View): # Find the Identity by the actor on the incoming item # This ensures that the signature used for the headers matches the actor # described in the payload. - identity = Identity.by_actor_uri(document["actor"], create=True) + identity = Identity.by_actor_uri(document["actor"], create=True, transient=True) if not identity.public_key: # See if we can fetch it right now async_to_sync(identity.fetch_actor)() if not identity.public_key: - print("Cannot get actor", document["actor"]) + exceptions.capture_message( + f"Inbox error: cannot fetch actor {document['actor']}" + ) return HttpResponseBadRequest("Cannot retrieve actor") # If there's a "signature" payload, verify against that if "signature" in document: try: LDSignature.verify_signature(document, identity.public_key) except VerificationFormatError as e: - print("Bad LD signature format:", e.args[0]) + exceptions.capture_message( + f"Inbox error: Bad LD signature format: {e.args[0]}" + ) return HttpResponseBadRequest(e.args[0]) except VerificationError: - print("Bad LD signature") + exceptions.capture_message("Inbox error: Bad LD signature") return HttpResponseUnauthorized("Bad signature") # Otherwise, verify against the header (assuming it's the same actor) else: @@ -156,10 +161,12 @@ class Inbox(View): identity.public_key, ) except VerificationFormatError as e: - print("Bad HTTP signature format:", e.args[0]) + exceptions.capture_message( + f"Inbox error: Bad HTTP signature format: {e.args[0]}" + ) return HttpResponseBadRequest(e.args[0]) except VerificationError: - print("Bad HTTP signature") + exceptions.capture_message("Inbox error: Bad HTTP signature") return HttpResponseUnauthorized("Bad signature") # Hand off the item to be processed by the queue InboxMessage.objects.create(message=document) |