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

Fix HTTP body example. #32

Merged
merged 2 commits into from
Aug 15, 2020
Merged

Fix HTTP body example. #32

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b3d2be
Fix HTTP body example.
PiotrSikora Aug 14, 2020
4167045
Merge branch 'master' into fix_http_body
PiotrSikora Aug 15, 2020
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
28 changes: 6 additions & 22 deletions examples/http_body.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,10 @@ use proxy_wasm::types::*;
#[no_mangle]
pub fn _start() {
proxy_wasm::set_log_level(LogLevel::Trace);
proxy_wasm::set_http_context(|_, _| -> Box<dyn HttpContext> { Box::new(HttpBody::new()) });
proxy_wasm::set_http_context(|_, _| -> Box<dyn HttpContext> { Box::new(HttpBody) });
}

#[derive(Default)]
struct HttpBody {
total_body_size: usize,
}

impl HttpBody {
fn new() -> HttpBody {
Default::default()
}
}
struct HttpBody;

impl Context for HttpBody {}

Expand All @@ -41,13 +32,10 @@ impl HttpContext for HttpBody {
// We must do this here, because once we exit this function we
// can no longer modify the response headers.
self.set_http_response_header("content-length", None);
// Don't continue to the next callout in the chain because we might
// modify the body.
Action::Pause
Action::Continue
}

fn on_http_response_body(&mut self, body_size: usize, end_of_stream: bool) -> Action {
self.total_body_size += body_size;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @gbrail, I'm not sure how I've missed this change while reviewing your PR. I think I just assumed that you've applied suggested changes and I merged it without thinking... In any case, on_http_response_body reports total buffered body size, not only the most recent chunk (that was a regression in Envoy-Wasm, see: envoyproxy/envoy-wasm#608).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes -- before the callback was getting only the size of the current chunk -- with this fix the code is much simpler. Thanks.

if !end_of_stream {
// Wait -- we'll be called again when the complete body is buffered
// at the host side.
Expand All @@ -56,15 +44,11 @@ impl HttpContext for HttpBody {

// Replace the message body if it contains the text "secret".
// Since we returned "Pause" previuously, this will return the whole body.
// However, we have to calculate the size ourselves.
if let Some(body_bytes) = self.get_http_response_body(0, self.total_body_size) {
if let Some(body_bytes) = self.get_http_response_body(0, body_size) {
let body_str = String::from_utf8(body_bytes).unwrap();
if body_str.find("secret").is_some() {
let new_body = format!(
"Original message body ({} bytes) redacted.",
self.total_body_size
);
self.set_http_response_body(0, self.total_body_size, &new_body.into_bytes());
let new_body = format!("Original message body ({} bytes) redacted.", body_size);
self.set_http_response_body(0, body_size, &new_body.into_bytes());
}
}
Action::Continue
Expand Down