radical/backend-ci-testing
1
0
Fork 0
forked from gorb/backend
Code Pull requests Activity

fix: hack around websocket spec to make tokens work

Browse source
This commit is contained in:
Radical 2025-05-26 19:41:32 +02:00
parent 5d26f94cdd
commit efa0cd555f
2 changed files with 50 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/api/v1/servers/uuid/channels/uuid/socket.rs
View file

@ -1,4 +1,8 @@
use actix_web::{Error, HttpRequest, HttpResponse, get, rt, web};
use actix_web::{
Error, HttpRequest, HttpResponse, get,
http::header::{HeaderValue, SEC_WEBSOCKET_PROTOCOL},
rt, web,
};
use actix_ws::AggregatedMessage;
use futures_util::StreamExt as _;
use uuid::Uuid;
@ -7,7 +11,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Channel, Member},
utils::get_auth_header,
utils::get_ws_protocol_header,
};
#[get("{uuid}/channels/{channel_uuid}/socket")]
@ -21,7 +25,7 @@ pub async fn echo(
let headers = req.headers();
// Retrieve auth header
let auth_header = get_auth_header(headers)?;
let auth_header = get_ws_protocol_header(headers)?;
// Get uuids from path
let (guild_uuid, channel_uuid) = path.into_inner();
@ -46,7 +50,7 @@ pub async fn echo(
.await?;
}
let (res, mut session_1, stream) = actix_ws::handle(&req, stream)?;
let (mut res, mut session_1, stream) = actix_ws::handle(&req, stream)?;
let mut stream = stream
.aggregate_continuations()
@ -77,10 +81,7 @@ pub async fn echo(
while let Some(msg) = stream.next().await {
match msg {
Ok(AggregatedMessage::Text(text)) => {
let mut conn = data
.cache_pool
.get_multiplexed_tokio_connection()
.await?;
let mut conn = data.cache_pool.get_multiplexed_tokio_connection().await?;
redis::cmd("PUBLISH")
.arg(&[channel_uuid.to_string(), text.to_string()])
@ -109,6 +110,13 @@ pub async fn echo(
Ok::<(), crate::error::Error>(())
});
let headers = res.headers_mut();
headers.append(
SEC_WEBSOCKET_PROTOCOL,
HeaderValue::from_str("Authorization")?,
);
// respond immediately with response connected to WS session
Ok(res)
}