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

Prevent stripping number from self recipient in edge cases

Browse source
This commit is contained in:
AsamK 2022-02-11 17:35:14 +01:00
parent 8985cc2656
commit 796f4d0d96
4 changed files with 46 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
View file

@ -75,7 +75,7 @@ public class AccountHelper {
private void updateSelfIdentifiers(final String number, final ACI aci) { private void updateSelfIdentifiers(final String number, final ACI aci) {
account.setNumber(number); account.setNumber(number);
account.setAci(aci); account.setAci(aci);
account.getRecipientStore().resolveRecipientTrusted(account.getSelfRecipientAddress()); account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
context.getAccountFileUpdater().updateAccountIdentifiers(account.getNumber(), account.getAci()); context.getAccountFileUpdater().updateAccountIdentifiers(account.getNumber(), account.getAci());
// TODO check and update remote storage // TODO check and update remote storage
context.getUnidentifiedAccessHelper().rotateSenderCertificates(); context.getUnidentifiedAccessHelper().rotateSenderCertificates();

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

@ -226,7 +226,7 @@ public class SignalAccount implements Closeable {
final var signalAccount = load(dataPath, accountPath, true, trustNewIdentity); final var signalAccount = load(dataPath, accountPath, true, trustNewIdentity);
signalAccount.setProvisioningData(number, aci, password, encryptedDeviceName, deviceId, profileKey); signalAccount.setProvisioningData(number, aci, password, encryptedDeviceName, deviceId, profileKey);
signalAccount.getRecipientStore().resolveRecipientTrusted(signalAccount.getSelfAddress()); signalAccount.getRecipientStore().resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
signalAccount.getSessionStore().archiveAllSessions(); signalAccount.getSessionStore().archiveAllSessions();
signalAccount.getSenderKeyStore().deleteAll(); signalAccount.getSenderKeyStore().deleteAll();
signalAccount.clearAllPreKeys(); signalAccount.clearAllPreKeys();
@ -277,7 +277,7 @@ public class SignalAccount implements Closeable {
signalAccount.stickerStore = new StickerStore(signalAccount::saveStickerStore); signalAccount.stickerStore = new StickerStore(signalAccount::saveStickerStore);
signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore); signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
signalAccount.getRecipientStore().resolveRecipientTrusted(signalAccount.getSelfAddress()); signalAccount.getRecipientStore().resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION; signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
signalAccount.migrateLegacyConfigs(); signalAccount.migrateLegacyConfigs();
signalAccount.save(); signalAccount.save();
@ -558,7 +558,7 @@ public class SignalAccount implements Closeable {
if (legacyRecipientStore != null) { if (legacyRecipientStore != null) {
getRecipientStore().resolveRecipientsTrusted(legacyRecipientStore.getAddresses()); getRecipientStore().resolveRecipientsTrusted(legacyRecipientStore.getAddresses());
} }
getRecipientStore().resolveRecipientTrusted(getSelfRecipientAddress()); getRecipientStore().resolveSelfRecipientTrusted(getSelfRecipientAddress());
migrated = true; migrated = true;
} }
@ -859,7 +859,8 @@ public class SignalAccount implements Closeable {
public RecipientStore getRecipientStore() { public RecipientStore getRecipientStore() {
return getOrCreate(() -> recipientStore, return getOrCreate(() -> recipientStore,
() -> recipientStore = RecipientStore.load(getRecipientsStoreFile(dataPath, accountPath), () -> recipientStore = RecipientStore.load(getRecipientsStoreFile(dataPath, accountPath),
this::mergeRecipients)); this::mergeRecipients,
this::getSelfRecipientAddress));
} }
public ProfileStore getProfileStore() { public ProfileStore getProfileStore() {
@ -1106,7 +1107,7 @@ public class SignalAccount implements Closeable {
clearAllPreKeys(); clearAllPreKeys();
getSessionStore().archiveAllSessions(); getSessionStore().archiveAllSessions();
getSenderKeyStore().deleteAll(); getSenderKeyStore().deleteAll();
final var recipientId = getRecipientStore().resolveRecipientTrusted(getSelfAddress()); final var recipientId = getRecipientStore().resolveSelfRecipientTrusted(getSelfRecipientAddress());
final var publicKey = getIdentityKeyPair().getPublicKey(); final var publicKey = getIdentityKeyPair().getPublicKey();
getIdentityKeyStore().saveIdentity(recipientId, publicKey, new Date()); getIdentityKeyStore().saveIdentity(recipientId, publicKey, new Date());
getIdentityKeyStore().setIdentityTrustLevel(recipientId, publicKey, TrustLevel.TRUSTED_VERIFIED); getIdentityKeyStore().setIdentityTrustLevel(recipientId, publicKey, TrustLevel.TRUSTED_VERIFIED);

46
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
View file

@ -42,6 +42,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final File file; private final File file;
private final RecipientMergeHandler recipientMergeHandler; private final RecipientMergeHandler recipientMergeHandler;
private final SelfAddressProvider selfAddressProvider;
private final Map<RecipientId, Recipient> recipients; private final Map<RecipientId, Recipient> recipients;
private final Map<Long, Long> recipientsMerged = new HashMap<>(); private final Map<Long, Long> recipientsMerged = new HashMap<>();
@ -49,7 +50,9 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
private long lastId; private long lastId;
private boolean isBulkUpdating; private boolean isBulkUpdating;
public static RecipientStore load(File file, RecipientMergeHandler recipientMergeHandler) { public static RecipientStore load(
File file, RecipientMergeHandler recipientMergeHandler, SelfAddressProvider selfAddressProvider
) {
final var objectMapper = Utils.createStorageObjectMapper(); final var objectMapper = Utils.createStorageObjectMapper();
try (var inputStream = new FileInputStream(file)) { try (var inputStream = new FileInputStream(file)) {
final var storage = objectMapper.readValue(inputStream, Storage.class); final var storage = objectMapper.readValue(inputStream, Storage.class);
@ -57,6 +60,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
final var recipientStore = new RecipientStore(objectMapper, final var recipientStore = new RecipientStore(objectMapper,
file, file,
recipientMergeHandler, recipientMergeHandler,
selfAddressProvider,
new HashMap<>(), new HashMap<>(),
storage.lastId); storage.lastId);
final var recipients = storage.recipients.stream().map(r -> { final var recipients = storage.recipients.stream().map(r -> {
@ -113,7 +117,12 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
return recipientStore; return recipientStore;
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
logger.trace("Creating new recipient store."); logger.trace("Creating new recipient store.");
return new RecipientStore(objectMapper, file, recipientMergeHandler, new HashMap<>(), 0); return new RecipientStore(objectMapper,
file,
recipientMergeHandler,
selfAddressProvider,
new HashMap<>(),
0);
} catch (IOException e) { } catch (IOException e) {
logger.warn("Failed to load recipient store", e); logger.warn("Failed to load recipient store", e);
throw new RuntimeException(e); throw new RuntimeException(e);
@ -124,12 +133,14 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
final ObjectMapper objectMapper, final ObjectMapper objectMapper,
final File file, final File file,
final RecipientMergeHandler recipientMergeHandler, final RecipientMergeHandler recipientMergeHandler,
final SelfAddressProvider selfAddressProvider,
final Map<RecipientId, Recipient> recipients, final Map<RecipientId, Recipient> recipients,
final long lastId final long lastId
) { ) {
this.objectMapper = objectMapper; this.objectMapper = objectMapper;
this.file = file; this.file = file;
this.recipientMergeHandler = recipientMergeHandler; this.recipientMergeHandler = recipientMergeHandler;
this.selfAddressProvider = selfAddressProvider;
this.recipients = recipients; this.recipients = recipients;
this.lastId = lastId; this.lastId = lastId;
} }
@ -161,7 +172,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
@Override @Override
public RecipientId resolveRecipient(ACI aci) { public RecipientId resolveRecipient(ACI aci) {
return resolveRecipient(new RecipientAddress(aci.uuid()), false); return resolveRecipient(new RecipientAddress(aci.uuid()), false, false);
} }
@Override @Override
@ -172,7 +183,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
@Override @Override
public RecipientId resolveRecipient(final String identifier) { public RecipientId resolveRecipient(final String identifier) {
return resolveRecipient(Utils.getRecipientAddressFromIdentifier(identifier), false); return resolveRecipient(Utils.getRecipientAddressFromIdentifier(identifier), false, false);
} }
public RecipientId resolveRecipient( public RecipientId resolveRecipient(
@ -188,26 +199,30 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
throw new UnregisteredRecipientException(new RecipientAddress(null, number)); throw new UnregisteredRecipientException(new RecipientAddress(null, number));
} }
return resolveRecipient(new RecipientAddress(aci.uuid(), number), false); return resolveRecipient(new RecipientAddress(aci.uuid(), number), false, false);
} }
return byNumber.get().getRecipientId(); return byNumber.get().getRecipientId();
} }
public RecipientId resolveRecipient(RecipientAddress address) { public RecipientId resolveRecipient(RecipientAddress address) {
return resolveRecipient(address, false); return resolveRecipient(address, false, false);
} }
@Override @Override
public RecipientId resolveRecipient(final SignalServiceAddress address) { public RecipientId resolveRecipient(final SignalServiceAddress address) {
return resolveRecipient(new RecipientAddress(address), false); return resolveRecipient(new RecipientAddress(address), false, false);
}
public RecipientId resolveSelfRecipientTrusted(RecipientAddress address) {
return resolveRecipient(address, true, true);
} }
public RecipientId resolveRecipientTrusted(RecipientAddress address) { public RecipientId resolveRecipientTrusted(RecipientAddress address) {
return resolveRecipient(address, true); return resolveRecipient(address, true, false);
} }
public RecipientId resolveRecipientTrusted(SignalServiceAddress address) { public RecipientId resolveRecipientTrusted(SignalServiceAddress address) {
return resolveRecipient(new RecipientAddress(address), true); return resolveRecipient(new RecipientAddress(address), true, false);
} }
public List<RecipientId> resolveRecipientsTrusted(List<RecipientAddress> addresses) { public List<RecipientId> resolveRecipientsTrusted(List<RecipientAddress> addresses) {
@ -215,7 +230,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
final List<Pair<RecipientId, RecipientId>> toBeMerged = new ArrayList<>(); final List<Pair<RecipientId, RecipientId>> toBeMerged = new ArrayList<>();
synchronized (recipients) { synchronized (recipients) {
recipientIds = addresses.stream().map(address -> { recipientIds = addresses.stream().map(address -> {
final var pair = resolveRecipientLocked(address, true); final var pair = resolveRecipientLocked(address, true, false);
if (pair.second().isPresent()) { if (pair.second().isPresent()) {
toBeMerged.add(new Pair<>(pair.first(), pair.second().get())); toBeMerged.add(new Pair<>(pair.first(), pair.second().get()));
} }
@ -345,10 +360,10 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
* @param isHighTrust true, if the number/uuid connection was obtained from a trusted source. * @param isHighTrust true, if the number/uuid connection was obtained from a trusted source.
* Has no effect, if the address contains only a number or a uuid. * Has no effect, if the address contains only a number or a uuid.
*/ */
private RecipientId resolveRecipient(RecipientAddress address, boolean isHighTrust) { private RecipientId resolveRecipient(RecipientAddress address, boolean isHighTrust, boolean isSelf) {
final Pair<RecipientId, Optional<RecipientId>> pair; final Pair<RecipientId, Optional<RecipientId>> pair;
synchronized (recipients) { synchronized (recipients) {
pair = resolveRecipientLocked(address, isHighTrust); pair = resolveRecipientLocked(address, isHighTrust, isSelf);
} }
if (pair.second().isPresent()) { if (pair.second().isPresent()) {
@ -358,8 +373,13 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
} }
private Pair<RecipientId, Optional<RecipientId>> resolveRecipientLocked( private Pair<RecipientId, Optional<RecipientId>> resolveRecipientLocked(
RecipientAddress address, boolean isHighTrust RecipientAddress address, boolean isHighTrust, boolean isSelf
) { ) {
if (isHighTrust && !isSelf) {
if (selfAddressProvider.getSelfAddress().matches(address)) {
isHighTrust = false;
}
}
final var byNumber = address.number().isEmpty() final var byNumber = address.number().isEmpty()
? Optional.<Recipient>empty() ? Optional.<Recipient>empty()
: findByNumberLocked(address.number().get()); : findByNumberLocked(address.number().get());

6
lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfAddressProvider.java Normal file
View file

@ -0,0 +1,6 @@
package org.asamk.signal.manager.storage.recipients;
public interface SelfAddressProvider {
RecipientAddress getSelfAddress();
}