fix(logging): keep redacted token hints UTF-16 safe (#103341)

zhangguiping-xydt · web-flow · commit 328eaa3a23d6 · 2026-07-10T14:14:13.000+01:00
diff --git a/src/logging/redact.test.ts b/src/logging/redact.test.ts
@@ -309,6 +309,29 @@ describe("redactSensitiveText", () => {
     expect(redactSensitiveFieldValue("MONKEY", "banana")).toBe("banana");
   });
 
+  it("keeps Unicode token hints on valid UTF-16 boundaries", () => {
+    const cases = [
+      {
+        secret: `abcde😀${"x".repeat(9)}wxyz`,
+        expected: "abcde…wxyz",
+      },
+      {
+        secret: `abcdef${"x".repeat(9)}😀abc`,
+        expected: "abcdef…abc",
+      },
+      {
+        secret: `abcd😀${"x".repeat(9)}😀ab`,
+        expected: "abcd😀…😀ab",
+      },
+    ];
+
+    for (const { secret, expected } of cases) {
+      const redacted = redactSensitiveFieldValue("token", secret);
+      expect(redacted).toBe(expected);
+      expect(redacted).not.toMatch(/[\uD800-\uDFFF]/u);
+    }
+  });
+
   it("masks bearer tokens", () => {
     const input = "Authorization: Bearer abcdef1234567890ghij";
     const output = redactSensitiveText(input, { mode: "tools" });
diff --git a/src/logging/redact.ts b/src/logging/redact.ts
@@ -1,4 +1,5 @@
 // Redaction helpers scrub secrets and sensitive identifiers from log output.
+import { sliceUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { compileConfigRegex } from "../security/config-regex.js";
 import { readLoggingConfig } from "./config.js";
@@ -354,8 +355,8 @@ function maskToken(token: string): string {
   if (token.length < DEFAULT_REDACT_MIN_LENGTH) {
     return "***";
   }
-  const start = token.slice(0, DEFAULT_REDACT_KEEP_START);
-  const end = token.slice(-DEFAULT_REDACT_KEEP_END);
+  const start = sliceUtf16Safe(token, 0, DEFAULT_REDACT_KEEP_START);
+  const end = sliceUtf16Safe(token, -DEFAULT_REDACT_KEEP_END);
   return `${start}…${end}`;
 }
 
