SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[chore] Try to parse public key as both Actor + bare key (#2710)

Browse Source 
* [chore] Try to parse public key as both Actor + bare key

* fix weird test fail
This commit is contained in:
tobi
2024-04-02 12:30:10 +02:00
committed by GitHub
parent adf345f1ec
commit 4bbdef02f1
5 changed files with 217 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
internal/federation/authenticate.go
View File

@ -30,6 +30,7 @@ import (
"codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/activity/streams"
typepublickey "github.com/superseriousbusiness/activity/streams/impl/w3idsecurityv1/type_publickey"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
@ -504,24 +505,45 @@ func parsePubKeyBytes(
return nil, nil, err
}
t, err := streams.ToType(ctx, m)
if err != nil {
return nil, nil, err
var (
pubKey *rsa.PublicKey
ownerURI *url.URL
)
if t, err := streams.ToType(ctx, m); err == nil {
// See if Actor with a PublicKey attached.
wpk, ok := t.(ap.WithPublicKey)
if !ok {
return nil, nil, gtserror.Newf(
"resource at %s with type %T did not contain recognizable public key",
pubKeyID, t,
)
}
pubKey, _, ownerURI, err = ap.ExtractPubKeyFromActor(wpk)
if err != nil {
return nil, nil, gtserror.Newf(
"error extracting public key from %T at %s: %w",
t, pubKeyID, err,
)
}
} else if pk, err := typepublickey.DeserializePublicKey(m, nil); err == nil {
// Bare PublicKey.
pubKey, _, ownerURI, err = ap.ExtractPubKeyFromKey(pk)
if err != nil {
return nil, nil, gtserror.Newf(
"error extracting public key at %s: %w",
pubKeyID, err,
)
}
} else {
return nil, nil, gtserror.Newf(
"resource at %s did not contain recognizable public key",
pubKeyID,
)
}
withPublicKey, ok := t.(ap.WithPublicKey)
if !ok {
err = gtserror.Newf("resource at %s with type %T could not be converted to ap.WithPublicKey", pubKeyID, t)
return nil, nil, err
}
pubKey, _, pubKeyOwnerID, err := ap.ExtractPublicKey(withPublicKey)
if err != nil {
err = gtserror.Newf("resource at %s with type %T did not contain recognizable public key", pubKeyID, t)
return nil, nil, err
}
return pubKey, pubKeyOwnerID, nil
return pubKey, ownerURI, nil
}
var signingAlgorithms = []httpsig.Algorithm{