opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix sanitation of $language for code highlighting (fixes #2080)

This commit is contained in:
Phy 2017-08-17 08:30:48 +08:00 committed by Guy Brand
parent 9011f4a9a5
commit c25c097059
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/parser/code.php
View File

@ -17,6 +17,7 @@ class Doku_Renderer_code extends Doku_Renderer {
function code($text, $language = null, $filename = '') {
global $INPUT;
if(!$language) $language = 'txt';
$language = preg_replace(PREG_PATTERN_VALID_LANGUAGE, '', $language);
if(!$filename) $filename = 'snippet.'.$language;
$filename = utf8_basename($filename);
$filename = utf8_stripspecials($filename, '_');

6
inc/parser/renderer.php
View File

@ -7,6 +7,12 @@
*/
if(!defined('DOKU_INC')) die('meh.');
/**
* Allowed chars in $language for code highlighting
* @see GeSHi::set_language()
*/
define('PREG_PATTERN_VALID_LANGUAGE', '#[^a-zA-Z0-9\-_]#');
/**
* An empty renderer, produces no output
*

2
inc/parser/xhtml.php
View File

@ -630,6 +630,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
global $ID;
global $lang;
$language = preg_replace(PREG_PATTERN_VALID_LANGUAGE, '', $language);
if($filename) {
// add icon
list($ext) = mimetype($filename, false);