TLS 1.3, channel persistence, membership signaling
- TLS 1.3 on TCP (rustls + tokio-rustls, optional self-signed cert) - Server-side channel CRUD with SQLite persistence - Gateway → voice-node membership bridge via broadcast channel
This commit is contained in:
parent
523680e05d
commit
5534cd01f7
GPG key ID:
253067914055423B
37 changed files with 771 additions and 160 deletions
|
|
@ -1,4 +1,5 @@
|
|||
use anyhow::Result;
|
||||
use tokio::io::{AsyncRead, AsyncWrite};
|
||||
use tracing::debug;
|
||||
|
||||
use crate::{
|
||||
|
|
@ -11,174 +12,402 @@ use crate::{
|
|||
|
||||
use super::{Ctx, channel, content, direct_message, friends, guild};
|
||||
|
||||
pub async fn dispatch(
|
||||
ctx: &mut Ctx<'_>,
|
||||
pub async fn dispatch<S: AsyncRead + AsyncWrite + Unpin>(
|
||||
ctx: &mut Ctx<'_, S>,
|
||||
session_id: &str,
|
||||
pid: PacketId,
|
||||
payload: &[u8],
|
||||
addr: std::net::SocketAddr,
|
||||
) -> Result<()> {
|
||||
let Ctx {
|
||||
stream,
|
||||
seq,
|
||||
crypto,
|
||||
state,
|
||||
} = ctx;
|
||||
match pid {
|
||||
PacketId::Ping => {
|
||||
let ping: PingPayload = serde_json::from_slice(payload)?;
|
||||
io::send_encrypted(
|
||||
stream,
|
||||
ctx.stream,
|
||||
PacketId::Pong,
|
||||
seq,
|
||||
ctx.seq,
|
||||
&to_payload(&PongPayload {
|
||||
timestamp: ping.timestamp,
|
||||
}),
|
||||
crypto,
|
||||
ctx.crypto,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::JoinChannel => {
|
||||
let m: JoinChannelPayload = serde_json::from_slice(payload)?;
|
||||
channel::join(stream, seq, session_id, &m.channel_id, crypto, state).await?;
|
||||
channel::join(ctx.stream, ctx.seq, session_id, &m.channel_id, ctx.crypto, ctx.state)
|
||||
.await?;
|
||||
}
|
||||
PacketId::LeaveChannel => {
|
||||
let m: LeaveChannelPayload = serde_json::from_slice(payload)?;
|
||||
channel::leave(stream, seq, session_id, &m.channel_id, crypto, state).await?;
|
||||
channel::leave(ctx.stream, ctx.seq, session_id, &m.channel_id, ctx.crypto, ctx.state)
|
||||
.await?;
|
||||
}
|
||||
PacketId::ChannelCreate => {
|
||||
channel::handle_channel_create(stream, seq, session_id, payload, crypto, state).await?;
|
||||
channel::handle_channel_create(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::ChannelDelete => {
|
||||
channel::handle_channel_delete(stream, seq, session_id, payload, crypto, state).await?;
|
||||
channel::handle_channel_delete(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::ChannelList => {
|
||||
channel::handle_channel_list(stream, seq, session_id, crypto, state).await?;
|
||||
channel::handle_channel_list(ctx.stream, ctx.seq, session_id, ctx.crypto, ctx.state)
|
||||
.await?;
|
||||
}
|
||||
PacketId::ChatMessage => {
|
||||
let m: ChatMessagePayload = serde_json::from_slice(payload)?;
|
||||
content::chat::handle(session_id, m, state).await?;
|
||||
content::chat::handle(session_id, m, ctx.state).await?;
|
||||
}
|
||||
PacketId::DmStart => {
|
||||
direct_message::handle_dm_start(stream, seq, session_id, payload, crypto, state)
|
||||
.await?;
|
||||
direct_message::handle_dm_start(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::DmMessage => {
|
||||
direct_message::handle_dm_message(stream, seq, session_id, payload, crypto, state)
|
||||
.await?;
|
||||
direct_message::handle_dm_message(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::DmHistory => {
|
||||
direct_message::handle_dm_history(stream, seq, session_id, payload, crypto, state)
|
||||
.await?;
|
||||
direct_message::handle_dm_history(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::DmReadAck => {
|
||||
direct_message::handle_dm_read_ack(stream, seq, session_id, payload, crypto, state)
|
||||
.await?;
|
||||
direct_message::handle_dm_read_ack(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildCreate => {
|
||||
guild::handle_guild_create(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_guild_create(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildDelete => {
|
||||
guild::handle_guild_delete(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_guild_delete(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildList => {
|
||||
guild::handle_guild_list(stream, seq, session_id, crypto, state).await?;
|
||||
guild::handle_guild_list(ctx.stream, ctx.seq, session_id, ctx.crypto, ctx.state)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildMemberJoin => {
|
||||
guild::handle_guild_member_join(stream, seq, session_id, payload, crypto, state)
|
||||
.await?;
|
||||
guild::handle_guild_member_join(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildMemberLeave => {
|
||||
guild::handle_guild_member_leave(stream, seq, session_id, payload, crypto, state)
|
||||
.await?;
|
||||
guild::handle_guild_member_leave(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildMemberKick => {
|
||||
guild::handle_guild_member_kick(stream, seq, session_id, payload, crypto, state)
|
||||
.await?;
|
||||
guild::handle_guild_member_kick(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::RoleCreate => {
|
||||
guild::handle_role_create(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_role_create(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::RoleDelete => {
|
||||
guild::handle_role_delete(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_role_delete(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::InviteCreate => {
|
||||
guild::handle_invite_create(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_invite_create(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::InviteAccept => {
|
||||
guild::handle_invite_accept(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_invite_accept(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::InviteDelete => {
|
||||
guild::handle_invite_delete(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_invite_delete(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildAuditLogFetch => {
|
||||
guild::handle_audit_log_fetch(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_audit_log_fetch(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildMemberListFetch => {
|
||||
guild::handle_member_list_fetch(stream, seq, session_id, payload, crypto, state)
|
||||
.await?;
|
||||
guild::handle_member_list_fetch(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildRoleAssign => {
|
||||
guild::handle_role_assign(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_role_assign(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildRoleUnassign => {
|
||||
guild::handle_role_unassign(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_role_unassign(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::GuildRoleListFetch => {
|
||||
guild::handle_role_list_fetch(stream, seq, session_id, payload, crypto, state).await?;
|
||||
guild::handle_role_list_fetch(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::PresenceUpdate => {
|
||||
content::presence::handle_presence_update(
|
||||
stream, seq, session_id, payload, crypto, state,
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::PresenceSync => {
|
||||
content::presence::handle_presence_sync(stream, seq, session_id, crypto, state).await?;
|
||||
content::presence::handle_presence_sync(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::FriendRequest => {
|
||||
friends::handle_friend_request(stream, seq, session_id, payload, crypto, state).await?;
|
||||
friends::handle_friend_request(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::FriendAccept => {
|
||||
friends::handle_friend_accept(stream, seq, session_id, payload, crypto, state).await?;
|
||||
friends::handle_friend_accept(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::FriendDecline => {
|
||||
friends::handle_friend_decline(stream, seq, session_id, payload, crypto, state).await?;
|
||||
friends::handle_friend_decline(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::FriendRemove => {
|
||||
friends::handle_friend_remove(stream, seq, session_id, payload, crypto, state).await?;
|
||||
friends::handle_friend_remove(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::FriendList => {
|
||||
friends::handle_friend_list(stream, seq, session_id, crypto, state).await?;
|
||||
friends::handle_friend_list(ctx.stream, ctx.seq, session_id, ctx.crypto, ctx.state)
|
||||
.await?;
|
||||
}
|
||||
PacketId::BlockUser => {
|
||||
friends::handle_block_user(stream, seq, session_id, payload, crypto, state).await?;
|
||||
friends::handle_block_user(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::UnblockUser => {
|
||||
friends::handle_unblock_user(stream, seq, session_id, payload, crypto, state).await?;
|
||||
friends::handle_unblock_user(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::BlockList => {
|
||||
friends::handle_block_list(stream, seq, session_id, crypto, state).await?;
|
||||
friends::handle_block_list(ctx.stream, ctx.seq, session_id, ctx.crypto, ctx.state)
|
||||
.await?;
|
||||
}
|
||||
PacketId::MessageReactionAdd => {
|
||||
let m: ReactionPayload = serde_json::from_slice(payload)?;
|
||||
content::reaction::handle_reaction_add(session_id, m, state).await?;
|
||||
content::reaction::handle_reaction_add(session_id, m, ctx.state).await?;
|
||||
}
|
||||
PacketId::MessageReactionRemove => {
|
||||
let m: ReactionPayload = serde_json::from_slice(payload)?;
|
||||
content::reaction::handle_reaction_remove(session_id, m, state).await?;
|
||||
content::reaction::handle_reaction_remove(session_id, m, ctx.state).await?;
|
||||
}
|
||||
PacketId::MessageEdit => {
|
||||
content::message_edit::handle_message_edit(session_id, payload, state).await?;
|
||||
content::message_edit::handle_message_edit(session_id, payload, ctx.state).await?;
|
||||
}
|
||||
PacketId::MessageDelete => {
|
||||
content::message_edit::handle_message_delete(session_id, payload, state).await?;
|
||||
content::message_edit::handle_message_delete(session_id, payload, ctx.state).await?;
|
||||
}
|
||||
PacketId::TypingStart => {
|
||||
content::handle_typing_start(session_id, payload, state).await?;
|
||||
content::handle_typing_start(session_id, payload, ctx.state).await?;
|
||||
}
|
||||
PacketId::ReadReceipt => {
|
||||
content::handle_read_receipt(stream, seq, session_id, payload, crypto, state).await?;
|
||||
content::handle_read_receipt(
|
||||
ctx.stream,
|
||||
ctx.seq,
|
||||
session_id,
|
||||
payload,
|
||||
ctx.crypto,
|
||||
ctx.state,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
PacketId::Disconnect => debug!("{addr} DISCONNECT"),
|
||||
other => debug!("{addr} unhandled {:?}", other),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue