Import upstream v0.16.22, stripped
Upstream commit: 474dd0229cb20cf513036619781ed97bd8073c3f Enterprise-only files removed or emptied: 63 Enterprise-only snippets removed: 117 in 50 files Dangling module declarations removed: 5 Cargo edits turning enterprise off: 14 Verification: clean Enterprise feature gates left for rebuilt features: 19 in 18 files Produced by tools/fork/strip.py. The full report is in docs/fork/strip-reports/ on main.
This commit is contained in:
@@ -0,0 +1,109 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2020 Stalwart Labs LLC <[email protected]>
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
|
||||
*/
|
||||
|
||||
use super::stream::WebSocketHandler;
|
||||
use common::{Server, auth::AccessToken};
|
||||
use http_proto::*;
|
||||
use hyper::StatusCode;
|
||||
use hyper_util::rt::TokioIo;
|
||||
use std::future::Future;
|
||||
use tokio_tungstenite::WebSocketStream;
|
||||
use trc::JmapEvent;
|
||||
use tungstenite::{handshake::derive_accept_key, protocol::Role};
|
||||
|
||||
pub trait WebSocketUpgrade: Sync + Send {
|
||||
fn upgrade_websocket_connection(
|
||||
&self,
|
||||
req: HttpRequest,
|
||||
access_token: AccessToken,
|
||||
session: HttpSessionData,
|
||||
) -> impl Future<Output = trc::Result<HttpResponse>> + Send;
|
||||
}
|
||||
|
||||
impl WebSocketUpgrade for Server {
|
||||
async fn upgrade_websocket_connection(
|
||||
&self,
|
||||
req: HttpRequest,
|
||||
access_token: AccessToken,
|
||||
session: HttpSessionData,
|
||||
) -> trc::Result<HttpResponse> {
|
||||
let headers = req.headers();
|
||||
let header_has_token = |name: hyper::header::HeaderName, token: &str| {
|
||||
headers
|
||||
.get(name)
|
||||
.and_then(|h| h.to_str().ok())
|
||||
.is_some_and(|value| {
|
||||
value
|
||||
.split(',')
|
||||
.any(|part| part.trim().eq_ignore_ascii_case(token))
|
||||
})
|
||||
};
|
||||
if !header_has_token(hyper::header::CONNECTION, "Upgrade")
|
||||
|| !header_has_token(hyper::header::UPGRADE, "websocket")
|
||||
{
|
||||
return Err(trc::ResourceEvent::BadParameters
|
||||
.into_err()
|
||||
.details("WebSocket upgrade failed")
|
||||
.ctx(
|
||||
trc::Key::Reason,
|
||||
"Missing or Invalid Connection or Upgrade headers.",
|
||||
));
|
||||
}
|
||||
let derived_key = match (
|
||||
headers
|
||||
.get("Sec-WebSocket-Key")
|
||||
.and_then(|h| h.to_str().ok()),
|
||||
headers
|
||||
.get("Sec-WebSocket-Version")
|
||||
.and_then(|h| h.to_str().ok()),
|
||||
) {
|
||||
(Some(key), Some("13")) => derive_accept_key(key.as_bytes()),
|
||||
_ => {
|
||||
return Err(trc::ResourceEvent::BadParameters
|
||||
.into_err()
|
||||
.details("WebSocket upgrade failed")
|
||||
.ctx(
|
||||
trc::Key::Reason,
|
||||
"Missing or Invalid Sec-WebSocket-Key headers.",
|
||||
));
|
||||
}
|
||||
};
|
||||
|
||||
// Spawn WebSocket connection
|
||||
let jmap = self.clone();
|
||||
tokio::spawn(async move {
|
||||
// Upgrade connection
|
||||
let session_id = session.session_id;
|
||||
match hyper::upgrade::on(req).await {
|
||||
Ok(upgraded) => {
|
||||
Box::pin(
|
||||
jmap.handle_websocket_stream(
|
||||
WebSocketStream::from_raw_socket(
|
||||
TokioIo::new(upgraded),
|
||||
Role::Server,
|
||||
None,
|
||||
)
|
||||
.await,
|
||||
access_token,
|
||||
session,
|
||||
),
|
||||
)
|
||||
.await;
|
||||
}
|
||||
Err(err) => {
|
||||
trc::event!(
|
||||
Jmap(JmapEvent::WebsocketError),
|
||||
Details = "Websocket upgrade failed",
|
||||
SpanId = session_id,
|
||||
Reason = err.to_string()
|
||||
);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Ok(HttpResponse::new(StatusCode::SWITCHING_PROTOCOLS).with_websocket_upgrade(derived_key))
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user