Skip to content

Node.js based forum software built for the modern web

fix(activitypub): use RFC 9421 registered algorithm identifiers in Signature-Input header

Julian Lamc5dc224ec215
diff --git a/src/activitypub/signatures.js b/src/activitypub/signatures.js
index ddbe1d9d6a..83ab57164d 100644
--- a/src/activitypub/signatures.js
+++ b/src/activitypub/signatures.js
@@ -106,7 +106,8 @@ Signatures.signRfc9421 = async ({ key, keyId }, url, method = 'GET', digest = nu
// Build Signature-Input header
// RFC 9421 Section 2.2: algorithm parameter is required
- const algorithm = getDraftAlgoString(privateKey);
+ // Must use registered algorithm identifiers from RFC 9421 §6.2.2
+ const algorithm = getRfc9421AlgoString(privateKey);
const signatureInput = `sig1=("${components.join('" "')}");algorithm="${algorithm}";created=${created};keyid="${keyId}"`;
headersToSign['signature-input'] = signatureInput;
@@ -170,6 +171,26 @@ function getDraftAlgoString(key) {
return 'rsa-sha256';
}
+// Returns the RFC 9421 §6.2.2 registered algorithm identifier for a given key.
+// These identifiers are used in the `algorithm` parameter of the Signature-Input
+// header and MUST match the IANA "HTTP Signature Algorithms" registry values.
+function getRfc9421AlgoString(key) {
+ const { name } = key.algorithm;
+ if (name === 'RSASSA-PKCS1-v1_5' || name === 'RSA') {
+ return 'rsa-v1_5-sha256';
+ }
+ if (name === 'ECDSA' || name === 'EC') {
+ return 'ecdsa-p256-sha256';
+ }
+ if (name === 'Ed25519') {
+ return 'ed25519';
+ }
+ if (name === 'Ed448') {
+ return 'ed448';
+ }
+ return 'rsa-v1_5-sha256';
+}
+
// Verifies a Content-Digest header in RFC 9530 format (sha-256=:base64:)
// Mitra and other RFC 9530 implementations use Content-Digest instead of Digest
function verifyContentDigest(bodyData, contentDigestHeader) {