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

minor fixes

This commit is contained in:
Adam Bezecny (DHL IT Services) 2020-12-01 19:19:45 +01:00
parent 4f7dab5d7b
commit 9f292d21fc
2 changed files with 10 additions and 11 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: true,
accept_unmasked_frames: true,
});
let mut websocket = accept_hdr_with_config(stream.unwrap(), callback, config).unwrap();

19
src/protocol/mod.rs
View File

@ -50,13 +50,12 @@ pub struct WebSocketConfig {
/// be reasonably big for all normal use-cases but small enough to prevent memory eating
/// by a malicious user.
pub max_frame_size: Option<usize>,
/// If set to true it will allow the websocket server to accept unmasked frames from client.
/// 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. By default (i.e. unless not explicitly specified)
/// this flag is set to false which means violation of RFC 6455 is not allowed and unmasked client frames will be rejected
///by websocket server.
pub server_allow_unmasked: bool,
/// When set to `true`, the server will accept and handle unmasked frames
/// from the client. According to the RFC 6455, the server must close the
/// connection to the client in such cases, however it seems like there are
/// some popular libraries that are sending unmasked frames, ignoring the RFC.
/// By default this option is set to `false`, i.e. according to RFC 6455.
pub accept_unmasked_frames: bool,
}
impl Default for WebSocketConfig {
@ -65,7 +64,7 @@ impl Default for WebSocketConfig {
max_send_queue: None,
max_message_size: Some(64 << 20),
max_frame_size: Some(16 << 20),
server_allow_unmasked: false,
accept_unmasked_frames: false,
}
}
}
@ -459,8 +458,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 true
if self.get_config().server_allow_unmasked == false {
// with WebSocketConfig.accept_unmasked_frames set to true
if !self.config.accept_unmasked_frames {
return Err(Error::Protocol(
"Received an unmasked frame from client".into(),
));