rust
/
tungstenite-rs
mirror of https://github.com/snapview/tungstenite-rs
1
0
Fork 0
Code Issues Releases Wiki Activity

server_allow_unmasked changed from Option<bool> to bool

This commit is contained in:
Adam Bezecny (DHL IT Services) 2020-11-27 21:38:33 +01:00
parent 0121bf9682
commit a9adb42343
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/srv_accept_unmasked_frames.rs
View File

@ -34,7 +34,7 @@ fn main() {
// This is not in compliance with RFC 6455 but might be handy in some
// rare cases where it is necessary to integrate with existing/legacy
// clients which are sending unmasked frames
server_allow_unmasked: Some(true),
server_allow_unmasked: true,
});
let mut websocket = accept_hdr_with_config(stream.unwrap(), callback, config).unwrap();

16
src/protocol/mod.rs
View File

@ -54,7 +54,7 @@ pub struct WebSocketConfig {
/// Even though this behaviour is not in compliance with RFC 6455 (which requires the server
/// to close the connection when unmasked frame from client is received) it might be handy in some cases
/// as there are existing applications sending unmasked client frames.
pub server_allow_unmasked: Option<bool>,
pub server_allow_unmasked: bool,
}
impl Default for WebSocketConfig {
@ -63,7 +63,7 @@ impl Default for WebSocketConfig {
max_send_queue: None,
max_message_size: Some(64 << 20),
max_frame_size: Some(16 << 20),
server_allow_unmasked: None,
server_allow_unmasked: false,
}
}
}
@ -457,16 +457,8 @@ impl WebSocketContext {
// frame that is not masked. (RFC 6455)
// The only exception here is if the user explicitly accepts given
// stream (by tungstenite::server::accept_with_config or tungstenite::server::accept_hdr_with_config)
// with WebSocketConfig.server_allow_unmasked set to Some(true)
if let Some(server_allow_unmasked_val) =
self.get_config().server_allow_unmasked
{
if server_allow_unmasked_val == false {
return Err(Error::Protocol(
"Received an unmasked frame from client".into(),
));
}
} else {
// with WebSocketConfig.server_allow_unmasked set to true
if self.get_config().server_allow_unmasked == false {
return Err(Error::Protocol(
"Received an unmasked frame from client".into(),
));