mirror/libsignal
0
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-19 19:42:19 +02:00
Code

backup: Disallow directionless messages that aren't updates

Browse Source 
Note that updates *with* directions are still allowed; some of them
have associated messages, like calls.
This commit is contained in:
Jordan Rose 2024-09-04 16:56:30 -07:00
parent de948b5acd
commit 8771e9759f
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rust/message-backup/src/backup/chat.rs
View File

@ -116,6 +116,8 @@ pub enum ChatItemError {
GiftBadge(#[from] GiftBadgeError),
/// ChatItem.directionalDetails is a oneof but is empty
NoDirection,
/// directionless ChatItem wasn't an update message
DirectionlessMessage,
/// outgoing message {0}
Outgoing(#[from] OutgoingSendError),
/// attachment: {0}
@ -411,6 +413,12 @@ impl<
.ok_or(ChatItemError::NoDirection)?
.try_into_with(context)?;
match (&direction, &message) {
(Direction::Directionless, ChatItemMessage::Update(_)) => Ok(()),
(Direction::Directionless, _) => Err(ChatItemError::DirectionlessMessage),
(_, _) => Ok(()),
}?;
let revisions: Vec<_> = revisions
.into_iter()
.map(|rev| {
@ -870,6 +878,17 @@ mod test {
.into(),
) => Err(ChatItemError::Outgoing(OutgoingSendError::UnknownRecipient(RecipientId(0xffff)))); "outgoing_unknown_recipient"
)]
#[test_case(|x| x.directionalDetails = Some(proto::chat_item::DirectionlessMessageDetails::default().into()) => Err(ChatItemError::DirectionlessMessage); "directionless_non_update")]
#[test_case(|x| {
x.directionalDetails = Some(proto::chat_item::DirectionlessMessageDetails::default().into());
x.set_updateMessage(proto::ChatUpdateMessage {
update: Some(proto::chat_update_message::Update::SimpleUpdate(proto::SimpleChatUpdate {
type_: proto::simple_chat_update::Type::JOINED_SIGNAL.into(),
..Default::default()
})),
..Default::default()
});
} => Ok(()); "directionless_update")]
fn chat_item(modifier: fn(&mut proto::ChatItem)) -> Result<(), ChatItemError> {
let mut message = proto::ChatItem::test_data();
modifier(&mut message);