Browse Source

Merge remote-tracking branch 'dani/main' into sso-support

pull/3899/head
Timshel 1 month ago
parent
commit
5ca0f4ffee
  1. 6
      src/api/core/sends.rs
  2. 4
      src/db/models/device.rs

6
src/api/core/sends.rs

@ -378,7 +378,11 @@ async fn post_send_file_v2_data(
};
match data.data.raw_name() {
Some(raw_file_name) if raw_file_name.dangerous_unsafe_unsanitized_raw() == send_data.fileName => (),
Some(raw_file_name)
if raw_file_name.dangerous_unsafe_unsanitized_raw() == send_data.fileName
// be less strict only if using CLI, cf. https://github.com/dani-garcia/vaultwarden/issues/5614
|| (headers.device.is_cli() && send_data.fileName.ends_with(raw_file_name.dangerous_unsafe_unsanitized_raw().as_str())
) => {}
Some(raw_file_name) => err!(
"Send file name does not match.",
format!(

4
src/db/models/device.rs

@ -81,6 +81,10 @@ impl Device {
pub fn is_registered(&self) -> bool {
self.push_uuid.is_some()
}
pub fn is_cli(&self) -> bool {
matches!(DeviceType::from_i32(self.atype), DeviceType::WindowsCLI | DeviceType::MacOsCLI | DeviceType::LinuxCLI)
}
}
pub struct DeviceWithAuthRequest {

Loading…
Cancel
Save