chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle previously renamed CONFIG_PATH gracefully

This commit is contained in:
Lucas Savva 2019-12-24 19:11:38 +00:00
parent d5d13fa831
commit 7d9ec9509b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Configuration.php
View File

@ -107,7 +107,8 @@ class Configuration
$configFile = $basePath . 'conf.php'; $configFile = $basePath . 'conf.php';
if (getenv('CONFIG_PATH') !== false) { if (getenv('CONFIG_PATH') !== false) {
$configFile = getenv('CONFIG_PATH'); $configFile = getenv('CONFIG_PATH');
$configFilePhp = substr($configFile, 0, -3) . 'php';
// Rename INI files to avoid configuration leakage // Rename INI files to avoid configuration leakage
if ( if (
@ -115,9 +116,12 @@ class Configuration
is_readable($configFile) && is_readable($configFile) &&
is_writable(dirname($configFile)) is_writable(dirname($configFile))
) { ) {
$oldConfigFile = $configFile; DataStore::prependRename($configFile, $configFilePhp, ';');
$configFile = substr($configFile, 0, -3) . 'php'; }
DataStore::prependRename($oldConfigFile, $configFile, ';');
// Rename successful? Already renamed? use that file
if (is_readable($configFilePhp)) {
$configFile = $configFilePhp;
} }
} }