A bad UDP packet on a flaky link could permanently wedge the voice path, unrecoverable even across app restarts. Three defects: 1. Anti-replay window was advanced from the UNAUTHENTICATED header seq before the AEAD tag was checked, and not rolled back on failure. One corrupted/forged frame shoved recv_highest_ far ahead, after which every legitimate frame was rejected as "too old" forever. Reorder to replay-check -> authenticate -> update (RFC 3711 3.3); the window now moves only after a successful tag check. 2. The wire seq was only the low 16 bits of the nonce counter (zero-extended on receive). After 65,536 frames the nonce desynced and all frames failed auth. Widen the voice frame seq u16 -> u64 (header 14 -> 20 bytes). The core owns all UDP framing, so Swift/C# clients need only a rebuild. This is a versioned wire change: VOICECAT_PROTOCOL_VERSION 1 -> 2, handshake rejects on mismatch. 3. Server leaked per-session UDP state on disconnect; unregister_session now frees udp_endpoints_/udp_tokens_/ssrc_to_session_. Also add rate-limited dropped-frame logging to MediaRelay so a wedged media path is observable. New regression tests in test_media_aead.cpp cover the poison (fails on old code) and the 16-bit wrap. ctest --preset dev -E external_pcm: 22/22 pass (external_pcm aborts on a pre-existing CoreAudio shutdown race, unrelated).
178 lines
7.5 KiB
C++
178 lines
7.5 KiB
C++
#include "media_relay.h"
|
|
|
|
#ifdef VOICECAT_HAS_NET
|
|
|
|
#include <array>
|
|
#include <chrono>
|
|
#include <cstdio>
|
|
#include <string_view>
|
|
|
|
#include "conn_session.h"
|
|
#include "crypto/crypto.h"
|
|
#include "net/voice_frame.h"
|
|
#include "session_registry.h"
|
|
|
|
namespace voicecat::server {
|
|
|
|
MediaRelay::MediaRelay(asio::io_context& io, std::shared_ptr<SessionRegistry> registry)
|
|
: io_(io), registry_(std::move(registry)) {}
|
|
|
|
MediaRelay::~MediaRelay() { stop(); }
|
|
|
|
bool MediaRelay::bind(uint16_t port) {
|
|
return udp_.bind(io_, port);
|
|
}
|
|
|
|
void MediaRelay::start() {
|
|
udp_.start_recv([this](const uint8_t* data, size_t len, asio::ip::udp::endpoint sender) {
|
|
on_udp_frame(data, len, sender);
|
|
});
|
|
}
|
|
|
|
void MediaRelay::stop() {
|
|
udp_.close();
|
|
}
|
|
|
|
uint16_t MediaRelay::media_port() const {
|
|
return static_cast<uint16_t>(udp_.local_endpoint().port());
|
|
}
|
|
|
|
void MediaRelay::note_drop(const char* reason) {
|
|
if (std::string_view(reason) == "unmapped-endpoint") ++drop_no_endpoint_;
|
|
else if (std::string_view(reason) == "no-recv-crypto") ++drop_no_crypto_;
|
|
else ++drop_open_failed_;
|
|
|
|
// Rate-limit the summary to at most once every 5s so a flood can't spam the log.
|
|
auto now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
|
|
std::chrono::steady_clock::now().time_since_epoch()).count();
|
|
if (now_ms - last_drop_log_ms_ < 5000) return;
|
|
last_drop_log_ms_ = now_ms;
|
|
std::fprintf(stderr,
|
|
"[media] dropped frames — unmapped-endpoint=%llu no-recv-crypto=%llu "
|
|
"open-failed(auth/replay)=%llu\n",
|
|
static_cast<unsigned long long>(drop_no_endpoint_),
|
|
static_cast<unsigned long long>(drop_no_crypto_),
|
|
static_cast<unsigned long long>(drop_open_failed_));
|
|
}
|
|
|
|
void MediaRelay::on_udp_frame(const uint8_t* data, size_t len,
|
|
asio::ip::udp::endpoint sender) {
|
|
if (len < 1) return;
|
|
|
|
const uint8_t frame_type = data[0];
|
|
|
|
if (frame_type == voicecat::net::kFrameUdpBinding) {
|
|
// Payload = 16-byte token after the 14-byte header.
|
|
if (len < voicecat::net::kVoiceHeaderSize + 16) return;
|
|
std::array<uint8_t, 16> token{};
|
|
std::memcpy(token.data(), data + voicecat::net::kVoiceHeaderSize, 16);
|
|
|
|
auto session = registry_->find_by_udp_token(token);
|
|
if (!session) return;
|
|
|
|
session->set_udp_endpoint(sender);
|
|
return;
|
|
}
|
|
|
|
if (frame_type == voicecat::net::kFrameVoice) {
|
|
if (len < voicecat::net::kVoiceHeaderSize + crypto_aead_chacha20poly1305_ietf_ABYTES) return;
|
|
|
|
// Resolve sender session.
|
|
auto sender_session = registry_->find_by_udp_endpoint(sender);
|
|
if (!sender_session) { note_drop("unmapped-endpoint"); return; }
|
|
|
|
auto* recv_crypto = sender_session->recv_crypto();
|
|
if (!recv_crypto) { note_drop("no-recv-crypto"); return; }
|
|
|
|
// AAD = 14-byte header (authenticated, not encrypted).
|
|
const uint8_t* aad = data;
|
|
const uint8_t* sealed = data + voicecat::net::kVoiceHeaderSize;
|
|
size_t sealed_len = len - voicecat::net::kVoiceHeaderSize;
|
|
|
|
if (plain_buf_.size() < sealed_len) plain_buf_.resize(sealed_len);
|
|
|
|
long plain_len = recv_crypto->open(sealed, sealed_len, aad, voicecat::net::kVoiceHeaderSize,
|
|
plain_buf_.data(), plain_buf_.size());
|
|
if (plain_len < 0) { note_drop("open-failed"); return; } // auth failure or replay
|
|
|
|
// Parse the voice frame header to find the source ssrc/channel.
|
|
voicecat::net::VoiceFrame hdr{};
|
|
if (!voicecat::net::parse_header(data, len, hdr)) return;
|
|
|
|
// Find the channel and get all other members.
|
|
uint32_t uid = sender_session->user_id();
|
|
uint32_t channel = registry_->user_channel(uid);
|
|
if (channel == 0) return;
|
|
|
|
auto members = registry_->find_channel_sessions(channel, sender_session->session_id());
|
|
|
|
// Re-encrypt and relay to each member.
|
|
for (auto& member : members) {
|
|
if (!member->has_udp_endpoint()) continue;
|
|
|
|
auto* send_crypto = member->send_crypto();
|
|
if (!send_crypto) continue;
|
|
|
|
// Build an outgoing frame with the same 14-byte header.
|
|
if (seal_buf_.size() < voicecat::net::kVoiceHeaderSize +
|
|
static_cast<size_t>(plain_len) +
|
|
crypto_aead_chacha20poly1305_ietf_ABYTES) {
|
|
seal_buf_.resize(voicecat::net::kVoiceHeaderSize +
|
|
static_cast<size_t>(plain_len) +
|
|
crypto_aead_chacha20poly1305_ietf_ABYTES);
|
|
}
|
|
|
|
// Copy header (ssrc, ts, flags pass through for demux/playout), then rewrite the
|
|
// seq field to THIS recipient's next send counter. The media AEAD nonce is an
|
|
// implicit per-direction monotonic counter; open() reconstructs it from the seq in
|
|
// the header (the AAD). Since we re-seal with the recipient's send_crypto (its own
|
|
// counter), the verbatim sender seq would no longer match the nonce seal() uses and
|
|
// every relayed frame would fail auth. Set seq = peek_send_counter() BEFORE sealing
|
|
// so the header (which is the authenticated AAD) carries the matching counter.
|
|
std::memcpy(seal_buf_.data(), data, voicecat::net::kVoiceHeaderSize);
|
|
const uint64_t send_ctr = send_crypto->peek_send_counter();
|
|
seal_buf_[8] = static_cast<uint8_t>((send_ctr >> 56) & 0xFF);
|
|
seal_buf_[9] = static_cast<uint8_t>((send_ctr >> 48) & 0xFF);
|
|
seal_buf_[10] = static_cast<uint8_t>((send_ctr >> 40) & 0xFF);
|
|
seal_buf_[11] = static_cast<uint8_t>((send_ctr >> 32) & 0xFF);
|
|
seal_buf_[12] = static_cast<uint8_t>((send_ctr >> 24) & 0xFF);
|
|
seal_buf_[13] = static_cast<uint8_t>((send_ctr >> 16) & 0xFF);
|
|
seal_buf_[14] = static_cast<uint8_t>((send_ctr >> 8) & 0xFF);
|
|
seal_buf_[15] = static_cast<uint8_t>(send_ctr & 0xFF);
|
|
|
|
uint8_t* out_payload = seal_buf_.data() + voicecat::net::kVoiceHeaderSize;
|
|
long sealed_out = send_crypto->seal(
|
|
plain_buf_.data(), static_cast<size_t>(plain_len),
|
|
seal_buf_.data(), voicecat::net::kVoiceHeaderSize,
|
|
out_payload,
|
|
static_cast<size_t>(plain_len) + crypto_aead_chacha20poly1305_ietf_ABYTES);
|
|
|
|
if (sealed_out < 0) continue;
|
|
|
|
udp_.send_to(seal_buf_.data(),
|
|
voicecat::net::kVoiceHeaderSize + static_cast<size_t>(sealed_out),
|
|
member->udp_endpoint());
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (frame_type == voicecat::net::kFrameKeepalive) {
|
|
// Plaintext KEEPALIVE (docs/voice.md §6): identify the sender by its verified UDP
|
|
// endpoint, bump last_seen so the reaper doesn't drop a client whose TCP control
|
|
// channel is idle but whose media path is alive, and echo the keepalive back so the
|
|
// client can measure media-path RTT/loss independently of the TCP ping.
|
|
auto session = registry_->find_by_udp_endpoint(sender);
|
|
if (!session) return;
|
|
session->touch_last_seen();
|
|
// Echo back to the sender (same plaintext header).
|
|
udp_.send_to(data, len, sender);
|
|
return;
|
|
}
|
|
|
|
// Unknown frame type: silently discard.
|
|
}
|
|
|
|
} // namespace voicecat::server
|
|
|
|
#endif // VOICECAT_HAS_NET
|