refactor: Introduce const SUPPORTED_WEBSOCKET_VERSION

n0-computer · Jun 24, 2024 · e99e7af · e99e7af
1 parent 160a2a0
commit e99e7af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/iroh-net/src/relay/http.rs b/iroh-net/src/relay/http.rs
@@ -10,6 +10,7 @@ pub use self::server::{Protocol, Server, ServerBuilder, ServerHandle, TlsAccepto
 
 pub(crate) const HTTP_UPGRADE_PROTOCOL: &str = "iroh derp http";
 pub(crate) const WEBSOCKET_UPGRADE_PROTOCOL: &str = "websocket";
+pub(crate) const SUPPORTED_WEBSOCKET_VERSION: &str = "13";
 
 #[cfg(test)]
 mod tests {

diff --git a/iroh-net/src/relay/http/server.rs b/iroh-net/src/relay/http/server.rs
@@ -24,7 +24,9 @@ use tracing::{debug, debug_span, error, info, info_span, warn, Instrument};
 use tungstenite::handshake::derive_accept_key;
 
 use crate::key::SecretKey;
-use crate::relay::http::{HTTP_UPGRADE_PROTOCOL, WEBSOCKET_UPGRADE_PROTOCOL};
+use crate::relay::http::{
+    HTTP_UPGRADE_PROTOCOL, SUPPORTED_WEBSOCKET_VERSION, WEBSOCKET_UPGRADE_PROTOCOL,
+};
 use crate::relay::server::{ClientConnHandler, MaybeTlsStream};
 use crate::relay::MaybeTlsStreamServer;
 
@@ -487,12 +489,12 @@ impl Service<Request<Incoming>> for ClientConnHandler {
                             .expect("valid body"));
                     };
 
-                    if version.as_bytes() != b"13" {
+                    if version.as_bytes() != SUPPORTED_WEBSOCKET_VERSION.as_bytes() {
                         warn!("invalid header Sec-WebSocket-Version: {:?}", version);
                         return Ok(builder
                             .status(StatusCode::BAD_REQUEST)
                             // It's convention to send back the version(s) we *do* support
-                            .header("Sec-WebSocket-Version", "13")
+                            .header("Sec-WebSocket-Version", SUPPORTED_WEBSOCKET_VERSION)
                             .body(body_empty())
                             .expect("valid body"));
                     }