Skip to content
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

Jump to bottom

fix: Wrong E2EI information for other users [WPB-9409] #2828

Merged
merged 3 commits into from
Jun 24, 2024
Merged

fix: Wrong E2EI information for other users [WPB-9409] #2828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55ee602
fix: Wrong E2EI information for other users
borichellow Jun 20, 2024
652c788
Added tests
borichellow Jun 20, 2024
fc9747b
Merge branch 'release/android-cycle-4.6' into fix/wrong_e2ei_informat…
borichellow Jun 24, 2024
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
12 changes: 9 additions & 3 deletions persistence/src/commonMain/db_user/com/wire/kalium/persistence/Conversations.sq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,15 @@ AND Conversation.mls_group_state IS 'ESTABLISHED'
ORDER BY Conversation.type DESC LIMIT 1;

getMLSGroupIdByUserId:
SELECT Conversation.mls_group_id FROM Member
JOIN Conversation ON Conversation.qualified_id = Member.conversation
WHERE Conversation.mls_group_id IS NOT NULL AND mls_group_state IS 'ESTABLISHED' AND Member.user = :userId LIMIT 1;
SELECT mls_group_id FROM
(SELECT COUNT(Member.user) AS users_amout, Conversation.mls_group_id, Conversation.mls_group_state FROM Member
mchenani marked this conversation as resolved.
Show resolved Hide resolved
JOIN Conversation ON Conversation.qualified_id = Member.conversation
WHERE Member.user = :userId OR Member.user = (SELECT SelfUser.id FROM SelfUser LIMIT 1)
GROUP BY Conversation.qualified_id)
WHERE users_amout > 1 -- both (Self and Other users) belongs to that conversation
AND mls_group_id IS NOT NULL
AND mls_group_state IS 'ESTABLISHED'
LIMIT 1;

getMLSGroupIdByConversationId:
SELECT Conversation.mls_group_id FROM Conversation
Expand Down
23 changes: 19 additions & 4 deletions persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/ConversationDAOTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,16 +272,17 @@ class ConversationDAOTest : BaseDatabaseTest() {
ConversationEntity.GroupState.PENDING_WELCOME_MESSAGE,
ConversationEntity.CipherSuite.MLS_256_DHKEMP521_AES256GCM_SHA512_P521,
(conversationEntity2.protocolInfo as ConversationEntity.ProtocolInfo.MLS).groupId,

)
val result = conversationDAO.getConversationByQualifiedID(conversationEntity2.id)
assertEquals(
(result?.protocolInfo as ConversationEntity.ProtocolInfo.MLS).groupState, ConversationEntity.GroupState.PENDING_WELCOME_MESSAGE
)
assertEquals(
(result?.protocolInfo as ConversationEntity.ProtocolInfo.MLS).cipherSuite, ConversationEntity.CipherSuite.MLS_256_DHKEMP521_AES256GCM_SHA512_P521
(result?.protocolInfo as ConversationEntity.ProtocolInfo.MLS).cipherSuite,
ConversationEntity.CipherSuite.MLS_256_DHKEMP521_AES256GCM_SHA512_P521
)
}

@Test
fun givenExistingConversation_ThenConversationIsUpdatedOnInsert() = runTest {
conversationDAO.insertConversation(conversationEntity1)
Expand Down Expand Up @@ -1650,22 +1651,36 @@ class ConversationDAOTest : BaseDatabaseTest() {
fun givenEstablishedMLSConversationExists_whenGettingMLSGroupIdByUserId_thenReturnsMLSGroupId() = runTest {
// given
val expected = (conversationEntity4.protocolInfo as ConversationEntity.ProtocolInfo.MLS).groupId
userDAO.upsertUser(user1)
userDAO.upsertUser(user2)

conversationDAO.insertConversation(conversationEntity1.copy(id = user1.id, type = ConversationEntity.Type.SELF))
conversationDAO.insertConversation(conversationEntity4)
memberDAO.insertMembersWithQualifiedId(
listOf(
MemberEntity(user1.id, MemberEntity.Role.Admin),
MemberEntity(user2.id, MemberEntity.Role.Admin),
MemberEntity(selfUserId, MemberEntity.Role.Admin),
),
conversationEntity4.id
)
// then
assertEquals(expected, conversationDAO.getMLSGroupIdByUserId(user1.id))
}

@Test
fun givenEstablishedMLSConversationExistsButSelfUserIsNotMember_whenGettingMLSGroupIdByUserId_thenNull() = runTest {
// given
conversationDAO.insertConversation(conversationEntity1.copy(id = user1.id, type = ConversationEntity.Type.SELF))
conversationDAO.insertConversation(conversationEntity4)
memberDAO.insertMembersWithQualifiedId(
listOf(
MemberEntity(user1.id, MemberEntity.Role.Admin),
MemberEntity(user2.id, MemberEntity.Role.Admin),
),
conversationEntity4.id
)
// then
assertEquals(null, conversationDAO.getMLSGroupIdByUserId(user1.id))
}

@Test
fun givenMLSSelfConversationDoesNotExists_whenGettingE2EIClientInfoByClientId_thenShouldReturnNull() = runTest {
Expand Down
Loading