fix(gateway): avoid expect on checked forum session

This commit is contained in:
Loki 2026-11-01 16:25:25 +01:00
parent c18ccadf99
commit 85a2d25844
Signed by: boba
GPG key ID: 253067914055423B

View file

@ -140,19 +140,14 @@ pub async fn handle(
Some(invalid("forum offset is too large")) Some(invalid("forum offset is too large"))
} else if operation.is_none() || operation == Some(ForumOperation::Unspecified) { } else if operation.is_none() || operation == Some(ForumOperation::Unspecified) {
Some(invalid("unsupported forum operation")) Some(invalid("unsupported forum operation"))
} else if channel.is_none() {
Some((proto::ErrorCode::ChannelNotFound, "forum not found"))
} else if session.is_none() {
Some((proto::ErrorCode::AuthFailed, "session not found"))
} else { } else {
authorize( match (&session, &channel) {
state, (_, None) => Some((proto::ErrorCode::ChannelNotFound, "forum not found")),
session.as_ref().expect("checked session"), (None, _) => Some((proto::ErrorCode::AuthFailed, "session not found")),
channel.as_ref().expect("checked forum"), (Some(session), Some(channel)) => {
posting, authorize(state, session, channel, posting).await?.err()
) }
.await? }
.err()
}; };
if let Some((code, error)) = rejection { if let Some((code, error)) = rejection {
result.error_code = code as u32; result.error_code = code as u32;
@ -160,7 +155,9 @@ pub async fn handle(
drop(guard); drop(guard);
return send(stream, seq, result).await; return send(stream, seq, result).await;
} }
let session = session.expect("checked session"); let Some(session) = session else {
return Ok(());
};
if !state.rate_limiter.try_consume(sid) { if !state.rate_limiter.try_consume(sid) {
result.error_code = proto::ErrorCode::RateLimited as u32; result.error_code = proto::ErrorCode::RateLimited as u32;
result.error = "forum requests are too frequent".into(); result.error = "forum requests are too frequent".into();