HDK/hyperf-saml
1
0
Fork 0
mirror of http://124.126.16.154:8888/singularity/hyperf-saml.git synced 2026-01-15 05:55:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(acs): 修复isLogin每次触发acs时都会更新最后登录用户，导致无法踢掉之前用户的问题

Browse Source 
Signed-off-by: 李东云 <dongyun.li@luxcreo.ai>
This commit is contained in:
李东云
2022-07-08 11:28:28 +08:00
parent 33d0596e73
commit 039052c9d4
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Services/Sp/Assertion.php
View File

@@ -87,30 +87,35 @@ class Assertion
{ {
$allow_multi_online = config('saml.allow_multi_online'); $allow_multi_online = config('saml.allow_multi_online');
$redis_prefix = config('common.redis.prefix'); $redis_prefix = config('common.redis.prefix');
$oldUser = $this->authentication->getCurrentUser(returnNull: true); // Session 中的现有数据
$user = $this->base->getAllAttributes($response); $oldUser = $this->authentication->getCurrentUser(returnNull: true)?->toArray() ?? [];
// SSO 响应的过来的断言
$user = array_replace($oldUser?->toArray() ?? [], $user->toArray()); $user = $this->base->getAllAttributes($response)->toArray();
$user = array_replace($oldUser, $user);
// 更新 // 更新
$token = $this->authentication->generate(new User($user)); $token = $this->authentication->generate(new User($user));
// 记录映射
$key = "{$redis_prefix}user:token_map:{$user['uid']}";
if ($allow_multi_online) {
$this->redis->hSet($key, $user['originToken'], $token);
} else {
$this->redis->set($key, $token);
}
// 据此判断是登录还是isLogin // 据此判断是登录还是isLogin
$relayState = $this->base->getRelayStateFromResponse($response); $relayState = $this->base->getRelayStateFromResponse($response);
if (!is_null($relayState)) { if (!is_null($relayState)) {
// 登录时的处理 // 登录时的处理
{
// 记录映射
$key = "{$redis_prefix}user:token_map:{$user['uid']}";
if ($allow_multi_online) {
$this->redis->hSet($key, $user['originToken'], $token);
} else {
$this->redis->set($key, $token);
}
}
$url = config('saml.client.landing_host'); $url = config('saml.client.landing_host');
$login_status_cookie = new Cookie( $login_status_cookie = new Cookie(
'is_login', 'is_login',
"1", '1',
time() + config('session.options.cookie_lifetime'), time() + config('session.options.cookie_lifetime'),
'/', '/',
domain: config('session.options.domain'), domain: config('session.options.domain'),