aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

normalize URLs before setting them

Browse Source
This commit is contained in:
Igor Galić 2019-05-27 13:34:38 +02:00 committed by Igor Galić
parent e6747de998
commit b09b51c74b
No known key found for this signature in database
GPG Key ID: ACFEFF7F6A123A86
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.rs
View File

@ -50,7 +50,7 @@ use plume_models::{
search::{Searcher as UnmanagedSearcher, SearcherError}, search::{Searcher as UnmanagedSearcher, SearcherError},
Connection, Error, CONFIG, Connection, Error, CONFIG,
}; };
use rocket::{fairing::AdHoc, http::uri::Origin}; use rocket::{fairing::AdHoc, http::ext::IntoOwned, http::uri::Origin};
use rocket_csrf::CsrfFairingBuilder; use rocket_csrf::CsrfFairingBuilder;
use scheduled_thread_pool::ScheduledThreadPool; use scheduled_thread_pool::ScheduledThreadPool;
use std::process::exit; use std::process::exit;
@ -183,7 +183,9 @@ Then try to restart Plume
let host = req.guard::<Host>(); let host = req.guard::<Host>();
if host.is_success() { if host.is_success() {
let rewrite_uri = format!("/custom_domains/{}/{}", host.unwrap(), req.uri()); let rewrite_uri = format!("/custom_domains/{}/{}", host.unwrap(), req.uri());
req.set_uri(Origin::parse_owned(rewrite_uri).unwrap()) let uri = Origin::parse_owned(rewrite_uri).unwrap();
let uri = uri.to_normalized().into_owned();
req.set_uri(uri);
} }
}); });