diff options
| author | brian978 <dbrian89@yahoo.com> | 2012-12-03 20:18:20 +0100 |
|---|---|---|
| committer | Wes Baker <wes@wesbaker.com> | 2013-07-05 21:56:50 +0200 |
| commit | 4c866e0b911fcc82cf49b317178788ce3c319bd4 (patch) | |
| tree | 88770f047772ebeee6f1d8c7c69902a9a8cdf9a5 /system/core | |
| parent | cc86334957360b5c8f753ba03658d4033b867003 (diff) | |
Added small improvement to the _remove_evil_attributes function
Signed-off-by: brian978 <dbrian89@yahoo.com>
Signed-off-by: Wes Baker <wes@wesbaker.com>
Conflicts:
system/core/Security.php
Diffstat (limited to 'system/core')
| -rwxr-xr-x | system/core/Security.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/system/core/Security.php b/system/core/Security.php index 00089d765..b0d39b981 100755 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -619,17 +619,16 @@ class CI_Security { $count = 0; $attribs = array(); - // find occurrences of illegal attribute strings without quotes - preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER); + // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes) + preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is', $str, $matches, PREG_SET_ORDER); foreach ($matches as $attr) { - $attribs[] = preg_quote($attr[0], '/'); } - // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes) - preg_match_all("/(".implode('|', $evil_attributes).")\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is", $str, $matches, PREG_SET_ORDER); + // find occurrences of illegal attribute strings without quotes + preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER); foreach ($matches as $attr) { @@ -639,7 +638,7 @@ class CI_Security { // replace illegal attribute strings that are inside an html tag if (count($attribs) > 0) { - $str = preg_replace("/<(\/?[^><]+?)([^A-Za-z<>\-])(.*?)(".implode('|', $attribs).")(.*?)([\s><])([><]*)/i", '<$1 $3$5$6$7', $str, -1, $count); + $str = preg_replace('/(<?)(\/?[^><]+?)([^A-Za-z<>\-])(.*?)('.implode('|', $attribs).')(.*?)([\s><]?)([><]*)/i', '$1$2 $4$6$7$8', $str, -1, $count); } } while ($count); @@ -873,4 +872,4 @@ class CI_Security { } /* End of file Security.php */ -/* Location: ./system/libraries/Security.php */
\ No newline at end of file +/* Location: ./system/libraries/Security.php */ |