extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

config got "lost" after deleting the cache, caused by it being automatic unserialized

Browse Source
This commit is contained in:
Ralf Becker 2020-10-02 08:38:03 +02:00
parent 302e1c3e2d
commit 08b32d403f
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
api/src/Auth/Multiple.php
View File

@ -2,6 +2,20 @@
/** /**
* EGroupware API - Authentication against multiple backends * EGroupware API - Authentication against multiple backends
* *
* @link https://www.egroupware.org
* @author Ralf Becker <rb@egroupware.org>
* @license http://opensource.org/licenses/lgpl-license.php LGPL - GNU Lesser General Public License
* @package api
* @subpackage auth
*/
namespace EGroupware\Api\Auth;
use EGroupware\Api;
/**
* Authentication agains multiple backends
*
* The first backend against which authentication succeeds is used, so you either need *somehow* to make sure usernames are unique, * The first backend against which authentication succeeds is used, so you either need *somehow* to make sure usernames are unique,
* or the backends in the *right* order. The name of the succeeding backend is stored in the instance cache. * or the backends in the *right* order. The name of the succeeding backend is stored in the instance cache.
* *
@ -19,22 +33,6 @@
* }, * },
* optional further backend objects * optional further backend objects
* } * }
*
* @link https://www.egroupware.org
* @author Ralf Becker <rb@egroupware.org>
* @license http://opensource.org/licenses/lgpl-license.php LGPL - GNU Lesser General Public License
* @package api
* @subpackage auth
*/
namespace EGroupware\Api\Auth;
use EGroupware\Api;
/**
* Authentication agains a LDAP Server with fallback to SQL
*
* For other fallback types, simply change auth backends in constructor call
*/ */
class Multiple implements Backend class Multiple implements Backend
{ {
@ -63,7 +61,7 @@ class Multiple implements Backend
/** /**
* Parse configuration * Parse configuration
* *
* @param string $config * @param string|array $config auth_multiple configuration
* @param boolean $checks true: run some extra checks, used in setup to check config is sane * @param boolean $checks true: run some extra checks, used in setup to check config is sane
* @return array * @return array
* @throws \Exception on invalid configuration * @throws \Exception on invalid configuration
@ -72,8 +70,11 @@ class Multiple implements Backend
{ {
try try
{ {
$config = $config[0] === '{' ? json_decode($config, true, 512, JSON_THROW_ON_ERROR) : if (!is_array($config))
array_combine($csv = preg_split('/,\s*/', $config), array_fill(0, count($csv), null)); {
$config = $config[0] === '{' ? json_decode($config, true, 512, JSON_THROW_ON_ERROR) :
array_combine($csv = preg_split('/,\s*/', $config), array_fill(0, count($csv), null));
}
} }
catch(\JsonException $e) { catch(\JsonException $e) {
throw new \Exception('Invalid JSON: '.$e->getMessage()); throw new \Exception('Invalid JSON: '.$e->getMessage());