mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-08-06 06:07:29 +02:00
Code Issues Projects Releases Wiki Activity

bring back cleanup of potentially sensitive environment variables but exclude CLI SAPI to prevent updater failures

Browse Source
This commit is contained in:
Andrew Dolgov 2025-05-02 13:37:08 +03:00
parent aeca30cb0c
commit 247efe3137
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
classes/Config.php
View File

@ -275,6 +275,13 @@ class Config {
if (isset(self::_DEFAULTS[$const])) {
$override = getenv(self::_ENVVAR_PREFIX . $const);
// cleanup original env var after importing (unless it's a background process)
if (php_sapi_name() != "cli") {
putenv(self::_ENVVAR_PREFIX . $const . '=');
unset($_ENV[self::_ENVVAR_PREFIX . $const]);
unset($_SERVER[self::_ENVVAR_PREFIX . $const]);
}
list ($defval, $deftype) = self::_DEFAULTS[$const];
$this->params[$cvalue] = [ self::cast_to($override !== false ? $override : $defval, $deftype), $deftype ];
@ -433,6 +440,13 @@ class Config {
private function _add(string $param, string $default, int $type_hint): void {
$override = getenv(self::_ENVVAR_PREFIX . $param);
// cleanup original env var after importing (unless it's a background process)
if (php_sapi_name() != "cli") {
putenv(self::_ENVVAR_PREFIX . $param . '=');
unset($_ENV[self::_ENVVAR_PREFIX . $param]);
unset($_SERVER[self::_ENVVAR_PREFIX . $param]);
}
$this->params[$param] = [ self::cast_to($override !== false ? $override : $default, $type_hint), $type_hint ];
}