fixup: rebase fixes

This commit is contained in:
elle 2026-04-13 20:55:17 +00:00
parent 50eb718958
commit d32bc37556
No known key found for this signature in database
2 changed files with 4 additions and 7 deletions

View file

@ -102,13 +102,9 @@ func verifyHTTPMessageSignature(ctx app_context.APIContext) (authenticated bool,
}
keyID := *msgDetails.KeyID
pubKey, err := federation.FindOrCreateFederatedUserKey(ctx, keyID)
if err != nil || pubKey == nil {
_, err = federation.FindOrCreateFederationHostKey(ctx, keyID)
if err != nil {
log.Debug("For %q verification failed: %v", r.URL.Path, err)
return false, err
}
if _, err = federation.FindOrCreateActorKey(ctx, keyID); err != nil {
log.Debug("For %q verification failed: %v", r.URL.Path, err)
return false, err
}
clientKey, err := activitypub.NewClientPublicKey(keyID, alg).ClientKey(ctx)

View file

@ -22,6 +22,7 @@ import (
"forgejo.org/modules/test"
"forgejo.org/routers"
"forgejo.org/services/contexttest"
"forgejo.org/services/federation"
"github.com/go-chi/chi/v5"
"github.com/stretchr/testify/assert"