httpsig-hyper 0.0.24

Hyper extension for http message signatures (RFC9421)
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
use super::{
  super::{
    error::HyperDigestError,
    hyper_content_digest::{RequestContentDigest, ResponseContentDigest},
    ContentDigestType,
  },
  *,
};
use http_body_util::{BodyExt, Full};
use httpsig::prelude::{AlgorithmName, PublicKey, SecretKey, SharedKey};

type BoxBody = http_body_util::combinators::BoxBody<bytes::Bytes, HyperDigestError>;

const EDDSA_SECRET_KEY: &str = r##"-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIDSHAE++q1BP7T8tk+mJtS+hLf81B0o6CFyWgucDFN/C
-----END PRIVATE KEY-----
"##;
const EDDSA_PUBLIC_KEY: &str = r##"-----BEGIN PUBLIC KEY-----
MCowBQYDK2VwAyEA1ixMQcxO46PLlgQfYS46ivFd+n0CcDHSKUnuhm3i1O0=
-----END PUBLIC KEY-----
"##;
// const EDDSA_KEY_ID: &str = "gjrE7ACMxgzYfFHgabgf4kLTg1eKIdsJ94AiFTFj1is=";
const COVERED_COMPONENTS_REQ: &[&str] = &["@method", "date", "content-type", "content-digest"];
const COVERED_COMPONENTS_RES: &[&str] = &["@status", "\"@method\";req", "date", "content-type", "\"content-digest\";req"];

async fn build_request() -> Request<BoxBody> {
  let body = Full::new(&b"{\"hello\": \"world\"}"[..]);
  let req = Request::builder()
    .method("GET")
    .uri("https://example.com/parameters?var=this%20is%20a%20big%0Amultiline%20value&bar=with+plus+whitespace&fa%C3%A7ade%22%3A%20=something")
    .header("date", "Sun, 09 May 2021 18:30:00 GMT")
    .header("content-type", "application/json")
    .header("content-type", "application/json-patch+json")
    .body(body)
    .unwrap();
  req.set_content_digest(&ContentDigestType::Sha256).await.unwrap()
}

async fn build_response() -> Response<BoxBody> {
  let body = Full::new(&b"{\"hello\": \"world!!\"}"[..]);
  let res = Response::builder()
    .status(200)
    .header("date", "Sun, 09 May 2021 18:30:00 GMT")
    .header("content-type", "application/json")
    .header("content-type", "application/json-patch+json")
    .body(body)
    .unwrap();
  res.set_content_digest(&ContentDigestType::Sha256).await.unwrap()
}

fn build_covered_components_req() -> Vec<HttpMessageComponentId> {
  COVERED_COMPONENTS_REQ
    .iter()
    .map(|&s| HttpMessageComponentId::try_from(s).unwrap())
    .collect()
}

fn build_covered_components_res() -> Vec<HttpMessageComponentId> {
  COVERED_COMPONENTS_RES
    .iter()
    .map(|&s| HttpMessageComponentId::try_from(s).unwrap())
    .collect()
}

/// Helper to build a request with query parameters (no content-digest needed)
fn build_query_request() -> Request<BoxBody> {
  let body = Full::new(bytes::Bytes::new()).map_err(|never| match never {}).boxed();
  Request::builder()
    .method("GET")
    .uri("https://example.com/path?foo=bar&id=123&x=y")
    .header("date", "Sun, 09 May 2021 18:30:00 GMT")
    .body(body)
    .unwrap()
}

// ---- Component extraction ----

#[tokio::test]
async fn test_extract_component_from_request() {
  let req = build_request().await;
  let req_or_res = RequestOrResponse::Request(&req);

  let component_id_method = HttpMessageComponentId::try_from("\"@method\"").unwrap();
  let component = extract_http_message_component(&req_or_res, &component_id_method).unwrap();
  assert_eq!(component.to_string(), "\"@method\": GET");

  let component_id = HttpMessageComponentId::try_from("\"date\"").unwrap();
  let component = extract_http_message_component(&req_or_res, &component_id).unwrap();
  assert_eq!(component.to_string(), "\"date\": Sun, 09 May 2021 18:30:00 GMT");

  let component_id = HttpMessageComponentId::try_from("content-type").unwrap();
  let component = extract_http_field(&req_or_res, &component_id).unwrap();
  assert_eq!(
    component.to_string(),
    "\"content-type\": application/json, application/json-patch+json"
  );

  let component_id = HttpMessageComponentId::try_from("content-digest").unwrap();
  let component = extract_http_message_component(&req_or_res, &component_id).unwrap();
  assert_eq!(
    component.to_string(),
    "\"content-digest\": sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=:"
  );
}

