Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-11-02 11:26:02 +01:00
Code Issues Packages Projects Releases Activity

Fixed path traversal vulnerability when using bin/grav server

Browse Source
This commit is contained in:
Matias Griese
2021-11-03 14:06:42 +02:00
parent 8bbf7a849b
commit 8f9c417c04
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -6,6 +6,7 @@
* Added `route` and `request` to `onPagesInitialized` event * Added `route` and `request` to `onPagesInitialized` event
* Improved page cloning, added method `Page::initialize()` * Improved page cloning, added method `Page::initialize()`
2. [](#bugfix) 2. [](#bugfix)
* Fixed path traversal vulnerability when using `bin/grav server`
* Fixed unescaped error messages in JSON error responses * Fixed unescaped error messages in JSON error responses
* Fixed `|t(variable)` twig filter in admin * Fixed `|t(variable)` twig filter in admin

21
system/router.php
View File

@@ -13,8 +13,25 @@ if (PHP_SAPI !== 'cli-server') {
$_SERVER['PHP_CLI_ROUTER'] = true; $_SERVER['PHP_CLI_ROUTER'] = true;
if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_NAME'])) { $root = $_SERVER['DOCUMENT_ROOT'];
return false; $path = $_SERVER['SCRIPT_NAME'];
if ($path !== '/index.php' && is_file($root . $path)) {
if (!(
// Block all direct access to files and folders beginning with a dot
strpos($path, '/.') !== false
// Block all direct access for these folders
|| preg_match('`^/(\.git|cache|bin|logs|backup|webserver-configs|tests)/`ui', $path)
// Block access to specific file types for these system folders
|| preg_match('`^/(system|vendor)/(.*)\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$`ui', $path)
// Block access to specific file types for these user folders
|| preg_match('`^/(user)/(.*)\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$`ui', $path)
// Block all direct access to .md files
|| preg_match('`\.md$`ui', $path)
// Block access to specific files in the root folder
|| preg_match('`^/(LICENSE\.txt|composer\.lock|composer\.json|\.htaccess)$`ui', $path)
)) {
return false;
}
} }
$grav_index = 'index.php'; $grav_index = 'index.php';