Monotone-Parent: 16149b4acf28c43530866e0b00c8f641e07afc24

Monotone-Revision: 52fad13e2d8c7765e5b822c94adbb945e0636f00

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-10T20:00:45
Monotone-Branch: ca.inverse.sogo

UI/MailPartViewers/UIxMailPartHTMLViewer.m

@@ -49,6 +49,9 @@
 #define showWhoWeAre()
 #endif
 
+/* Tags that are forbidden within the body of the html content */
+static NSArray *BannedTags = nil;
+
 static xmlCharEncoding
 _xmlCharsetForCharset (NSString *charset)
 {
@@ -102,14 +105,14 @@ _xmlCharsetForCharset (NSString *charset)
   NSMutableString *result;
   NSMutableString *css;
   NSDictionary *attachmentIds;
+  BOOL ignoreContent;
+  NSString *ignoreTag;
   BOOL inBody;
   BOOL inStyle;
-  BOOL inScript;
   BOOL inCSSDeclaration;
   BOOL hasEmbeddedCSS;
   BOOL hasExternalImages;
   BOOL unsafe;
-  NSMutableArray *crumb;
   xmlCharEncoding contentEncoding;
 }
 
@@ -119,13 +122,23 @@ _xmlCharsetForCharset (NSString *charset)
 
 @implementation _UIxHTMLMailContentHandler
 
++ (void) initialize
+{
+  if (!BannedTags)
+    {
+      BannedTags = [NSArray arrayWithObjects: @"SCRIPT", @"LINK", @"BASE",
+                            @"META", @"TITLE", nil];
+      [BannedTags retain];
+    }
+}
+
 - (id) init
 {
   if ((self = [super init]))
     {
-      crumb = nil;
       css = nil;
       result = nil;
+      ignoreTag = nil;
       attachmentIds = nil;
       contentEncoding = XML_CHAR_ENCODING_UTF8;
     }
@@ -135,7 +148,6 @@ _xmlCharsetForCharset (NSString *charset)
 
 - (void) dealloc
 {
-  [crumb release];
   [result release];
   [css release];
   [super dealloc];
@@ -181,34 +193,25 @@ _xmlCharsetForCharset (NSString *charset)
 {
   showWhoWeAre();
 
-  [crumb release];
   [css release];
   [result release];
 
   result = [NSMutableString new];
   css = [NSMutableString new];
-  crumb = [NSMutableArray new];
+
+  ignoreContent = NO;
+  [ignoreTag release];
+  ignoreTag = nil;
 
   inBody = NO;
   inStyle = NO;
-  inScript = NO;
   inCSSDeclaration = NO;
   hasEmbeddedCSS = NO;
 }
 
 - (void) endDocument
 {
-  unsigned int count, max;
-
-
   showWhoWeAre();
-  max = [crumb count];
-  if (max > 0)
-    for (count = max - 1; count > -1; count--)
-      {
-        [result appendFormat: @"</%@>", [crumb objectAtIndex: count]];
-        [crumb removeObjectAtIndex: count];
-      }
 }
 
 - (void) startPrefixMapping: (NSString *)_prefix
@@ -225,10 +228,13 @@ _xmlCharsetForCharset (NSString *charset)
 - (void) _appendStyle: (unichar *) _chars
                length: (int) _len
 {
-  unsigned int count;
+  unsigned int count, length;
   unichar *start, *currentChar;
 
   start = _chars;
+  while (*start < 33)
+    start++;
+
   currentChar = start;
   for (count = 0; count < _len; count++)
     {
@@ -241,11 +247,20 @@ _xmlCharsetForCharset (NSString *charset)
               hasEmbeddedCSS = NO;
             }
         }
+      else
+        {
+          if (*currentChar < 32)
+            {
+              if (currentChar > start)
+                [css appendString: [NSString stringWithCharacters: start
+                                                           length: (currentChar - start)]];
+              start = currentChar + 1;
+            }
           else
             {
               if (*currentChar == '{')
                 inCSSDeclaration = YES;
-          if (*currentChar == ',')
+              else if (*currentChar == ',')
                 hasEmbeddedCSS = NO;
               else if (!hasEmbeddedCSS)
                 {
@@ -254,15 +269,17 @@ _xmlCharsetForCharset (NSString *charset)
                   else
                     if (*currentChar > 32)
                       {
-                    [css appendString: [NSString stringWithCharacters: start
+                        length = (currentChar - start);
-                                                 length: (currentChar - start)]];
+                        [css appendFormat: @"%@\n.SOGoHTMLMail-CSS-Delimiter ",
-                    [css appendString: @".SOGoHTMLMail-CSS-Delimiter "];
+                             [NSString stringWithCharacters: start length: length]];
                         hasEmbeddedCSS = YES;
                         start = currentChar;
                       }
                 }
             }
         }
+    }
+  if (currentChar > start)
     [css appendString: [NSString stringWithCharacters: start
                                                length: (currentChar - start)]];
 }
