Merge be3cfdca90 into 8c3172c014

src/protocol/data.rs

@@ -0,0 +1,123 @@
+use bytes::Bytes;
+use std::borrow::Cow;
+
+/// Binary message data
+#[derive(Debug, Clone)]
+pub struct MessageData(MessageDataImpl);
+
+/// opaque inner type to allow modifying the implementation in the future
+#[derive(Debug, Clone)]
+enum MessageDataImpl {
+    Shared(Bytes),
+    Unique(Vec<u8>),
+}
+
+impl MessageData {
+    pub fn len(&self) -> usize {
+        self.as_ref().len()
+    }
+
+    fn make_unique(&mut self) {
+        if let MessageDataImpl::Shared(data) = &self.0 {
+            self.0 = MessageDataImpl::Unique(Vec::from(data.as_ref()));
+        }
+    }
+}
+
+impl PartialEq for MessageData {
+    fn eq(&self, other: &MessageData) -> bool {
+        self.as_ref().eq(other.as_ref())
+    }
+}
+
+impl Eq for MessageData {}
+
+impl From<MessageData> for Vec<u8> {
+    fn from(data: MessageData) -> Vec<u8> {
+        match data.0 {
+            MessageDataImpl::Shared(data) => {
+                let mut bytes = Vec::with_capacity(data.len());
+                bytes.copy_from_slice(data.as_ref());
+                bytes
+            }
+            MessageDataImpl::Unique(data) => data,
+        }
+    }
+}
+
+impl From<MessageData> for Bytes {
+    fn from(data: MessageData) -> Bytes {
+        match data.0 {
+            MessageDataImpl::Shared(data) => data,
+            MessageDataImpl::Unique(data) => data.into(),
+        }
+    }
+}
+
+impl AsRef<[u8]> for MessageData {
+    fn as_ref(&self) -> &[u8] {
+        match &self.0 {
+            MessageDataImpl::Shared(data) => data.as_ref(),
+            MessageDataImpl::Unique(data) => data.as_ref(),
+        }
+    }
+}
+
+impl AsMut<[u8]> for MessageData {
+    fn as_mut(&mut self) -> &mut [u8] {
+        self.make_unique();
+        match &mut self.0 {
+            MessageDataImpl::Unique(data) => data.as_mut_slice(),
+            MessageDataImpl::Shared(_) => unreachable!("Data has just been made unique"),
+        }
+    }
+}
+
+impl From<Vec<u8>> for MessageData {
+    fn from(data: Vec<u8>) -> MessageData {
+        MessageData(MessageDataImpl::Unique(data))
+    }
+}
+
+impl From<&'static [u8]> for MessageData {
+    fn from(data: &'static [u8]) -> MessageData {
+        MessageData(MessageDataImpl::Shared(Bytes::from_static(data)))
+    }
+}
+
+impl From<Bytes> for MessageData {
+    fn from(data: Bytes) -> MessageData {
+        MessageData(MessageDataImpl::Shared(data))
+    }
+}
+
+/// String message data
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct MessageStringData(Cow<'static, str>);
+
+impl<T: Into<Cow<'static, str>>> From<T> for MessageStringData {
+    fn from(str: T) -> Self {
+        MessageStringData(str.into())
+    }
+}
+
+impl From<MessageStringData> for String {
+    fn from(data: MessageStringData) -> String {
+        data.0.into()
+    }
+}
+
+impl From<MessageStringData> for MessageData {
+    fn from(data: MessageStringData) -> MessageData {
+        match data.0 {
+            Cow::Borrowed(data) => MessageData::from(data.as_bytes()),
+            Cow::Owned(data) => MessageData::from(data.into_bytes()),
+        }
+    }
+}
+
+impl AsRef<str> for MessageStringData {
+    fn as_ref(&self) -> &str {
+        self.0.as_ref()
+    }
+}

src/protocol/frame/frame.rs

