actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-24 00:21:08 +01:00
Code Issues Releases Wiki Activity

Optimize multipart handling #634, #769

Browse Source
This commit is contained in:
Nikolay Kim 2019-04-21 15:41:01 -07:00
parent f0789aad05
commit 895e409d57
3 changed files with 90 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-multipart/CHANGES.md
View File

@ -1,7 +1,9 @@
# Changes # Changes
## [0.1.0-alpha.1] - 2019-04-xx ## [0.1.0-beta.1] - 2019-04-21
* Do not support nested multipart * Do not support nested multipart
* Split multipart support to separate crate * Split multipart support to separate crate
* Optimize multipart handling #634, #769

8
actix-multipart/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-multipart" name = "actix-multipart"
version = "0.1.0-alpha.1" version = "0.1.0-beta.1"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Multipart support for actix web framework." description = "Multipart support for actix web framework."
readme = "README.md" readme = "README.md"
@ -18,8 +18,8 @@ name = "actix_multipart"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
actix-web = "1.0.0-alpha.6" actix-web = "1.0.0-beta.1"
actix-service = "0.3.4" actix-service = "0.3.6"
bytes = "0.4" bytes = "0.4"
derive_more = "0.14" derive_more = "0.14"
httparse = "1.3" httparse = "1.3"
@ -31,4 +31,4 @@ twoway = "0.2"
[dev-dependencies] [dev-dependencies]
actix-rt = "0.2.2" actix-rt = "0.2.2"
actix-http = "0.1.0" actix-http = "0.1.1"

140
actix-multipart/src/server.rs
View File

@ -168,7 +168,7 @@ impl InnerMultipart {
match payload.readline() { match payload.readline() {
None => { None => {
if payload.eof { if payload.eof {
Err(MultipartError::Incomplete) Ok(Some(true))
} else { } else {
Ok(None) Ok(None)
} }
@ -201,8 +201,7 @@ impl InnerMultipart {
match payload.readline() { match payload.readline() {
Some(chunk) => { Some(chunk) => {
if chunk.is_empty() { if chunk.is_empty() {
//ValueError("Could not find starting boundary %r" return Err(MultipartError::Boundary);
//% (self._boundary))
} }
if chunk.len() < boundary.len() { if chunk.len() < boundary.len() {
continue; continue;
@ -505,47 +504,73 @@ impl InnerField {
payload: &mut PayloadBuffer, payload: &mut PayloadBuffer,
boundary: &str, boundary: &str,
) -> Poll<Option<Bytes>, MultipartError> { ) -> Poll<Option<Bytes>, MultipartError> {
match payload.read_until(b"\r") { let mut pos = 0;
None => {
if payload.eof { let len = payload.buf.len();
Err(MultipartError::Incomplete) if len == 0 {
return Ok(Async::NotReady);
}
// check boundary
if len > 4 && payload.buf[0] == b'\r' {
let b_len = if &payload.buf[..2] == b"\r\n" && &payload.buf[2..4] == b"--" {
Some(4)
} else if &payload.buf[1..3] == b"--" {
Some(3)
} else {
None
};
if let Some(b_len) = b_len {
let b_size = boundary.len() + b_len;
if len < b_size {
return Ok(Async::NotReady);
} else { } else {
Ok(Async::NotReady) if &payload.buf[b_len..b_size] == boundary.as_bytes() {
// found boundary
payload.buf.split_to(b_size);
return Ok(Async::Ready(None));
} else {
pos = b_size;
}
} }
} }
Some(mut chunk) => { }
if chunk.len() == 1 {
payload.unprocessed(chunk); loop {
match payload.read_exact(boundary.len() + 4) { return if let Some(idx) = twoway::find_bytes(&payload.buf[pos..], b"\r") {
None => { let cur = pos + idx;
if payload.eof {
Err(MultipartError::Incomplete) // check if we have enough data for boundary detection
} else { if cur + 4 > len {
Ok(Async::NotReady) if cur > 0 {
} Ok(Async::Ready(Some(payload.buf.split_to(cur).freeze())))
} } else {
Some(mut chunk) => { Ok(Async::NotReady)
if &chunk[..2] == b"\r\n"
&& &chunk[2..4] == b"--"
&& &chunk[4..] == boundary.as_bytes()
{
payload.unprocessed(chunk);
Ok(Async::Ready(None))
} else {
// \r might be part of data stream
let ch = chunk.split_to(1);
payload.unprocessed(chunk);
Ok(Async::Ready(Some(ch)))
}
}
} }
} else { } else {
let to = chunk.len() - 1; // check boundary
let ch = chunk.split_to(to); if (&payload.buf[cur..cur + 2] == b"\r\n"
payload.unprocessed(chunk); && &payload.buf[cur + 2..cur + 4] == b"--")
Ok(Async::Ready(Some(ch))) || (&payload.buf[cur..cur + 1] == b"\r"
&& &payload.buf[cur + 1..cur + 3] == b"--")
{
if cur != 0 {
// return buffer
Ok(Async::Ready(Some(payload.buf.split_to(cur).freeze())))
} else {
pos = cur + 1;
continue;
}
} else {
// not boundary
pos = cur + 1;
continue;
}
} }
} } else {
return Ok(Async::Ready(Some(payload.buf.take().freeze())));
};
} }
} }
@ -555,26 +580,27 @@ impl InnerField {
} }
let result = if let Some(payload) = self.payload.as_ref().unwrap().get_mut(s) { let result = if let Some(payload) = self.payload.as_ref().unwrap().get_mut(s) {
let res = if let Some(ref mut len) = self.length { if !self.eof {
InnerField::read_len(payload, len)? let res = if let Some(ref mut len) = self.length {
} else { InnerField::read_len(payload, len)?
InnerField::read_stream(payload, &self.boundary)? } else {
}; InnerField::read_stream(payload, &self.boundary)?
};
match res { match res {
Async::NotReady => Async::NotReady, Async::NotReady => return Ok(Async::NotReady),
Async::Ready(Some(bytes)) => Async::Ready(Some(bytes)), Async::Ready(Some(bytes)) => return Ok(Async::Ready(Some(bytes))),
Async::Ready(None) => { Async::Ready(None) => self.eof = true,
self.eof = true; }
match payload.readline() { }
None => Async::Ready(None),
Some(line) => { match payload.readline() {
if line.as_ref() != b"\r\n" { None => Async::Ready(None),
log::warn!("multipart field did not read all the data or it is malformed"); Some(line) => {
} if line.as_ref() != b"\r\n" {
Async::Ready(None) log::warn!("multipart field did not read all the data or it is malformed");
}
} }
Async::Ready(None)
} }
} }
} else { } else {
@ -704,7 +730,7 @@ impl PayloadBuffer {
} }
/// Read exact number of bytes /// Read exact number of bytes
#[inline] #[cfg(test)]
fn read_exact(&mut self, size: usize) -> Option<Bytes> { fn read_exact(&mut self, size: usize) -> Option<Bytes> {
if size <= self.buf.len() { if size <= self.buf.len() {
Some(self.buf.split_to(size).freeze()) Some(self.buf.split_to(size).freeze())