configuration message
parent
e4a1de24f5
commit
03ff1d1941
@ -0,0 +1,53 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.protocol
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import org.session.libsession.messaging.messages.control.ConfigurationMessage
|
||||||
|
import org.session.libsession.utilities.TextSecurePreferences
|
||||||
|
import org.session.libsignal.service.api.push.SignalServiceAddress
|
||||||
|
import org.session.libsignal.utilities.logging.Log
|
||||||
|
import org.thoughtcrime.securesms.ApplicationContext
|
||||||
|
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
|
||||||
|
import org.thoughtcrime.securesms.loki.utilities.recipient
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
object MultiDeviceProtocol {
|
||||||
|
|
||||||
|
@JvmStatic
|
||||||
|
fun syncConfigurationIfNeeded(context: Context) {
|
||||||
|
val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
|
||||||
|
val lastSyncTime = TextSecurePreferences.getLastConfigurationSyncTime(context)
|
||||||
|
val now = System.currentTimeMillis()
|
||||||
|
if (now - lastSyncTime < 2 * 24 * 60 * 60 * 1000) return
|
||||||
|
val configurationMessage = ConfigurationMessage.getCurrent()
|
||||||
|
val serializedMessage = configurationMessage.toProto()!!.toByteArray()
|
||||||
|
val messageSender = ApplicationContext.getInstance(context).communicationModule.provideSignalMessageSender()
|
||||||
|
val address = SignalServiceAddress(userPublicKey)
|
||||||
|
val recipient = recipient(context, userPublicKey)
|
||||||
|
val udAccess = UnidentifiedAccessUtil.getAccessFor(context, recipient)
|
||||||
|
try {
|
||||||
|
messageSender.sendMessage(0, address, udAccess.get().targetUnidentifiedAccess,
|
||||||
|
Date().time, serializedMessage, false, configurationMessage.ttl.toInt(), false,
|
||||||
|
true, false, true, false)
|
||||||
|
TextSecurePreferences.setLastConfigurationSyncTime(context, now)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.d("Loki", "Failed to send configuration message due to error: $e.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun forceSyncConfigurationNowIfNeeded(context: Context) {
|
||||||
|
val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
|
||||||
|
val configurationMessage = ConfigurationMessage.getCurrent()
|
||||||
|
val serializedMessage = configurationMessage.toProto()!!.toByteArray()
|
||||||
|
val messageSender = ApplicationContext.getInstance(context).communicationModule.provideSignalMessageSender()
|
||||||
|
val address = SignalServiceAddress(userPublicKey)
|
||||||
|
val recipient = recipient(context, userPublicKey)
|
||||||
|
val udAccess = UnidentifiedAccessUtil.getAccessFor(context, recipient)
|
||||||
|
try {
|
||||||
|
messageSender.sendMessage(0, address, udAccess.get().targetUnidentifiedAccess,
|
||||||
|
Date().time, serializedMessage, false, configurationMessage.ttl.toInt(), false,
|
||||||
|
true, false, true, false)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.d("Loki", "Failed to send configuration message due to error: $e.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,105 @@
|
|||||||
|
package org.session.libsession.messaging.messages.control
|
||||||
|
|
||||||
|
import com.google.protobuf.ByteString
|
||||||
|
import org.session.libsession.messaging.MessagingConfiguration
|
||||||
|
import org.session.libsession.messaging.threads.Address
|
||||||
|
import org.session.libsession.utilities.GroupUtil
|
||||||
|
import org.session.libsignal.libsignal.ecc.DjbECPrivateKey
|
||||||
|
import org.session.libsignal.libsignal.ecc.DjbECPublicKey
|
||||||
|
import org.session.libsignal.libsignal.ecc.ECKeyPair
|
||||||
|
import org.session.libsignal.service.internal.push.SignalServiceProtos
|
||||||
|
import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
|
||||||
|
import org.session.libsignal.service.loki.utilities.toHexString
|
||||||
|
|
||||||
|
class ConfigurationMessage(val closedGroups: List<ClosedGroup>, val openGroups: List<String>): ControlMessage() {
|
||||||
|
|
||||||
|
class ClosedGroup(val publicKey: String, val name: String, val encryptionKeyPair: ECKeyPair, val members: List<String>, val admins: List<String>) {
|
||||||
|
val isValid: Boolean get() = members.isNotEmpty() && admins.isNotEmpty()
|
||||||
|
|
||||||
|
override fun toString(): String {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
fun fromProto(proto: SignalServiceProtos.ConfigurationMessage.ClosedGroup): ClosedGroup? {
|
||||||
|
if (!proto.hasPublicKey() || !proto.hasName() || !proto.hasEncryptionKeyPair()) return null
|
||||||
|
val publicKey = proto.publicKey.toByteArray().toHexString()
|
||||||
|
val name = proto.name
|
||||||
|
val encryptionKeyPairAsProto = proto.encryptionKeyPair
|
||||||
|
val encryptionKeyPair = ECKeyPair(DjbECPublicKey(encryptionKeyPairAsProto.publicKey.toByteArray().removing05PrefixIfNeeded()),
|
||||||
|
DjbECPrivateKey(encryptionKeyPairAsProto.privateKey.toByteArray()))
|
||||||
|
val members = proto.membersList.map { it.toByteArray().toHexString() }
|
||||||
|
val admins = proto.adminsList.map { it.toByteArray().toHexString() }
|
||||||
|
return ClosedGroup(publicKey, name, encryptionKeyPair, members, admins)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun toProto(): SignalServiceProtos.ConfigurationMessage.ClosedGroup? {
|
||||||
|
val result = SignalServiceProtos.ConfigurationMessage.ClosedGroup.newBuilder()
|
||||||
|
result.publicKey = ByteString.copyFrom(publicKey.toByteArray())
|
||||||
|
result.name = name
|
||||||
|
val encryptionKeyPairAsProto = SignalServiceProtos.KeyPair.newBuilder()
|
||||||
|
encryptionKeyPairAsProto.publicKey = ByteString.copyFrom(encryptionKeyPair.publicKey.serialize().removing05PrefixIfNeeded())
|
||||||
|
encryptionKeyPairAsProto.privateKey = ByteString.copyFrom(encryptionKeyPair.privateKey.serialize())
|
||||||
|
result.encryptionKeyPair = encryptionKeyPairAsProto.build()
|
||||||
|
result.addAllMembers(members.map { ByteString.copyFrom(it.toByteArray()) })
|
||||||
|
result.addAllAdmins(admins.map { ByteString.copyFrom(it.toByteArray()) })
|
||||||
|
return result.build()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override val ttl: Long = 4 * 24 * 60 * 60 * 1000
|
||||||
|
override val isSelfSendValid: Boolean = true
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
fun getCurrent(): ConfigurationMessage {
|
||||||
|
val closedGroups = mutableListOf<ClosedGroup>()
|
||||||
|
val openGroups = mutableListOf<String>()
|
||||||
|
val storage = MessagingConfiguration.shared.storage
|
||||||
|
val groups = storage.getAllGroups()
|
||||||
|
for (groupRecord in groups) {
|
||||||
|
if (groupRecord.isClosedGroup) {
|
||||||
|
if (!groupRecord.members.contains(Address.fromSerialized(storage.getUserPublicKey()!!))) continue
|
||||||
|
val groupPublicKey = GroupUtil.getDecodedGroupID(groupRecord.encodedId) // TODO: Check if this is correct. Does it need to be double decoded?
|
||||||
|
if (!storage.isClosedGroup(groupPublicKey)) continue
|
||||||
|
val encryptionKeyPair = storage.getLatestClosedGroupEncryptionKeyPair(groupPublicKey) ?: continue
|
||||||
|
val closedGroup = ClosedGroup(groupPublicKey, groupRecord.title, encryptionKeyPair, groupRecord.members.map { it.serialize() }, groupRecord.admins.map { it.serialize() })
|
||||||
|
closedGroups.add(closedGroup)
|
||||||
|
}
|
||||||
|
if (groupRecord.isOpenGroup) {
|
||||||
|
val threadID = storage.getThreadID(groupRecord.encodedId) ?: continue
|
||||||
|
val openGroup = storage.getOpenGroup(threadID) ?: continue
|
||||||
|
openGroups.add(openGroup.server)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ConfigurationMessage(closedGroups, openGroups)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun fromProto(proto: SignalServiceProtos.Content): ConfigurationMessage? {
|
||||||
|
if (!proto.hasConfigurationMessage()) return null
|
||||||
|
val configurationProto = proto.configurationMessage
|
||||||
|
val closedGroups = configurationProto.closedGroupsList.mapNotNull { ClosedGroup.fromProto(it) }
|
||||||
|
val openGroups = configurationProto.openGroupsList
|
||||||
|
return ConfigurationMessage(closedGroups, openGroups)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toProto(): SignalServiceProtos.Content? {
|
||||||
|
val configurationProto = SignalServiceProtos.ConfigurationMessage.newBuilder()
|
||||||
|
configurationProto.addAllClosedGroups(closedGroups.mapNotNull { it.toProto() })
|
||||||
|
configurationProto.addAllOpenGroups(openGroups)
|
||||||
|
val contentProto = SignalServiceProtos.Content.newBuilder()
|
||||||
|
contentProto.configurationMessage = configurationProto.build()
|
||||||
|
return contentProto.build()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toString(): String {
|
||||||
|
return """
|
||||||
|
ConfigurationMessage(
|
||||||
|
closedGroups: ${(closedGroups)}
|
||||||
|
openGroups: ${(openGroups)}
|
||||||
|
)
|
||||||
|
""".trimIndent()
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue