Skip to content

fix: always sanitize messages on startup #171

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
sanity merged 1 commit into from
Mar 13, 2026
Merged

fix: always sanitize messages on startup #171

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
23 changes: 12 additions & 11 deletions ui/src/components/app/freenet_api/response_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,22 +398,23 @@ impl ResponseHandler {
.await;

if result != crate::signing::MigrationResult::Failed {
let mut sanitized = false;
ROOMS.with_mut(|rooms| {
if let Some(room_data) = rooms.map.get_mut(&room_key_copy) {
room_data.key_migrated_to_delegate = true;
if result == crate::signing::MigrationResult::StaleKeyOverwritten {
let params = river_core::room_state::ChatRoomParametersV1 {
owner: room_key_copy,
};
crate::signing::remove_unverifiable_messages(
&mut room_data.room_state,
&params,
);
}
// Always sanitize — bad messages may persist in delegate
// storage from before the key was fixed
let params = river_core::room_state::ChatRoomParametersV1 {
owner: room_key_copy,
};
let removed = crate::signing::remove_unverifiable_messages(
&mut room_data.room_state,
&params,
);
sanitized = removed > 0;
}
});
// Ensure sanitized state is saved to delegate and synced
if result == crate::signing::MigrationResult::StaleKeyOverwritten {
if sanitized {
crate::components::app::mark_needs_sync(room_key_copy);
}
}
Expand Down
25 changes: 14 additions & 11 deletions ui/src/components/app/freenet_api/response_handler/get_response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,23 +351,26 @@ pub async fn handle_get_response(
let result =
crate::signing::migrate_signing_key(room_key, &signing_key_clone).await;
if result != crate::signing::MigrationResult::Failed {
let mut sanitized = false;
ROOMS.with_mut(|rooms| {
if let Some(room_data) = rooms.map.get_mut(&owner_vk) {
room_data.key_migrated_to_delegate = true;
if result == crate::signing::MigrationResult::StaleKeyOverwritten {
let params = river_core::room_state::ChatRoomParametersV1 {
owner: owner_vk,
};
crate::signing::remove_unverifiable_messages(
&mut room_data.room_state,
&params,
);
}
// Always sanitize — bad messages may persist in delegate
// storage from before the key was fixed
let params = river_core::room_state::ChatRoomParametersV1 {
owner: owner_vk,
};
let removed = crate::signing::remove_unverifiable_messages(
&mut room_data.room_state,
&params,
);
sanitized = removed > 0;
info!("Signing key migrated to delegate for new room");
}
});
// Ensure sanitized state is saved to delegate and synced to contract
crate::components::app::mark_needs_sync(owner_vk);
if sanitized {
crate::components::app::mark_needs_sync(owner_vk);
}
}
});

Expand Down
Loading