#[tokio::test]
async fn test_extract_signature_params_from_request() {
  let mut req = build_request().await;
  let headers = req.headers_mut();
  headers.insert(
    "signature-input",
    http::HeaderValue::from_static(r##"sig1=("@method" "@authority")"##),
  );
  let component_id = HttpMessageComponentId::try_from("@signature-params").unwrap();
  let req_or_res = RequestOrResponse::Request(&req);
  let component = extract_http_message_component(&req_or_res, &component_id).unwrap();
  assert_eq!(component.to_string(), "\"@signature-params\": (\"@method\" \"@authority\")");
  assert_eq!(component.value.to_string(), r##"("@method" "@authority")"##);
  assert_eq!(component.value.as_field_value(), r##"sig1=("@method" "@authority")"##);
  assert_eq!(component.value.as_component_value(), r##"("@method" "@authority")"##);
  assert_eq!(component.value.key(), Some("sig1"));
}

#[tokio::test]
async fn test_build_signature_base_from_request() {
  let req = build_request().await;

  const SIGPARA: &str = r##";created=1704972031;alg="ed25519";keyid="gjrE7ACMxgzYfFHgabgf4kLTg1eKIdsJ94AiFTFj1is=""##;
  let values = (r##""@method" "content-type" "date" "content-digest""##, SIGPARA);
  let signature_params = HttpSignatureParams::try_from(format!("({}){}", values.0, values.1).as_str()).unwrap();

  let req_or_res = RequestOrResponse::Request(&req);
  let signature_base = build_signature_base(&req_or_res, &signature_params, None as Option<&Request<()>>).unwrap();
  assert_eq!(
    signature_base.to_string(),
    r##""@method": GET
"content-type": application/json, application/json-patch+json
"date": Sun, 09 May 2021 18:30:00 GMT
"content-digest": sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=:
"@signature-params": ("@method" "content-type" "date" "content-digest");created=1704972031;alg="ed25519";keyid="gjrE7ACMxgzYfFHgabgf4kLTg1eKIdsJ94AiFTFj1is=""##
  );
}

#[tokio::test]
async fn test_extract_tuples_from_request() {
  let mut req = build_request().await;
  let headers = req.headers_mut();
  headers.insert(
    "signature-input",
    http::HeaderValue::from_static(r##"sig11=("@method" "@authority");created=1704972031"##),
  );
  headers.insert(
    "signature",
    http::HeaderValue::from_static(
      r##"sig11=:wqcAqbmYJ2ji2glfAMaRy4gruYYnx2nEFN2HN6jrnDnQCK1u02Gb04v9EDgwUPiu4A0w6vuQv5lIp5WPpBKRCw==:"##,
    ),
  );

  let req_or_res = RequestOrResponse::Request(&req);
  let tuples = extract_signature_headers_with_name(&req_or_res).unwrap();
  assert_eq!(tuples.len(), 1);
  assert_eq!(tuples.get("sig11").unwrap().signature_name(), "sig11");
  assert_eq!(
    tuples.get("sig11").unwrap().signature_params().to_string(),
    r##"("@method" "@authority");created=1704972031"##
  );
}

// ---- Sign and verify ----

#[tokio::test]
async fn test_set_verify_message_signature_req() {
  let mut req = build_request().await;
  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&build_covered_components_req()).unwrap();
  signature_params.set_key_info(&secret_key);

  req.set_message_signature(&signature_params, &secret_key, None).await.unwrap();
  let signature_input = req.headers().get("signature-input").unwrap().to_str().unwrap();
  assert!(signature_input.starts_with(r##"sig=("@method" "date" "content-type" "content-digest")"##));

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let verification_res = req.verify_message_signature(&public_key, None).await;
  assert!(verification_res.is_ok());
}

#[tokio::test]
async fn test_set_verify_message_signature_res() {
  let req = build_request().await;
  let mut res = build_response().await;

  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();

  let mut signature_params = HttpSignatureParams::try_new(&build_covered_components_res()).unwrap();
  signature_params.set_key_info(&secret_key);

  res
    .set_message_signature(&signature_params, &secret_key, None, Some(&req))
    .await
    .unwrap();
  let signature_input = res.headers().get("signature-input").unwrap().to_str().unwrap();
  assert!(signature_input.starts_with(r##"sig=("@status" "@method";req "date" "content-type" "content-digest";req)"##));

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let verification_res = res.verify_message_signature(&public_key, None, Some(&req)).await;
  assert!(verification_res.is_ok());
}

#[tokio::test]
async fn test_expired_signature() {
  let mut req = build_request().await;
  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&build_covered_components_req()).unwrap();
  signature_params.set_key_info(&secret_key);
  let created = signature_params.created.unwrap();
  signature_params.set_expires(created - 1);
  assert!(signature_params.is_expired());

  req.set_message_signature(&signature_params, &secret_key, None).await.unwrap();

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let verification_res = req.verify_message_signature(&public_key, None).await;
  assert!(verification_res.is_err());
}

#[tokio::test]
async fn test_set_verify_with_signature_name() {
  let mut req = build_request().await;
  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&build_covered_components_req()).unwrap();
  signature_params.set_key_info(&secret_key);

  req
    .set_message_signature(&signature_params, &secret_key, Some("custom_sig_name"))
    .await
    .unwrap();

  let req_or_res = RequestOrResponse::Request(&req);
  let signature_headers_map = extract_signature_headers_with_name(&req_or_res).unwrap();
  assert_eq!(signature_headers_map.len(), 1);
  assert_eq!(signature_headers_map[0].signature_name(), "custom_sig_name");

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let verification_res = req.verify_message_signature(&public_key, None).await;
  assert!(verification_res.is_ok());
}

#[tokio::test]
async fn test_set_verify_with_key_id() {
  let mut req = build_request().await;
  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&build_covered_components_req()).unwrap();
  signature_params.set_key_info(&secret_key);

  req.set_message_signature(&signature_params, &secret_key, None).await.unwrap();

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let key_id = public_key.key_id();
  let verification_res = req.verify_message_signature(&public_key, Some(&key_id)).await;
  assert!(verification_res.is_ok());

  let verification_res = req.verify_message_signature(&public_key, Some("NotFoundKeyId")).await;
  assert!(verification_res.is_err());
}

const HMACSHA256_SECRET_KEY: &str =
  r##"uzvJfB4u3N0Jy4T7NZ75MDVcr8zSTInedJtkgcu46YW4XByzNJjxBdtjUkdJPBtbmHhIDi6pcl8jsasjlTMtDQ=="##;

#[tokio::test]
async fn test_set_verify_with_key_id_hmac_sha256() {
  let mut req = build_request().await;
  let secret_key = SharedKey::from_base64(&AlgorithmName::HmacSha256, HMACSHA256_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&build_covered_components_req()).unwrap();
  signature_params.set_key_info(&secret_key);
  // Random nonce is highly recommended for HMAC
  signature_params.set_random_nonce();

  req.set_message_signature(&signature_params, &secret_key, None).await.unwrap();

  let org_key_id = VerifyingKey::key_id(&secret_key);
  let (alg, key_id) = req.get_alg_key_ids().unwrap().into_iter().next().unwrap().1;
  let alg = alg.unwrap();
  let key_id = key_id.unwrap();
  assert_eq!(org_key_id, key_id);
  let verification_key = SharedKey::from_base64(&alg, HMACSHA256_SECRET_KEY).unwrap();
  let verification_res = req.verify_message_signature(&verification_key, Some(&key_id)).await;
  assert!(verification_res.is_ok());

  let verification_res = req.verify_message_signature(&verification_key, Some("NotFoundKeyId")).await;
  assert!(verification_res.is_err());
}

#[tokio::test]
async fn test_get_alg_key_ids() {
  let mut req = build_request().await;
  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&build_covered_components_req()).unwrap();
  signature_params.set_key_info(&secret_key);

  req.set_message_signature(&signature_params, &secret_key, None).await.unwrap();
  let key_ids = req.get_alg_key_ids().unwrap();
  assert_eq!(key_ids.len(), 1);
  assert_eq!(key_ids[0].0.as_ref().unwrap(), &AlgorithmName::Ed25519);
  assert_eq!(key_ids[0].1.as_ref().unwrap(), "gjrE7ACMxgzYfFHgabgf4kLTg1eKIdsJ94AiFTFj1is=");
}

const P256_SECRET_KEY: &str = r##"-----BEGIN PRIVATE KEY-----
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgv7zxW56ojrWwmSo1
4uOdbVhUfj9Jd+5aZIB9u8gtWnihRANCAARGYsMe0CT6pIypwRvoJlLNs4+cTh2K
L7fUNb5i6WbKxkpAoO+6T3pMBG5Yw7+8NuGTvvtrZAXduA2giPxQ8zCf
-----END PRIVATE KEY-----
"##;
const P256_PUBLIC_KEY: &str = r##"-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAERmLDHtAk+qSMqcEb6CZSzbOPnE4d
ii+31DW+YulmysZKQKDvuk96TARuWMO/vDbhk777a2QF3bgNoIj8UPMwnw==
-----END PUBLIC KEY-----
"##;
#[tokio::test]
async fn test_set_verify_multiple_signatures() {
  let mut req = build_request().await;

  let secret_key_eddsa = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params_eddsa = HttpSignatureParams::try_new(&build_covered_components_req()).unwrap();
  signature_params_eddsa.set_key_info(&secret_key_eddsa);

  let secret_key_p256 = SecretKey::from_pem(&AlgorithmName::EcdsaP256Sha256, P256_SECRET_KEY).unwrap();
  let mut signature_params_hmac = HttpSignatureParams::try_new(&build_covered_components_req()).unwrap();
  signature_params_hmac.set_key_info(&secret_key_p256);

  let params_key_name = &[
    (&signature_params_eddsa, &secret_key_eddsa, Some("eddsa_sig")),
    (&signature_params_hmac, &secret_key_p256, Some("p256_sig")),
  ];

  req.set_message_signatures(params_key_name).await.unwrap();

  let public_key_eddsa = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let public_key_p256 = PublicKey::from_pem(&AlgorithmName::EcdsaP256Sha256, P256_PUBLIC_KEY).unwrap();
  let key_id_eddsa = public_key_eddsa.key_id();
  let key_id_p256 = public_key_p256.key_id();

  let verification_res = req
    .verify_message_signatures(&[
      (&public_key_eddsa, Some(&key_id_eddsa)),
      (&public_key_p256, Some(&key_id_p256)),
    ])
    .await
    .unwrap();

  assert!(verification_res.len() == 2 && verification_res.iter().all(|r| r.is_ok()));
  assert!(verification_res[0].as_ref().unwrap() == "eddsa_sig");
  assert!(verification_res[1].as_ref().unwrap() == "p256_sig");
}

// ---- Blocking (sync) ----

#[cfg(feature = "blocking")]
#[test]
fn test_blocking_set_verify_message_signature_req() {
  let mut req = futures::executor::block_on(build_request());
  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&build_covered_components_req()).unwrap();
  signature_params.set_key_info(&secret_key);

  req.set_message_signature_sync(&signature_params, &secret_key, None).unwrap();

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let verification_res = req.verify_message_signature_sync(&public_key, None);
  assert!(verification_res.is_ok());
}

#[cfg(feature = "blocking")]
#[test]
fn test_blocking_set_verify_message_signature_res() {
  let req = futures::executor::block_on(build_request());
  let mut res = futures::executor::block_on(build_response());
  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&build_covered_components_res()).unwrap();
  signature_params.set_key_info(&secret_key);
  res
    .set_message_signature_sync(&signature_params, &secret_key, None, Some(&req))
    .unwrap();

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let verification_res = res.verify_message_signature_sync(&public_key, None, Some(&req));
  assert!(verification_res.is_ok());
}

// ---- Issue #17: @query-param;name="..." ----

/// Regression test for issue #17: @query-param;name="id" must produce signature headers (sync)
#[cfg(feature = "blocking")]
#[test]
fn test_query_param_sign_verify_sync() {
  let mut req = build_query_request();

  let covered = ["@method", "\"@query-param\";name=\"id\"", "date"];
  let covered_components = covered
    .iter()
    .map(|v| HttpMessageComponentId::try_from(*v))
    .collect::<Result<Vec<_>, _>>()
    .unwrap();

  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&covered_components).unwrap();
  signature_params.set_key_info(&secret_key);

  req
    .set_message_signature_sync(&signature_params, &secret_key, Some("qp"))
    .unwrap();

  assert!(
    req.headers().get("signature-input").is_some(),
    "signature-input header is missing"
  );
  assert!(req.headers().get("signature").is_some(), "signature header is missing");

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let verification_res = req.verify_message_signature_sync(&public_key, None);
  assert!(
    verification_res.is_ok(),
    "signature verification failed: {:?}",
    verification_res.err()
  );
}

/// Regression test for issue #17: @query-param;name="id" must produce signature headers (async)
#[tokio::test]
async fn test_query_param_sign_verify_async() {
  let mut req = build_query_request();

  let covered = ["@method", "\"@query-param\";name=\"id\"", "date"];
  let covered_components = covered
    .iter()
    .map(|v| HttpMessageComponentId::try_from(*v))
    .collect::<Result<Vec<_>, _>>()
    .unwrap();

  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&covered_components).unwrap();
  signature_params.set_key_info(&secret_key);

  req
    .set_message_signature(&signature_params, &secret_key, Some("qp"))
    .await
    .unwrap();

  assert!(
    req.headers().get("signature-input").is_some(),
    "signature-input header is missing"
  );
  assert!(req.headers().get("signature").is_some(), "signature header is missing");

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let verification_res = req.verify_message_signature(&public_key, None).await;
  assert!(
    verification_res.is_ok(),
    "signature verification failed: {:?}",
    verification_res.err()
  );
}

// ---- Derived component parameter validation ----

#[test]
fn test_extract_derived_component_rejects_name_on_non_query_param() {
  let req = build_query_request();
  let req_or_res = RequestOrResponse::Request(&req);
  // `@method;name="foo"` is invalid — `name` is only for `@query-param`
  let id = HttpMessageComponentId::try_from("\"@method\";name=\"foo\"");
  // component_id parsing itself may reject this; if it doesn't, extraction should
  if let Ok(id) = id {
    let result = extract_derived_component(&req_or_res, &id);
    assert!(result.is_err(), "expected error for `name` on `@method`");
  }
}

#[test]
fn test_extract_derived_component_rejects_sf_on_derived() {
  let req = build_query_request();
  let req_or_res = RequestOrResponse::Request(&req);
  // `@method;sf` is invalid — `sf` is only for HTTP field components
  let id = HttpMessageComponentId::try_from("\"@method\";sf");
  if let Ok(id) = id {
    let result = extract_derived_component(&req_or_res, &id);
    assert!(result.is_err(), "expected error for `sf` on derived component");
  }
}

// ---- Error propagation (Bug #2 regression) ----

#[tokio::test]
async fn test_set_message_signature_propagates_build_error() {
  // Use `@status` on a request — this is invalid and must return Err, not Ok
  let body = Full::new(bytes::Bytes::new()).map_err(|never| match never {}).boxed();
  let mut req: Request<BoxBody> = Request::builder()
    .method("GET")
    .uri("https://example.com/")
    .body(body)
    .unwrap();

  let covered = vec![HttpMessageComponentId::try_from("@status").unwrap()];
  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&covered).unwrap();
  signature_params.set_key_info(&secret_key);

  let result = req
    .set_message_signature(&signature_params, &secret_key, None as Option<&str>)
    .await;
  assert!(result.is_err(), "expected Err when using `@status` on request, got Ok");
}

