From 7b08225c5708109ff14e04ebbe7a099d94d33265 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 24 Oct 2025 09:52:43 +0200
Subject: [PATCH] Prevent invalid profile keys from being processed for storage
 service

---
 .../manager/syncStorage/ContactRecordProcessor.java   |  6 +++++-
 .../java/org/asamk/signal/manager/util/KeyUtils.java  | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index e1fee99b..b8e937ea 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -172,6 +172,10 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
             e164 = firstNonEmpty(remote.e164, local.e164);
         }
 
+        final var remoteProfileKey = remote.profileKey.size() == 0
+                || KeyUtils.profileKeyOrNull(remote.profileKey.toByteArray()) == null
+                ? ByteString.EMPTY
+                : remote.profileKey;
         final var mergedBuilder = remote.newBuilder()
                 .aci(local.aci.isEmpty() ? remote.aci : local.aci)
                 .e164(e164)
@@ -181,7 +185,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .systemGivenName(account.isPrimaryDevice() ? local.systemGivenName : remote.systemGivenName)
                 .systemFamilyName(account.isPrimaryDevice() ? local.systemFamilyName : remote.systemFamilyName)
                 .systemNickname(remote.systemNickname)
-                .profileKey(firstNonEmpty(remote.profileKey, local.profileKey))
+                .profileKey(firstNonEmpty(remoteProfileKey, local.profileKey))
                 .username(firstNonEmpty(remote.username, local.username))
                 .identityState(identityState)
                 .identityKey(identityKey)
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 31c3cd39..b5d7fbf3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -96,6 +96,17 @@ public class KeyUtils {
         }
     }
 
+    public static ProfileKey profileKeyOrNull(byte[] profileKey) {
+        if (profileKey == null) {
+            return null;
+        }
+        try {
+            return new ProfileKey(profileKey);
+        } catch (InvalidInputException e) {
+            return null;
+        }
+    }
+
     public static String createPassword() {
         return getSecret(18);
     }