octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-09-28 23:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

make domain protocol validation work with multi-domains

Browse Source
This commit is contained in:
BlockListed 2023-09-09 11:10:04 +02:00
parent 2c7b739d49
commit e313745f7c
No known key found for this signature in database
GPG Key ID: 2D204777C477B588
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/config.rs
View File

@ -733,11 +733,13 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
}
}
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'"
);
let domains = cfg.domain_change_back.split(',').map(|d| d.to_string().to_lowercase());
for dom in domains {
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'"
);
}
}
let whitelist = &cfg.signups_domains_whitelist;
@ -1314,6 +1316,8 @@ impl Config {
}).get(host).map(|h| h.clone())
}
// Yes this is a base_url
// But the configuration precedent says, that we call this a domain.
pub fn main_domain(&self) -> String {
self.domain_change_back().split(',').nth(0).expect("Missing domain").to_string()
}