webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reorganize SignalAccount

Browse source
This commit is contained in:
AsamK 2023-10-02 12:09:41 +02:00
parent 310aadbdc0
commit 7f83bfefd6
2 changed files with 138 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
View file

@ -120,7 +120,8 @@ public class PreKeyHelper {
} }
private List<PreKeyRecord> generatePreKeys(ServiceIdType serviceIdType) { private List<PreKeyRecord> generatePreKeys(ServiceIdType serviceIdType) {
final var offset = account.getPreKeyIdOffset(serviceIdType); final var accountData = account.getAccountData(serviceIdType);
final var offset = accountData.getPreKeyMetadata().getPreKeyIdOffset();
var records = KeyUtils.generatePreKeyRecords(offset); var records = KeyUtils.generatePreKeyRecords(offset);
account.addPreKeys(serviceIdType, records); account.addPreKeys(serviceIdType, records);
@ -144,7 +145,8 @@ public class PreKeyHelper {
} }
private SignedPreKeyRecord generateSignedPreKey(ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair) { private SignedPreKeyRecord generateSignedPreKey(ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair) {
final var signedPreKeyId = account.getNextSignedPreKeyId(serviceIdType); final var accountData = account.getAccountData(serviceIdType);
final var signedPreKeyId = accountData.getPreKeyMetadata().getNextSignedPreKeyId();
var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair); var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair);
account.addSignedPreKey(serviceIdType, record); account.addSignedPreKey(serviceIdType, record);
@ -155,7 +157,8 @@ public class PreKeyHelper {
private List<KyberPreKeyRecord> generateKyberPreKeys( private List<KyberPreKeyRecord> generateKyberPreKeys(
ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
) { ) {
final var offset = account.getKyberPreKeyIdOffset(serviceIdType); final var accountData = account.getAccountData(serviceIdType);
final var offset = accountData.getPreKeyMetadata().getKyberPreKeyIdOffset();
var records = KeyUtils.generateKyberPreKeyRecords(offset, identityKeyPair.getPrivateKey()); var records = KeyUtils.generateKyberPreKeyRecords(offset, identityKeyPair.getPrivateKey());
account.addKyberPreKeys(serviceIdType, records); account.addKyberPreKeys(serviceIdType, records);
@ -182,7 +185,8 @@ public class PreKeyHelper {
private KyberPreKeyRecord generateLastResortKyberPreKey( private KyberPreKeyRecord generateLastResortKyberPreKey(
ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair
) { ) {
final var signedPreKeyId = account.getKyberPreKeyIdOffset(serviceIdType); final var accountData = account.getAccountData(serviceIdType);
final var signedPreKeyId = accountData.getPreKeyMetadata().getKyberPreKeyIdOffset();
var record = KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey()); var record = KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
account.addLastResortKyberPreKey(serviceIdType, record); account.addLastResortKyberPreKey(serviceIdType, record);

282
lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
View file

@ -120,25 +120,27 @@ public class SignalAccount implements Closeable {
private File dataPath; private File dataPath;
private String accountPath; private String accountPath;
private ServiceEnvironment serviceEnvironment; private ServiceEnvironment serviceEnvironment;
private String number; private String number;
private String username; private String username;
private ACI aci; private ACI aci;
private PNI pni; private PNI pni;
private String sessionId;
private String sessionNumber;
private String encryptedDeviceName; private String encryptedDeviceName;
private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID; private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
private boolean isMultiDevice = false;
private String password; private String password;
private String registrationLockPin; private String registrationLockPin;
private MasterKey pinMasterKey; private MasterKey pinMasterKey;
private StorageKey storageKey; private StorageKey storageKey;
private long storageManifestVersion = -1;
private ProfileKey profileKey; private ProfileKey profileKey;
private Settings settings;
private long lastReceiveTimestamp = 0;
private Settings settings;
private String sessionId;
private String sessionNumber;
private long lastReceiveTimestamp = 0;
private long storageManifestVersion = -1;
private boolean isMultiDevice = false;
private boolean registered = false; private boolean registered = false;
private final AccountData aciAccountData = new AccountData(ServiceIdType.ACI); private final AccountData aciAccountData = new AccountData(ServiceIdType.ACI);
@ -225,6 +227,57 @@ public class SignalAccount implements Closeable {
return signalAccount; return signalAccount;
} }
private static SignalAccount createLinkedAccount(
File dataPath,
String accountPath,
String number,
ServiceEnvironment serviceEnvironment,
ACI aci,
PNI pni,
String password,
String encryptedDeviceName,
int deviceId,
IdentityKeyPair aciIdentityKey,
IdentityKeyPair pniIdentityKey,
int registrationId,
int pniRegistrationId,
ProfileKey profileKey,
final Settings settings
) throws IOException {
var fileName = getFileName(dataPath, accountPath);
IOUtils.createPrivateFile(fileName);
final var pair = openFileChannel(fileName, true);
var signalAccount = new SignalAccount(pair.first(), pair.second());
signalAccount.dataPath = dataPath;
signalAccount.accountPath = accountPath;
signalAccount.serviceEnvironment = serviceEnvironment;
signalAccount.aciAccountData.setLocalRegistrationId(registrationId);
signalAccount.pniAccountData.setLocalRegistrationId(pniRegistrationId);
signalAccount.settings = settings;
signalAccount.setProvisioningData(number,
aci,
pni,
password,
encryptedDeviceName,
deviceId,
aciIdentityKey,
pniIdentityKey,
profileKey);
signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
signalAccount.getRecipientTrustedResolver()
.resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
signalAccount.migrateLegacyConfigs();
signalAccount.clearAllPreKeys();
signalAccount.save();
return signalAccount;
}
public static SignalAccount createOrUpdateLinkedAccount( public static SignalAccount createOrUpdateLinkedAccount(
File dataPath, File dataPath,
String accountPath, String accountPath,
@ -281,92 +334,6 @@ public class SignalAccount implements Closeable {
return signalAccount; return signalAccount;
} }
public void initDatabase() {
getAccountDatabase();
}
private void clearAllPreKeys() {
clearAllPreKeys(ServiceIdType.ACI);
clearAllPreKeys(ServiceIdType.PNI);
}
private void clearAllPreKeys(ServiceIdType serviceIdType) {
final var accountData = getAccountData(serviceIdType);
resetPreKeyOffsets(serviceIdType);
resetKyberPreKeyOffsets(serviceIdType);
accountData.getPreKeyStore().removeAllPreKeys();
accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
save();
}
private void setPreKeys(ServiceIdType serviceIdType, PreKeyCollection preKeyCollection) {
final var accountData = getAccountData(serviceIdType);
final var preKeyMetadata = accountData.getPreKeyMetadata();
preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getSignedPreKey().getId();
preKeyMetadata.kyberPreKeyIdOffset = preKeyCollection.getLastResortKyberPreKey().getId();
accountData.getPreKeyStore().removeAllPreKeys();
accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
addSignedPreKey(serviceIdType, preKeyCollection.getSignedPreKey());
addLastResortKyberPreKey(serviceIdType, preKeyCollection.getLastResortKyberPreKey());
save();
}
private static SignalAccount createLinkedAccount(
File dataPath,
String accountPath,
String number,
ServiceEnvironment serviceEnvironment,
ACI aci,
PNI pni,
String password,
String encryptedDeviceName,
int deviceId,
IdentityKeyPair aciIdentityKey,
IdentityKeyPair pniIdentityKey,
int registrationId,
int pniRegistrationId,
ProfileKey profileKey,
final Settings settings
) throws IOException {
var fileName = getFileName(dataPath, accountPath);
IOUtils.createPrivateFile(fileName);
final var pair = openFileChannel(fileName, true);
var signalAccount = new SignalAccount(pair.first(), pair.second());
signalAccount.dataPath = dataPath;
signalAccount.accountPath = accountPath;
signalAccount.serviceEnvironment = serviceEnvironment;
signalAccount.aciAccountData.setLocalRegistrationId(registrationId);
signalAccount.pniAccountData.setLocalRegistrationId(pniRegistrationId);
signalAccount.settings = settings;
signalAccount.setProvisioningData(number,
aci,
pni,
password,
encryptedDeviceName,
deviceId,
aciIdentityKey,
pniIdentityKey,
profileKey);
signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
signalAccount.getRecipientTrustedResolver()
.resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
signalAccount.migrateLegacyConfigs();
signalAccount.clearAllPreKeys();
signalAccount.save();
return signalAccount;
}
private void setProvisioningData( private void setProvisioningData(
final String number, final String number,
final ACI aci, final ACI aci,
@ -399,6 +366,42 @@ public class SignalAccount implements Closeable {
trustSelfIdentity(ServiceIdType.PNI); trustSelfIdentity(ServiceIdType.PNI);
} }
public void finishRegistration(
final ACI aci,
final PNI pni,
final MasterKey masterKey,
final String pin,
final PreKeyCollection aciPreKeys,
final PreKeyCollection pniPreKeys
) {
this.pinMasterKey = masterKey;
this.storageManifestVersion = -1;
this.setStorageManifest(null);
this.storageKey = null;
this.encryptedDeviceName = null;
this.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
this.isMultiDevice = false;
this.registered = true;
this.aci = aci;
this.pni = pni;
this.registrationLockPin = pin;
this.lastReceiveTimestamp = 0;
save();
setPreKeys(ServiceIdType.ACI, aciPreKeys);
setPreKeys(ServiceIdType.PNI, pniPreKeys);
aciAccountData.getSessionStore().archiveAllSessions();
pniAccountData.getSessionStore().archiveAllSessions();
getSenderKeyStore().deleteAll();
getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
trustSelfIdentity(ServiceIdType.ACI);
trustSelfIdentity(ServiceIdType.PNI);
}
public void initDatabase() {
getAccountDatabase();
}
private void migrateLegacyConfigs() { private void migrateLegacyConfigs() {
if (getPassword() == null) { if (getPassword() == null) {
setPassword(KeyUtils.createPassword()); setPassword(KeyUtils.createPassword());
@ -1066,6 +1069,37 @@ public class SignalAccount implements Closeable {
} }
} }
private void clearAllPreKeys() {
clearAllPreKeys(ServiceIdType.ACI);
clearAllPreKeys(ServiceIdType.PNI);
}
private void clearAllPreKeys(ServiceIdType serviceIdType) {
final var accountData = getAccountData(serviceIdType);
resetPreKeyOffsets(serviceIdType);
resetKyberPreKeyOffsets(serviceIdType);
accountData.getPreKeyStore().removeAllPreKeys();
accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
save();
}
private void setPreKeys(ServiceIdType serviceIdType, PreKeyCollection preKeyCollection) {
final var accountData = getAccountData(serviceIdType);
final var preKeyMetadata = accountData.getPreKeyMetadata();
preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getSignedPreKey().getId();
preKeyMetadata.kyberPreKeyIdOffset = preKeyCollection.getLastResortKyberPreKey().getId();
accountData.getPreKeyStore().removeAllPreKeys();
accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
addSignedPreKey(serviceIdType, preKeyCollection.getSignedPreKey());
addLastResortKyberPreKey(serviceIdType, preKeyCollection.getLastResortKyberPreKey());
save();
}
public void resetPreKeyOffsets(final ServiceIdType serviceIdType) { public void resetPreKeyOffsets(final ServiceIdType serviceIdType) {
final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata(); final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset(); preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
@ -1344,7 +1378,7 @@ public class SignalAccount implements Closeable {
public AccountAttributes getAccountAttributes(String registrationLock) { public AccountAttributes getAccountAttributes(String registrationLock) {
return new AccountAttributes(null, return new AccountAttributes(null,
getLocalRegistrationId(), aciAccountData.getLocalRegistrationId(),
false, false,
false, false,
true, true,
@ -1354,7 +1388,7 @@ public class SignalAccount implements Closeable {
isDiscoverableByPhoneNumber(), isDiscoverableByPhoneNumber(),
getAccountCapabilities(), getAccountCapabilities(),
encryptedDeviceName, encryptedDeviceName,
getLocalPniRegistrationId(), pniAccountData.getLocalRegistrationId(),
null); // TODO recoveryPassword? null); // TODO recoveryPassword?
} }
@ -1398,7 +1432,7 @@ public class SignalAccount implements Closeable {
final int localPniRegistrationId final int localPniRegistrationId
) { ) {
setPniIdentityKeyPair(pniIdentityKeyPair); setPniIdentityKeyPair(pniIdentityKeyPair);
setLocalPniRegistrationId(localPniRegistrationId); pniAccountData.setLocalRegistrationId(localPniRegistrationId);
final var preKeyMetadata = getAccountData(ServiceIdType.PNI).getPreKeyMetadata(); final var preKeyMetadata = getAccountData(ServiceIdType.PNI).getPreKeyMetadata();
preKeyMetadata.nextSignedPreKeyId = pniSignedPreKey.getId(); preKeyMetadata.nextSignedPreKeyId = pniSignedPreKey.getId();
@ -1407,6 +1441,7 @@ public class SignalAccount implements Closeable {
preKeyMetadata.kyberPreKeyIdOffset = lastResortKyberPreKey.getId(); preKeyMetadata.kyberPreKeyIdOffset = lastResortKyberPreKey.getId();
addLastResortKyberPreKey(ServiceIdType.PNI, lastResortKyberPreKey); addLastResortKyberPreKey(ServiceIdType.PNI, lastResortKyberPreKey);
} }
save();
} }
public SignalServiceAddress getSelfAddress() { public SignalServiceAddress getSelfAddress() {
@ -1465,19 +1500,6 @@ public class SignalAccount implements Closeable {
save(); save();
} }
public int getLocalRegistrationId() {
return aciAccountData.getLocalRegistrationId();
}
public int getLocalPniRegistrationId() {
return pniAccountData.getLocalRegistrationId();
}
public void setLocalPniRegistrationId(final int localPniRegistrationId) {
pniAccountData.setLocalRegistrationId(localPniRegistrationId);
save();
}
public String getPassword() { public String getPassword() {
return password; return password;
} }
@ -1604,18 +1626,6 @@ public class SignalAccount implements Closeable {
return UnidentifiedAccess.deriveAccessKeyFrom(getProfileKey()); return UnidentifiedAccess.deriveAccessKeyFrom(getProfileKey());
} }
public int getPreKeyIdOffset(ServiceIdType serviceIdType) {
return getAccountData(serviceIdType).getPreKeyMetadata().preKeyIdOffset;
}
public int getNextSignedPreKeyId(ServiceIdType serviceIdType) {
return getAccountData(serviceIdType).getPreKeyMetadata().nextSignedPreKeyId;
}
public int getKyberPreKeyIdOffset(ServiceIdType serviceIdType) {
return getAccountData(serviceIdType).getPreKeyMetadata().kyberPreKeyIdOffset;
}
public boolean isRegistered() { public boolean isRegistered() {
return registered; return registered;
} }
@ -1656,38 +1666,6 @@ public class SignalAccount implements Closeable {
return phoneNumberUnlisted == null || !phoneNumberUnlisted; return phoneNumberUnlisted == null || !phoneNumberUnlisted;
} }
public void finishRegistration(
final ACI aci,
final PNI pni,
final MasterKey masterKey,
final String pin,
final PreKeyCollection aciPreKeys,
final PreKeyCollection pniPreKeys
) {
this.pinMasterKey = masterKey;
this.storageManifestVersion = -1;
this.setStorageManifest(null);
this.storageKey = null;
this.encryptedDeviceName = null;
this.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
this.isMultiDevice = false;
this.registered = true;
this.aci = aci;
this.pni = pni;
this.registrationLockPin = pin;
this.lastReceiveTimestamp = 0;
save();
setPreKeys(ServiceIdType.ACI, aciPreKeys);
setPreKeys(ServiceIdType.PNI, pniPreKeys);
aciAccountData.getSessionStore().archiveAllSessions();
pniAccountData.getSessionStore().archiveAllSessions();
getSenderKeyStore().deleteAll();
getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
trustSelfIdentity(ServiceIdType.ACI);
trustSelfIdentity(ServiceIdType.PNI);
}
private void trustSelfIdentity(ServiceIdType serviceIdType) { private void trustSelfIdentity(ServiceIdType serviceIdType) {
final var accountData = getAccountData(serviceIdType); final var accountData = getAccountData(serviceIdType);
final var serviceId = accountData.getServiceId(); final var serviceId = accountData.getServiceId();