Addressed every rustc warning surfaced by \`cargo check --workspace
--release --lib --bins\` on opus-DRED-v2. Split across three
categories:
## Real bugs surfaced by the audit (fix, don't silence)
- **crates/wzp-relay/src/federation.rs** — the per-peer RTT monitor
task computed \`rtt_ms\` every 5 s and threw it on the floor. The
\`wzp_federation_peer_rtt_ms\` gauge has been registered in
metrics.rs the whole time but was never receiving samples, leaving
the Grafana panel blank. Wired it up: the task now calls
\`fm_rtt.metrics.federation_peer_rtt_ms.with_label_values(&[&label_rtt]).set(rtt_ms)\`
on every sample. Fixes three warnings (\`rtt_ms\`, \`fm_rtt\`,
\`label_rtt\` were all captured for this task and all dead).
## Dead code removal
- **crates/wzp-relay/src/federation.rs** — removed \`local_delivery_seq:
AtomicU16\` field and its initializer. It was described in comments
as "per-room seq counter for federation media delivered to local
clients" but was declared, initialized to 0, and never read or
written anywhere else. Genuine half-wired feature; deletable with
zero behavior change.
- **crates/wzp-relay/src/room.rs** — removed \`let recv_start =
Instant::now()\` at the top of a recv loop that was never read.
Separate variable \`last_recv_instant\` already measures the actual
gap that's used for the \`max_recv_gap_ms\` stat.
- **crates/wzp-client/src/cli.rs** — removed \`let my_fp = fp.clone()\`
from the signal loop setup. Cloned but never used in any match arm.
## Stub-intent warnings (underscore + explanatory comment)
- **crates/wzp-relay/src/handshake.rs** — \`choose_profile\` hardcodes
\`QualityProfile::GOOD\` and ignores its \`supported\` parameter.
Comment already documented "Cap at GOOD (24k) for now — studio
tiers not yet tested for federation reliability". Renamed to
\`_supported\`, expanded the comment to explicitly note the future
plan (pick highest supported ≤ relay ceiling).
- **crates/wzp-relay/src/federation.rs** — \`forward_to_peers\` takes
\`room_name: &str\` but only uses \`room_hash\`. The caller
(handle_datagram) passes the name for caller-site symmetry with
other helpers; kept the param shape and underscored the binding
with a comment noting it's reserved for future per-name logging.
## Cosmetic fixes
- **crates/wzp-relay/src/event_log.rs** — dropped \`use std::sync::Arc\`
(unused).
- **crates/wzp-relay/src/signal_hub.rs** — trimmed \`use tracing::{info,
warn}\` to \`use tracing::info\`. Also removed unnecessary \`mut\` on
\`hub\` binding in the \`register_unregister\` test.
- **crates/wzp-relay/src/room.rs** — trimmed \`use tracing::{debug,
error, info, trace, warn}\` to \`{error, info, warn}\`. Also removed
unnecessary \`mut\` on \`mgr\` binding in the \`room_join_leave\` test.
- **crates/wzp-relay/src/main.rs** — removed unnecessary \`mut\` on the
\`config\` destructured binding from \`parse_args()\`; and dropped
\`ref caller_alias\` from the \`DirectCallOffer\` match pattern since
the relay just forwards the full \`msg\` (caller_alias is preserved
end-to-end, we don't need to read it on the relay).
- **crates/wzp-crypto/tests/featherchat_compat.rs** — dropped
\`CallSignalType\` from a \`use wzp_client::featherchat::{...}\`
(unused in the test body). Note: this test file has pre-existing
compile errors from SignalMessage schema drift unrelated to this
sweep; that's tracked separately.
## Crate-level annotation
- **crates/wzp-android/src/lib.rs** — added
\`#![allow(dead_code, unused_imports, unused_variables, unused_mut)]\`
with a doc block explaining the crate is dead code since the Tauri
mobile rewrite. The legacy Kotlin+JNI Android app that consumed
this crate was replaced by desktop/src-tauri (live Android recv
path) + crates/wzp-native (Oboe bridge). Rather than piecemeal
cleanup of a crate that shouldn't be maintained, the whole-crate
allow keeps CI clean until someone removes the crate entirely. Kills
all 6 wzp-android warnings (4 unused imports/vars, 1 unused \`mut\`
on a JNI env param, 1 dead \`command_rx\` field) in one line.
## Not touched
- **deps/featherchat/warzone/crates/warzone-protocol/src/x3dh.rs** —
3 unused-variable warnings in \`alice_spk_secret\`, \`alice_bundle\`,
\`bob_bundle_bytes\`. This is a vendored third-party submodule;
upstream's problem, not ours. Would need to be reported to
featherchat upstream if we care.
## Verification
- \`cargo check --workspace --release --lib --bins\` → 0 warnings, 0 errors
- \`cargo check --workspace --release --all-targets\` → only the 3
featherchat submodule warnings remain, plus the pre-existing 3
broken integration tests (SignalMessage schema drift from Phase 2,
tracked separately and explicitly out of scope).
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
128 lines
4.7 KiB
Rust
128 lines
4.7 KiB
Rust
//! Relay-side (callee) cryptographic handshake.
|
|
//!
|
|
//! Performs the callee role of the WarzonePhone key exchange:
|
|
//! recv `CallOffer` → verify → generate ephemeral → derive session → send `CallAnswer`.
|
|
|
|
use wzp_crypto::{CryptoSession, KeyExchange, WarzoneKeyExchange};
|
|
use wzp_proto::{MediaTransport, QualityProfile, SignalMessage};
|
|
|
|
/// Accept the relay (callee) side of the cryptographic handshake.
|
|
///
|
|
/// 1. Receive `CallOffer` from client
|
|
/// 2. Verify caller's signature over `(ephemeral_pub || "call-offer")`
|
|
/// 3. Generate our own ephemeral X25519 keypair
|
|
/// 4. Sign `(ephemeral_pub || "call-answer")` with our identity key
|
|
/// 5. Derive shared ChaCha20-Poly1305 session
|
|
/// 6. Send `CallAnswer` back
|
|
///
|
|
/// Returns the derived `CryptoSession`, the chosen `QualityProfile`, the caller's fingerprint,
|
|
/// and the caller's alias (if provided in CallOffer).
|
|
pub async fn accept_handshake(
|
|
transport: &dyn MediaTransport,
|
|
seed: &[u8; 32],
|
|
) -> Result<(Box<dyn CryptoSession>, QualityProfile, String, Option<String>), anyhow::Error> {
|
|
// 1. Receive CallOffer
|
|
let offer = transport
|
|
.recv_signal()
|
|
.await?
|
|
.ok_or_else(|| anyhow::anyhow!("connection closed before receiving CallOffer"))?;
|
|
|
|
let (caller_identity_pub, caller_ephemeral_pub, caller_signature, supported_profiles, caller_alias) =
|
|
match offer {
|
|
SignalMessage::CallOffer {
|
|
identity_pub,
|
|
ephemeral_pub,
|
|
signature,
|
|
supported_profiles,
|
|
alias,
|
|
} => (identity_pub, ephemeral_pub, signature, supported_profiles, alias),
|
|
other => {
|
|
return Err(anyhow::anyhow!(
|
|
"expected CallOffer, got {:?}",
|
|
std::mem::discriminant(&other)
|
|
))
|
|
}
|
|
};
|
|
|
|
// 2. Verify caller's signature over (ephemeral_pub || "call-offer")
|
|
let mut verify_data = Vec::with_capacity(32 + 10);
|
|
verify_data.extend_from_slice(&caller_ephemeral_pub);
|
|
verify_data.extend_from_slice(b"call-offer");
|
|
if !WarzoneKeyExchange::verify(&caller_identity_pub, &verify_data, &caller_signature) {
|
|
return Err(anyhow::anyhow!("caller signature verification failed"));
|
|
}
|
|
|
|
// 3. Create our key exchange and generate ephemeral
|
|
let mut kx = WarzoneKeyExchange::from_identity_seed(seed);
|
|
let identity_pub = kx.identity_public_key();
|
|
let ephemeral_pub = kx.generate_ephemeral();
|
|
|
|
// 4. Sign (ephemeral_pub || "call-answer")
|
|
let mut sign_data = Vec::with_capacity(32 + 11);
|
|
sign_data.extend_from_slice(&ephemeral_pub);
|
|
sign_data.extend_from_slice(b"call-answer");
|
|
let signature = kx.sign(&sign_data);
|
|
|
|
// 5. Derive session from caller's ephemeral public key
|
|
let session = kx.derive_session(&caller_ephemeral_pub)?;
|
|
|
|
// Choose the best supported profile (prefer GOOD > DEGRADED > CATASTROPHIC)
|
|
let chosen_profile = choose_profile(&supported_profiles);
|
|
|
|
// 6. Send CallAnswer
|
|
let answer = SignalMessage::CallAnswer {
|
|
identity_pub,
|
|
ephemeral_pub,
|
|
signature,
|
|
chosen_profile,
|
|
};
|
|
transport.send_signal(&answer).await?;
|
|
|
|
// Derive caller fingerprint: SHA-256(Ed25519 pub)[:16], formatted as xxxx:xxxx:...
|
|
// Must match the format used in signal registration and presence.
|
|
let caller_fp = {
|
|
use sha2::{Sha256, Digest};
|
|
let hash = Sha256::digest(&caller_identity_pub);
|
|
let fp = wzp_crypto::Fingerprint([
|
|
hash[0], hash[1], hash[2], hash[3], hash[4], hash[5], hash[6], hash[7],
|
|
hash[8], hash[9], hash[10], hash[11], hash[12], hash[13], hash[14], hash[15],
|
|
]);
|
|
fp.to_string()
|
|
};
|
|
|
|
Ok((session, chosen_profile, caller_fp, caller_alias))
|
|
}
|
|
|
|
/// Select the best quality profile from those the caller supports.
|
|
///
|
|
/// The `_supported` list is currently ignored — we hardcode GOOD (24k) until
|
|
/// studio tiers (32k/48k/64k) have been validated across federation (large
|
|
/// packets may exceed path MTU and fragment in unpleasant ways). Once that's
|
|
/// tested, the body should pick the highest supported profile ≤ the relay's
|
|
/// configured ceiling.
|
|
fn choose_profile(_supported: &[QualityProfile]) -> QualityProfile {
|
|
QualityProfile::GOOD
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn choose_profile_picks_highest_bitrate() {
|
|
let profiles = vec![
|
|
QualityProfile::CATASTROPHIC,
|
|
QualityProfile::GOOD,
|
|
QualityProfile::DEGRADED,
|
|
];
|
|
let chosen = choose_profile(&profiles);
|
|
assert_eq!(chosen, QualityProfile::GOOD);
|
|
}
|
|
|
|
#[test]
|
|
fn choose_profile_empty_defaults_to_good() {
|
|
let chosen = choose_profile(&[]);
|
|
assert_eq!(chosen, QualityProfile::GOOD);
|
|
}
|
|
}
|