@@ -273,24 +290,31 @@ _xmlCharsetForCharset (NSString *charset)
            attributes: (id <SaxAttributes>) _attributes
 {
   unsigned int count, max;
-  NSString *name, *value, *cid;
+  NSString *name, *value, *cid, *upperName;
   NSMutableString *resultPart;
   BOOL skipAttribute;
 
   showWhoWeAre();
-  if (inStyle || inScript)
+
+  upperName = [_localName uppercaseString];
+  if (inStyle || ignoreContent)
     ;
-  else if ([_localName caseInsensitiveCompare: @"base"] == NSOrderedSame)
+  else if ([upperName isEqualToString: @"BASE"])
     ;
-  else if ([_localName caseInsensitiveCompare: @"meta"] == NSOrderedSame)
+  else if ([upperName isEqualToString: @"META"])
     ;
-  else if ([_localName caseInsensitiveCompare: @"body"] == NSOrderedSame)
+  else if ([upperName isEqualToString: @"BODY"])
     inBody = YES;
-  else if ([_localName caseInsensitiveCompare: @"script"] == NSOrderedSame)
+  else if ([upperName isEqualToString: @"STYLE"])
-    inScript = YES;
-  else if ([_localName caseInsensitiveCompare: @"style"] == NSOrderedSame)
     inStyle = YES;
   else if (inBody)
+    {
+      if ([BannedTags containsObject: upperName])
+        {
+          ignoreTag = [upperName copy];
+          ignoreContent = YES;
+        }
+      else
         {
           resultPart = [NSMutableString new];
           [resultPart appendFormat: @"<%@", _rawName];
@@ -299,10 +323,10 @@ _xmlCharsetForCharset (NSString *charset)
           for (count = 0; count < max; count++)
             {
               skipAttribute = NO;
-          name = [_attributes nameAtIndex: count];
+              name = [[_attributes nameAtIndex: count] uppercaseString];
-          if ([[name lowercaseString] hasPrefix: @"on"])
+              if ([name hasPrefix: @"ON"])
                 skipAttribute = YES;
-          else if ([name caseInsensitiveCompare: @"src"] == NSOrderedSame)
+              else if ([name isEqualToString: @"SRC"])
                 {
                   value = [_attributes valueAtIndex: count];
                   if ([value hasPrefix: @"cid:"])
@@ -312,7 +336,7 @@ _xmlCharsetForCharset (NSString *charset)
                       value = [attachmentIds objectForKey: cid];
                       skipAttribute = (value == nil);
                     }
-              else if ([_rawName caseInsensitiveCompare: @"img"] == NSOrderedSame)
+                  else if ([upperName isEqualToString: @"IMG"])
                     {
                       hasExternalImages = YES;
                       
@@ -321,8 +345,8 @@ _xmlCharsetForCharset (NSString *charset)
                   else
                     skipAttribute = YES;
                 }
-          else if ([name caseInsensitiveCompare: @"href"] == NSOrderedSame
+              else if ([name isEqualToString: @"HREF"]
-		   || [name caseInsensitiveCompare: @"action"] == NSOrderedSame)
+                       || [name isEqualToString: @"ACTION"])
                 {
                   value = [_attributes valueAtIndex: count];
                   skipAttribute = ([value rangeOfString: @"://"].location
@@ -342,50 +366,78 @@ _xmlCharsetForCharset (NSString *charset)
           [resultPart release];
         }
     }
+}
 
 - (void) _finishCSS
 {
+  NSRange excessiveDelimiter;
+
+  [css replaceString: @"<!--" withString: @""];
+  [css replaceString: @"-->" withString: @""];
   [css replaceString: @".SOGoHTMLMail-CSS-Delimiter body"
        withString: @".SOGoHTMLMail-CSS-Delimiter"];
   [css replaceString: @";" withString: @" !important;"];
-  [css replaceString: @"<!--" withString: @""];
+
-  [css replaceString: @"-->" withString: @""];
+  excessiveDelimiter = [css rangeOfString: @".SOGoHTMLMail-CSS-Delimiter "
+                                  options: NSBackwardsSearch];
+  if (excessiveDelimiter.location != NSNotFound)
+    {
+      if (NSMaxRange (excessiveDelimiter) == [css length])
+        [css deleteCharactersInRange: excessiveDelimiter];
+    }
 }
 
 - (void) endElement: (NSString *) _localName
           namespace: (NSString *) _ns
             rawName: (NSString *) _rawName
 {
+  NSString *upperName;
+
   showWhoWeAre();
 
+  upperName = [_localName uppercaseString];
+
+  if (ignoreContent)
+    {
+      if ([upperName isEqualToString: ignoreTag])
+        {
+          ignoreContent = NO;
+          [ignoreTag release];
+          ignoreTag = nil;
+        }
+    }
+  else
+    {
       if (inStyle)
         {
-     if ([_localName caseInsensitiveCompare: @"style"] == NSOrderedSame)
+          if ([upperName isEqualToString: @"STYLE"])
             {
               inStyle = NO;
               inCSSDeclaration = NO;
             }
         }
-  else if (inScript)
-    inScript = ([_localName caseInsensitiveCompare: @"script"] != NSOrderedSame);
       else if (inBody)
         {
-      if ([_localName caseInsensitiveCompare: @"body"] == NSOrderedSame)
+          if ([upperName isEqualToString: @"BODY"])
             {
               inBody = NO;
               if (css)
                 [self _finishCSS];
             }
           else
+            {
+              NSLog (@"%@", _localName);
               [result appendFormat: @"</%@>", _localName];
             }
         }
+    }
+}
 
 - (void) characters: (unichar *) _chars
              length: (int) _len
 {
   showWhoWeAre();
-  if (!inScript)
+  if (!ignoreContent)
     {
       if (inStyle)
         [self _appendStyle: _chars length: _len];