maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

properly escape custom-error strings in apache2, fixes #1009

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-23 14:48:02 +02:00
parent 74b48dace2
commit f9f4773616
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -145,9 +145,11 @@ class apache
if ($this->settings['defaultwebsrverrhandler']['err' . $statusCode] != '') { if ($this->settings['defaultwebsrverrhandler']['err' . $statusCode] != '') {
$defhandler = $this->settings['defaultwebsrverrhandler']['err' . $statusCode]; $defhandler = $this->settings['defaultwebsrverrhandler']['err' . $statusCode];
if (!validateUrl($defhandler)) { if (!validateUrl($defhandler)) {
$defhandler = makeCorrectFile($defhandler); if (substr($defhandler, 0, 1) != '"' && substr($defhandler, -1, 1) != '"') {
$defhandler = '"'.makeCorrectFile($defhandler).'"';
}
} }
$this->virtualhosts_data[$vhosts_filename] .= 'ErrorDocument ' . $statusCode . ' "' . $defhandler . '"'."\n"; $this->virtualhosts_data[$vhosts_filename] .= 'ErrorDocument ' . $statusCode . ' ' . $defhandler . "\n";
} }
} }
} }
@@ -872,9 +874,11 @@ class apache
) { ) {
$defhandler = $row_diroptions['error' . $statusCode . 'path']; $defhandler = $row_diroptions['error' . $statusCode . 'path'];
if (!validateUrl($defhandler)) { if (!validateUrl($defhandler)) {
$defhandler = makeCorrectFile($defhandler); if (substr($defhandler, 0, 1) != '"' && substr($defhandler, -1, 1) != '"') {
$defhandler = '"'.makeCorrectFile($defhandler).'"';
}
} }
$this->diroptions_data[$diroptions_filename].= ' ErrorDocument ' . $statusCode . ' "' . $defhandler. '"' . "\n"; $this->diroptions_data[$diroptions_filename].= ' ErrorDocument ' . $statusCode . ' ' . $defhandler . "\n";
} }
} }