Merge 056be54 into a1fd8be

Author: kpp

.travis.yml

@@ -1,13 +1,12 @@
 language: rust
-rust: nightly
+rust: nightly-2019-04-19
 
 before_script:
   - export PATH="$PATH:$HOME/.cargo/bin"
 
 install:
   - rustup component add rustfmt
-  - rustup component add clippy --toolchain=nightly || cargo install --git https://github.com/rust-lang/rust-clippy/ --force clippy
-
+  - rustup component add clippy
 script:
   - cargo fmt -- --version
   - cargo fmt -- --check

src/header/accept.rs

@@ -32,14 +32,11 @@ impl FromStr for WebSocketAccept {
 					));
 				}
 				let mut array = [0u8; 20];
-				let mut iter = vec.into_iter();
-				for i in &mut array {
-					*i = iter.next().unwrap();
-				}
+				array[..20].clone_from_slice(&vec[..20]);
 				Ok(WebSocketAccept(array))
 			}
 			Err(_) => Err(WebSocketError::ProtocolError(
-				"Invalid Sec-WebSocket-Accept ",
+				"Invalid Sec-WebSocket-Accept",
 			)),
 		}
 	}
@@ -101,6 +98,18 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn test_header_from_str() {
+		let accept = WebSocketAccept::from_str("YSBzaW1wbGUgc2FtcGwgbm9uY2U=");
+		assert!(accept.is_ok()); // 20 bytes
+
+		let accept = WebSocketAccept::from_str("YSBzaG9ydCBub25jZQ==");
+		assert!(accept.is_err()); // < 20 bytes
+
+		let accept = WebSocketAccept::from_str("YSByZWFsbHkgbWFsaWNpb3VzIG5vbmNl");
+		assert!(accept.is_err()); // > 20 bytes
+	}
+
 	#[bench]
 	fn bench_header_accept_new(b: &mut test::Bencher) {
 		let key = WebSocketKey::new();

src/header/key.rs

@@ -29,11 +29,7 @@ impl FromStr for WebSocketKey {
 					));
 				}
 				let mut array = [0u8; 16];
-				let mut iter = vec.into_iter();
-				for i in &mut array {
-					*i = iter.next().unwrap();
-				}
-
+				array[..16].clone_from_slice(&vec[..16]);
 				Ok(WebSocketKey(array))
 			}
 			Err(_) => Err(WebSocketError::ProtocolError(
@@ -92,6 +88,18 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn test_header_from_str() {
+		let key = WebSocketKey::from_str("YSByZWFsbCBnb29kIGtleQ==");
+		assert!(key.is_ok()); // 16 bytes
+
+		let key = WebSocketKey::from_str("YSBzaG9ydCBrZXk=");
+		assert!(key.is_err()); // < 16 bytes
+
+		let key = WebSocketKey::from_str("YSB2ZXJ5IHZlcnkgbG9uZyBrZXk=");
+		assert!(key.is_err()); // > 16 bytes
+	}
+
 	#[bench]
 	fn bench_header_key_new(b: &mut test::Bencher) {
 		b.iter(|| {