mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-12-07 14:00:59 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Breaks OIDC

This reverts commit 247efe3137fadf5d74ab254cf4c80957624abc90.
This commit is contained in:
Andrew Dolgov 2025-05-04 13:29:38 +03:00
parent 5eba9fd116
commit ec12a514a2
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
classes/Config.php
View File

@ -275,13 +275,6 @@ class Config {
if (isset(self::_DEFAULTS[$const])) { if (isset(self::_DEFAULTS[$const])) {
$override = getenv(self::_ENVVAR_PREFIX . $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]; list ($defval, $deftype) = self::_DEFAULTS[$const];
$this->params[$cvalue] = [ self::cast_to($override !== false ? $override : $defval, $deftype), $deftype ]; $this->params[$cvalue] = [ self::cast_to($override !== false ? $override : $defval, $deftype), $deftype ];
@ -440,13 +433,6 @@ class Config {
private function _add(string $param, string $default, int $type_hint): void { private function _add(string $param, string $default, int $type_hint): void {
$override = getenv(self::_ENVVAR_PREFIX . $param); $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 ]; $this->params[$param] = [ self::cast_to($override !== false ? $override : $default, $type_hint), $type_hint ];
} }

11
classes/Pref_System.php
View File

@ -216,6 +216,17 @@ class Pref_System extends Handler_Administrative {
</script> </script>
<span class='loading'><?= __("Loading, please wait...") ?></span> <span class='loading'><?= __("Loading, please wait...") ?></span>
</div> </div>
<div dojoType='dijit.layout.AccordionPane' title='<i class="material-icons">info</i> <?= __('Scheduled tasks') ?>'>
<script type='dojo/method' event='onSelected' args='evt'>
if (this.domNode.querySelector('.loading'))
window.setTimeout(() => {
xhr.post("backend.php", {op: 'Pref_System', method: 'getphpinfo'}, (reply) => {
this.attr('content', `<div class='phpinfo'>${reply}</div>`);
});
}, 200);
</script>
<span class='loading'><?= __("Loading, please wait...") ?></span>
</div>
<?php PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "prefSystem") ?> <?php PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "prefSystem") ?>
</div> </div>