Merge pull request #192 from Hirobreak/clean

fix email body sanitizer
Criptext · Sep 12, 2018 · 15107d4 · 15107d4
2 parents 35cb493 + 545aaad
commit 15107d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/iOS-Email-Client/Info.plist b/iOS-Email-Client/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/iOS-Email-Client/Libs/EventHandler.swift b/iOS-Email-Client/Libs/EventHandler.swift
@@ -213,10 +213,11 @@ class EventHandler {
 
     func getContentPreview(content: String) -> (String, String) {
         do {
+            let allowList = try SwiftSoup.Whitelist.relaxed().addTags("style", "title", "header").addAttributes(":all", "class", "style")
             let doc: Document = try SwiftSoup.parse(content)
             let preview = try String(doc.text().prefix(100))
-            let content = try SwiftSoup.clean(content, Whitelist.basic())!
-            return (content, preview)
+            let cleanContent = try SwiftSoup.clean(content, allowList)!
+            return (preview, cleanContent)
         } catch {
             let preview = String(content.removeHtmlTags().replaceNewLineCharater(separator: " ").prefix(100))
             return (preview, content)