saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-10-31 22:01:15 +00:00
Code Activity

Merge pull request #1010 from jjlin/admin-url

Browse source 
Avoid double-slashes in the admin URL
This commit is contained in:
Daniel García 2020-05-31 00:22:46 +02:00 • committed by GitHub
commit b03698fadb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/admin.rs
View file

@ -63,7 +63,9 @@ fn admin_path() -> String {
/// Used for `Location` response headers, which must specify an absolute URI
/// (see https://tools.ietf.org/html/rfc2616#section-14.30).
fn admin_url() -> String {
format!("{}{}", CONFIG.domain(), ADMIN_PATH)
// Don't use CONFIG.domain() directly, since the user may want to keep a
// trailing slash there, particularly when running under a subpath.
format!("{}{}{}", CONFIG.domain_origin(), CONFIG.domain_path(), ADMIN_PATH)
}
#[get("/", rank = 2)]