summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-05-22 07:27:15 +0000
committeralecpl <alec@alec.pl>2010-05-22 07:27:15 +0000
commit0b7f3a8ab26f992ebd83e8b9ab1deabab6d51957 (patch)
tree432b1e07776c4ae9ee7e82da89c4b698de37f9c5
parent2bb1f633fb2c5055a561414b5650a9247662169b (diff)
- Add support for data URI scheme [RFC2397] (#1486740)
-rw-r--r--CHANGELOG1
-rw-r--r--program/lib/washtml.php43
2 files changed, 26 insertions, 18 deletions
diff --git a/CHANGELOG b/CHANGELOG
index eda0cb1a4..e4556682f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Add support for data URI scheme [RFC2397] (#1486740)
- Added 'actionbefore', 'actionafter', 'responsebefore', 'responseafter' events
- Removed response.callbacks feature
- Fix double-addition of e-mail domain to content ID in HTML images
diff --git a/program/lib/washtml.php b/program/lib/washtml.php
index fbbfa43c9..e19fdf0aa 100644
--- a/program/lib/washtml.php
+++ b/program/lib/washtml.php
@@ -73,6 +73,7 @@
* Roundcube Changes:
* - added $block_elements
* - changed $ignore_elements behaviour
+ * - added RFC2397 support
*/
class washtml
@@ -131,31 +132,34 @@ class washtml
private function wash_style($style) {
$s = '';
- foreach(explode(';', $style) as $declaration) {
- if(preg_match('/^\s*([a-z\-]+)\s*:\s*(.*)\s*$/i', $declaration, $match)) {
+ foreach (explode(';', $style) as $declaration) {
+ if (preg_match('/^\s*([a-z\-]+)\s*:\s*(.*)\s*$/i', $declaration, $match)) {
$cssid = $match[1];
$str = $match[2];
$value = '';
- while(sizeof($str) > 0 &&
+ while (sizeof($str) > 0 &&
preg_match('/^(url\(\s*[\'"]?([^\'"\)]*)[\'"]?\s*\)'./*1,2*/
'|rgb\(\s*[0-9]+\s*,\s*[0-9]+\s*,\s*[0-9]+\s*\)'.
'|-?[0-9.]+\s*(em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)?'.
'|#[0-9a-f]{3,6}|[a-z0-9\-]+'.
')\s*/i', $str, $match)) {
- if($match[2]) {
- if($src = $this->config['cid_map'][$match[2]])
- $value .= ' url(\''.htmlspecialchars($src, ENT_QUOTES) . '\')';
- else if(preg_match('/^(http|https|ftp):.*$/i', $match[2], $url)) {
- if($this->config['allow_remote'])
- $value .= ' url(\''.htmlspecialchars($url[0], ENT_QUOTES).'\')';
+ if ($match[2]) {
+ if ($src = $this->config['cid_map'][$match[2]])
+ $value .= ' url('.htmlspecialchars($src, ENT_QUOTES) . ')';
+ else if (preg_match('/^(http|https|ftp):.*$/i', $match[2], $url)) {
+ if ($this->config['allow_remote'])
+ $value .= ' url('.htmlspecialchars($url[0], ENT_QUOTES).')';
else
$this->extlinks = true;
}
- } else if($match[0] != 'url' && $match[0] != 'rbg')//whitelist ?
+ else if (preg_match('/^data:.+/i', $url)) { // RFC2397
+ $value .= ' url('.htmlspecialchars($url, ENT_QUOTES).')';
+ }
+ } else if ($match[0] != 'url' && $match[0] != 'rbg') //whitelist ?
$value .= ' ' . $match[0];
$str = substr($str, strlen($match[0]));
}
- if($value)
+ if ($value)
$s .= ($s?' ':'') . $cssid . ':' . $value . ';';
}
}
@@ -167,20 +171,20 @@ class washtml
$t = '';
$washed;
- foreach($node->attributes as $key => $plop) {
+ foreach ($node->attributes as $key => $plop) {
$key = strtolower($key);
$value = $node->getAttribute($key);
- if(isset($this->_html_attribs[$key]) ||
+ if (isset($this->_html_attribs[$key]) ||
($key == 'href' && preg_match('/^(http:|https:|ftp:|mailto:|#).+/i', $value)))
$t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
- else if($key == 'style' && ($style = $this->wash_style($value)))
+ else if ($key == 'style' && ($style = $this->wash_style($value)))
$t .= ' style="' . $style . '"';
- else if($key == 'background' || ($key == 'src' && strtolower($node->tagName) == 'img')) { //check tagName anyway
- if($src = $this->config['cid_map'][$value]) {
+ else if ($key == 'background' || ($key == 'src' && strtolower($node->tagName) == 'img')) { //check tagName anyway
+ if ($src = $this->config['cid_map'][$value]) {
$t .= ' ' . $key . '="' . htmlspecialchars($src, ENT_QUOTES) . '"';
}
- else if(preg_match('/^(http|https|ftp):.+/i', $value)) {
- if($this->config['allow_remote'])
+ else if (preg_match('/^(http|https|ftp):.+/i', $value)) {
+ if ($this->config['allow_remote'])
$t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
else {
$this->extlinks = true;
@@ -188,6 +192,9 @@ class washtml
$t .= ' ' . $key . '="' . htmlspecialchars($this->config['blocked_src'], ENT_QUOTES) . '"';
}
}
+ else if (preg_match('/^data:.+/i', $value)) { // RFC2397
+ $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
+ }
} else
$washed .= ($washed?' ':'') . $key;
}