|
|
|
|
@ -112,6 +112,7 @@ object ClosedGroupsProtocol {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
val oldMembers = group.members.map { it.serialize() }.toSet()
|
|
|
|
|
val newMembers = members.minus(oldMembers)
|
|
|
|
|
val membersAsData = members.map { Hex.fromStringCondensed(it) }
|
|
|
|
|
val admins = group.admins.map { it.serialize() }
|
|
|
|
|
val adminsAsData = admins.map { Hex.fromStringCondensed(it) }
|
|
|
|
|
@ -123,6 +124,7 @@ object ClosedGroupsProtocol {
|
|
|
|
|
val wasAnyUserRemoved = members.toSet().intersect(oldMembers) != oldMembers.toSet()
|
|
|
|
|
val removedMembers = oldMembers.minus(members)
|
|
|
|
|
val isUserLeaving = removedMembers.contains(userPublicKey)
|
|
|
|
|
var newSenderKeys = listOf<ClosedGroupSenderKey>()
|
|
|
|
|
if (wasAnyUserRemoved) {
|
|
|
|
|
if (isUserLeaving && removedMembers.count() != 1) {
|
|
|
|
|
Log.d("Loki", "Can't remove self and others simultaneously.")
|
|
|
|
|
@ -147,6 +149,15 @@ object ClosedGroupsProtocol {
|
|
|
|
|
} else {
|
|
|
|
|
// Establish sessions if needed
|
|
|
|
|
establishSessionsWithMembersIfNeeded(context, members)
|
|
|
|
|
// Send closed group update messages to any new members using established channels
|
|
|
|
|
for (member in newMembers) {
|
|
|
|
|
@Suppress("NAME_SHADOWING")
|
|
|
|
|
val closedGroupUpdateKind = ClosedGroupUpdateMessageSendJob.Kind.New(Hex.fromStringCondensed(groupPublicKey), name,
|
|
|
|
|
Hex.fromStringCondensed(groupPrivateKey), listOf(), membersAsData, adminsAsData)
|
|
|
|
|
@Suppress("NAME_SHADOWING")
|
|
|
|
|
val job = ClosedGroupUpdateMessageSendJob(member, closedGroupUpdateKind)
|
|
|
|
|
ApplicationContext.getInstance(context).jobManager.add(job)
|
|
|
|
|
}
|
|
|
|
|
// Send out the user's new ratchet to all members (minus the removed ones) using established channels
|
|
|
|
|
val userRatchet = SharedSenderKeysImplementation.shared.generateRatchet(groupPublicKey, userPublicKey)
|
|
|
|
|
val userSenderKey = ClosedGroupSenderKey(Hex.fromStringCondensed(userRatchet.chainKey), userRatchet.keyIndex, Hex.fromStringCondensed(userPublicKey))
|
|
|
|
|
@ -159,10 +170,9 @@ object ClosedGroupsProtocol {
|
|
|
|
|
ApplicationContext.getInstance(context).jobManager.add(job)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
} else if (newMembers.isNotEmpty()) {
|
|
|
|
|
// Generate ratchets for any new members
|
|
|
|
|
val newMembers = members.minus(oldMembers)
|
|
|
|
|
val newSenderKeys: List<ClosedGroupSenderKey> = newMembers.map { publicKey ->
|
|
|
|
|
newSenderKeys = newMembers.map { publicKey ->
|
|
|
|
|
val ratchet = SharedSenderKeysImplementation.shared.generateRatchet(groupPublicKey, publicKey)
|
|
|
|
|
ClosedGroupSenderKey(Hex.fromStringCondensed(ratchet.chainKey), ratchet.keyIndex, Hex.fromStringCondensed(publicKey))
|
|
|
|
|
}
|
|
|
|
|
@ -174,7 +184,8 @@ object ClosedGroupsProtocol {
|
|
|
|
|
// Establish sessions if needed
|
|
|
|
|
establishSessionsWithMembersIfNeeded(context, newMembers)
|
|
|
|
|
// Send closed group update messages to the new members using established channels
|
|
|
|
|
val allSenderKeys = sskDatabase.getAllClosedGroupSenderKeys(groupPublicKey) + newSenderKeys
|
|
|
|
|
var allSenderKeys = sskDatabase.getAllClosedGroupSenderKeys(groupPublicKey);
|
|
|
|
|
allSenderKeys = allSenderKeys.union(newSenderKeys)
|
|
|
|
|
for (member in newMembers) {
|
|
|
|
|
@Suppress("NAME_SHADOWING")
|
|
|
|
|
val closedGroupUpdateKind = ClosedGroupUpdateMessageSendJob.Kind.New(Hex.fromStringCondensed(groupPublicKey), name,
|
|
|
|
|
@ -183,6 +194,12 @@ object ClosedGroupsProtocol {
|
|
|
|
|
val job = ClosedGroupUpdateMessageSendJob(member, closedGroupUpdateKind)
|
|
|
|
|
ApplicationContext.getInstance(context).jobManager.add(job)
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
val allSenderKeys = sskDatabase.getAllClosedGroupSenderKeys(groupPublicKey);
|
|
|
|
|
val closedGroupUpdateKind = ClosedGroupUpdateMessageSendJob.Kind.Info(Hex.fromStringCondensed(groupPublicKey), name,
|
|
|
|
|
allSenderKeys, membersAsData, adminsAsData)
|
|
|
|
|
val job = ClosedGroupUpdateMessageSendJob(groupPublicKey, closedGroupUpdateKind)
|
|
|
|
|
ApplicationContext.getInstance(context).jobManager.add(job)
|
|
|
|
|
}
|
|
|
|
|
// Update the group
|
|
|
|
|
groupDB.updateTitle(groupID, name)
|
|
|
|
|
@ -225,7 +242,7 @@ object ClosedGroupsProtocol {
|
|
|
|
|
when (closedGroupUpdate.type) {
|
|
|
|
|
SignalServiceProtos.ClosedGroupUpdate.Type.NEW -> {
|
|
|
|
|
return !closedGroupUpdate.name.isNullOrEmpty() && !(closedGroupUpdate.groupPrivateKey ?: ByteString.copyFrom(ByteArray(0))).isEmpty
|
|
|
|
|
&& closedGroupUpdate.senderKeysCount > 0 && closedGroupUpdate.membersCount > 0 && closedGroupUpdate.adminsCount > 0
|
|
|
|
|
&& closedGroupUpdate.membersCount > 0 && closedGroupUpdate.adminsCount > 0 // senderKeys may be empty
|
|
|
|
|
}
|
|
|
|
|
SignalServiceProtos.ClosedGroupUpdate.Type.INFO -> {
|
|
|
|
|
return !closedGroupUpdate.name.isNullOrEmpty() && closedGroupUpdate.membersCount > 0 && closedGroupUpdate.adminsCount > 0 // senderKeys may be empty
|
|
|
|
|
@ -255,10 +272,35 @@ object ClosedGroupsProtocol {
|
|
|
|
|
val ratchet = ClosedGroupRatchet(senderKey.chainKey.toHexString(), senderKey.keyIndex, listOf())
|
|
|
|
|
sskDatabase.setClosedGroupRatchet(groupPublicKey, senderKey.publicKey.toHexString(), ratchet)
|
|
|
|
|
}
|
|
|
|
|
// Sort out any discrepancies between the provided sender keys and what's required
|
|
|
|
|
val missingSenderKeys = members.toSet().subtract(senderKeys.map { Hex.toStringCondensed(it.publicKey) })
|
|
|
|
|
if (missingSenderKeys.contains(userPublicKey)) {
|
|
|
|
|
establishSessionsWithMembersIfNeeded(context, members)
|
|
|
|
|
val userRatchet = SharedSenderKeysImplementation.shared.generateRatchet(groupPublicKey, userPublicKey)
|
|
|
|
|
val userSenderKey = ClosedGroupSenderKey(Hex.fromStringCondensed(userRatchet.chainKey), userRatchet.keyIndex, Hex.fromStringCondensed(userPublicKey))
|
|
|
|
|
for (member in members) {
|
|
|
|
|
if (member == userPublicKey) { continue }
|
|
|
|
|
@Suppress("NAME_SHADOWING")
|
|
|
|
|
val closedGroupUpdateKind = ClosedGroupUpdateMessageSendJob.Kind.SenderKey(Hex.fromStringCondensed(groupPublicKey), userSenderKey)
|
|
|
|
|
@Suppress("NAME_SHADOWING")
|
|
|
|
|
val job = ClosedGroupUpdateMessageSendJob(member, closedGroupUpdateKind)
|
|
|
|
|
ApplicationContext.getInstance(context).jobManager.add(job)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (publicKey in missingSenderKeys.minus(userPublicKey)) {
|
|
|
|
|
requestSenderKey(context, groupPublicKey, publicKey)
|
|
|
|
|
}
|
|
|
|
|
// Create the group
|
|
|
|
|
val groupID = doubleEncodeGroupID(groupPublicKey)
|
|
|
|
|
DatabaseFactory.getGroupDatabase(context).create(groupID, name, LinkedList<Address>(members.map { Address.fromSerialized(it) }),
|
|
|
|
|
null, null, LinkedList<Address>(admins.map { Address.fromSerialized(it) }))
|
|
|
|
|
val groupDB = DatabaseFactory.getGroupDatabase(context)
|
|
|
|
|
if (groupDB.getGroup(groupID).orNull() != null) {
|
|
|
|
|
// Update the group
|
|
|
|
|
groupDB.updateTitle(groupID, name)
|
|
|
|
|
groupDB.updateMembers(groupID, members.map { Address.fromSerialized(it) })
|
|
|
|
|
} else {
|
|
|
|
|
groupDB.create(groupID, name, LinkedList<Address>(members.map { Address.fromSerialized(it) }),
|
|
|
|
|
null, null, LinkedList<Address>(admins.map { Address.fromSerialized(it) }))
|
|
|
|
|
}
|
|
|
|
|
DatabaseFactory.getRecipientDatabase(context).setProfileSharing(Recipient.from(context, Address.fromSerialized(groupID), false), true)
|
|
|
|
|
// Add the group to the user's set of public keys to poll for
|
|
|
|
|
sskDatabase.setClosedGroupPrivateKey(groupPublicKey, groupPrivateKey.toHexString())
|
|
|
|
|
@ -297,7 +339,6 @@ object ClosedGroupsProtocol {
|
|
|
|
|
}
|
|
|
|
|
// Store the ratchets for any new members (it's important that this happens before the code below)
|
|
|
|
|
senderKeys.forEach { senderKey ->
|
|
|
|
|
if (!members.contains(senderKey.publicKey.toHexString())) { return@forEach }
|
|
|
|
|
val ratchet = ClosedGroupRatchet(senderKey.chainKey.toHexString(), senderKey.keyIndex, listOf())
|
|
|
|
|
sskDatabase.setClosedGroupRatchet(groupPublicKey, senderKey.publicKey.toHexString(), ratchet)
|
|
|
|
|
}
|
|
|
|
|
@ -358,7 +399,8 @@ object ClosedGroupsProtocol {
|
|
|
|
|
// Respond to the request
|
|
|
|
|
Log.d("Loki", "Responding to sender key request from: $senderPublicKey.")
|
|
|
|
|
ApplicationContext.getInstance(context).sendSessionRequestIfNeeded(senderPublicKey)
|
|
|
|
|
val userRatchet = SharedSenderKeysImplementation.shared.generateRatchet(groupPublicKey, userPublicKey)
|
|
|
|
|
val userRatchet = DatabaseFactory.getSSKDatabase(context).getClosedGroupRatchet(groupPublicKey, userPublicKey)
|
|
|
|
|
?: SharedSenderKeysImplementation.shared.generateRatchet(groupPublicKey, userPublicKey)
|
|
|
|
|
val userSenderKey = ClosedGroupSenderKey(Hex.fromStringCondensed(userRatchet.chainKey), userRatchet.keyIndex, Hex.fromStringCondensed(userPublicKey))
|
|
|
|
|
val closedGroupUpdateKind = ClosedGroupUpdateMessageSendJob.Kind.SenderKey(Hex.fromStringCondensed(groupPublicKey), userSenderKey)
|
|
|
|
|
val job = ClosedGroupUpdateMessageSendJob(senderPublicKey, closedGroupUpdateKind)
|
|
|
|
|
@ -369,24 +411,12 @@ object ClosedGroupsProtocol {
|
|
|
|
|
// Prepare
|
|
|
|
|
val sskDatabase = DatabaseFactory.getSSKDatabase(context)
|
|
|
|
|
val groupPublicKey = closedGroupUpdate.groupPublicKey.toByteArray().toHexString()
|
|
|
|
|
val groupDB = DatabaseFactory.getGroupDatabase(context)
|
|
|
|
|
val groupID = doubleEncodeGroupID(groupPublicKey)
|
|
|
|
|
val group = groupDB.getGroup(groupID).orNull()
|
|
|
|
|
if (group == null) {
|
|
|
|
|
Log.d("Loki", "Ignoring closed group sender key for nonexistent group.")
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
val senderKeyProto = closedGroupUpdate.senderKeysList.firstOrNull()
|
|
|
|
|
if (senderKeyProto == null) {
|
|
|
|
|
Log.d("Loki", "Ignoring invalid closed group sender key.")
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
val senderKey = ClosedGroupSenderKey(senderKeyProto.chainKey.toByteArray(), senderKeyProto.keyIndex, senderKeyProto.publicKey.toByteArray())
|
|
|
|
|
// Check that the sending user is a member of the group
|
|
|
|
|
if (!group.members.map { it.serialize() }.contains(senderPublicKey)) {
|
|
|
|
|
Log.d("Loki", "Ignoring closed group sender key from non-member.")
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
if (senderKeyProto.publicKey.toByteArray().toHexString() != senderPublicKey) {
|
|
|
|
|
Log.d("Loki", "Ignoring invalid closed group sender key.")
|
|
|
|
|
return
|
|
|
|
|
|
Anton Chekulaev
4 years ago