fix(maestro): broker dials peer before WS upgrade so failures surface (NAP-265)
ci / rust (push) Failing after 5m59s
ci / rust (push) Failing after 5m59s
`broker_attach_ws` upgraded the client WS first and only then dialed the peer inside `pump_broker_ws`; a dial failure (peer down, perimeter rejection, peer verifier refusing the pair JWT — all reported pre-upgrade) just logged and closed the socket, indistinguishable from a clean session end. Move the `connect_async` ahead of `on_upgrade`: on failure return a structured `502 peer_unreachable` (matching the other pre-upgrade error paths); on success hand the connected upstream to `pump_broker_ws`. Updated the allow_inbound-reject e2e to assert the handshake now fails with 502 instead of an opaque post-upgrade close. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -613,29 +613,24 @@ async fn broker_rejects_when_target_doesnt_allow_inbound() {
|
||||
.await;
|
||||
|
||||
let broker_url = format!("ws://{}/api/attach/{}", alpha.bind_addr, sid);
|
||||
// The handshake itself succeeds (alpha's broker accepts and starts
|
||||
// proxying), but beta will reject the pair JWT — the upstream WS closes
|
||||
// immediately, and alpha's proxy closes the client WS in turn.
|
||||
let (mut ws, _) = tokio_tungstenite::connect_async(broker_url)
|
||||
// NAP-265: beta rejects the pair JWT (empty allow_inbound) pre-upgrade.
|
||||
// alpha's broker now dials the peer *before* completing the upgrade, so the
|
||||
// client's handshake fails with a structured 502 rather than succeeding and
|
||||
// then closing opaquely.
|
||||
let err = tokio_tungstenite::connect_async(broker_url)
|
||||
.await
|
||||
.expect("alpha handshake");
|
||||
// We should get a close shortly without any binary frames.
|
||||
let deadline = std::time::Instant::now() + Duration::from_secs(3);
|
||||
let mut got_binary = false;
|
||||
while std::time::Instant::now() < deadline {
|
||||
tokio::select! {
|
||||
msg = ws.next() => match msg {
|
||||
Some(Ok(WsMessage::Binary(_))) => got_binary = true,
|
||||
None | Some(Err(_)) => break,
|
||||
Some(Ok(_)) => {}
|
||||
},
|
||||
_ = tokio::time::sleep(Duration::from_millis(50)) => {}
|
||||
.expect_err("handshake must fail when the peer rejects the attach");
|
||||
match err {
|
||||
tokio_tungstenite::tungstenite::Error::Http(resp) => {
|
||||
assert_eq!(
|
||||
resp.status(),
|
||||
502,
|
||||
"expected BAD_GATEWAY from alpha's broker, got {}",
|
||||
resp.status()
|
||||
);
|
||||
}
|
||||
other => panic!("expected an HTTP 502 response, got {other:?}"),
|
||||
}
|
||||
assert!(
|
||||
!got_binary,
|
||||
"beta rejected the JWT but alpha somehow forwarded PTY bytes"
|
||||
);
|
||||
|
||||
client.kill_session(sid).await.expect("kill");
|
||||
drop(alpha);
|
||||
|
||||
Reference in New Issue
Block a user