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

fix awstats/webalizer directory protection when using nginx; fixes #888

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-10-13 20:18:44 +02:00
parent 907c475361
commit 3a47b2050e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Froxlor/Cron/Http/Nginx.php
View File

@@ -902,7 +902,6 @@ class Nginx extends HttpConfigBase
FROM `" . TABLE_PANEL_HTPASSWDS . "` AS a FROM `" . TABLE_PANEL_HTPASSWDS . "` AS a
JOIN `" . TABLE_PANEL_DOMAINS . "` AS b USING (`customerid`) JOIN `" . TABLE_PANEL_DOMAINS . "` AS b USING (`customerid`)
WHERE b.customerid = :customerid AND b.domain = :domain WHERE b.customerid = :customerid AND b.domain = :domain
AND path LIKE CONCAT(b.documentroot, '%')
"); ");
Database::pexecute($result_stmt, array( Database::pexecute($result_stmt, array(
'customerid' => $domain['customerid'], 'customerid' => $domain['customerid'],
@@ -1042,10 +1041,10 @@ class Nginx extends HttpConfigBase
if (Settings::Get('system.awstats_enabled') == '1') { if (Settings::Get('system.awstats_enabled') == '1') {
// awstats // awstats
$stats_text .= "\t" . 'location /awstats {' . "\n"; $stats_text .= "\t" . 'location ^~ /awstats {' . "\n";
} else { } else {
// webalizer // webalizer
$stats_text .= "\t" . 'location /webalizer {' . "\n"; $stats_text .= "\t" . 'location ^~ /webalizer {' . "\n";
} }
$stats_text .= "\t\t" . 'alias ' . $alias_dir . ';' . "\n"; $stats_text .= "\t\t" . 'alias ' . $alias_dir . ';' . "\n";