From 8e59a660ceddd3549f14837ae9af0bb1b53c68b2 Mon Sep 17 00:00:00 2001
From: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com>
Date: Fri, 29 Mar 2024 11:03:55 -0700
Subject: [PATCH] Add better invalid service id logs

---
 ts/types/ServiceId.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ts/types/ServiceId.ts b/ts/types/ServiceId.ts
index 74cff7b681ba..73a36f1b0124 100644
--- a/ts/types/ServiceId.ts
+++ b/ts/types/ServiceId.ts
@@ -53,6 +53,12 @@ export function toUntaggedPni(pni: PniString): UntaggedPniString {
   return pni.replace(/^PNI:/i, '') as UntaggedPniString;
 }
 
+const INVALID_SERVICE_ID_PATTERN = /^.*(.{3})/;
+
+function redactInvalidServiceId(input: string): string {
+  return input.replace(INVALID_SERVICE_ID_PATTERN, '[REDACTED]$1');
+}
+
 export function normalizeServiceId(
   rawServiceId: string,
   context: string,
@@ -77,8 +83,10 @@ export function normalizeServiceId(
   const result = rawServiceId.toLowerCase().replace(/^pni:/, 'PNI:');
 
   if (!isAciString(result) && !isPniString(result)) {
+    const before = redactInvalidServiceId(rawServiceId);
+    const after = redactInvalidServiceId(result);
     logger.warn(
-      `Normalizing invalid serviceId: ${rawServiceId} to ${result} in context "${context}"`
+      `Normalizing invalid serviceId: ${before} to ${after} in context "${context}"`
     );
 
     // Cast anyway we don't want to throw here