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

Merge branch 'jjlin-webauthn-origin' into main

Browse Source
This commit is contained in:
Daniel García 2021-09-06 17:17:04 +02:00
commit d5ed2ce6df
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/core/two_factor/webauthn.rs
View File

@ -22,12 +22,14 @@ pub fn routes() -> Vec<Route> {
struct WebauthnConfig {
url: String,
origin: String,
rpid: String,
}
impl WebauthnConfig {
fn load() -> Webauthn<Self> {
let domain = CONFIG.domain();
let domain_origin = CONFIG.domain_origin();
Webauthn::new(Self {
rpid: reqwest::Url::parse(&domain)
.map(|u| u.domain().map(str::to_owned))
@ -35,6 +37,7 @@ impl WebauthnConfig {
.flatten()
.unwrap_or_default(),
url: domain,
origin: domain_origin,
})
}
}
@ -45,7 +48,7 @@ impl webauthn_rs::WebauthnConfig for WebauthnConfig {
}
fn get_origin(&self) -> &str {
&self.url
&self.origin
}
fn get_relying_party_id(&self) -> &str {