extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail/Wiki/Sitemgr: reworked XSS tests to allow eg. font-names containing "script" and other patterns forbidden by previous test, also added new html5 specific tests

Browse Source
This commit is contained in:
Ralf Becker 2015-10-16 19:01:56 +00:00
parent 642b52850b
commit da4ffc2a0c
2 changed files with 81 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/class.egw_htmLawed.inc.php
View File

@ -138,7 +138,7 @@ function hl_my_tag_transform($element, $attribute_array=0)
//if ($element=='img') error_log(__METHOD__.__LINE__." ".$element.'->'.array2string($attribute_array)); //if ($element=='img') error_log(__METHOD__.__LINE__." ".$element.'->'.array2string($attribute_array));
if ($element=='td' && isset($attribute_array['background'])) if ($element=='td' && isset($attribute_array['background']))
{ {
if (stripos($attribute_array['background'],$GLOBALS['egw']->link('/index.php'))!==false) if (is_object($GLOBALS['egw']) && stripos($attribute_array['background'],$GLOBALS['egw']->link('/index.php'))!==false)
{ {
//error_log(__METHOD__.__LINE__.array2string($attribute_array)); //error_log(__METHOD__.__LINE__.array2string($attribute_array));
//$attribute_array['background'] = 'url('.$attribute_array['background'].');'; //$attribute_array['background'] = 'url('.$attribute_array['background'].');';
@ -160,10 +160,6 @@ function hl_my_tag_transform($element, $attribute_array=0)
{ {
if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']); if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
} }
if (isset($attribute_array['face']))
{
if (stripos($attribute_array['face'],'script')!==false) $attribute_array['face']=str_ireplace('script','',$attribute_array['face']);
}
if ($element == 'blockquote') if ($element == 'blockquote')
{ {
if (isset($attribute_array['cite'])) if (isset($attribute_array['cite']))

98
phpgwapi/inc/common_functions.inc.php
View File

@ -1451,6 +1451,17 @@ function function_backtrace($remove=0)
*/ */
function _check_script_tag(&$var,$name='') function _check_script_tag(&$var,$name='')
{ {
static $preg=null;
//old: '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
if (!isset($preg)) $preg =
// forbidden tags like iframe or script
'/(<(\s*\/)?\s*(iframe|script|object|embed|math|meta)|'.
// on* attributes
'<[^>]*on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mouse[^=]+|reset|select|submit|unload|resize|propertychange|page[^=]*|scroll|readystatechange|start|popstate|form[^=]+|input)\s*=|'.
// ="javascript:*" diverse javascript attribute value
'<[^>]+(href|src|dynsrc|lowsrc|background|style|poster|action)\s*=\s*("|\')?[^"\']*javascript|'.
// benavior:url and expression in style attribute
'<[^>]+style\s*=\s*("|\')[^>]*(behavior\s*:\s*url|expression)\s*\()/i';
if (is_array($var)) if (is_array($var))
{ {
foreach($var as $key => $val) foreach($var as $key => $val)
@ -1461,7 +1472,6 @@ function _check_script_tag(&$var,$name='')
} }
elseif(strpos($val, '<') !== false) // speedup: ignore everything without < elseif(strpos($val, '<') !== false) // speedup: ignore everything without <
{ {
static $preg = '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
if (preg_match($preg,$val)) if (preg_match($preg,$val))
{ {
// special handling for $_POST[json_data], to decend into it's decoded content, fixing json direct might break json syntax // special handling for $_POST[json_data], to decend into it's decoded content, fixing json direct might break json syntax
@ -1501,11 +1511,26 @@ if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE_
$total = $num_failed = 0; $total = $num_failed = 0;
$patterns = array( $patterns = array(
// pattern => true: should fail, false: should not fail // pattern => true: should fail, false: should not fail
'<script>alert(1)</script>' => true, '< script >alert(1)< / script >' => true,
'<span onmouseover="alert(1)">blah</span>' => true, '<span onMouseOver ="alert(1)">blah</span>' => true,
'<a href="javascript:alert(1)">Click Me</a>' => true, '<a href= "JaVascript: alert(1)">Click Me</a>' => true,
// from https://www.acunetix.com/websitesecurity/cross-site-scripting/
'<body onload=alert("XSS")>' => true,
'<body background="javascript:alert("XSS")">' => true,
'<iframe src=”http://evil.com/xss.html”>' => true,
'<input type="image" src="javascript:alert(\'XSS\');">' => true,
'<link rel="stylesheet" href="javascript:alert(\'XSS\');">' => true,
'<table background="javascript:alert(\'XSS\')">' => true,
'<td background="javascript:alert(\'XSS\')">' => true,
'<div style="background-image: url(javascript:alert(\'XSS\'))">' => true,
'<div style="width: expression(alert(\'XSS\'));">' => true,
'<object type="text/x-scriptlet" data="http://hacker.com/xss.html">' => true,
// false positiv tests
'If 1 < 2, what does that mean for description, if 2 > 1.' => false, 'If 1 < 2, what does that mean for description, if 2 > 1.' => false,
'If 1 < 2, what does that mean for a script, if 2 > 1.' => false, // false positive 'If 1 < 2, what does that mean for a script, if 2 > 1.' => false,
'<div>Script and Javascript: not evil ;-)' => false,
'<span>style=background-color' => false,
'<font face="Script MT Bold" size="4"><span style="font-size:16pt;">Hugo Sonstwas</span></font>' => false,
); );
foreach($patterns as $pattern => $should_fail) foreach($patterns as $pattern => $should_fail)
{ {
@ -1518,21 +1543,58 @@ if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE_
echo "<p style='color: ".($failed?'red':'black')."'> ".html::htmlspecialchars($pattern).' '. echo "<p style='color: ".($failed?'red':'black')."'> ".html::htmlspecialchars($pattern).' '.
(isset($GLOBALS['egw_unset_vars'])?'removed':'passed')."</p>"; (isset($GLOBALS['egw_unset_vars'])?'removed':'passed')."</p>";
} }
// no all xss attack vectors from http://ha.ckers.org/xssAttacks.xml are relevant here! (needs interpretation) $x = 1;
$vectors = new SimpleXMLElement(file_get_contents('http://ha.ckers.org/xssAttacks.xml')); // urls with attack vectors
foreach($vectors->attack as $attack) $urls = array(
// we currently fail 76 of 666 test, thought they seem not to apply to our use case, as we check request data
'https://gist.github.com/JohannesHoppe/5612274' => file(
'https://gist.githubusercontent.com/JohannesHoppe/5612274/raw/60016bccbfe894dcd61a6be658a4469e403527de/666_lines_of_XSS_vectors.html'),
// we currently fail 44 of 140 tests, thought they seem not to apply to our use case, as we check request data
'https://html5sec.org/' => call_user_func(function() {
$payloads = $items = null;
if (!($items_js = file_get_contents('https://html5sec.org/items.js')) ||
!preg_match_all("|^\s+'data'\s+:\s+'(.*)',$|m", $items_js, $items, PREG_PATTERN_ORDER) ||
!($payload_js = file_get_contents('https://html5sec.org/payloads.js')) ||
!preg_match_all("|^\s+'([^']+)'\s+:\s+'(.*)',$|m", $payload_js, $payloads, PREG_PATTERN_ORDER))
{
return false;
}
$replace = array(
"\\'" => "'",
'\\\\'=> '\\,',
'\r' => "\r",
'\n' => "\n",
);
foreach($payloads[1] as $n => $from) {
$replace['%'.$from.'%'] = $payloads[2][$n];
}
return array_map(function($item) use ($replace) {
return strtr($item, $replace);
}, $items[1]);
}),
);
foreach($urls as $url => $vectors)
{ {
$test = array((string)$attack->code); // no all xss attack vectors from http://ha.ckers.org/xssAttacks.xml are relevant here! (needs interpretation)
unset($GLOBALS['egw_unset_vars']); if (!$vectors)
_check_script_tag($test, $attack->name); {
$failed = !isset($GLOBALS['egw_unset_vars']); echo "<p style='color:red'>Could NOT download or parse $url with attack vectors!</p>\n";
++$total; continue;
if ($failed) $num_failed++; }
echo "<p><span style='color: ".($failed?'red':'black')."'>".html::htmlspecialchars($attack->name).": ".html::htmlspecialchars($attack->code)." ". echo "<p><b>Attacks from <a href='$url' target='_blank'>$url</a> with ".count($vectors)." tests:</b></p>";
(isset($GLOBALS['egw_unset_vars'])?'removed':'passed'). foreach($vectors as $line => $pattern)
"</span><br /><span style='color: gray'>".html::htmlspecialchars($attack->desc)."</span></p>"; {
$test = array($pattern);
unset($GLOBALS['egw_unset_vars']);
_check_script_tag($test, 'line '.(1+$line));
$failed = !isset($GLOBALS['egw_unset_vars']);
++$total;
if ($failed) $num_failed++;
echo "<p style='color: ".($failed?'red':'black')."'>".(1+$line).": ".html::htmlspecialchars($pattern).' '.
(isset($GLOBALS['egw_unset_vars'])?'removed':'passed')."</p>";
}
} }
die("<p>Tests finished: $num_failed / $total failed</p>"); die("<p style='color: ".($num_failed?'red':'black')."'>Tests finished: $num_failed / $total failed</p>");
}*/ }*/
foreach(array('_GET','_POST','_REQUEST','HTTP_GET_VARS','HTTP_POST_VARS') as $n => $where) foreach(array('_GET','_POST','_REQUEST','HTTP_GET_VARS','HTTP_POST_VARS') as $n => $where)