fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 12:02:24 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add config.php options to set defaults for Cookie class #2184

Browse source
This commit is contained in:
Kijin Sung 2023-10-24 23:09:17 +09:00
parent 5005a09f06
commit a3cde9c109
3 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/defaults/config.php
View file

@ -70,6 +70,13 @@ return array(
'lifetime' => 0, 'lifetime' => 0,
'refresh' => 300, 'refresh' => 300,
), ),
'cookie' => array(
'domain' => null,
'path' => null,
'secure' => null,
'httponly' => null,
'samesite' => 'Lax',
),
'file' => array( 'file' => array(
'folder_structure' => 2, 'folder_structure' => 2,
'umask' => '0022', 'umask' => '0022',

14
common/framework/Cookie.php
View file

@ -58,17 +58,25 @@ class Cookie
} }
// Set defaults. // Set defaults.
if (!isset($options['path'])) if (!array_key_exists('path', $options))
{ {
$options['path'] = \RX_BASEURL; $options['path'] = config('cookie.path') ?? \RX_BASEURL;
}
if (!array_key_exists('domain', $options) && ($default_domain = config('cookie.domain')))
{
$options['domain'] = $default_domain;
} }
if (!isset($options['secure'])) if (!isset($options['secure']))
{ {
$options['secure'] = \RX_SSL && !!config('session.use_ssl_cookies'); $options['secure'] = \RX_SSL && !!config('session.use_ssl_cookies');
} }
if (!isset($options['httponly']))
{
$options['httponly'] = config('cookie.httponly') ?? false;
}
if (!isset($options['samesite'])) if (!isset($options['samesite']))
{ {
$options['samesite'] = 'Lax'; $options['samesite'] = config('cookie.samesite') ?? 'Lax';
} }
// PHP 7.3+ supports the samesite attribute natively. PHP 7.2 requires a hack. // PHP 7.3+ supports the samesite attribute natively. PHP 7.2 requires a hack.

16
modules/admin/controllers/systemconfig/Security.php
View file

@ -140,6 +140,22 @@ class Security extends Base
Config::set('security.x_frame_options', strtoupper($vars->x_frame_options)); Config::set('security.x_frame_options', strtoupper($vars->x_frame_options));
Config::set('security.x_content_type_options', strtolower($vars->x_content_type_options)); Config::set('security.x_content_type_options', strtolower($vars->x_content_type_options));
// Prepare the alternate config key for cookies.
if (Config::get('cookie'))
{
Config::set('cookie.secure', $vars->use_cookies_ssl === 'Y');
}
else
{
Config::set('cookie', [
'domain' => null,
'path' => null,
'secure' => $vars->use_cookies_ssl === 'Y',
'httponly' => null,
'samesite' => 'Lax',
]);
}
// Save // Save
if (!Config::save()) if (!Config::save())
{ {