diff --git a/quest/m1/auth/README.md b/quest/m1/auth/README.md index 7263a26844f..4e1bfadb816 100644 --- a/quest/m1/auth/README.md +++ b/quest/m1/auth/README.md @@ -145,7 +145,6 @@ because `main` assigned 0x3A to NOT_FETCHABLE first. ## Required - [Binding auth polish](/quest/m1/auth/bindings-polish.md) - OBS reconnects with the presented token, Swift grant sequences -- [Expiry before SETUP](/quest/m1/auth/expire-before-setup.md) - a mocked-clock test proves a grant expiring before SETUP closes as Expired ## Related diff --git a/quest/m1/auth/expire-before-setup.md b/quest/m1/auth/expire-before-setup.md deleted file mode 100644 index f374e955a08..00000000000 --- a/quest/m1/auth/expire-before-setup.md +++ /dev/null @@ -1,14 +0,0 @@ -# [XS] A grant that expires before SETUP - -## Goal - -A test on `moq_clock::Manual` proves that a grant expiring between admission -and SETUP closes the session as `Expired` (session code 0x18 at the client), -not `Unauthorized`. - -## Plan - -- The branch exists in `rs/moq-relay/src/auth/refresh.rs` (from - [moq-dev/moq#6612](https://github.com/moq-dev/moq/pull/6612)) but nothing - asserts it. Parameterize `refused_before_setup` with the expected error and - advance the clock past `expires` before `preparing`. diff --git a/rs/moq-relay/src/auth/refresh.rs b/rs/moq-relay/src/auth/refresh.rs index bf4b8e09363..2eaed108507 100644 --- a/rs/moq-relay/src/auth/refresh.rs +++ b/rs/moq-relay/src/auth/refresh.rs @@ -597,13 +597,32 @@ mod tests { #[tokio::test(start_paused = true)] async fn an_invalid_label_added_before_protocol_setup_is_refused() { - refused_before_setup(|grant| grant.label = Some("project/*".into())).await; + let _clock = manual(); + refused_before_setup( + |grant| grant.label = Some("project/*".into()), + SessionError::Unauthorized, + ) + .await; + } + + #[tokio::test(start_paused = true)] + async fn a_grant_expiring_before_protocol_setup_is_refused_as_expired() { + let clock = manual(); + refused_before_setup( + |_| { + // Expire the grant before the client's independent SETUP deadline. + clock.advance(Duration::from_secs(2)); + }, + SessionError::Expired, + ) + .await; } /// Admit a session, apply `change` to its grant before protocol setup, and check /// that setup refuses it as a failure. - async fn refused_before_setup(change: fn(&mut moq_auth::Grant)) { - let (producer, consumer) = lease::Producer::new(grant("a/**", 3000)); + async fn refused_before_setup(change: impl FnOnce(&mut moq_auth::Grant), expected: SessionError) { + let initial = grant("a/**", 1); + let (producer, consumer) = lease::Producer::new(initial.clone()); let registry = moq_net::stats::Registry::new(Default::default()); let stats = registry.tier(moq_net::stats::Tier::default()).session("room"); let lease = super::super::Lease::new("/room", consumer).with_stats(stats.clone()); @@ -625,23 +644,31 @@ mod tests { .accept_request(now, server) .await .unwrap(); - let mut changed = grant("a/**", 3000); + let mut changed = initial; change(&mut changed); producer.update(changed); - assert!(matches!( - lease.preparing(request.auth(), request.requests(), request.role()), - Err(moq_net::Error::Unauthorized) - )); - request.close(moq_net::Error::Unauthorized); + let error = lease + .preparing(request.auth(), request.requests(), request.role()) + .err() + .expect("setup must refuse the grant"); + assert_eq!(SessionError::from(&error), expected); + request.close(error); }; let ((session, driver), ()) = tokio::join!(connecting, refusing); - assert!(driver.await.unwrap().to_string().contains("unauthorized")); + let error = driver.await.unwrap(); + assert_eq!(error.session(), Some(&expected), "{error:?}"); drop(session); drop(stats); let presence = registry.snapshot().sessions()[0].1; assert_eq!(presence.sessions_ended, 1); + let failure = if expected == SessionError::Expired { + moq_net::stats::Failure::Expired + } else { + moq_net::stats::Failure::Application + }; assert_eq!( - presence.sessions_failed.application, 1, + presence.sessions_failed.count(failure), + 1, "an admitted session refused before SETUP is a failure" ); }