diff options
| author | Daniel García <[email protected]> | 2024-06-16 22:05:17 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-06-16 22:05:17 +0200 |
| commit | 377969ea6769bccd008203c5464eb361f685b787 (patch) | |
| tree | 55ee3ff35acfbd4a91d8465012158a4a477f2193 /src | |
| parent | f05398a6b36891e6e979a39937f8f8eaa6360d52 (diff) | |
| download | vaultwarden-377969ea6769bccd008203c5464eb361f685b787.tar.gz vaultwarden-377969ea6769bccd008203c5464eb361f685b787.zip | |
Update rust and remove unused header values (#4645)
* Update rust and remove unused header values
* Missed one unused var
Diffstat (limited to 'src')
| -rw-r--r-- | src/auth.rs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/auth.rs b/src/auth.rs index f05eba65..c8060a28 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -405,7 +405,6 @@ impl<'r> FromRequest<'r> for Host { } pub struct ClientHeaders { - pub host: String, pub device_type: i32, pub ip: ClientIp, } @@ -415,7 +414,6 @@ impl<'r> FromRequest<'r> for ClientHeaders { type Error = &'static str; async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> { - let host = try_outcome!(Host::from_request(request).await).host; let ip = match ClientIp::from_request(request).await { Outcome::Success(ip) => ip, _ => err_handler!("Error getting Client IP"), @@ -425,7 +423,6 @@ impl<'r> FromRequest<'r> for ClientHeaders { request.headers().get_one("device-type").map(|d| d.parse().unwrap_or(14)).unwrap_or_else(|| 14); Outcome::Success(ClientHeaders { - host, device_type, ip, }) @@ -531,7 +528,6 @@ pub struct OrgHeaders { pub user: User, pub org_user_type: UserOrgType, pub org_user: UserOrganization, - pub org_id: String, pub ip: ClientIp, } @@ -594,7 +590,6 @@ impl<'r> FromRequest<'r> for OrgHeaders { } }, org_user, - org_id: String::from(org_id), ip: headers.ip, }) } @@ -671,7 +666,6 @@ pub struct ManagerHeaders { pub host: String, pub device: Device, pub user: User, - pub org_user_type: UserOrgType, pub ip: ClientIp, } @@ -700,7 +694,6 @@ impl<'r> FromRequest<'r> for ManagerHeaders { host: headers.host, device: headers.device, user: headers.user, - org_user_type: headers.org_user_type, ip: headers.ip, }) } else { @@ -727,7 +720,6 @@ pub struct ManagerHeadersLoose { pub device: Device, pub user: User, pub org_user: UserOrganization, - pub org_user_type: UserOrgType, pub ip: ClientIp, } @@ -743,7 +735,6 @@ impl<'r> FromRequest<'r> for ManagerHeadersLoose { device: headers.device, user: headers.user, org_user: headers.org_user, - org_user_type: headers.org_user_type, ip: headers.ip, }) } else { @@ -782,14 +773,12 @@ impl ManagerHeaders { host: h.host, device: h.device, user: h.user, - org_user_type: h.org_user_type, ip: h.ip, }) } } pub struct OwnerHeaders { - pub host: String, pub device: Device, pub user: User, pub ip: ClientIp, @@ -803,7 +792,6 @@ impl<'r> FromRequest<'r> for OwnerHeaders { let headers = try_outcome!(OrgHeaders::from_request(request).await); if headers.org_user_type == UserOrgType::Owner { Outcome::Success(Self { - host: headers.host, device: headers.device, user: headers.user, ip: headers.ip, |