From 67e11a1a613bea9b7f5ac81a5f3bb2cd6c47b105 Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Thu, 18 Jan 2024 16:11:13 +0000
Subject: [chore] chore rationalise http return codes for activitypub handlers
 (#2540)

* some small code fixups and changes

* add check in ResolveIncomingActivity for transient activity types (i.e. activity ID is nil)

* update test to handle new transient behaviour
---
 internal/federation/federatingactor.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'internal/federation/federatingactor.go')

diff --git a/internal/federation/federatingactor.go b/internal/federation/federatingactor.go
index 81f3c3281..8fc47462d 100644
--- a/internal/federation/federatingactor.go
+++ b/internal/federation/federatingactor.go
@@ -143,10 +143,12 @@ func (f *federatingActor) PostInboxScheme(ctx context.Context, w http.ResponseWr
 		have not yet applied authorization (ie., blocks).
 	*/
 
-	// Obtain the activity; reject unknown activities.
-	activity, errWithCode := ap.ResolveIncomingActivity(r)
+	// Resolve the activity, rejecting badly formatted / transient.
+	activity, ok, errWithCode := ap.ResolveIncomingActivity(r)
 	if errWithCode != nil {
 		return false, errWithCode
+	} else if !ok { // transient
+		return false, nil
 	}
 
 	// Set additional context data. Primarily this means
-- 
cgit v1.2.3