@@ -11,9 +11,10 @@ use std::{
 
 use super::{
     coding::{CloseCode, Control, Data, OpCode},
-    mask::{apply_mask, generate_mask},
+    mask::{generate_mask, write_masked},
 };
 use crate::error::{Error, ProtocolError, Result};
+use crate::protocol::data::MessageData;
 
 /// A struct representing the close command.
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -186,7 +187,7 @@ impl FrameHeader {
         // Disallow bad opcode
         match opcode {
             OpCode::Control(Control::Reserved(_)) | OpCode::Data(Data::Reserved(_)) => {
-                return Err(Error::Protocol(ProtocolError::InvalidOpcode(first & 0x0F)))
+                return Err(Error::Protocol(ProtocolError::InvalidOpcode(first & 0x0F)));
             }
             _ => (),
         }
@@ -201,7 +202,7 @@ impl FrameHeader {
 #[derive(Debug, Clone)]
 pub struct Frame {
     header: FrameHeader,
-    payload: Vec<u8>,
+    payload: MessageData,
 }
 
 impl Frame {
@@ -233,14 +234,8 @@ impl Frame {
 
     /// Get a reference to the frame's payload.
     #[inline]
-    pub fn payload(&self) -> &Vec<u8> {
+    pub fn payload(&self) -> &[u8] {
-        &self.payload
+        self.payload.as_ref()
-    }
-
-    /// Get a mutable reference to the frame's payload.
-    #[inline]
-    pub fn payload_mut(&mut self) -> &mut Vec<u8> {
-        &mut self.payload
     }
 
     /// Test whether the frame is masked.
@@ -258,25 +253,16 @@ impl Frame {
         self.header.set_random_mask()
     }
 
-    /// This method unmasks the payload and should only be called on frames that are actually
-    /// masked. In other words, those frames that have just been received from a client endpoint.
-    #[inline]
-    pub(crate) fn apply_mask(&mut self) {
-        if let Some(mask) = self.header.mask.take() {
-            apply_mask(&mut self.payload, mask)
-        }
-    }
-
     /// Consume the frame into its payload as binary.
     #[inline]
     pub fn into_data(self) -> Vec<u8> {
-        self.payload
+        self.payload.into()
     }
 
     /// Consume the frame into its payload as string.
     #[inline]
     pub fn into_string(self) -> StdResult<String, FromUtf8Error> {
-        String::from_utf8(self.payload)
+        String::from_utf8(self.payload.into())
     }
 
     /// Consume the frame into a closing frame.
@@ -286,10 +272,10 @@ impl Frame {
             0 => Ok(None),
             1 => Err(Error::Protocol(ProtocolError::InvalidCloseSequence)),
             _ => {
-                let mut data = self.payload;
+                let mut data = self.into_data();
                 let code = NetworkEndian::read_u16(&data[0..2]).into();
                 data.drain(0..2);
-                let text = String::from_utf8(data)?;
+                let text = String::from_utf8(data.into())?;
                 Ok(Some(CloseFrame { code, reason: text.into() }))
             }
         }
@@ -297,10 +283,16 @@ impl Frame {
 
     /// Create a new data frame.
     #[inline]
-    pub fn message(data: Vec<u8>, opcode: OpCode, is_final: bool) -> Frame {
+    pub fn message<D>(data: D, opcode: OpCode, is_final: bool) -> Frame
+    where
+        D: Into<MessageData>,
+    {
         debug_assert!(matches!(opcode, OpCode::Data(_)), "Invalid opcode for data frame.");
 
-        Frame { header: FrameHeader { is_final, opcode, ..FrameHeader::default() }, payload: data }
+        Frame {
+            header: FrameHeader { is_final, opcode, ..FrameHeader::default() },
+            payload: data.into(),
+        }
     }
 
     /// Create a new Pong control frame.
@@ -311,7 +303,7 @@ impl Frame {
                 opcode: OpCode::Control(Control::Pong),
                 ..FrameHeader::default()
             },
-            payload: data,
+            payload: data.into(),
         }
     }
 
@@ -323,7 +315,7 @@ impl Frame {
                 opcode: OpCode::Control(Control::Ping),
                 ..FrameHeader::default()
             },
-            payload: data,
+            payload: data.into(),
         }
     }
 
@@ -339,19 +331,22 @@ impl Frame {
             Vec::new()
         };
 
-        Frame { header: FrameHeader::default(), payload }
+        Frame { header: FrameHeader::default(), payload: payload.into() }
     }
 
     /// Create a frame from given header and data.
     pub fn from_payload(header: FrameHeader, payload: Vec<u8>) -> Self {
-        Frame { header, payload }
+        Frame { header, payload: payload.into() }
     }
 
     /// Write a frame out to a buffer
     pub fn format(mut self, output: &mut impl Write) -> Result<()> {
         self.header.format(self.payload.len() as u64, output)?;
-        self.apply_mask();
+        if let Some(mask) = self.header.mask.take() {
-        output.write_all(self.payload())?;
+            write_masked(self.payload(), output, mask)
+        } else {
+            output.write_all(self.payload())?;
+        }
         Ok(())
     }
 }
@@ -377,7 +372,7 @@ payload: 0x{}
             // self.mask.map(|mask| format!("{:?}", mask)).unwrap_or("NONE".into()),
             self.len(),
             self.payload.len(),
-            self.payload.iter().map(|byte| format!("{:x}", byte)).collect::<String>()
+            self.payload.as_ref().iter().map(|byte| format!("{:x}", byte)).collect::<String>()
         )
     }
 }
