mirror of
https://code.castopod.org/adaures/castopod
synced 2025-04-19 04:51:17 +00:00
fix: allow passing json to app.proxyIPs config to set it
This commit is contained in:
parent
63f93f585b
commit
cbf739e95c
@ -5,6 +5,7 @@ declare(strict_types=1);
|
||||
namespace Config;
|
||||
|
||||
use CodeIgniter\Config\BaseConfig;
|
||||
use Override;
|
||||
|
||||
class App extends BaseConfig
|
||||
{
|
||||
@ -192,9 +193,9 @@ class App extends BaseConfig
|
||||
* '192.168.5.0/24' => 'X-Real-IP',
|
||||
* ]
|
||||
*
|
||||
* @var array<string, string>
|
||||
* @var array<string, string>|string
|
||||
*/
|
||||
public array $proxyIPs = [];
|
||||
public $proxyIPs = [];
|
||||
|
||||
/**
|
||||
* --------------------------------------------------------------------------
|
||||
@ -249,4 +250,37 @@ class App extends BaseConfig
|
||||
public ?int $bandwidthLimit = null;
|
||||
|
||||
public ?string $legalNoticeURL = null;
|
||||
|
||||
/**
|
||||
* AuthToken Config Constructor
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
if (is_string($this->proxyIPs)) {
|
||||
$array = json_decode($this->proxyIPs, true);
|
||||
if (is_array($array)) {
|
||||
$this->proxyIPs = $array;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Override parent initEnvValue() to allow for direct setting to array properties values from ENV
|
||||
*
|
||||
* In order to set array properties via ENV vars we need to set the property to a string value first.
|
||||
*
|
||||
* @param mixed $property
|
||||
*/
|
||||
#[Override]
|
||||
protected function initEnvValue(&$property, string $name, string $prefix, string $shortPrefix): void
|
||||
{
|
||||
// if attempting to set property from ENV, first set to empty string
|
||||
if ($name === 'proxyIPs' && $this->getEnvValue($name, $prefix, $shortPrefix) !== null) {
|
||||
$property = '';
|
||||
}
|
||||
|
||||
parent::initEnvValue($property, $name, $prefix, $shortPrefix);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user