Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Add kses HTML cleaning to comment functions.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2003-12-24 20:43:04 +00:00
parent 3f71149d19
commit 52e1d45f45
4 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/functions.php
View File

@ -1308,12 +1308,7 @@ function balanceTags($text, $is_comment = 0) {
// $attributes = $regex[2]; // $attributes = $regex[2];
$attributes = $regex[2]; $attributes = $regex[2];
if($attributes) { if($attributes) {
// fix to avoid CSS defacements
if ($is_comment) {
$attributes = str_replace('style=', 'title=', $attributes);
$attributes = str_replace('class=', 'title=', $attributes);
$attributes = str_replace('id=', 'title=', $attributes);
}
$attributes = ' '.$attributes; $attributes = ' '.$attributes;
} }

68
wp-includes/kses.php
View File

@ -10,6 +10,17 @@
# #
# [kses strips evil scripts!] # [kses strips evil scripts!]
$allowedtags = array('b' => array(),
'i' => array(),
'strong' => array(),
'code' => array(),
'em' => array(),
'strike' => array(),
'a' => array('href' => array('minlen' => 3, 'maxlen' => 50),
'title' => array('valueless' => 'n'),
'rel' => array('minlen' => 3, 'maxlen' => 250)),
'blockquote' => array('cite' => array()),
'br' => array());
function wp_kses($string, $allowed_html, $allowed_protocols = function wp_kses($string, $allowed_html, $allowed_protocols =
array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
@ -21,12 +32,12 @@ function wp_kses($string, $allowed_html, $allowed_protocols =
# call this function. # call this function.
############################################################################### ###############################################################################
{ {
$string = kses_no_null($string); $string = wp_kses_no_null($string);
$string = kses_js_entities($string); $string = wp_kses_js_entities($string);
$string = kses_normalize_entities($string); $string = wp_kses_normalize_entities($string);
$string = kses_hook($string); $string = wp_kses_hook($string);
$allowed_html_fixed = kses_array_lc($allowed_html); $allowed_html_fixed = wp_kses_array_lc($allowed_html);
return kses_split($string, $allowed_html_fixed, $allowed_protocols); return wp_kses_split($string, $allowed_html_fixed, $allowed_protocols);
} # function wp_kses } # function wp_kses
@ -58,7 +69,7 @@ function wp_kses_split($string, $allowed_html, $allowed_protocols)
'[^>]*'. # things that aren't > '[^>]*'. # things that aren't >
'(>|$)'. # > or end of string '(>|$)'. # > or end of string
'|>)%e', # OR: just a > '|>)%e', # OR: just a >
"kses_split2('\\1', \$allowed_html, ". "wp_kses_split2('\\1', \$allowed_html, ".
'$allowed_protocols)', '$allowed_protocols)',
$string); $string);
} # function wp_kses_split } # function wp_kses_split
@ -72,7 +83,7 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols)
# attribute list. # attribute list.
############################################################################### ###############################################################################
{ {
$string = kses_stripslashes($string); $string = wp_kses_stripslashes($string);
if (substr($string, 0, 1) != '<') if (substr($string, 0, 1) != '<')
return '&gt;'; return '&gt;';
@ -90,7 +101,7 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols)
return ''; return '';
# They are using a not allowed HTML element # They are using a not allowed HTML element
return kses_attr("$slash$elem", $attrlist, $allowed_html, return wp_kses_attr("$slash$elem", $attrlist, $allowed_html,
$allowed_protocols); $allowed_protocols);
} # function wp_kses_split2 } # function wp_kses_split2
@ -98,7 +109,7 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols)
function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols)
############################################################################### ###############################################################################
# This function removes all attributes, if none are allowed for this element. # This function removes all attributes, if none are allowed for this element.
# If some are allowed it calls kses_hair() to split them further, and then it # If some are allowed it calls wp_kses_hair() to split them further, and then it
# builds up new HTML code from the data that kses_hair() returns. It also # builds up new HTML code from the data that kses_hair() returns. It also
# removes "<" and ">" characters, if there are any left. One more thing it # removes "<" and ">" characters, if there are any left. One more thing it
# does is to check if the tag has a closing XHTML slash, and if it does, # does is to check if the tag has a closing XHTML slash, and if it does,
@ -118,7 +129,7 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols)
# Split it # Split it
$attrarr = kses_hair($attr, $allowed_protocols); $attrarr = wp_kses_hair($attr, $allowed_protocols);
# Go through $attrarr, and save the allowed attributes for this element # Go through $attrarr, and save the allowed attributes for this element
# in $attr2 # in $attr2
@ -141,7 +152,7 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols)
# there are some checks # there are some checks
$ok = true; $ok = true;
foreach ($current as $currkey => $currval) foreach ($current as $currkey => $currval)
if (!kses_check_attr_val($arreach['value'], $arreach['vless'], if (!wp_kses_check_attr_val($arreach['value'], $arreach['vless'],
$currkey, $currval)) $currkey, $currval))
{ $ok = false; break; } { $ok = false; break; }
@ -218,7 +229,7 @@ function wp_kses_hair($attr, $allowed_protocols)
if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match))
# "value" # "value"
{ {
$thisval = kses_bad_protocol($match[1], $allowed_protocols); $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols);
$attrarr[] = array $attrarr[] = array
('name' => $attrname, ('name' => $attrname,
@ -233,7 +244,7 @@ function wp_kses_hair($attr, $allowed_protocols)
if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match))
# 'value' # 'value'
{ {
$thisval = kses_bad_protocol($match[1], $allowed_protocols); $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols);
$attrarr[] = array $attrarr[] = array
('name' => $attrname, ('name' => $attrname,
@ -248,7 +259,7 @@ function wp_kses_hair($attr, $allowed_protocols)
if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match))
# value # value
{ {
$thisval = kses_bad_protocol($match[1], $allowed_protocols); $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols);
$attrarr[] = array $attrarr[] = array
('name' => $attrname, ('name' => $attrname,
@ -265,7 +276,7 @@ function wp_kses_hair($attr, $allowed_protocols)
if ($working == 0) # not well formed, remove and try again if ($working == 0) # not well formed, remove and try again
{ {
$attr = kses_html_error($attr); $attr = wp_kses_html_error($attr);
$mode = 0; $mode = 0;
} }
} # while } # while
@ -357,13 +368,13 @@ function wp_kses_bad_protocol($string, $allowed_protocols)
# fooled by a string like "javascript:javascript:alert(57)". # fooled by a string like "javascript:javascript:alert(57)".
############################################################################### ###############################################################################
{ {
$string = kses_no_null($string); $string = wp_kses_no_null($string);
$string2 = $string.'a'; $string2 = $string.'a';
while ($string != $string2) while ($string != $string2)
{ {
$string2 = $string; $string2 = $string;
$string = kses_bad_protocol_once($string, $allowed_protocols); $string = wp_kses_bad_protocol_once($string, $allowed_protocols);
} # while } # while
return $string; return $string;
@ -430,7 +441,7 @@ function wp_kses_js_entities($string)
function wp_kses_html_error($string) function wp_kses_html_error($string)
############################################################################### ###############################################################################
# This function deals with parsing errors in kses_hair(). The general plan is # This function deals with parsing errors in wp_kses_hair(). The general plan is
# to remove everything to and including some whitespace, but it deals with # to remove everything to and including some whitespace, but it deals with
# quotes and apostrophes as well. # quotes and apostrophes as well.
############################################################################### ###############################################################################
@ -447,7 +458,7 @@ function wp_kses_bad_protocol_once($string, $allowed_protocols)
{ {
return preg_replace('/^((&[^;]*;|[\sA-Za-z0-9])*)'. return preg_replace('/^((&[^;]*;|[\sA-Za-z0-9])*)'.
'(:|&#58;|&#[Xx]3[Aa];)\s*/e', '(:|&#58;|&#[Xx]3[Aa];)\s*/e',
'kses_bad_protocol_once2("\\1", $allowed_protocols)', 'wp_kses_bad_protocol_once2("\\1", $allowed_protocols)',
$string); $string);
} # function wp_kses_bad_protocol_once } # function wp_kses_bad_protocol_once
@ -458,9 +469,9 @@ function wp_kses_bad_protocol_once2($string, $allowed_protocols)
# list or not, and returns different data depending on the answer. # list or not, and returns different data depending on the answer.
############################################################################### ###############################################################################
{ {
$string2 = kses_decode_entities($string); $string2 = wp_kses_decode_entities($string);
$string2 = preg_replace('/\s/', '', $string2); $string2 = preg_replace('/\s/', '', $string2);
$string2 = kses_no_null($string2); $string2 = wp_kses_no_null($string2);
$string2 = strtolower($string2); $string2 = strtolower($string2);
$allowed = false; $allowed = false;
@ -493,7 +504,7 @@ function wp_kses_normalize_entities($string)
$string = preg_replace('/&amp;([A-Za-z][A-Za-z0-9]{0,19});/', $string = preg_replace('/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
'&\\1;', $string); '&\\1;', $string);
$string = preg_replace('/&amp;#0*([0-9]{1,5});/e', $string = preg_replace('/&amp;#0*([0-9]{1,5});/e',
'kses_normalize_entities2("\\1")', $string); 'wp_kses_normalize_entities2("\\1")', $string);
$string = preg_replace('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', $string = preg_replace('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
'&#\\1\\2;', $string); '&#\\1\\2;', $string);
@ -503,7 +514,7 @@ function wp_kses_normalize_entities($string)
function wp_kses_normalize_entities2($i) function wp_kses_normalize_entities2($i)
############################################################################### ###############################################################################
# This function helps kses_normalize_entities() to only accept 16 bit values # This function helps wp_kses_normalize_entities() to only accept 16 bit values
# and nothing more for &#number; entities. # and nothing more for &#number; entities.
############################################################################### ###############################################################################
{ {
@ -525,4 +536,13 @@ function wp_kses_decode_entities($string)
return $string; return $string;
} # function wp_kses_decode_entities } # function wp_kses_decode_entities
function wp_filter_kses($data) {
global $allowedtags;
return wp_kses($data, $allowedtags);
}
// Filter untrusted content
add_filter('comment_author', 'wp_filter_kses');
add_filter('comment_text', 'wp_filter_kses');
?> ?>

20
wp-includes/template-functions.php
View File

@ -1524,8 +1524,10 @@ function comment_ID() {
function comment_author() { function comment_author() {
global $comment; global $comment;
if (!empty($comment->comment_author)) { $author = stripslashes(stripslashes($comment->comment_author));
echo htmlspecialchars(stripslashes($comment->comment_author)); $author = apply_filters('comment_auther', $author);
if (!empty($author)) {
echo htmlspecialchars($comment->comment_author);
} }
else { else {
echo "Anonymous"; echo "Anonymous";
@ -1534,6 +1536,8 @@ function comment_author() {
function comment_author_email() { function comment_author_email() {
global $comment; global $comment;
$email = stripslashes(stripslashes($comment->comment_author_email));
echo antispambot(stripslashes($comment->comment_author_email)); echo antispambot(stripslashes($comment->comment_author_email));
} }
@ -1547,7 +1551,7 @@ function comment_author_link() {
} }
$url = str_replace('http://url', '', $url); $url = str_replace('http://url', '', $url);
$url = preg_replace('|[^a-z0-9-_.,/:]|i', '', $url);
if (empty($url) && empty($email)) { if (empty($url) && empty($email)) {
echo $author; echo $author;
return; return;
@ -1578,6 +1582,7 @@ function comment_author_url() {
$url = (!strstr($url, '://')) ? 'http://'.$url : $url; $url = (!strstr($url, '://')) ? 'http://'.$url : $url;
// convert & into &amp; // convert & into &amp;
$url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&#038;$1', $url); $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&#038;$1', $url);
$url = preg_replace('|[^a-z0-9-_.,/:]|i', '', $url);
if ($url != 'http://url') { if ($url != 'http://url') {
echo $url; echo $url;
} }
@ -1599,10 +1604,11 @@ function comment_author_url_link($linktext='', $before='', $after='') {
$url = trim(stripslashes($comment->comment_author_url)); $url = trim(stripslashes($comment->comment_author_url));
$url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&#038;$1', $url); $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&#038;$1', $url);
$url = (!stristr($url, '://')) ? 'http://'.$url : $url; $url = (!stristr($url, '://')) ? 'http://'.$url : $url;
$url = preg_replace('|[^a-z0-9-_.,/:]|i', '', $url);
if ((!empty($url)) && ($url != 'http://') && ($url != 'http://url')) { if ((!empty($url)) && ($url != 'http://') && ($url != 'http://url')) {
$display = ($linktext != '') ? $linktext : stripslashes($url); $display = ($linktext != '') ? $linktext : stripslashes($url);
echo $before; echo $before;
echo '<a href="'.stripslashes($url).'" target="_blank">'.$display.'</a>'; echo '<a href="'.stripslashes($url).'" rel="external">'.$display.'</a>';
echo $after; echo $after;
} }
} }
@ -1679,14 +1685,12 @@ function comment_text_rss() {
} }
function comment_link_rss() { function comment_link_rss() {
global $comment,$postdata,$pagenow,$siteurl,$blogfilename; global $comment;
global $querystring_start, $querystring_equal, $querystring_separator;
echo get_permalink($comment->comment_post_ID).'#comments'; echo get_permalink($comment->comment_post_ID).'#comments';
} }
function permalink_comments_rss() { function permalink_comments_rss() {
global $comment,$postdata,$pagenow,$siteurl,$blogfilename; global $comment;
global $querystring_start, $querystring_equal, $querystring_separator;
echo get_permalink($comment->comment_post_ID); echo get_permalink($comment->comment_post_ID);
} }

1
wp-settings.php
View File

@ -28,6 +28,7 @@ require (ABSPATH . WPINC . '/template-functions.php');
require (ABSPATH . WPINC . '/class-xmlrpc.php'); require (ABSPATH . WPINC . '/class-xmlrpc.php');
require (ABSPATH . WPINC . '/class-xmlrpcs.php'); require (ABSPATH . WPINC . '/class-xmlrpcs.php');
require (ABSPATH . WPINC . '/links.php'); require (ABSPATH . WPINC . '/links.php');
require (ABSPATH . WPINC . '/kses.php');
//setup the old globals from b2config.php //setup the old globals from b2config.php
// //