@@ -462,7 +457,7 @@ mod tests {
 
     #[test]
     fn display() {
-        let f = Frame::message("hi there".into(), OpCode::Data(Data::Text), true);
+        let f = Frame::message(&b"hi there"[..], OpCode::Data(Data::Text), true);
         let view = format!("{}", f);
         assert!(view.contains("payload:"));
     }

src/protocol/frame/mask.rs

@@ -1,30 +1,31 @@
+use std::io::Write;
+
 /// Generate a random frame mask.
 #[inline]
 pub fn generate_mask() -> [u8; 4] {
     rand::random()
 }
 
-/// Mask/unmask a frame.
+/// Write data to an output, masking the data in the process
-#[inline]
+pub fn write_masked(data: &[u8], output: &mut impl Write, mask: [u8; 4]) {
-pub fn apply_mask(buf: &mut [u8], mask: [u8; 4]) {
+    write_mask_fast32(data, output, mask)
-    apply_mask_fast32(buf, mask)
 }
 
 /// A safe unoptimized mask application.
 #[inline]
-fn apply_mask_fallback(buf: &mut [u8], mask: [u8; 4]) {
+fn write_mask_fallback(data: &[u8], output: &mut impl Write, mask: [u8; 4]) {
-    for (i, byte) in buf.iter_mut().enumerate() {
+    for (i, byte) in data.iter().enumerate() {
-        *byte ^= mask[i & 3];
+        output.write(&[*byte ^ mask[i & 3]]).unwrap();
     }
 }
 
 /// Faster version of `apply_mask()` which operates on 4-byte blocks.
 #[inline]
-pub fn apply_mask_fast32(buf: &mut [u8], mask: [u8; 4]) {
+fn write_mask_fast32(data: &[u8], output: &mut impl Write, mask: [u8; 4]) {
     let mask_u32 = u32::from_ne_bytes(mask);
 
-    let (mut prefix, words, mut suffix) = unsafe { buf.align_to_mut::<u32>() };
+    let (mut prefix, words, mut suffix) = unsafe { data.align_to::<u32>() };
-    apply_mask_fallback(&mut prefix, mask);
+    write_mask_fallback(&mut prefix, output, mask);
     let head = prefix.len() & 3;
     let mask_u32 = if head > 0 {
         if cfg!(target_endian = "big") {
@@ -35,10 +36,11 @@ pub fn apply_mask_fast32(buf: &mut [u8], mask: [u8; 4]) {
     } else {
         mask_u32
     };
-    for word in words.iter_mut() {
+    for word in words {
-        *word ^= mask_u32;
+        let bytes = (*word ^ mask_u32).to_ne_bytes();
+        output.write(&bytes).unwrap();
     }
-    apply_mask_fallback(&mut suffix, mask_u32.to_ne_bytes());
+    write_mask_fallback(&mut suffix, output, mask_u32.to_ne_bytes());
 }
 
 #[cfg(test)]
@@ -60,11 +62,11 @@ mod tests {
                 if unmasked.len() < off {
                     continue;
                 }
-                let mut masked = unmasked.to_vec();
+                let mut masked = Vec::new();
-                apply_mask_fallback(&mut masked[off..], mask);
+                write_mask_fallback(&unmasked, &mut masked, mask);
 
-                let mut masked_fast = unmasked.to_vec();
+                let mut masked_fast = Vec::new();
-                apply_mask_fast32(&mut masked_fast[off..], mask);
+                write_mask_fast32(&unmasked, &mut masked_fast, mask);
 
                 assert_eq!(masked, masked_fast);
             }

src/protocol/frame/mod.rs

@@ -4,11 +4,16 @@ pub mod coding;
 
 #[allow(clippy::module_inception)]
 mod frame;
+#[cfg(feature = "__expose_benchmark_fn")]
+#[allow(missing_docs)]
+pub mod mask;
+#[cfg(not(feature = "__expose_benchmark_fn"))]
 mod mask;
 
 pub use self::frame::{CloseFrame, Frame, FrameHeader};
 
 use crate::error::{CapacityError, Error, Result};
+use crate::protocol::frame::mask::write_masked;
 use input_buffer::{InputBuffer, MIN_READ};
 use log::*;
 use std::io::{Error as IoError, ErrorKind as IoErrorKind, Read, Write};
@@ -142,10 +147,28 @@ impl FrameCodec {
                     let input_size = cursor.get_ref().len() as u64 - cursor.position();
                     if length <= input_size {
                         // No truncation here since `length` is checked above
-                        let mut payload = Vec::with_capacity(length as usize);
+
+                        // take a slice from the cursor
+                        let payload_input = &cursor.get_ref().as_slice()
+                            [(cursor.position() as usize)..(cursor.position() + length) as usize];
+
+                        let mut payload = Vec::new();
                         if length > 0 {
-                            cursor.take(length).read_to_end(&mut payload)?;
+                            if let Some(mask) =
+                                self.header.as_ref().and_then(|header| header.0.mask)
+                            {
+                                // A server MUST remove masking for data frames received from a client
+                                // as described in Section 5.3. (RFC 6455)
+
+                                payload = Vec::with_capacity(length as usize);
+                                write_masked(payload_input, &mut payload, mask);
+                            } else {
+                                payload = payload_input.to_vec();
+                            }
                         }
+
+                        cursor.set_position(cursor.position() + length);
+
                         break payload;
                     }
                 }

src/protocol/message.rs

@@ -79,6 +79,7 @@ mod string_collect {
 }
 
 use self::string_collect::StringCollector;
+use crate::protocol::data::{MessageData, MessageStringData};
 
 /// A struct representing the incomplete message.
 #[derive(Debug)]
@@ -140,10 +141,10 @@ impl IncompleteMessage {
     /// Convert an incomplete message into a complete one.
     pub fn complete(self) -> Result<Message> {
         match self.collector {
-            IncompleteMessageCollector::Binary(v) => Ok(Message::Binary(v)),
+            IncompleteMessageCollector::Binary(v) => Ok(Message::binary(v)),
             IncompleteMessageCollector::Text(t) => {
                 let text = t.into_string()?;
-                Ok(Message::Text(text))
+                Ok(Message::text(text))
             }
         }
     }
@@ -159,9 +160,9 @@ pub enum IncompleteMessageType {
 #[derive(Debug, Eq, PartialEq, Clone)]
 pub enum Message {
     /// A text WebSocket message
-    Text(String),
+    Text(MessageStringData),
     /// A binary WebSocket message
-    Binary(Vec<u8>),
+    Binary(MessageData),
     /// A ping message with the specified payload
     ///
     /// The payload here must have a length less than 125 bytes
@@ -178,7 +179,7 @@ impl Message {
     /// Create a new text WebSocket message from a stringable.
     pub fn text<S>(string: S) -> Message
     where
-        S: Into<String>,
+        S: Into<MessageStringData>,
     {
         Message::Text(string.into())
     }
@@ -186,7 +187,7 @@ impl Message {
     /// Create a new binary WebSocket message by converting to Vec<u8>.
     pub fn binary<B>(bin: B) -> Message
     where
-        B: Into<Vec<u8>>,
+        B: Into<MessageData>,
     {
         Message::Binary(bin.into())
     }
@@ -218,12 +219,11 @@ impl Message {
 
     /// Get the length of the WebSocket message.
     pub fn len(&self) -> usize {
-        match *self {
+        match self {
-            Message::Text(ref string) => string.len(),
+            Message::Text(string) => string.as_ref().len(),
-            Message::Binary(ref data) | Message::Ping(ref data) | Message::Pong(ref data) => {
+            Message::Binary(data) => data.as_ref().len(),
-                data.len()
+            Message::Ping(data) | Message::Pong(data) => data.len(),
-            }
+            Message::Close(data) => data.as_ref().map(|d| d.reason.len()).unwrap_or(0),
-            Message::Close(ref data) => data.as_ref().map(|d| d.reason.len()).unwrap_or(0),
         }
     }
 
@@ -236,8 +236,9 @@ impl Message {
     /// Consume the WebSocket and return it as binary data.
     pub fn into_data(self) -> Vec<u8> {
         match self {
-            Message::Text(string) => string.into_bytes(),
+            Message::Text(string) => String::from(string).into(),
-            Message::Binary(data) | Message::Ping(data) | Message::Pong(data) => data,
+            Message::Binary(data) => data.into(),
+            Message::Ping(data) | Message::Pong(data) => data,
             Message::Close(None) => Vec::new(),
             Message::Close(Some(frame)) => frame.reason.into_owned().into_bytes(),
         }
@@ -246,8 +247,11 @@ impl Message {
     /// Attempt to consume the WebSocket message and convert it to a String.
     pub fn into_text(self) -> Result<String> {
         match self {
-            Message::Text(string) => Ok(string),
+            Message::Text(string) => Ok(string.into()),
-            Message::Binary(data) | Message::Ping(data) | Message::Pong(data) => {
+            Message::Binary(data) => {
+                Ok(String::from_utf8(data.into()).map_err(|err| err.utf8_error())?)
+            }
+            Message::Ping(data) | Message::Pong(data) => {
                 Ok(String::from_utf8(data).map_err(|err| err.utf8_error())?)
             }
             Message::Close(None) => Ok(String::new()),
@@ -258,13 +262,12 @@ impl Message {
     /// Attempt to get a &str from the WebSocket message,
     /// this will try to convert binary data to utf8.
     pub fn to_text(&self) -> Result<&str> {
-        match *self {
+        match self {
-            Message::Text(ref string) => Ok(string),
+            Message::Text(string) => Ok(string.as_ref()),
-            Message::Binary(ref data) | Message::Ping(ref data) | Message::Pong(ref data) => {
+            Message::Binary(data) => Ok(str::from_utf8(data.as_ref())?),
-                Ok(str::from_utf8(data)?)
+            Message::Ping(data) | Message::Pong(data) => Ok(str::from_utf8(data)?),
-            }
             Message::Close(None) => Ok(""),
-            Message::Close(Some(ref frame)) => Ok(&frame.reason),
+            Message::Close(Some(frame)) => Ok(&frame.reason),
         }
     }
 }
@@ -277,13 +280,13 @@ impl From<String> for Message {
 
 impl<'s> From<&'s str> for Message {
     fn from(string: &'s str) -> Message {
-        Message::text(string)
+        Message::text(string.to_string())
     }
 }
 
 impl<'b> From<&'b [u8]> for Message {
     fn from(data: &'b [u8]) -> Message {
-        Message::binary(data)
+        Message::binary(data.to_vec())
     }
 }
 
@@ -293,9 +296,9 @@ impl From<Vec<u8>> for Message {
     }
 }
 
-impl Into<Vec<u8>> for Message {
+impl From<Message> for Vec<u8> {
-    fn into(self) -> Vec<u8> {
+    fn from(message: Message) -> Vec<u8> {
-        self.into_data()
+        message.into_data()
     }
 }
 

src/protocol/mod.rs

@@ -2,6 +2,7 @@
 
 pub mod frame;
 
+mod data;
 mod message;
 
 pub use self::{frame::CloseFrame, message::Message};
@@ -348,7 +349,7 @@ impl WebSocketContext {
         }
 
         let frame = match message {
-            Message::Text(data) => Frame::message(data.into(), OpCode::Data(OpData::Text), true),
+            Message::Text(data) => Frame::message(data, OpCode::Data(OpData::Text), true),
             Message::Binary(data) => Frame::message(data, OpCode::Data(OpData::Binary), true),
             Message::Ping(data) => Frame::ping(data),
             Message::Pong(data) => {
@@ -425,7 +426,7 @@ impl WebSocketContext {
     where
         Stream: Read + Write,
     {
-        if let Some(mut frame) = self
+        if let Some(frame) = self
             .frame
             .read_frame(stream, self.config.max_frame_size)
             .check_connection_reset(self.state)?
@@ -447,11 +448,7 @@ impl WebSocketContext {
 
             match self.role {
                 Role::Server => {
-                    if frame.is_masked() {
+                    if !frame.is_masked() && !self.config.accept_unmasked_frames {
-                        // A server MUST remove masking for data frames received from a client
-                        // as described in Section 5.3. (RFC 6455)
-                        frame.apply_mask()
-                    } else if !self.config.accept_unmasked_frames {
                         // The server MUST close the connection upon receiving a
                         // frame that is not masked. (RFC 6455)
                         // The only exception here is if the user explicitly accepts given
@@ -700,8 +697,8 @@ mod tests {
         let mut socket = WebSocket::from_raw_socket(WriteMoc(incoming), Role::Client, None);
         assert_eq!(socket.read_message().unwrap(), Message::Ping(vec![1, 2]));
         assert_eq!(socket.read_message().unwrap(), Message::Pong(vec![3]));
-        assert_eq!(socket.read_message().unwrap(), Message::Text("Hello, World!".into()));
+        assert_eq!(socket.read_message().unwrap(), Message::text("Hello, World!"));
-        assert_eq!(socket.read_message().unwrap(), Message::Binary(vec![0x01, 0x02, 0x03]));
+        assert_eq!(socket.read_message().unwrap(), Message::binary(vec![0x01, 0x02, 0x03]));
     }
 
     #[test]