Changeset 909 in subversion

Timestamp:

Nov 1, 2007 5:51:14 AM (6 years ago)

Author:

thomasb

Message:

Also remove unclosed script tags (fixes XSS vulnerability)

File:

• trunk/roundcubemail/program/steps/mail/func.inc (modified) (1 diff)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -974 +974 @@
   foreach (array('script', 'applet', 'object', 'embed', 'iframe') as $tag)
     {
-    while (($pos = strpos($body_lc, '<'.$tag)) && ($pos2 = strpos($body_lc, '</'.$tag.'>', $pos)))
-      {
-      $pos2 += strlen('</'.$tag.'>');
-      $body = substr($body, 0, $pos) . substr($body, $pos2, strlen($body)-$pos2);
+    while (($pos = strpos($body_lc, '<'.$tag)) && (($pos2 = strpos($body_lc, '</'.$tag.'>', $pos)) || ($pos3 = strpos($body_lc, '>', $pos))))
+      {
+      $end = $pos2 ? $pos2 + strlen('</'.$tag.'>') : $pos3 + 1;
+      $body = substr($body, 0, $pos) . substr($body, $end, strlen($body)-$end);
       $body_lc = strtolower($body);
       }