mirrored/vaultwarden
1
0
Fork 1
Spiegel von https://github.com/dani-garcia/vaultwarden.git synchronisiert 2024-11-16 04:12:53 +01:00
Code Issues Releases Aktivität

replace domain with base_url

Quellcode durchsuchen
Dieser Commit ist enthalten in:
BlockListed 2023-09-09 10:30:04 +02:00
Ursprung 303eb30ae4
Commit 17923c3fd0
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 2D204777C477B588
1 geänderte Dateien mit 28 neuen und 28 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

56
src/auth.rs
Datei anzeigen

@ -360,12 +360,12 @@ use crate::db::{
DbConn, DbConn,
}; };
pub struct Domain { pub struct BaseURL {
pub domain: String, pub base_url: String,
} }
#[rocket::async_trait] #[rocket::async_trait]
impl<'r> FromRequest<'r> for Domain { impl<'r> FromRequest<'r> for BaseURL {
type Error = &'static str; type Error = &'static str;
async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> { async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
@ -373,7 +373,7 @@ impl<'r> FromRequest<'r> for Domain {
// Get host // Get host
// TODO: UPDATE THIS SECTION // TODO: UPDATE THIS SECTION
let domain = if CONFIG.domain_set() { let base_url = if CONFIG.domain_set() {
let host = if let Some(host) = headers.get_one("X-Forwarded-Host") { let host = if let Some(host) = headers.get_one("X-Forwarded-Host") {
host host
} else if let Some(host) = headers.get_one("Host") { } else if let Some(host) = headers.get_one("Host") {
@ -385,13 +385,13 @@ impl<'r> FromRequest<'r> for Domain {
todo!() todo!()
}; };
let Some(domain) = CONFIG.host_to_domain(host) else { let Some(base_url) = CONFIG.host_to_base_url(host) else {
// TODO fix error handling // TODO fix error handling
// This is probably a 421 misdirected request. // This is probably a 421 misdirected request.
todo!() todo!()
}; };
domain base_url
} else if let Some(referer) = headers.get_one("Referer") { } else if let Some(referer) = headers.get_one("Referer") {
referer.to_string() referer.to_string()
} else { } else {
@ -417,14 +417,14 @@ impl<'r> FromRequest<'r> for Domain {
format!("{protocol}://{host}") format!("{protocol}://{host}")
}; };
Outcome::Success(Domain { Outcome::Success(BaseURL {
domain, base_url,
}) })
} }
} }
pub struct ClientHeaders { pub struct ClientHeaders {
pub domain: String, pub base_url: String,
pub device_type: i32, pub device_type: i32,
pub ip: ClientIp, pub ip: ClientIp,
} }
@ -434,7 +434,7 @@ impl<'r> FromRequest<'r> for ClientHeaders {
type Error = &'static str; type Error = &'static str;
async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> { async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
let domain = try_outcome!(Domain::from_request(request).await).domain; let base_url = try_outcome!(Domain::from_request(request).await).base_url;
let ip = match ClientIp::from_request(request).await { let ip = match ClientIp::from_request(request).await {
Outcome::Success(ip) => ip, Outcome::Success(ip) => ip,
_ => err_handler!("Error getting Client IP"), _ => err_handler!("Error getting Client IP"),
@ -444,7 +444,7 @@ impl<'r> FromRequest<'r> for ClientHeaders {
request.headers().get_one("device-type").map(|d| d.parse().unwrap_or(14)).unwrap_or_else(|| 14); request.headers().get_one("device-type").map(|d| d.parse().unwrap_or(14)).unwrap_or_else(|| 14);
Outcome::Success(ClientHeaders { Outcome::Success(ClientHeaders {
domain, base_url,
device_type, device_type,
ip, ip,
}) })
@ -452,7 +452,7 @@ impl<'r> FromRequest<'r> for ClientHeaders {
} }
pub struct Headers { pub struct Headers {
pub domain: String, pub base_url: String,
pub device: Device, pub device: Device,
pub user: User, pub user: User,
pub ip: ClientIp, pub ip: ClientIp,
@ -465,7 +465,7 @@ impl<'r> FromRequest<'r> for Headers {
async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> { async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
let headers = request.headers(); let headers = request.headers();
let domain = try_outcome!(Domain::from_request(request).await).domain; let base_url = try_outcome!(BaseURL::from_request(request).await).base_url;
let ip = match ClientIp::from_request(request).await { let ip = match ClientIp::from_request(request).await {
Outcome::Success(ip) => ip, Outcome::Success(ip) => ip,
_ => err_handler!("Error getting Client IP"), _ => err_handler!("Error getting Client IP"),
@ -536,7 +536,7 @@ impl<'r> FromRequest<'r> for Headers {
} }
Outcome::Success(Headers { Outcome::Success(Headers {
domain, base_url,
device, device,
user, user,
ip, ip,
@ -545,7 +545,7 @@ impl<'r> FromRequest<'r> for Headers {
} }
pub struct OrgHeaders { pub struct OrgHeaders {
pub domain: String, pub base_url: String,
pub device: Device, pub device: Device,
pub user: User, pub user: User,
pub org_user_type: UserOrgType, pub org_user_type: UserOrgType,
@ -601,7 +601,7 @@ impl<'r> FromRequest<'r> for OrgHeaders {
}; };
Outcome::Success(Self { Outcome::Success(Self {
domain: headers.domain, base_url: headers.base_url,
device: headers.device, device: headers.device,
user, user,
org_user_type: { org_user_type: {
@ -623,7 +623,7 @@ impl<'r> FromRequest<'r> for OrgHeaders {
} }
pub struct AdminHeaders { pub struct AdminHeaders {
pub domain: String, pub base_url: String,
pub device: Device, pub device: Device,
pub user: User, pub user: User,
pub org_user_type: UserOrgType, pub org_user_type: UserOrgType,
@ -640,7 +640,7 @@ impl<'r> FromRequest<'r> for AdminHeaders {
let client_version = request.headers().get_one("Bitwarden-Client-Version").map(String::from); let client_version = request.headers().get_one("Bitwarden-Client-Version").map(String::from);
if headers.org_user_type >= UserOrgType::Admin { if headers.org_user_type >= UserOrgType::Admin {
Outcome::Success(Self { Outcome::Success(Self {
domain: headers.domain, base_url: headers.base_url,
device: headers.device, device: headers.device,
user: headers.user, user: headers.user,
org_user_type: headers.org_user_type, org_user_type: headers.org_user_type,
@ -656,7 +656,7 @@ impl<'r> FromRequest<'r> for AdminHeaders {
impl From<AdminHeaders> for Headers { impl From<AdminHeaders> for Headers {
fn from(h: AdminHeaders) -> Headers { fn from(h: AdminHeaders) -> Headers {
Headers { Headers {
domain: h.domain, base_url: h.base_url,
device: h.device, device: h.device,
user: h.user, user: h.user,
ip: h.ip, ip: h.ip,
@ -687,7 +687,7 @@ fn get_col_id(request: &Request<'_>) -> Option<String> {
/// and have access to the specific collection provided via the <col_id>/collections/collectionId. /// and have access to the specific collection provided via the <col_id>/collections/collectionId.
/// This does strict checking on the collection_id, ManagerHeadersLoose does not. /// This does strict checking on the collection_id, ManagerHeadersLoose does not.
pub struct ManagerHeaders { pub struct ManagerHeaders {
pub domain: String, pub base_url: String,
pub device: Device, pub device: Device,
pub user: User, pub user: User,
pub org_user_type: UserOrgType, pub org_user_type: UserOrgType,
@ -716,7 +716,7 @@ impl<'r> FromRequest<'r> for ManagerHeaders {
} }
Outcome::Success(Self { Outcome::Success(Self {
domain: headers.domain, base_url: headers.base_url,
device: headers.device, device: headers.device,
user: headers.user, user: headers.user,
org_user_type: headers.org_user_type, org_user_type: headers.org_user_type,
@ -731,7 +731,7 @@ impl<'r> FromRequest<'r> for ManagerHeaders {
impl From<ManagerHeaders> for Headers { impl From<ManagerHeaders> for Headers {
fn from(h: ManagerHeaders) -> Headers { fn from(h: ManagerHeaders) -> Headers {
Headers { Headers {
domain: h.domain, base_url: h.base_url,
device: h.device, device: h.device,
user: h.user, user: h.user,
ip: h.ip, ip: h.ip,
@ -742,7 +742,7 @@ impl From<ManagerHeaders> for Headers {
/// The ManagerHeadersLoose is used when you at least need to be a Manager, /// The ManagerHeadersLoose is used when you at least need to be a Manager,
/// but there is no collection_id sent with the request (either in the path or as form data). /// but there is no collection_id sent with the request (either in the path or as form data).
pub struct ManagerHeadersLoose { pub struct ManagerHeadersLoose {
pub domain: String, pub base_url: String,
pub device: Device, pub device: Device,
pub user: User, pub user: User,
pub org_user: UserOrganization, pub org_user: UserOrganization,
@ -758,7 +758,7 @@ impl<'r> FromRequest<'r> for ManagerHeadersLoose {
let headers = try_outcome!(OrgHeaders::from_request(request).await); let headers = try_outcome!(OrgHeaders::from_request(request).await);
if headers.org_user_type >= UserOrgType::Manager { if headers.org_user_type >= UserOrgType::Manager {
Outcome::Success(Self { Outcome::Success(Self {
domain: headers.domain, base_url: headers.base_url,
device: headers.device, device: headers.device,
user: headers.user, user: headers.user,
org_user: headers.org_user, org_user: headers.org_user,
@ -774,7 +774,7 @@ impl<'r> FromRequest<'r> for ManagerHeadersLoose {
impl From<ManagerHeadersLoose> for Headers { impl From<ManagerHeadersLoose> for Headers {
fn from(h: ManagerHeadersLoose) -> Headers { fn from(h: ManagerHeadersLoose) -> Headers {
Headers { Headers {
domain: h.domain, base_url: h.base_url,
device: h.device, device: h.device,
user: h.user, user: h.user,
ip: h.ip, ip: h.ip,
@ -802,7 +802,7 @@ impl ManagerHeaders {
} }
Ok(ManagerHeaders { Ok(ManagerHeaders {
domain: h.domain, base_url: h.base_url,
device: h.device, device: h.device,
user: h.user, user: h.user,
org_user_type: h.org_user_type, org_user_type: h.org_user_type,
@ -812,7 +812,7 @@ impl ManagerHeaders {
} }
pub struct OwnerHeaders { pub struct OwnerHeaders {
pub host: String, pub base_url: String,
pub device: Device, pub device: Device,
pub user: User, pub user: User,
pub ip: ClientIp, pub ip: ClientIp,
@ -826,7 +826,7 @@ impl<'r> FromRequest<'r> for OwnerHeaders {
let headers = try_outcome!(OrgHeaders::from_request(request).await); let headers = try_outcome!(OrgHeaders::from_request(request).await);
if headers.org_user_type == UserOrgType::Owner { if headers.org_user_type == UserOrgType::Owner {
Outcome::Success(Self { Outcome::Success(Self {
host: headers.host, base_url: headers.base_url,
device: headers.device, device: headers.device,
user: headers.user, user: headers.user,
ip: headers.ip, ip: headers.ip,