Mirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-06-12 13:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rework file ID generation

Browse Source
This commit is contained in:
Jeremy Lin
2021-05-25 23:15:24 -07:00
parent 5fef7983f4
commit c2ef331df9
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/core/ciphers.rs
View File

@ -808,7 +808,7 @@ fn post_attachment_v2(
err!("Cipher is not write accessible")
}
let attachment_id = crypto::generate_file_id();
let attachment_id = crypto::generate_attachment_id();
let data: AttachmentRequestData = data.into_inner().data;
let attachment =
Attachment::new(attachment_id.clone(), cipher.uuid.clone(), data.FileName, data.FileSize, Some(data.Key));
@ -912,7 +912,7 @@ fn save_attachment(
// In the v2 API, we use the value from post_attachment_v2().
let file_id = match &attachment {
Some(attachment) => attachment.id.clone(), // v2 API
None => crypto::generate_file_id(), // Legacy API
None => crypto::generate_attachment_id(), // Legacy API
};
path = base_path.join(&file_id);

2
src/api/core/sends.rs
View File

@ -173,7 +173,7 @@ fn post_send_file(data: Data, content_type: &ContentType, headers: Headers, conn
// Create the Send
let mut send = create_send(data.data, headers.user.uuid.clone())?;
let file_id = crate::crypto::generate_file_id();
let file_id = crate::crypto::generate_send_id();
if send.atype != SendType::File as i32 {
err!("Send content is not a file");