saulteafarmer/castopod
1
0
Fork 0
mirror of https://code.castopod.org/adaures/castopod synced 2025-06-06 18:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow passing json to app.proxyIPs config to set it

Browse Source
This commit is contained in:
Yassine Doghri 2024-10-16 11:42:06 +00:00
parent a2af32abbd
commit 7d1460b8e0
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/Config/App.php
View File

@ -192,9 +192,9 @@ class App extends BaseConfig
* '192.168.5.0/24' => 'X-Real-IP', * '192.168.5.0/24' => 'X-Real-IP',
* ] * ]
* *
* @var array<string, string> * @var array<string, string>|string
*/ */
public array $proxyIPs = []; public $proxyIPs = [];
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -249,4 +249,36 @@ class App extends BaseConfig
public ?int $bandwidthLimit = null; public ?int $bandwidthLimit = null;
public ?string $legalNoticeURL = 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
*/
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);
}
} }