Rename pkey to pubKey

Author: Anthony Wang

integrations/api_activitypub_person_test.go

@@ -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/inbox$", username), person.Inbox.GetID().String())
 
-		pkey := person.PublicKey
-		assert.NotNil(t, pkey)
+		pubKey := person.PublicKey
+		assert.NotNil(t, pubKey)
 		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.Regexp(t, "^-----BEGIN PUBLIC KEY-----", pubKeyPem)
 	})

routers/api/v1/activitypub/reqsignature.go

@@ -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)
 		return
 	}
-	pkey := person.PublicKey
-	if pkey.ID.String() != keyID.String() {
+	pubKey := person.PublicKey
+	if pubKey.ID.String() != keyID.String() {
 		err = fmt.Errorf("cannot find publicKey with id: %s in %s", keyID, b)
 		return
 	}
-	pubKeyPem := pkey.PublicKeyPem
+	pubKeyPem := pubKey.PublicKeyPem
 	block, _ := pem.Decode([]byte(pubKeyPem))
 	if block == nil || block.Type != "PUBLIC KEY" {
 		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 {
 		return
 	}
-	pKey, err := getPublicKeyFromResponse(*ctx, b, idIRI)
+	pubKey, err := getPublicKeyFromResponse(*ctx, b, idIRI)
 	if err != nil {
 		return
 	}
 	// 3. Verify the other actor's key
 	algo := httpsig.Algorithm(setting.Federation.Algorithms[0])
-	authenticated = v.Verify(pKey, algo) == nil
+	authenticated = v.Verify(pubKey, algo) == nil
 	return
 }