kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

percent-encode path for x-accel-redirect

This commit is contained in:
Vincent Breitmoser 2019-05-04 02:36:46 +02:00
parent 356eb39e86
commit 979257cb97
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/web/mod.rs
View File

@ -3,6 +3,7 @@ use rocket::http::Header;
use rocket::response::NamedFile;
use rocket::config::Config;
use rocket_contrib::templates::Template;
use rocket::http::uri::Uri;
use serde::Serialize;
use handlebars::Handlebars;
@ -69,6 +70,8 @@ impl MyResponse {
pub fn x_accel_redirect(x_accel_path: String, fp: &Fingerprint) -> Self {
use rocket::http::hyper::header::{ContentDisposition, DispositionType,
DispositionParam, Charset};
// nginx expects percent-encoded URIs
let x_accel_path = Uri::percent_encode(&x_accel_path).into_owned();
MyResponse::XAccelRedirect(
"",
Header::new("X-Accel-Redirect", x_accel_path),
@ -191,6 +194,7 @@ fn key_to_response<'a>(state: rocket::State<HagridState>,
if let Some(prefix) = state.x_accel_prefix.as_ref() {
x_accel_path = x_accel_path.strip_prefix(&prefix).unwrap().to_path_buf();
}
// prepend a / to make path relative to nginx root
let x_accel_path = format!("/{}", x_accel_path.to_string_lossy());
return MyResponse::x_accel_redirect(x_accel_path, &fp);
}