Skip to content

Don't return ASCII control characters in HTTP error messages #921

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

Merged
TheBlueMatt merged 1 commit into from
May 14, 2021
Merged

Don't return ASCII control characters in HTTP error messages #921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 3 deletions lightning-block-sync/src/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,11 @@ impl HttpClient {

if !status.is_ok() {
// TODO: Handle 3xx redirection responses.
let error_details = match contents.is_ascii() {
true => String::from_utf8_lossy(&contents).to_string(),
false => "binary".to_string()
let error_details = match String::from_utf8(contents) {
// Check that the string is all-ASCII with no control characters before returning
// it.
Ok(s) if s.as_bytes().iter().all(|c| c.is_ascii() && !c.is_ascii_control()) => s,
_ => "binary".to_string()
};
let error_msg = format!("Errored with status: {} and contents: {}",
status.code, error_details);
Expand Down