Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-26 05:50:29 +01:00
Merge pull request #1026 from BlackDex/issue-1022
Fixes #1022 cloning with attachments
Dieser Commit ist enthalten in:
Commit
52ed8e4d75
1 geänderte Dateien mit 4 neuen und 1 gelöschten Zeilen
|
@ -274,7 +274,10 @@ pub fn update_cipher_from_data(
|
||||||
};
|
};
|
||||||
|
|
||||||
if saved_att.cipher_uuid != cipher.uuid {
|
if saved_att.cipher_uuid != cipher.uuid {
|
||||||
err!("Attachment is not owned by the cipher")
|
// Warn and break here since cloning ciphers provides attachment data but will not be cloned.
|
||||||
|
// If we error out here it will break the whole cloning and causes empty ciphers to appear.
|
||||||
|
warn!("Attachment is not owned by the cipher");
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
saved_att.akey = Some(attachment.Key);
|
saved_att.akey = Some(attachment.Key);
|
||||||
|
|
Laden …
In neuem Issue referenzieren