server_allow_unmasked changed from Option<bool> to bool

pull/159/head
Adam Bezecny (DHL IT Services) 4 years ago
parent 0121bf9682
commit a9adb42343
  1. 2
      examples/srv_accept_unmasked_frames.rs
  2. 16
      src/protocol/mod.rs

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

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

Loading…
Cancel
Save