fix(auth): 登录不再推进会话世代,支持同账号多端同时在线
产品定档同账号可多端同时在线:登录 +1 会让每次登录都吊销其他端 token。 - 移除登录路径的 session_epoch 自增;登出仍原子 +1 吊销全部旧令牌 - 改密补 session_epoch +1,避免旧 token 继续用到 7 天 TTL - 单设备开关仍可按 machine 顶下线(现网默认关闭)
This commit is contained in:
+42
@@ -1,5 +1,8 @@
|
||||
package com.nanri.aiimage.modules.admin.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.admin.model.dto.AdminUserCreateRequest;
|
||||
import com.nanri.aiimage.modules.admin.model.dto.AdminUserUpdateRequest;
|
||||
@@ -11,6 +14,8 @@ import com.nanri.aiimage.modules.permission.model.dto.UserColumnPermissionUpdate
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -30,6 +35,13 @@ import static org.mockito.Mockito.when;
|
||||
|
||||
class AdminUserServiceTest {
|
||||
|
||||
@BeforeAll
|
||||
static void initMybatisMetadata() {
|
||||
// LambdaUpdateWrapper 列名解析需要 TableInfo 缓存;mock 环境不会自动注册
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""), AdminUserEntity.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
void createUserStoresSuppliedDirectPermissionsInSameTransactionalMethod() throws Exception {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
@@ -77,6 +89,36 @@ class AdminUserServiceTest {
|
||||
.isAnnotationPresent(Transactional.class)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void updateUserPasswordAdvancesSessionEpoch() {
|
||||
// 登录不再推进世代(多端同时在线)后,改密必须吊销所有旧 token,否则能用到 7 天 TTL
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
WerkzeugPasswordEncoder passwordEncoder = mock(WerkzeugPasswordEncoder.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
PermissionMenuService permissionService = mock(PermissionMenuService.class);
|
||||
UserApiSecretService userApiSecretService = mock(UserApiSecretService.class);
|
||||
AdminUserService service = new AdminUserService(
|
||||
userMapper, passwordEncoder, authSupport, permissionService, userApiSecretService,
|
||||
mock(CompanyService.class));
|
||||
AdminUserEntity operator = user(10L, "admin", 1, null);
|
||||
AdminUserEntity target = user(20L, "normal", 0, 10L);
|
||||
AdminUserUpdateRequest request = new AdminUserUpdateRequest();
|
||||
request.setPassword("newpass1");
|
||||
|
||||
when(authSupport.currentRole(operator)).thenReturn("admin");
|
||||
when(permissionService.hasAnyAdminMenu(eq(operator), any())).thenReturn(true);
|
||||
when(userMapper.selectById(20L)).thenReturn(target);
|
||||
when(passwordEncoder.hash("newpass1")).thenReturn("hashed");
|
||||
|
||||
service.updateUser(operator, 20L, request);
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
ArgumentCaptor<LambdaUpdateWrapper<AdminUserEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
|
||||
verify(userMapper).update(any(), captor.capture());
|
||||
assertThat(captor.getValue().getSqlSet()).contains("session_epoch = session_epoch + 1");
|
||||
}
|
||||
|
||||
@Test
|
||||
void updateUserCanReplaceOnlyDirectPermissionsTransactionally() throws Exception {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
|
||||
+9
-11
@@ -60,9 +60,9 @@ class AuthServiceTest {
|
||||
|
||||
// 绑定写入当前设备(last-login-wins),签发的 token 也用当前设备
|
||||
verify(f.loginUserMapper, times(1)).update(any(), any());
|
||||
verify(f.loginUserMapper).incrementSessionEpoch(7L);
|
||||
// 登录推进世代(0 → 1),新令牌必须签上推进后的值
|
||||
verify(f.jwtService).issue(7L, "u7", "devB", 1L);
|
||||
// 2026-10-26:登录不再推进世代,多端同时在线;旧令牌只由登出/改密吊销
|
||||
verify(f.loginUserMapper, never()).incrementSessionEpoch(anyLong());
|
||||
verify(f.jwtService).issue(7L, "u7", "devB", 0L);
|
||||
assertThat(vo.getDeviceId()).isEqualTo("devB");
|
||||
}
|
||||
|
||||
@@ -107,16 +107,13 @@ class AuthServiceTest {
|
||||
// ---------- check_login:被顶下线必须拦截且不续期 ----------
|
||||
|
||||
@Test
|
||||
void loginSignsTokenWithSessionEpochReadBackFromDatabase() {
|
||||
// CR-07:并发登录时库里的世代可能已被另一路推到 N+2;内存 +1 会签出 stale token,
|
||||
// 登录成功后第一次请求立刻 401。令牌必须用自增后回读到的库值。
|
||||
Fixture f = fixture(true);
|
||||
void loginKeepsStoredSessionEpochForConcurrentSessions() {
|
||||
// 2026-10-26「同账号多端同时在线」:登录不再自增世代,令牌直接签当前库值,
|
||||
// 另一端的旧 token 不会被新登录顶掉;吊销只由登出/改密推进。
|
||||
Fixture f = fixture(false);
|
||||
LoginUserEntity user = f.user("devA");
|
||||
user.setSessionEpoch(0L);
|
||||
LoginUserEntity refreshed = f.user("devA");
|
||||
refreshed.setSessionEpoch(41L);
|
||||
user.setSessionEpoch(41L);
|
||||
when(f.loginUserMapper.selectOne(any())).thenReturn(user);
|
||||
when(f.loginUserMapper.selectById(7L)).thenReturn(refreshed);
|
||||
when(f.passwordEncoder.matches("pwd", "hash")).thenReturn(true);
|
||||
when(f.jwtService.issue(eq(7L), anyString(), anyString(), anyLong())).thenReturn("jwt-token");
|
||||
|
||||
@@ -128,6 +125,7 @@ class AuthServiceTest {
|
||||
f.service.login(request);
|
||||
|
||||
verify(f.jwtService).issue(7L, "u7", "devB", 41L);
|
||||
verify(f.loginUserMapper, never()).incrementSessionEpoch(anyLong());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user