From efe3025395ac2202a22639e3ac98f67617af0685 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sun, 17 Mar 2019 22:57:27 -0700
Subject: [PATCH] add handshake test
---
actix-web-actors/src/ws.rs | 122 ++++++++++++++++++++++++++++++++++++-
1 file changed, 121 insertions(+), 1 deletion(-)
diff --git a/actix-web-actors/src/ws.rs b/actix-web-actors/src/ws.rs
index 54632627..a5d26623 100644
--- a/actix-web-actors/src/ws.rs
+++ b/actix-web-actors/src/ws.rs
@@ -52,7 +52,7 @@ pub fn handshake(req: &HttpRequest) -> Result<HttpResponseBuilder, HandshakeErro
// Check for "UPGRADE" to websocket header
let has_hdr = if let Some(hdr) = req.headers().get(header::UPGRADE) {
if let Ok(s) = hdr.to_str() {
- s.to_lowercase().contains("websocket")
+ s.to_ascii_lowercase().contains("websocket")
} else {
false
}
@@ -426,3 +426,123 @@ where
}
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use actix_web::http::{header, Method};
+ use actix_web::test::TestRequest;
+
+ #[test]
+ fn test_handshake() {
+ let req = TestRequest::default()
+ .method(Method::POST)
+ .to_http_request();
+ assert_eq!(
+ HandshakeError::GetMethodRequired,
+ handshake(&req).err().unwrap()
+ );
+
+ let req = TestRequest::default().to_http_request();
+ assert_eq!(
+ HandshakeError::NoWebsocketUpgrade,
+ handshake(&req).err().unwrap()
+ );
+
+ let req = TestRequest::default()
+ .header(header::UPGRADE, header::HeaderValue::from_static("test"))
+ .to_http_request();
+ assert_eq!(
+ HandshakeError::NoWebsocketUpgrade,
+ handshake(&req).err().unwrap()
+ );
+
+ let req = TestRequest::default()
+ .header(
+ header::UPGRADE,
+ header::HeaderValue::from_static("websocket"),
+ )
+ .to_http_request();
+ assert_eq!(
+ HandshakeError::NoConnectionUpgrade,
+ handshake(&req).err().unwrap()
+ );
+
+ let req = TestRequest::default()
+ .header(
+ header::UPGRADE,
+ header::HeaderValue::from_static("websocket"),
+ )
+ .header(
+ header::CONNECTION,
+ header::HeaderValue::from_static("upgrade"),
+ )
+ .to_http_request();
+ assert_eq!(
+ HandshakeError::NoVersionHeader,
+ handshake(&req).err().unwrap()
+ );
+
+ let req = TestRequest::default()
+ .header(
+ header::UPGRADE,
+ header::HeaderValue::from_static("websocket"),
+ )
+ .header(
+ header::CONNECTION,
+ header::HeaderValue::from_static("upgrade"),
+ )
+ .header(
+ header::SEC_WEBSOCKET_VERSION,
+ header::HeaderValue::from_static("5"),
+ )
+ .to_http_request();
+ assert_eq!(
+ HandshakeError::UnsupportedVersion,
+ handshake(&req).err().unwrap()
+ );
+
+ let req = TestRequest::default()
+ .header(
+ header::UPGRADE,
+ header::HeaderValue::from_static("websocket"),
+ )
+ .header(
+ header::CONNECTION,
+ header::HeaderValue::from_static("upgrade"),
+ )
+ .header(
+ header::SEC_WEBSOCKET_VERSION,
+ header::HeaderValue::from_static("13"),
+ )
+ .to_http_request();
+ assert_eq!(
+ HandshakeError::BadWebsocketKey,
+ handshake(&req).err().unwrap()
+ );
+
+ let req = TestRequest::default()
+ .header(
+ header::UPGRADE,
+ header::HeaderValue::from_static("websocket"),
+ )
+ .header(
+ header::CONNECTION,
+ header::HeaderValue::from_static("upgrade"),
+ )
+ .header(
+ header::SEC_WEBSOCKET_VERSION,
+ header::HeaderValue::from_static("13"),
+ )
+ .header(
+ header::SEC_WEBSOCKET_KEY,
+ header::HeaderValue::from_static("13"),
+ )
+ .to_http_request();
+
+ assert_eq!(
+ StatusCode::SWITCHING_PROTOCOLS,
+ handshake(&req).unwrap().finish().status()
+ );
+ }
+}