Skip to content

KSM-664 - Handle broken encryption in records, folders and files #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2025
Merged

KSM-664 - Handle broken encryption in records, folders and files #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 35 additions & 15 deletions sdk/rust/src/core/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,12 +968,17 @@ impl SecretsManager {
.collect::<HashMap<String, Value>>();
let record_result =
Record::new_from_json(record_hashmap_parsed, &_secret_key, None);
if record_result.is_err() {
log::error!("Error parsing record: {}", record);
} else {
let unwrapped_record = record_result.unwrap();
records_count += 1;
records.push(unwrapped_record);
match record_result {
Ok(unwrapped_record) => {
records_count += 1;
records.push(unwrapped_record);
}
Err(e) => {
let uid = record_hashmap.get("recordUid")
.and_then(|v| v.as_str())
.unwrap_or("unknown");
log::error!("Record {} skipped due to error: {:?}, {}", uid, e, e);
}
}
}
}
Expand All @@ -988,15 +993,30 @@ impl SecretsManager {
.map(|(k, v)| (k.clone(), v.clone()))
.collect::<HashMap<String, Value>>();
let folder_result: Option<Folder> =
Folder::new_from_json(folder_hashmap_parsed, &_secret_key);
if folder_result.is_none() {
log::error!("Error parsing folder: {}", folder);
} else {
let unwrapped_folder = folder_result.unwrap();
shared_folders_count += 1;
records_count += unwrapped_folder.records()?.len();
records.extend(unwrapped_folder.records()?);
shared_folders.push(unwrapped_folder);
Folder::new_from_json(folder_hashmap_parsed.clone(), &_secret_key);
match folder_result {
Some(unwrapped_folder) => {
shared_folders_count += 1;
match unwrapped_folder.records() {
Ok(folder_records) => {
records_count += folder_records.len();
records.extend(folder_records);
}
Err(e) => {
let uid = folder_hashmap_parsed.get("folderUid")
.and_then(|v| v.as_str())
.unwrap_or("unknown");
log::error!("Error processing records in folder {}: {:?}", uid, e);
}
}
shared_folders.push(unwrapped_folder);
}
None => {
let uid = folder_hashmap_parsed.get("folderUid")
.and_then(|v| v.as_str())
.unwrap_or("unknown");
log::error!("Folder {} skipped due to error during parsing", uid);
}
}
}
}
Expand Down
37 changes: 21 additions & 16 deletions sdk/rust/src/dto/dtos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,14 @@ impl Record {
.collect();

let created_keeper_file =
KeeperFile::new_from_json(file_map_hashmap, record_key_bytes.clone());
KeeperFile::new_from_json(file_map_hashmap.clone(), record_key_bytes.clone());
match created_keeper_file {
Ok(file) => files.push(file),
Err(e) => {
let msg = format!("Error loading file: {}", e);
eprintln!("{}", msg);
let uid = file_map_hashmap.get("fileUid")
.and_then(|v| v.as_str())
.unwrap_or("unknown");
log::error!("File {} skipped due to error: {:?}, {}", uid, e, e);
}
}
}
Expand Down Expand Up @@ -692,14 +694,16 @@ impl Record {
.collect();

let created_keeper_file = KeeperFile::new_from_json(
file_map_hashmap,
file_map_hashmap.clone(),
record.record_key_bytes.to_vec(),
);
match created_keeper_file {
Ok(file) => _files.push(file),
Err(e) => {
let msg = format!("Error loading file: {}", e);
eprintln!("{}", msg);
let uid = file_map_hashmap.get("fileUid")
.and_then(|v| v.as_str())
.unwrap_or("unknown");
log::error!("File {} skipped due to error: {:?}, {}", uid, e, e);
}
}
}
Expand Down Expand Up @@ -1325,16 +1329,17 @@ impl Folder {
let record_result =
Record::new_from_json(record_map.clone(), &self.key, Some(self.uid.to_string()));

// if record_result.is_err() {
// log::error!("Error parsing folder record: {:?}", record_map);
// } else {
// records.push(record_result.unwrap());
// }

if let Ok(record) = record_result {
records.push(record);
} else {
log::error!("Error parsing folder record: {:?}", record_map);
match record_result {
Ok(record) => {
records.push(record);
}
Err(e) => {
let uid = record_map.get("recordUid")
.and_then(|v| v.as_str())
.unwrap_or("unknown");
log::error!("Record {} in folder {} skipped due to error: {:?}, {}",
uid, self.uid, e, e);
}
}
}
Ok(records)
Expand Down