SAK-41717 filter the user-supplied HTML because an emoji will cause a…

… stacktrace and fail to distribute the email (sakaiproject#6846)
brdebr · Apr 30, 2019 · 05c9c5f · 05c9c5f
1 parent c0ed84f
commit 05c9c5f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...larchive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/BaseMailArchiveService.java b/...larchive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/BaseMailArchiveService.java
@@ -825,10 +825,13 @@ public MailArchiveMessageEdit addMailArchiveMessage() throws PermissionException
 		public MailArchiveMessage addMailArchiveMessage(String subject, String fromAddress, Instant dateSent, List mailHeaders,
 				List attachments, String[] body) throws PermissionException
 		{
+			StringBuilder alertMsg = new StringBuilder();
+			String cleanedHtml = FormattedText.processFormattedText(body[1], alertMsg);
+
 			MailArchiveMessageEdit edit = (MailArchiveMessageEdit) addMessage();
 			MailArchiveMessageHeaderEdit archiveHeaders = edit.getMailArchiveHeaderEdit();
 			edit.setBody(body[0]); 
-			edit.setHtmlBody(body[1]);
+			edit.setHtmlBody(cleanedHtml);
 			archiveHeaders.replaceAttachments(attachments);
 			archiveHeaders.setSubject(subject);
 			archiveHeaders.setFromAddress(fromAddress);