Attachment 251641 Details for Bug 279929 – git diff for security/vaultwarden

[patch] git diff for security/vaultwarden

patch-security_vaultwarden-Rust-1[1].79 (text/plain), 4.43 KB, created by Bernard Spil on 2024-06-23 11:24:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2024-06-23 11:24:39 UTC

Size: 4.43 KB

patch

obsolete

>diff --git a/security/vaultwarden/files/patch-Rust-1.79 b/security/vaultwarden/files/patch-Rust-1.79
>new file mode 100644
>index 0000000000..683241cd52
>--- /dev/null
>+++ b/security/vaultwarden/files/patch-Rust-1.79
>@@ -0,0 +1,129 @@
>+From 9a73230f6c37b2771e90d73a78b280701e07df03 Mon Sep 17 00:00:00 2001
>+From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
>+ <dani-garcia@users.noreply.github.com>
>+Date: Sun, 16 Jun 2024 21:46:44 +0200
>+Subject: [PATCH] Update rust and remove unused header values
>+
>+---
>+ docker/DockerSettings.yaml |  2 +-
>+ docker/Dockerfile.alpine   |  8 ++++----
>+ docker/Dockerfile.debian   |  2 +-
>+ rust-toolchain.toml        |  2 +-
>+ src/auth.rs                | 11 -----------
>+ 5 files changed, 7 insertions(+), 18 deletions(-)
>+
>+diff --git a/docker/DockerSettings.yaml b/docker/DockerSettings.yaml
>+index 3d2b7d4049..64fedb63a8 100644
>+diff --git a/src/auth.rs b/src/auth.rs
>+index f05eba6548..eee620e3f3 100644
>+--- src/auth.rs.orig
>++++ 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,
>+ }
>+@@ -425,7 +424,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 +529,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 +591,6 @@ impl<'r> FromRequest<'r> for OrgHeaders {
>+                         }
>+                     },
>+                     org_user,
>+-                    org_id: String::from(org_id),
>+                     ip: headers.ip,
>+                 })
>+             }
>+@@ -671,7 +667,6 @@ pub struct ManagerHeaders {
>+     pub host: String,
>+     pub device: Device,
>+     pub user: User,
>+-    pub org_user_type: UserOrgType,
>+     pub ip: ClientIp,
>+ }
>+ 
>+@@ -700,7 +695,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 +721,6 @@ pub struct ManagerHeadersLoose {
>+     pub device: Device,
>+     pub user: User,
>+     pub org_user: UserOrganization,
>+-    pub org_user_type: UserOrgType,
>+     pub ip: ClientIp,
>+ }
>+ 
>+@@ -743,7 +736,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 +774,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 +793,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,
>+From 16d09be2fac290224d3b9ff19685db422f4e6014 Mon Sep 17 00:00:00 2001
>+From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
>+ <dani-garcia@users.noreply.github.com>
>+Date: Sun, 16 Jun 2024 21:56:53 +0200
>+Subject: [PATCH] Missed one unused var
>+
>+---
>+ src/auth.rs | 1 -
>+ 1 file changed, 1 deletion(-)
>+
>+diff --git a/src/auth.rs b/src/auth.rs
>+index eee620e3f3..c8060a28ab 100644
>+--- src/auth.rs.orig
>++++ src/auth.rs
>+@@ -414,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"),

Actions: View | Diff

Attachments on bug 279929: 251641