Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose zero-copy-ish headers on ClientRequest #35

Merged
merged 18 commits into from
Jun 11, 2021
Merged

Expose zero-copy-ish headers on ClientRequest #35

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
03bf0b5
Expose zero-copy-ish headers on ClientRequest
maciejhirsz Jun 10, 2021
dc21081
Minor cleanup
maciejhirsz Jun 10, 2021
26a6131
Cleaner way to check for CRLF header tail
maciejhirsz Jun 10, 2021
6c5ad6a
Keep exposed headers as &[u8]
maciejhirsz Jun 10, 2021
37ba44f
Make that Sec-WebSocket-Key `ArrayVec` is `WebSocketKey`
maciejhirsz Jun 10, 2021
8b43ea7
More pedantic `Sec-WebSocket-Key` handling
maciejhirsz Jun 10, 2021
263bc37
Comment on backtracking 4 bytes
maciejhirsz Jun 10, 2021
5f25ec3
Limit headers to 8kb
maciejhirsz Jun 10, 2021
3f154f8
Clarify ClientRequest::key() comment
maciejhirsz Jun 10, 2021
e8487d4
Apply suggestions from code review
maciejhirsz Jun 10, 2021
ab4a9d5
Use `try_from` instead of manually checking length
maciejhirsz Jun 10, 2021
46e504b
Document ClientRequest::headers
maciejhirsz Jun 10, 2021
b198c3a
Unnecessary lifetime
maciejhirsz Jun 10, 2021
3e110d8
Pedantic camel case
maciejhirsz Jun 10, 2021
3abedb4
Fix doc comment
maciejhirsz Jun 10, 2021
0fa5fd5
Fix cargo doc warning
maciejhirsz Jun 10, 2021
89514e7
.find().is_some() -> .any()
maciejhirsz Jun 11, 2021
45c3383
Fix one clippy nit
maciejhirsz Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/handshake/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ pub struct Server<'a, T> {
buffer: BytesMut
}

/// Owned value of the `Sec-WebSocket-Key` header.
pub type WebSocketKey = ArrayVec<u8, 28>;

impl<'a, T: AsyncRead + AsyncWrite + Unpin> Server<'a, T> {
/// Create a new server handshake.
pub fn new(socket: T) -> Self {
Expand Down Expand Up @@ -164,7 +161,7 @@ impl<'a, T: AsyncRead + AsyncWrite + Unpin> Server<'a, T> {
let headers = RequestHeaders { host, origin };

let ws_key = with_first_header(&request.headers, "Sec-WebSocket-Key", |k| {
let mut key = ArrayVec::new();
let mut key = WebSocketKey::new();

match key.try_extend_from_slice(k) {
Ok(()) => Ok(key),
Expand Down Expand Up @@ -235,6 +232,9 @@ impl<'a, T: AsyncRead + AsyncWrite + Unpin> Server<'a, T> {
}
}

/// Owned value of the `Sec-WebSocket-Key` header.
pub type WebSocketKey = ArrayVec<u8, 28>;

/// Handshake request received from the client.
#[derive(Debug)]
pub struct ClientRequest<'a> {
Expand Down