associate capabilities discovered through incoming requests with gateway, not DID

Author: dimkr

ap/id.go

@@ -26,9 +26,6 @@ var (
 	// KeyRegex matches a base58-encoded Ed25519 public key.
 	KeyRegex = regexp.MustCompile(`\b(z6Mk[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]+)\b`)
 
-	// didKeyRegex matches a portable object ID, without the ap:// prefix.
-	didKeyRegex = regexp.MustCompile(`^did:key:(z6Mk[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]+)(?:[\/#?].*){0,1}`)
-
 	// apURLRegex matches an ap:// URL.
 	apURLRegex = regexp.MustCompile(`^ap:\/\/did:key:(z6Mk[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]+)((?:[\/#?].*){0,1})`)
 
@@ -67,23 +64,26 @@ func Gateway(gw, id string) string {
 	return id
 }
 
-// Origin returns the origin of an ActivityPub ID.
-func Origin(id string) (string, error) {
+// Origins returns the origin and the host of an ActivityPub ID.
+func Origins(id string) (string, string, error) {
+	u, err := url.Parse(id)
+	if err != nil {
+		return "", "", err
+	}
+
 	if m := apURLRegex.FindStringSubmatch(id); m != nil {
-		return "did:key:" + m[1], nil
+		return "did:key:" + m[1], u.Host, nil
 	}
 
 	if m := GatewayURLRegex.FindStringSubmatch(id); m != nil {
-		return "did:key:" + m[1], nil
+		return "did:key:" + m[1], u.Host, nil
 	}
 
-	if m := didKeyRegex.FindStringSubmatch(id); m != nil {
-		return "did:key:" + m[1], nil
-	}
+	return u.Host, u.Host, nil
+}
 
-	if u, err := url.Parse(id); err != nil {
-		return "", err
-	} else {
-		return u.Host, nil
-	}
+// Origin returns the origin of an ActivityPub ID.
+func Origin(id string) (string, error) {
+	origin, _, err := Origins(id)
+	return origin, err
 }

fed/inbox.go

@@ -43,26 +43,26 @@ var unsupportedActivityTypes = map[ap.ActivityType]struct{}{
 	ap.Move:       {},
 }
 
-func (l *Listener) getActivityOrigin(activity *ap.Activity, sender *ap.Actor) (string, string, error) {
+func (l *Listener) getActivityOrigin(activity *ap.Activity, sender *ap.Actor) (string, string, string, error) {
 	if activity.ID == "" {
-		return "", "", errors.New("unspecified activity ID")
+		return "", "", "", errors.New("unspecified activity ID")
 	}
 
 	activityOrigin, err := ap.Origin(activity.ID)
 	if err != nil {
-		return "", "", err
+		return "", "", "", err
 	}
 
 	if sender.ID == "" {
-		return "", "", errors.New("unspecified sender ID")
+		return "", "", "", errors.New("unspecified sender ID")
 	}
 
-	senderOrigin, err := ap.Origin(sender.ID)
+	senderOrigin, senderHost, err := ap.Origins(sender.ID)
 	if err != nil {
-		return "", "", err
+		return "", "", "", err
 	}
 
-	return activityOrigin, senderOrigin, nil
+	return activityOrigin, senderOrigin, senderHost, nil
 }
 
 func (l *Listener) validateActivity(activity *ap.Activity, origin string, depth uint) error {
@@ -434,7 +434,7 @@ func (l *Listener) doHandleInbox(w http.ResponseWriter, r *http.Request, keys [2
 		if an activity wasn't sent by an actor on the same server, we must fetch the activity from its origin instead
 		of trusting the sender to pass it as-is
 	*/
-	origin, senderOrigin, err := l.getActivityOrigin(queued, sender)
+	origin, senderOrigin, senderHost, err := l.getActivityOrigin(queued, sender)
 	if err != nil {
 		slog.Warn("Failed to determine whether or not activity is forwarded", "activity", &activity, "sender", sender.ID, "error", err)
 		w.WriteHeader(http.StatusInternalServerError)
@@ -596,7 +596,7 @@ func (l *Listener) doHandleInbox(w http.ResponseWriter, r *http.Request, keys [2
 		if _, err = l.DB.ExecContext(
 			r.Context(),
 			`INSERT INTO servers (host, capabilities) VALUES ($1, $2) ON CONFLICT(host) DO UPDATE SET capabilities = capabilities | $2, updated = UNIXEPOCH()`,
-			senderOrigin,
+			senderHost,
 			capabilities,
 		); err != nil {
 			slog.Error("Failed to record server capabilities", "server", senderOrigin, "error", err)

migrations/050_didhost.go

@@ -0,0 +1,11 @@
+package migrations
+
+import (
+	"context"
+	"database/sql"
+)
+
+func didhost(ctx context.Context, domain string, tx *sql.Tx) error {
+	_, err := tx.ExecContext(ctx, `DELETE FROM servers WHERE host LIKE 'did:key:%'`)
+	return err
+}