Emi/kochab
Emi/kochab
1
1
Fork 0
Code Issues Pull requests Releases Activity

Fix bug where autorewrite was always on, respond 50 and log instead of panic on rewrite error

Browse source
This commit is contained in:
Emi Tatsuo 2020-12-05 11:05:04 -05:00
parent 680c04abe4
commit 9bc1f317c5
Signed by: Emi
GPG key ID: 68FAB2E2E6DFC98B
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/lib.rs
View file

@ -390,6 +390,7 @@ impl ServerInner {
request.set_cert(client_cert); request.set_cert(client_cert);
} }
#[cfg_attr(feature = "gemini_srv", allow(unused_mut))] // Used for scgi_srv only
let mut response = if let Some((trailing, handler)) = self.routes.match_request(&request) { let mut response = if let Some((trailing, handler)) = self.routes.match_request(&request) {
request.set_trailing(trailing); request.set_trailing(trailing);
handler.handle(request.clone()).await handler.handle(request.clone()).await
@ -397,12 +398,25 @@ impl ServerInner {
Response::not_found() Response::not_found()
}; };
match response.rewrite_all(&request).await { #[cfg(feature = "scgi_srv")] // No point running noop code
Ok(true) => { /* all is well */ } if self.autorewrite {
Ok(false) => panic!("Upstream did not include SCRIPT_PATH or SCRIPT_NAME"), match response.rewrite_all(&request).await {
Err(e) => { Ok(true) => { /* all is well */ }
error!("Error reading text/gemini file from Response reader: {}", e); Ok(false) => {
response = Response::not_found(); error!(
concat!(
"Upstream did not include SCRIPT_PATH or SCRIPT_NAME, refusing to",
" serve any text/gemini content with absolute links. It's most",
" likely that the proxy server you're using doesn't correctly",
" or completely implement the SCGI specification.",
)
);
response = Response::temporary_failure("Server misconfigured");
},
Err(e) => {
error!("Error reading text/gemini file from Response reader: {}", e);
response = Response::not_found();
}
} }
} }