GUI: Fix unicode rendering of attributed messages (#1351)

Also added a test to stop this from happening again
google · May 15, 2024 · 67883c5 · 67883c5
1 parent 8e1e155
commit 67883c5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/Source/common/BUILD b/Source/common/BUILD
@@ -478,13 +478,16 @@ santa_unit_test(
     name = "SNTBlockMessageTest",
     srcs = ["SNTBlockMessageTest.m"],
     deps = [
-        ":SNTBlockMessage",
+        ":SNTBlockMessage_SantaGUI",
         ":SNTConfigurator",
         ":SNTFileAccessEvent",
         ":SNTStoredEvent",
         ":SNTSystemInfo",
         "@OCMock",
     ],
+    sdk_frameworks = [
+        "AppKit",
+    ],
 )
 
 santa_unit_test(

diff --git a/Source/common/SNTBlockMessage.m b/Source/common/SNTBlockMessage.m
@@ -56,7 +56,11 @@ + (NSAttributedString *)formatMessage:(NSString *)message {
 
 #ifdef SANTAGUI
   NSData *htmlData = [fullHTML dataUsingEncoding:NSUTF8StringEncoding];
-  return [[NSAttributedString alloc] initWithHTML:htmlData documentAttributes:NULL];
+  NSDictionary *options = @{
+    NSDocumentTypeDocumentAttribute : NSHTMLTextDocumentType,
+    NSCharacterEncodingDocumentAttribute : @(NSUTF8StringEncoding),
+  };
+  return [[NSAttributedString alloc] initWithHTML:htmlData options:options documentAttributes:NULL];
 #else
   NSString *strippedHTML = [self stringFromHTML:fullHTML];
   if (!strippedHTML) {

diff --git a/Source/common/SNTBlockMessageTest.m b/Source/common/SNTBlockMessageTest.m
@@ -39,6 +39,12 @@ - (void)setUp {
   OCMStub([self.mockSystemInfo serialNumber]).andReturn(@"my_s");
 }
 
+- (void)testFormatMessage {
+  NSString *input = @"Testing with somé Ünicode çharacters";
+  NSAttributedString *got = [SNTBlockMessage formatMessage:input];
+  XCTAssertEqualObjects([got string], input);
+}
+
 - (void)testEventDetailURLForEvent {
   SNTStoredEvent *se = [[SNTStoredEvent alloc] init];