jelq

public

an http based roguelike rpg about jelqing

Star0

Fork 0

Watch0

62 commits 1 branch 0 tags 0 releases1.3 MiB

Commit `886159fd0fe7`

tarball

atagen <boss@atagen.co>2026-10-13 12:50 UTC

7 files changed+143-41

game: keep Mum's nonce in view and let her leave in character

The challenge only rode on 401s, so the response where Mum arrived carried no nonce and the page built Digest answers from the previous visit, which then cost a strike as a stale conversation. Every response while she is at the door now carries WWW-Authenticate, as RFC 9110 permits, and a stale nonce is explained for free. Her parting line was the washing whatever she came for, so each errand now has its own.

Modified file: src/game/gauges.rs+2 additions−2 deletions@@ -25,7 +25,7 @@ pub struct Gauges {
     pub(crate) cash: u32,
     pub(crate) floor: u8,
     pub(crate) observed: Option<Observer>,
-    pub(crate) mum_at_door: bool,
+    pub(crate) mum_challenge: Option<String>,
     pub(crate) warnings: Vec<&'static str>,
     pub(crate) arrived: Option<Arrival>,
     pub(crate) ruler: bool,
@@ -81,7 +81,7 @@ impl Run {
             cash: self.standing.cash,
             floor: self.floor.number(),
             observed: self.observed,
-            mum_at_door: self.household.mum.is_some(),
+            mum_challenge: self.mum_challenge(),
             warnings,
             arrived,
             ruler: self.items.kit.ruler,

Modified file: src/game/household.rs+82 additions−35 deletions@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use axum::http::{StatusCode, header};
+use axum::http::StatusCode;
 
 use super::{
     Cause, Floor, Notice, Run,
@@ -83,17 +83,56 @@ fn is_truth(spoken: &str) -> bool {
         .any(|truth| truth.eq_ignore_ascii_case(spoken))
 }
 
-const BEDROOM_ERRANDS: [&str; 4] = [
-    "She has brought your washing.",
-    "She wants to know if you have eaten.",
-    "She needs the wifi password.",
-    "She would like to talk about your future.",
+/// Why Mum came to the door, and how she leaves once she believes you.
+#[derive(Clone, Copy)]
+pub struct Errand {
+    pub(crate) knock: &'static str,
+    pub(crate) parting: &'static str,
+}
+
+pub const HEARD_A_NOISE: Errand = Errand {
+    knock: "She heard a noise.",
+    parting: "Mum seems satisfied. It must have been the pipes.",
+};
+const VIRAL: Errand = Errand {
+    knock: "A neighbour has sent her something.",
+    parting: "Mum seems satisfied. She has decided not to open the attachment.",
+};
+const BEDROOM_ERRANDS: [Errand; 4] = [
+    Errand {
+        knock: "She has brought your washing.",
+        parting: "Mum seems satisfied. She leaves the washing on the chair.",
+    },
+    Errand {
+        knock: "She wants to know if you have eaten.",
+        parting: "Mum seems satisfied. There will be a plate in the oven.",
+    },
+    Errand {
+        knock: "She needs the wifi password.",
+        parting: "Mum seems satisfied. She has written the wifi password on her hand.",
+    },
+    Errand {
+        knock: "She would like to talk about your future.",
+        parting: "Mum seems satisfied. The future can wait until dinner.",
+    },
 ];
-const CHRISTMAS_ERRANDS: [&str; 4] = [
-    "Nan would like to see you.",
-    "Christmas dinner is in ten minutes.",
-    "The King's speech is about to start.",
-    "An uncle has asked where you went.",
+const CHRISTMAS_ERRANDS: [Errand; 4] = [
+    Errand {
+        knock: "Nan would like to see you.",
+        parting: "Mum seems satisfied. She tells Nan you are on your way.",
+    },
+    Errand {
+        knock: "Christmas dinner is in ten minutes.",
+        parting: "Mum seems satisfied. She will save you a pig in a blanket.",
+    },
+    Errand {
+        knock: "The King's speech is about to start.",
+        parting: "Mum seems satisfied. She will tell you what the King said.",
+    },
+    Errand {
+        knock: "An uncle has asked where you went.",
+        parting: "Mum seems satisfied. She tells the uncle you are helping in the kitchen.",
+    },
 ];
 
 #[derive(Default)]
@@ -104,7 +143,7 @@ pub struct Household {
 }
 
 pub struct MumVisit {
-    pub(crate) errand: &'static str,
+    pub(crate) errand: Errand,
     pub(crate) nonce: String,
     pub(crate) strikes: u8,
     pub(crate) knocked: bool,
@@ -159,9 +198,9 @@ impl Run {
             .collect()
     }
 
-    pub(super) fn errand(&mut self, summoned: bool) -> &'static str {
+    pub(super) fn errand(&mut self, summoned: bool) -> Errand {
         if summoned {
-            return "She heard a noise.";
+            return HEARD_A_NOISE;
         }
         if self.online.filmed_at.is_some()
             && self.chance(
@@ -169,7 +208,7 @@ impl Run {
                 VIRAL_ERRAND,
             )
         {
-            return "A neighbour has sent her something.";
+            return VIRAL;
         }
         let errands = if self.floor == Floor::Nans {
             CHRISTMAS_ERRANDS
@@ -177,33 +216,38 @@ impl Run {
             BEDROOM_ERRANDS
         };
         let weights = vec![1; errands.len()];
+        let knocks = errands.map(|errand| errand.knock);
         let i = self.oracle.pick(
             self.decision("errand", "What has brought Mum to the door?"),
             &weights,
-            &errands,
+            &knocks,
         );
         errands[i]
     }
 
     /// Mum answers every request on the run until she has been given something she believes.
     pub fn answer_door(&mut self, authorization: Option<&str>) -> Result<(), Problem> {
-        let Some(visit) = &self.household.mum else {
+        if self.household.mum.is_none() {
             return Ok(());
-        };
-        let digest = self.floor == Floor::Nans;
-        let challenge = if digest {
+        }
+        match authorization {
+            None => Err(self.knock()),
+            Some(authorization) => self.hear(authorization, self.floor == Floor::Nans),
+        }
+    }
+
+    /// Sent on every response while she is at the door, so a client always holds the current nonce.
+    pub fn mum_challenge(&self) -> Option<String> {
+        let visit = self
+            .household
+            .mum
+            .as_ref()
+            .filter(|_| self.ended.is_none())?;
+        Some(if self.floor == Floor::Nans {
             format!("Digest realm=\"household\", nonce=\"{}\"", visit.nonce)
         } else {
             "Excuse realm=\"household\"".to_owned()
-        };
-        let result = match authorization {
-            None => Err(self.knock()),
-            Some(authorization) => self.hear(authorization, digest),
-        };
-        if self.ended.is_some() {
-            return result;
-        }
-        result.map_err(|problem| problem.header(header::WWW_AUTHENTICATE, &challenge))
+        })
     }
 
     /// The first knock is free. Every one after it is a strike.
@@ -211,7 +255,7 @@ impl Run {
         let Some(visit) = &mut self.household.mum else {
             unreachable!("knock is only called while Mum is at the door");
         };
-        let errand = visit.errand;
+        let errand = visit.errand.knock;
         if !std::mem::replace(&mut visit.knocked, true) {
             self.touch();
             return Problem::new(
@@ -302,10 +346,11 @@ impl Run {
             .as_ref()
             .is_some_and(|visit| params.get("nonce") == Some(&visit.nonce));
         if !current {
-            return Err(self.mum_strike(turned_away(
+            self.touch();
+            return Err(turned_away(
                 "stale-nonce",
-                "That was a different conversation.",
-            )));
+                "That was a different conversation. Mum has started a new one, with a new nonce.",
+            ));
         }
         Ok(params.remove("username").unwrap_or_default())
     }
@@ -332,9 +377,11 @@ impl Run {
     }
 
     fn leave_door(&mut self) {
-        self.household.mum = None;
+        if let Some(visit) = self.household.mum.take() {
+            self.notices
+                .push(Notice::MumSatisfied(visit.errand.parting));
+        }
         self.standing.suspicion = 0;
-        self.notices.push(Notice::MumSatisfied);
         self.touch();
     }
 }

Modified file: src/game/mod.rs+2

@@ -37,6 +37,8 @@ pub use clinic::Clinic;

3737 pub use floor::{Floor, FloorState, Observer};

3838 pub use forum::{Branch, ELDER_LAST_MODIFIED, Elder, FORUM_THREAD, Online, Story, forum_thread};

3939 pub use gauges::{Gauges, Shown};

40+#[cfg(test)]

41+pub use household::HEARD_A_NOISE;

4042 pub use household::{Excuse, Household, MumVisit, vocabulary as excuse_vocabulary};

4143 pub use inventory::Items;

4244 pub use items::{Item, SHOP};

Modified file: src/game/notice.rs+2 additions−2 deletions@@ -13,7 +13,7 @@ pub enum Notice {
     DrawerComesLoose,
     ThreadHasReplies,
     Reflection,
-    MumSatisfied,
+    MumSatisfied(&'static str),
     ColdStart,
     RunningLong(Floor),
     LastTurn,
@@ -34,7 +34,7 @@ impl Notice {
             Self::DrawerComesLoose => "The drawer comes loose. That took a while.",
             Self::ThreadHasReplies => "Somewhere, a forum thread from 2009 still has replies.",
             Self::Reflection => "the count reached ten, and then the reflection started",
-            Self::MumSatisfied => "Mum seems satisfied. She takes the washing with her.",
+            Self::MumSatisfied(parting) => parting,
             Self::ColdStart => "Cold start. The server has noted this.",
             Self::RunningLong(floor) => match floor {
                 Floor::Bedroom => "Mum is coming up the stairs.",

Modified file: src/http/run.rs+2 additions−1 deletions@@ -162,9 +162,10 @@ fn stats(gauges: &Gauges, shame: u32) -> Vec<(HeaderName, String)> {
     if let Some(observer) = gauges.observed {
         stats.push((X_OBSERVED_BY, observer.name().into()));
     }
-    if gauges.mum_at_door {
+    if let Some(challenge) = &gauges.mum_challenge {
         stats.push((header::VIA, "1.1 mum".into()));
         stats.push((header::VARY, "Mum".into()));
+        stats.push((header::WWW_AUTHENTICATE, challenge.clone()));
     }
     if let Some(arrived) = &gauges.arrived {
         let mut gains = format!("length={:.3}, girth={:.3}", arrived.length, arrived.girth);

Modified file: src/tests/household.rs+52 additions@@ -393,3 +393,55 @@ async fn an_excuse_without_a_scheme_is_explained_for_free() {
     .await;
     assert_eq!(excused.status(), StatusCode::OK);
 }
+
+#[tokio::test]
+async fn mum_leaves_the_way_her_errand_suggests() {
+    let app = seeded_with(Floor::Bedroom, mum_at_the_door);
+    let pockets = send(&app, "GET", "/runs/cafebabe/inventory", &[], "").await;
+    assert_eq!(
+        header(&pockets, "www-authenticate"),
+        "Excuse realm=\"household\""
+    );
+    let excused = send(
+        &app,
+        "GET",
+        "/runs/cafebabe",
+        &[("authorization", "Excuse \"homework\"")],
+        "",
+    )
+    .await;
+    assert!(warnings(&excused).iter().any(|w| w.contains("the pipes")));
+    assert!(excused.headers().get("www-authenticate").is_none());
+}
+
+#[tokio::test]
+async fn a_stale_nonce_is_explained_for_free() {
+    let app = seeded_with(Floor::Nans, mum_at_the_door);
+    for _ in 0..4 {
+        let stale = send(
+            &app,
+            "GET",
+            "/runs/cafebabe",
+            &[(
+                "authorization",
+                "Digest username=\"helping Nan\", nonce=\"old\"",
+            )],
+            "",
+        )
+        .await;
+        assert_eq!(stale.status(), StatusCode::UNAUTHORIZED);
+        assert!(header(&stale, "www-authenticate").contains("nonce=\"abc\""));
+    }
+    let current = send(
+        &app,
+        "GET",
+        "/runs/cafebabe",
+        &[(
+            "authorization",
+            "Digest username=\"helping Nan\", nonce=\"abc\"",
+        )],
+        "",
+    )
+    .await;
+    assert_eq!(current.status(), StatusCode::OK);
+}

Modified file: src/tests/mod.rs+1−1

@@ -108,7 +108,7 @@ pub fn app() -> Router {

108108

109109 pub fn mum_at_the_door(run: &mut Run) {

110110 run.household.mum = Some(MumVisit {

111- errand: "She heard a noise.",

111+ errand: crate::game::HEARD_A_NOISE,

112112 nonce: "abc".into(),

113113 strikes: 0,

114114 knocked: false,

jelq

Commit 886159fd0fe7

Commit `886159fd0fe7`