Double-bang requests with rfc9421 and cavage after on error

web/shared/clientRfc9421.go

@@ -33,9 +33,7 @@ Links for home:
 func RequestSignedRFC9421(
 	method, target string,
 	body []byte,
-	keyId string,
-	privateKeyBytes []byte,
-	useEd bool,
+	actor *models.User,
 ) (*http.Response, error) {
 	req, err := http.NewRequest(method, target, bytes.NewBuffer(slices.Clone(body)))
 	if err != nil {
@@ -46,7 +44,7 @@ func RequestSignedRFC9421(
 	signerFields := httpsign.Headers("@request-target", "content-digest")
 	if config.GlobalConfig.Experimental.UseEd25519Keys {
 		signer, err = httpsign.NewEd25519Signer(
-			privateKeyBytes,
+			actor.PrivateKeyEd,
 			httpsign.NewSignConfig(),
 			signerFields,
 		)
@@ -54,7 +52,7 @@ func RequestSignedRFC9421(
 			return nil, err
 		}
 	} else {
-		key, err := x509.ParsePKCS1PrivateKey(privateKeyBytes)
+		key, err := x509.ParsePKCS1PrivateKey(actor.PrivateKeyRsa)
 		if err != nil {
 			return nil, err
 		}
@@ -63,9 +61,15 @@ func RequestSignedRFC9421(
 			return nil, err
 		}
 	}
+	clientConfig := httpsign.NewClientConfig().SetSigner(signer)
+	if config.GlobalConfig.Experimental.UseEd25519Keys {
+		clientConfig = clientConfig.SetSignatureName("sig-ed")
+	} else {
+		clientConfig = clientConfig.SetSignatureName("sig-rsa")
+	}
 	client := httpsign.NewClient(
 		RequestClient,
-		httpsign.NewClientConfig().SetSigner(signer).SetSignatureName("sig1"),
+		clientConfig,
 	)
 	res, err := client.Do(req)
 	return res, err