Update libsignal-service

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / util / ProfileUtils.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 213f516c2ca564e963210af7631c2cbb01f14911..82ffc8617b4139f49a6438138e406a96c4edfdb6 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -1,25 +1,41 @@
 package org.asamk.signal.manager.util;
 
-import org.asamk.signal.manager.storage.recipients.Profile;
-import org.signal.zkgroup.profiles.ProfileKey;
-import org.whispersystems.libsignal.util.Pair;
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.Profile;
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
+import org.whispersystems.signalservice.internal.push.PaymentAddress;
 
+import java.io.IOException;
 import java.util.Base64;
 import java.util.HashSet;
 
 public class ProfileUtils {
 
+    private static final Logger logger = LoggerFactory.getLogger(ProfileUtils.class);
+
     public static Profile decryptProfile(
             final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
     ) {
         var profileCipher = new ProfileCipher(profileKey);
+        IdentityKey identityKey = null;
+        try {
+            identityKey = new IdentityKey(Base64.getDecoder().decode(encryptedProfile.getIdentityKey()), 0);
+        } catch (InvalidKeyException e) {
+            logger.debug("Failed to decode identity key in profile, can't verify payment address", e);
+        }
+
         try {
             var name = decrypt(encryptedProfile.getName(), profileCipher);
-            var about = decrypt(encryptedProfile.getAbout(), profileCipher);
-            var aboutEmoji = decrypt(encryptedProfile.getAboutEmoji(), profileCipher);
+            var about = trimZeros(decrypt(encryptedProfile.getAbout(), profileCipher));
+            var aboutEmoji = trimZeros(decrypt(encryptedProfile.getAboutEmoji(), profileCipher));
 
             final var nameParts = splitName(name);
             return new Profile(System.currentTimeMillis(),
@@ -27,9 +43,16 @@ public class ProfileUtils {
                     nameParts.second(),
                     about,
                     aboutEmoji,
+                    encryptedProfile.getAvatar(),
+                    identityKey == null || encryptedProfile.getPaymentAddress() == null
+                            ? null
+                            : decryptAndVerifyMobileCoinAddress(encryptedProfile.getPaymentAddress(),
+                                    profileCipher,
+                                    identityKey.getPublicKey()),
                     getUnidentifiedAccessMode(encryptedProfile, profileCipher),
                     getCapabilities(encryptedProfile));
         } catch (InvalidCiphertextException e) {
+            logger.debug("Failed to decrypt profile for {}", encryptedProfile.getServiceId(), e);
             return null;
         }
     }
@@ -53,18 +76,10 @@ public class ProfileUtils {
 
     public static HashSet<Profile.Capability> getCapabilities(final SignalServiceProfile encryptedProfile) {
         final var capabilities = new HashSet<Profile.Capability>();
-        if (encryptedProfile.getCapabilities().isGv1Migration()) {
-            capabilities.add(Profile.Capability.gv1Migration);
-        }
-        if (encryptedProfile.getCapabilities().isGv2()) {
-            capabilities.add(Profile.Capability.gv2);
-        }
         if (encryptedProfile.getCapabilities().isStorage()) {
             capabilities.add(Profile.Capability.storage);
         }
-        if (encryptedProfile.getCapabilities().isSenderKey()) {
-            capabilities.add(Profile.Capability.senderKey);
-        }
+
         return capabilities;
     }
 
@@ -80,19 +95,47 @@ public class ProfileUtils {
         }
     }
 
+    private static byte[] decryptAndVerifyMobileCoinAddress(
+            final byte[] encryptedPaymentAddress, final ProfileCipher profileCipher, final ECPublicKey publicKey
+    ) throws InvalidCiphertextException {
+        byte[] decrypted;
+        try {
+            decrypted = profileCipher.decryptWithLength(encryptedPaymentAddress);
+        } catch (IOException e) {
+            logger.debug("Failed to decrypt payment address", e);
+            return null;
+        }
+
+        PaymentAddress paymentAddress;
+        try {
+            paymentAddress = PaymentAddress.ADAPTER.decode(decrypted);
+        } catch (IOException e) {
+            logger.debug("Failed to parse payment address", e);
+            return null;
+        }
+
+        return PaymentUtils.verifyPaymentsAddress(paymentAddress, publicKey);
+    }
+
     private static Pair<String, String> splitName(String name) {
         if (name == null) {
             return new Pair<>(null, null);
         }
         String[] parts = name.split("\0");
 
-        switch (parts.length) {
-            case 0:
-                return new Pair<>(null, null);
-            case 1:
-                return new Pair<>(parts[0], null);
-            default:
-                return new Pair<>(parts[0], parts[1]);
+        return switch (parts.length) {
+            case 0 -> new Pair<>(null, null);
+            case 1 -> new Pair<>(parts[0], null);
+            default -> new Pair<>(parts[0], parts[1]);
+        };
+    }
+
+    static String trimZeros(String str) {
+        if (str == null) {
+            return null;
         }
+
+        int pos = str.indexOf(0);
+        return pos == -1 ? str : str.substring(0, pos);
     }
 }