Prevent stripping number from self recipient in edge cases

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 6b7f68f40ea6dd8b94506bd4cd5e74d0a2d770be..2affa078d890eaaa407b049420b7790f91c87860 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -75,7 +75,7 @@ public class AccountHelper {
     private void updateSelfIdentifiers(final String number, final ACI aci) {
         account.setNumber(number);
         account.setAci(aci);
-        account.getRecipientStore().resolveRecipientTrusted(account.getSelfRecipientAddress());
+        account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
         context.getAccountFileUpdater().updateAccountIdentifiers(account.getNumber(), account.getAci());
         // TODO check and update remote storage
         context.getUnidentifiedAccessHelper().rotateSenderCertificates();

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

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 36f82481d3c932512e7996a53f3b0b543a376009..f52b79b7a46b173d7ba861e91c53702f8c42438e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -42,6 +42,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
     private final ObjectMapper objectMapper;
     private final File file;
     private final RecipientMergeHandler recipientMergeHandler;
+    private final SelfAddressProvider selfAddressProvider;
 
     private final Map<RecipientId, Recipient> recipients;
     private final Map<Long, Long> recipientsMerged = new HashMap<>();
@@ -49,7 +50,9 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
     private long lastId;
     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();
         try (var inputStream = new FileInputStream(file)) {
             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,
                     file,
                     recipientMergeHandler,
+                    selfAddressProvider,
                     new HashMap<>(),
                     storage.lastId);
             final var recipients = storage.recipients.stream().map(r -> {
@@ -113,7 +117,12 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
             return recipientStore;
         } catch (FileNotFoundException e) {
             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) {
             logger.warn("Failed to load recipient store", e);
             throw new RuntimeException(e);
@@ -124,12 +133,14 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
             final ObjectMapper objectMapper,
             final File file,
             final RecipientMergeHandler recipientMergeHandler,
+            final SelfAddressProvider selfAddressProvider,
             final Map<RecipientId, Recipient> recipients,
             final long lastId
     ) {
         this.objectMapper = objectMapper;
         this.file = file;
         this.recipientMergeHandler = recipientMergeHandler;
+        this.selfAddressProvider = selfAddressProvider;
         this.recipients = recipients;
         this.lastId = lastId;
     }
@@ -161,7 +172,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
 
     @Override
     public RecipientId resolveRecipient(ACI aci) {
-        return resolveRecipient(new RecipientAddress(aci.uuid()), false);
+        return resolveRecipient(new RecipientAddress(aci.uuid()), false, false);
     }
 
     @Override
@@ -172,7 +183,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
 
     @Override
     public RecipientId resolveRecipient(final String identifier) {
-        return resolveRecipient(Utils.getRecipientAddressFromIdentifier(identifier), false);
+        return resolveRecipient(Utils.getRecipientAddressFromIdentifier(identifier), false, false);
     }
 
     public RecipientId resolveRecipient(
@@ -188,26 +199,30 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
                 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();
     }
 
     public RecipientId resolveRecipient(RecipientAddress address) {
-        return resolveRecipient(address, false);
+        return resolveRecipient(address, false, false);
     }
 
     @Override
     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) {
-        return resolveRecipient(address, true);
+        return resolveRecipient(address, true, false);
     }
 
     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) {
@@ -215,7 +230,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
         final List<Pair<RecipientId, RecipientId>> toBeMerged = new ArrayList<>();
         synchronized (recipients) {
             recipientIds = addresses.stream().map(address -> {
-                final var pair = resolveRecipientLocked(address, true);
+                final var pair = resolveRecipientLocked(address, true, false);
                 if (pair.second().isPresent()) {
                     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.
      *                    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;
         synchronized (recipients) {
-            pair = resolveRecipientLocked(address, isHighTrust);
+            pair = resolveRecipientLocked(address, isHighTrust, isSelf);
         }
 
         if (pair.second().isPresent()) {
@@ -358,8 +373,13 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
     }
 
     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()
                 ? Optional.<Recipient>empty()
                 : findByNumberLocked(address.number().get());

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfAddressProvider.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfAddressProvider.java
new file mode 100644 (file)
index 0000000..c99b43e
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfAddressProvider.java
@@ -0,0 +1,6 @@
+package org.asamk.signal.manager.storage.recipients;
+
+public interface SelfAddressProvider {
+
+    RecipientAddress getSelfAddress();
+}