Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename pkey to pubKey

This commit is contained in:
Anthony Wang 2022-06-13 20:51:49 -05:00
parent 3e9a69c8d3
commit d749f8ff4f
No known key found for this signature in database
GPG Key ID: BC96B00AEC5F2D76
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
integrations/api_activitypub_person_test.go
View File

@ -44,12 +44,12 @@ func TestActivityPubPerson(t *testing.T) {
assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/outbox$", username), person.Outbox.GetID().String()) assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/outbox$", username), person.Outbox.GetID().String())
assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/inbox$", username), person.Inbox.GetID().String()) assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/inbox$", username), person.Inbox.GetID().String())
pkey := person.PublicKey pubKey := person.PublicKey
assert.NotNil(t, pkey) assert.NotNil(t, pubKey)
publicKeyID := keyID + "#main-key" publicKeyID := keyID + "#main-key"
assert.Equal(t, pkey.ID.String(), publicKeyID) assert.Equal(t, pubKey.ID.String(), publicKeyID)
pubKeyPem := pkey.PublicKeyPem pubKeyPem := pubKey.PublicKeyPem
assert.NotNil(t, pubKeyPem) assert.NotNil(t, pubKeyPem)
assert.Regexp(t, "^-----BEGIN PUBLIC KEY-----", pubKeyPem) assert.Regexp(t, "^-----BEGIN PUBLIC KEY-----", pubKeyPem)
}) })

10
routers/api/v1/activitypub/reqsignature.go
View File

@ -31,12 +31,12 @@ func getPublicKeyFromResponse(ctx context.Context, b []byte, keyID *url.URL) (p
err = fmt.Errorf("ActivityStreams type cannot be converted to one known to have publicKey property: %v", err) err = fmt.Errorf("ActivityStreams type cannot be converted to one known to have publicKey property: %v", err)
return return
} }
pkey := person.PublicKey pubKey := person.PublicKey
if pkey.ID.String() != keyID.String() { if pubKey.ID.String() != keyID.String() {
err = fmt.Errorf("cannot find publicKey with id: %s in %s", keyID, b) err = fmt.Errorf("cannot find publicKey with id: %s in %s", keyID, b)
return return
} }
pubKeyPem := pkey.PublicKeyPem pubKeyPem := pubKey.PublicKeyPem
block, _ := pem.Decode([]byte(pubKeyPem)) block, _ := pem.Decode([]byte(pubKeyPem))
if block == nil || block.Type != "PUBLIC KEY" { if block == nil || block.Type != "PUBLIC KEY" {
err = fmt.Errorf("could not decode publicKeyPem to PUBLIC KEY pem block type") err = fmt.Errorf("could not decode publicKeyPem to PUBLIC KEY pem block type")
@ -83,13 +83,13 @@ func verifyHTTPSignatures(ctx *gitea_context.APIContext) (authenticated bool, er
if err != nil { if err != nil {
return return
} }
pKey, err := getPublicKeyFromResponse(*ctx, b, idIRI) pubKey, err := getPublicKeyFromResponse(*ctx, b, idIRI)
if err != nil { if err != nil {
return return
} }
// 3. Verify the other actor's key // 3. Verify the other actor's key
algo := httpsig.Algorithm(setting.Federation.Algorithms[0]) algo := httpsig.Algorithm(setting.Federation.Algorithms[0])
authenticated = v.Verify(pKey, algo) == nil authenticated = v.Verify(pubKey, algo) == nil
return return
} }