#[cfg(feature = "blocking")]
#[test]
fn test_set_message_signature_sync_propagates_build_error() {
  // Same as above but for sync path
  let body = Full::new(bytes::Bytes::new()).map_err(|never| match never {}).boxed();
  let mut req: Request<BoxBody> = Request::builder()
    .method("GET")
    .uri("https://example.com/")
    .body(body)
    .unwrap();

  let covered = vec![HttpMessageComponentId::try_from("@status").unwrap()];
  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&covered).unwrap();
  signature_params.set_key_info(&secret_key);

  let result = req.set_message_signature_sync(&signature_params, &secret_key, None);
  assert!(result.is_err(), "expected Err when using `@status` on request, got Ok");
}

// ---- RFC 9421 §2.2: Derived component extraction values ----

#[test]
fn test_extract_derived_components_values() {
  let req = build_query_request();
  // URI: https://example.com/path?foo=bar&id=123&x=y
  let req_or_res = RequestOrResponse::Request(&req);

  // @method (§2.2.1)
  let id = HttpMessageComponentId::try_from("@method").unwrap();
  let c = extract_derived_component(&req_or_res, &id).unwrap();
  assert_eq!(c.to_string(), "\"@method\": GET");

  // @target-uri (§2.2.2)
  let id = HttpMessageComponentId::try_from("@target-uri").unwrap();
  let c = extract_derived_component(&req_or_res, &id).unwrap();
  assert_eq!(c.to_string(), "\"@target-uri\": https://example.com/path?foo=bar&id=123&x=y");

  // @authority (§2.2.3)
  let id = HttpMessageComponentId::try_from("@authority").unwrap();
  let c = extract_derived_component(&req_or_res, &id).unwrap();
  assert_eq!(c.to_string(), "\"@authority\": example.com");

  // @scheme (§2.2.4)
  let id = HttpMessageComponentId::try_from("@scheme").unwrap();
  let c = extract_derived_component(&req_or_res, &id).unwrap();
  assert_eq!(c.to_string(), "\"@scheme\": https");

  // @path (§2.2.6)
  let id = HttpMessageComponentId::try_from("@path").unwrap();
  let c = extract_derived_component(&req_or_res, &id).unwrap();
  assert_eq!(c.to_string(), "\"@path\": /path");

  // @query (§2.2.7)
  let id = HttpMessageComponentId::try_from("@query").unwrap();
  let c = extract_derived_component(&req_or_res, &id).unwrap();
  assert_eq!(c.to_string(), "\"@query\": ?foo=bar&id=123&x=y");

  // @query-param;name="id" (§2.2.8)
  let id = HttpMessageComponentId::try_from("\"@query-param\";name=\"id\"").unwrap();
  let c = extract_derived_component(&req_or_res, &id).unwrap();
  assert_eq!(c.to_string(), "\"@query-param\";name=\"id\": 123");
}

