Changeset 36c236e in github

Timestamp:

Sep 16, 2008 9:02:53 AM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a47acc5

Parents:

2f746dcd

Message:

Fix typos + only add callback for style tags when safe-flag is set

Location:

program

Files:

• include/html.php (modified) (1 diff)
• steps/mail/func.inc (modified) (2 diffs)

program/include/html.php

@@ -34 +34 @@
 
     public static $common_attrib = array('id','class','style','title','align');
-    public static $containers = array('div','span','p','h1','h2','h3','form','textarea','table','tr','th','td');
+    public static $containers = array('div','span','p','h1','h2','h3','form','textarea','table','tr','th','td','style');
     public static $lc_tags = true;
 

program/steps/mail/func.inc

@@ -612 +612 @@
     }
     
-    // allow CSS styles, will be sanitized by rcmail_washtml_callback()
-    if ($p['safe']) {
-      $wash_opts['html_elements'][] = 'style';
-    }
-    
     $washer = new washtml($wash_opts);
     $washer->add_callback('form', 'rcmail_washtml_callback');
-    $washer->add_callback('style', 'rcmail_washtml_callback');
+    
+    if ($p['safe']) {  // allow CSS styles, will be sanitized by rcmail_washtml_callback()
+      $washer->add_callback('style', 'rcmail_washtml_callback');
+    }
+    
     $body = $washer->wash($html);
     $REMOTE_OBJECTS = $washer->extlinks;
@@ -709 +708 @@
     case 'style':
       // decode all escaped entities and reduce to ascii strings
-      $stripped = preg_replace('/[^a-zA-Z\(:]/', '', rcmail_xss_entitiy_decode($source));
+      $stripped = preg_replace('/[^a-zA-Z\(:]/', '', rcmail_xss_entitiy_decode($content));
       
-      // now check for evli strings like expression, behavior or url()
-      if (!preg_match('/expression|behavior|url\(|import/', $css)) {
+      // now check for evil strings like expression, behavior or url()
+      if (!preg_match('/expression|behavior|url\(|import/', $stripped)) {
         $out = html::tag('style', array('type' => 'text/css'), $content);
         break;