From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 82A2C63221 for ; Wed, 15 Jul 2020 11:08:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75B0E2D9F4 for ; Wed, 15 Jul 2020 11:08:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0DB482D9D4 for ; Wed, 15 Jul 2020 11:08:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C34954310F for ; Wed, 15 Jul 2020 11:08:40 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 15 Jul 2020 11:08:40 +0200 Message-Id: <20200715090840.16833-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200714110957.31884-7-d.csapak@proxmox.com> References: <20200714110957.31884-7-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [websocket.rs] Subject: [pbs-devel] [PATCH proxmox v2 6/9] proxmox/tools/websocket: improve mask_bytes and create_frame interface X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jul 2020 09:08:42 -0000 by using a Box<[u8]> instead of a vector (we do not need it) Signed-off-by: Dominik Csapak --- changes from v1: adapt tests proxmox/src/tools/websocket.rs | 41 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/proxmox/src/tools/websocket.rs b/proxmox/src/tools/websocket.rs index 078225a..a5065b2 100644 --- a/proxmox/src/tools/websocket.rs +++ b/proxmox/src/tools/websocket.rs @@ -44,18 +44,17 @@ impl OpCode { } } -fn mask_bytes(mask: Option<[u8; 4]>, data: &mut Vec) -> &mut Vec { +fn mask_bytes(mask: Option<[u8; 4]>, data: &mut Box<[u8]>) { let mask = match mask { - Some([0,0,0,0]) | None => return data, + Some([0,0,0,0]) | None => return, Some(mask) => mask, }; if data.len() < 32 { - let mut_data = data.as_mut_slice(); - for i in 0..mut_data.len() { - mut_data[i] ^= mask[i%4]; + for i in 0..data.len() { + data[i] ^= mask[i%4]; } - return data; + return; } let mut newmask: u32 = u32::from_le_bytes(mask); @@ -75,8 +74,6 @@ fn mask_bytes(mask: Option<[u8; 4]>, data: &mut Vec) -> &mut Vec { *s ^= newmask as u8; newmask = newmask.rotate_right(8); } - - data } /// Can be used to create a complete WebSocket Frame. @@ -91,7 +88,7 @@ fn mask_bytes(mask: Option<[u8; 4]>, data: &mut Vec) -> &mut Vec { /// # use std::io; /// # fn main() -> io::Result<()> { /// let data = vec![0,1,2,3,4]; -/// let frame = create_frame(None, data, OpCode::Text)?; +/// let frame = create_frame(None, &data, OpCode::Text)?; /// assert_eq!(frame, vec![0b10000001, 5, 0, 1, 2, 3, 4]); /// # Ok(()) /// # } @@ -104,7 +101,7 @@ fn mask_bytes(mask: Option<[u8; 4]>, data: &mut Vec) -> &mut Vec { /// # use std::io; /// # fn main() -> io::Result<()> { /// let data = vec![0,1,2,3,4]; -/// let frame = create_frame(Some([0u8, 1u8, 2u8, 3u8]), data, OpCode::Text)?; +/// let frame = create_frame(Some([0u8, 1u8, 2u8, 3u8]), &data, OpCode::Text)?; /// assert_eq!(frame, vec![0b10000001, 0b10000101, 0, 1, 2, 3, 0, 0, 0, 0, 4]); /// # Ok(()) /// # } @@ -117,7 +114,7 @@ fn mask_bytes(mask: Option<[u8; 4]>, data: &mut Vec) -> &mut Vec { /// # use std::io; /// # fn main() -> io::Result<()> { /// let data = vec![0,1,2,3,4]; -/// let frame = create_frame(None, data, OpCode::Ping)?; +/// let frame = create_frame(None, &data, OpCode::Ping)?; /// assert_eq!(frame, vec![0b10001001, 0b00000101, 0, 1, 2, 3, 4]); /// # Ok(()) /// # } @@ -125,7 +122,7 @@ fn mask_bytes(mask: Option<[u8; 4]>, data: &mut Vec) -> &mut Vec { /// ``` pub fn create_frame( mask: Option<[u8; 4]>, - mut data: Vec, + data: &[u8], frametype: OpCode, ) -> io::Result> { let first_byte = 0b10000000 | (frametype as u8); @@ -155,8 +152,10 @@ pub fn create_frame( if let Some(mask) = mask { buf.extend_from_slice(&mask); } + let mut data = data.to_vec().into_boxed_slice(); + mask_bytes(mask, &mut data); - buf.append(&mut mask_bytes(mask, &mut data)); + buf.append(&mut data.into_vec()); Ok(buf) } @@ -212,7 +211,7 @@ impl AsyncWrite for WebSocketWriter { if this.frame.is_none() { // create frame buf - let frame = match create_frame(this.mask, buf.to_vec(), frametype) { + let frame = match create_frame(this.mask, buf, frametype) { Ok(f) => f, Err(e) => { return Poll::Ready(Err(e)); @@ -285,7 +284,7 @@ impl FrameHeader { /// # use proxmox::tools::websocket::*; /// # use std::io; /// # fn main() -> io::Result<()> { - /// let frame = create_frame(None, vec![0,1,2,3], OpCode::Ping)?; + /// let frame = create_frame(None, &[0,1,2,3], OpCode::Ping)?; /// let header = FrameHeader::try_from_bytes(&frame[..1])?; /// match header { /// Ok(_) => unreachable!(), @@ -514,12 +513,11 @@ impl AsyncRead for WebSocketReader if header.is_control_frame() { if read_buffer.len() >= header.payload_len { + let mut data = read_buffer.remove_data(header.payload_len); + mask_bytes(header.mask, &mut data); (this.callback)( header.frametype, - mask_bytes( - header.mask, - &mut read_buffer.remove_data(header.payload_len).into_vec(), - ), + &data, ); this.state = if read_buffer.is_empty() { ReaderState::NoData @@ -538,8 +536,9 @@ impl AsyncRead for WebSocketReader let len = min(buf.len() - offset, min(header.payload_len, read_buffer.len())); - let mut data = read_buffer.remove_data(len).into_vec(); - buf[offset..offset+len].copy_from_slice(mask_bytes(header.mask, &mut data)); + let mut data = read_buffer.remove_data(len); + mask_bytes(header.mask, &mut data); + buf[offset..offset+len].copy_from_slice(&data); offset += len; header.payload_len -= len; -- 2.20.1