mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
add sigchat Account.link() relink validity checks
This commit is contained in:
parent
7eb1c07269
commit
147e60a805
2 changed files with 45 additions and 7 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
mod service_environment;
|
mod service_environment;
|
||||||
|
|
||||||
use crate::manager::libsignal::{DeviceNameUtil, ProvisionMessage};
|
use crate::manager::libsignal::{DeviceNameUtil, ProvisionMessage, SignalServiceAddress};
|
||||||
use pddb::Pddb;
|
use pddb::Pddb;
|
||||||
pub use service_environment::ServiceEnvironment;
|
pub use service_environment::ServiceEnvironment;
|
||||||
use std::io::{Error, ErrorKind, Read, Write};
|
use std::io::{Error, ErrorKind, Read, Write};
|
||||||
|
|
@ -231,16 +231,36 @@ impl Account {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// link to an existing Signal Account as a secondary device
|
||||||
|
///
|
||||||
|
/// Confirm that the state of the Signal Account is OK before linking
|
||||||
|
/// https://github.com/AsamK/signal-cli/blob/375bdb79485ec90beb9a154112821a4657740b7a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java#L200-L239
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `device_name` - name to describe this new device
|
||||||
|
/// * `provisioning_msg` - obtained from the Signal server
|
||||||
|
///
|
||||||
|
/// # Returns
|
||||||
|
///
|
||||||
|
/// true on success
|
||||||
|
///
|
||||||
pub fn link(
|
pub fn link(
|
||||||
&mut self,
|
&mut self,
|
||||||
device_name: &str,
|
device_name: &str,
|
||||||
provisioning_msg: ProvisionMessage,
|
provisioning_msg: ProvisionMessage,
|
||||||
) -> Result<bool, Error> {
|
) -> Result<bool, Error> {
|
||||||
// TODO complete link pre-checks
|
|
||||||
// Check if this device can be relinked
|
// Check if this device can be relinked
|
||||||
// check not primary
|
if self.is_primary_device() {
|
||||||
// check not registered in another environment
|
log::warn!("failed to link device as already registered as primary");
|
||||||
// check account state with server
|
return Ok(false);
|
||||||
|
}
|
||||||
|
// TODO complete link pre-checks
|
||||||
|
// } else if self.is_registered()
|
||||||
|
// && self.service_environment() != provisioning_msg.service_environment{
|
||||||
|
// log::warn!("failed to link device as already registered in different Service Environment");
|
||||||
|
// return Ok(false);
|
||||||
|
// }
|
||||||
|
|
||||||
let aci = provisioning_msg.aci;
|
let aci = provisioning_msg.aci;
|
||||||
self.set(ACI_IDENTITY_PRIVATE_KEY, Some(&aci.djb_private_key.key))?;
|
self.set(ACI_IDENTITY_PRIVATE_KEY, Some(&aci.djb_private_key.key))?;
|
||||||
|
|
@ -277,6 +297,7 @@ impl Account {
|
||||||
self.set(STORE_MANIFEST_KEY, None)?;
|
self.set(STORE_MANIFEST_KEY, None)?;
|
||||||
|
|
||||||
// TODO complete registration setup
|
// TODO complete registration setup
|
||||||
|
// https://github.com/AsamK/signal-cli/blob/375bdb79485ec90beb9a154112821a4657740b7a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java#L270-L306
|
||||||
// getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
|
// getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
|
||||||
// getSenderKeyStore().deleteAll();
|
// getSenderKeyStore().deleteAll();
|
||||||
// trustSelfIdentity(ServiceIdType.ACI);
|
// trustSelfIdentity(ServiceIdType.ACI);
|
||||||
|
|
@ -286,13 +307,21 @@ impl Account {
|
||||||
// clearAllPreKeys();
|
// clearAllPreKeys();
|
||||||
// getKeyValueStore().storeEntry(lastRecipientsRefresh, null);
|
// getKeyValueStore().storeEntry(lastRecipientsRefresh, null);
|
||||||
|
|
||||||
Ok(false)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn host(&self) -> &Host {
|
pub fn host(&self) -> &Host {
|
||||||
&self.host
|
&self.host
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn is_primary_device(&self) -> bool {
|
||||||
|
self.device_id == SignalServiceAddress::DEFAULT_DEVICE_ID
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_registered(&self) -> bool {
|
||||||
|
self.registered
|
||||||
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub fn number(&self) -> Option<&str> {
|
pub fn number(&self) -> Option<&str> {
|
||||||
match &self.number {
|
match &self.number {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,15 @@
|
||||||
// this is a stub for a wrapped libsignal
|
// this is a stub for a wrapped libsignal
|
||||||
|
|
||||||
// org.whispersystems.signalservice.api.util.DeviceNameUtil;
|
|
||||||
|
// use org.whispersystems.signalservice.api.push.SignalServiceAddress;
|
||||||
|
pub struct SignalServiceAddress {}
|
||||||
|
impl SignalServiceAddress {
|
||||||
|
pub const DEFAULT_DEVICE_ID: u32 = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
// use org.whispersystems.signalservice.api.util.DeviceNameUtil;
|
||||||
pub struct DeviceNameUtil {}
|
pub struct DeviceNameUtil {}
|
||||||
impl DeviceNameUtil {
|
impl DeviceNameUtil {
|
||||||
pub fn encrypt_device_name(_device_name: &str, _aci_private_key: IdentityKey) -> String {
|
pub fn encrypt_device_name(_device_name: &str, _aci_private_key: IdentityKey) -> String {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue