Mirrors/Vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-11 13:32:38 +01:00
Code Issues Releases Activity

Make sure the provided domain contains the protocol and show a useful error when it doesn't

Browse Source
This commit is contained in:
Daniel García 2020-02-23 14:55:27 +01:00
parent 8a5450e830
commit cd8907542a
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/config.rs
View File

@ -420,6 +420,11 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
if cfg!(feature = "postgresql") && !db_url.starts_with("postgresql:") { if cfg!(feature = "postgresql") && !db_url.starts_with("postgresql:") {
err!("`DATABASE_URL` should start with postgresql: when using the PostgreSQL server") err!("`DATABASE_URL` should start with postgresql: when using the PostgreSQL server")
} }
let dom = cfg.domain.to_lowercase();
if !dom.starts_with("http://") && !dom.starts_with("https://") {
err!("DOMAIN variable needs to contain the protocol (http, https). Use 'http[s]://bw.example.com' instead of 'bw.example.com'");
}
if let Some(ref token) = cfg.admin_token { if let Some(ref token) = cfg.admin_token {
if token.trim().is_empty() && !cfg.disable_admin_token { if token.trim().is_empty() && !cfg.disable_admin_token {
@ -465,17 +470,25 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
/// Extracts an RFC 6454 web origin from a URL. /// Extracts an RFC 6454 web origin from a URL.
fn extract_url_origin(url: &str) -> String { fn extract_url_origin(url: &str) -> String {
let url = Url::parse(url).expect("valid URL"); match Url::parse(url) {
Ok(u) => u.origin().ascii_serialization(),
url.origin().ascii_serialization() Err(e) => {
println!("Error validating domain: {}", e);
String::new()
}
}
} }
/// Extracts the path from a URL. /// Extracts the path from a URL.
/// All trailing '/' chars are trimmed, even if the path is a lone '/'. /// All trailing '/' chars are trimmed, even if the path is a lone '/'.
fn extract_url_path(url: &str) -> String { fn extract_url_path(url: &str) -> String {
let url = Url::parse(url).expect("valid URL"); match Url::parse(url) {
Ok(u) => u.path().trim_end_matches('/').to_string(),
url.path().trim_end_matches('/').to_string() Err(_) => {
// We already print it in the method above, no need to do it again
String::new()
}
}
} }
impl Config { impl Config {