// ---- RFC 9421 §2.4: @query-param;name="...";req on response ----

#[tokio::test]
async fn test_response_with_query_param_req_sign_verify() {
  // Build a request with query params
  let req = build_query_request();
  // Build a response
  let body = Full::new(bytes::Bytes::new()).map_err(|never| match never {}).boxed();
  let mut res: Response<BoxBody> = Response::builder().status(200).body(body).unwrap();

  // Response signature covering @status + @query-param;name="id";req
  let covered = ["@status", "\"@query-param\";name=\"id\";req"];
  let covered_components = covered
    .iter()
    .map(|v| HttpMessageComponentId::try_from(*v))
    .collect::<Result<Vec<_>, _>>()
    .unwrap();

  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&covered_components).unwrap();
  signature_params.set_key_info(&secret_key);

  res
    .set_message_signature(&signature_params, &secret_key, None, Some(&req))
    .await
    .unwrap();

  assert!(req.headers().get("signature-input").is_none(), "request should not be modified");
  assert!(res.headers().get("signature-input").is_some(), "signature-input header is missing on response");
  assert!(res.headers().get("signature").is_some(), "signature header is missing on response");

  let public_key = PublicKey::from_pem(&AlgorithmName::Ed25519, EDDSA_PUBLIC_KEY).unwrap();
  let verification_res = res.verify_message_signature(&public_key, None, Some(&req)).await;
  assert!(verification_res.is_ok(), "signature verification failed: {:?}", verification_res.err());
}

// ---- RFC 9421: Response must reject request-derived components without `req` ----

#[tokio::test]
async fn test_response_rejects_derived_component_without_req() {
  let body = Full::new(bytes::Bytes::new()).map_err(|never| match never {}).boxed();
  let mut res: Response<BoxBody> = Response::builder().status(200).body(body).unwrap();

  // `@method` without `req` on a response — must fail
  let covered = vec![
    HttpMessageComponentId::try_from("@status").unwrap(),
    HttpMessageComponentId::try_from("@method").unwrap(),
  ];

  let secret_key = SecretKey::from_pem(&AlgorithmName::Ed25519, EDDSA_SECRET_KEY).unwrap();
  let mut signature_params = HttpSignatureParams::try_new(&covered).unwrap();
  signature_params.set_key_info(&secret_key);

  let result = res
    .set_message_signature(&signature_params, &secret_key, None, None as Option<&Request<()>>)
    .await;
  assert!(result.is_err(), "expected Err when using `@method` without `req` on response");
}