test(公司tab): 把两条「筛空」日志分支钉进用例,并订正 company_id 口径
baf8baef 给密钥管理与用量统计接了公司 tab,但"筛空早退"那两支日志一直没人看守:
主管的文案写的是「主管名下无子账户」,可这条分支真正的成因几乎只可能是 company_id
越界(主管的 base 恒含本人,UserDataScopeSupport:55/:78)——排障时会把人往错的方向指。
现在两支分别带 companyScope 宽度,并各钉一条 ListAppender 用例互不放过:
超管只许吐「公司或分组筛后」,主管只许吐「交集为空(多为越界 company_id)」。
分母 UserApiSecretServiceTest 50 例、UserSecretUsageServiceTest 12 例,Failures/Errors 均 0。
同批订正三处会漂的口径:两个 api 模块的注释原写「company_id=0 会让后端 requireCompanyId
直接抛」,实际 DataReadScope.readScope 第一行把 <=0 归一成「没选公司」,0 与缺失等价;
company-tab-wiring 的取值口注释去掉行号(api 文件一改就漂);两支接口的 OpenAPI 描述
补上「company_id 只收窄不放大、跨公司查看仅超管」。
docs/plans/19-company-tab.md 记一条评审未修项(Task 9 I-1):同一页里
POST /user-secrets/{userId}/check 与 DELETE /{userId} 一期就没有归属闸门,本轮把读接进
公司 tab 后它成了唯一还开着的越权写点,补校验是会 403 的行为变更 ⇒ 单独一张工单。
This commit is contained in:
+122
@@ -1,5 +1,9 @@
|
||||
package com.nanri.aiimage.modules.usersecret.service;
|
||||
|
||||
import ch.qos.logback.classic.Level;
|
||||
import ch.qos.logback.classic.Logger;
|
||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
||||
import ch.qos.logback.core.read.ListAppender;
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
@@ -23,13 +27,17 @@ import com.nanri.aiimage.modules.usersecret.model.entity.UserApiSecretEntity;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.AdminUserSecretModuleVo;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBundleVo;
|
||||
import com.nanri.aiimage.modules.usersecret.support.UserSecretModule;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
import org.springframework.data.redis.core.ValueOperations;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashMap;
|
||||
@@ -68,6 +76,8 @@ class UserApiSecretServiceTest {
|
||||
/** 巡检测试用:记录 updateById 写入的 userId → checkStatus 快照。 */
|
||||
private final Map<Long, String> inspectionWrites = new LinkedHashMap<>();
|
||||
private ValueOperations<String, String> valueOps;
|
||||
/** 早退那两条「筛空」日志按角色分开,断言必须挂在 logback 事件上,而不是包内布尔。 */
|
||||
private ListAppender<ILoggingEvent> logEvents;
|
||||
|
||||
private UserApiSecretService newService() {
|
||||
when(crypto.encrypt(anyString())).thenAnswer(inv -> "enc:" + inv.getArgument(0, String.class));
|
||||
@@ -666,9 +676,121 @@ class UserApiSecretServiceTest {
|
||||
when(userDataScopeSupport.resolveVisibleUserIds(88L)).thenReturn(List.of(1L, 2L, 88L));
|
||||
assertThat(service.scopedUserIds(operator, null, ReadScope.users(List.of(2L, 88L))))
|
||||
.containsExactlyInAnyOrder(2L, 88L);
|
||||
// 没选公司 ≠ 放开范围:unfiltered 只表示「不额外按公司筛」,主管仍受分组锁定。
|
||||
assertThat(service.scopedUserIds(operator, null, ReadScope.unfiltered()))
|
||||
.containsExactlyInAnyOrder(1L, 2L, 88L);
|
||||
assertThat(service.scopedUserIds(operator, null, ReadScope.users(List.of()))).isEmpty();
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void attachLogAppender() {
|
||||
Logger logger = (Logger) LoggerFactory.getLogger(UserApiSecretService.class);
|
||||
logEvents = new ListAppender<>();
|
||||
logEvents.setContext(logger.getLoggerContext());
|
||||
logEvents.start();
|
||||
logger.addAppender(logEvents);
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void detachLogAppender() {
|
||||
((Logger) LoggerFactory.getLogger(UserApiSecretService.class)).detachAppender(logEvents);
|
||||
logEvents.stop();
|
||||
}
|
||||
|
||||
/** 只取 INFO 级、已插值的消息;level 单独断言,避免 warn/error 混进来也能过。 */
|
||||
private List<String> infoMessages() {
|
||||
List<String> messages = new ArrayList<>();
|
||||
for (ILoggingEvent event : logEvents.list) {
|
||||
if (event.getLevel() == Level.INFO) {
|
||||
messages.add(event.getFormattedMessage());
|
||||
}
|
||||
}
|
||||
return messages;
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("超管筛空那条日志:排障要分得清「筛空」还是「查空」,挂错角色等于把排障带偏")
|
||||
void superAdminEmptyByFilterLogsFilterMessageNotLeaderMessage() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(any())).thenReturn("super_admin");
|
||||
when(adminGroupMapper.selectUserIdsByGroupId(7L)).thenReturn(List.of(99L));
|
||||
|
||||
AdminUserSecretQuery query = new AdminUserSecretQuery();
|
||||
query.setGroupId(7L);
|
||||
assertThat(service.adminPage(operator, query, ReadScope.users(List.of(11L))).getItems()).isEmpty();
|
||||
|
||||
assertThat(infoMessages()).anyMatch(m -> m.contains("公司或分组筛后无匹配用户"));
|
||||
assertThat(infoMessages()).noneMatch(m -> m.contains("主管可见集与公司范围交集为空"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("主管无子账户那条走另一支日志:不许和超管的「筛空」混成一条")
|
||||
void leaderWithoutChildrenLogsLeaderMessage() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(userDataScopeSupport.resolveVisibleUserIds(88L)).thenReturn(List.of());
|
||||
|
||||
assertThat(service.adminPage(operator, new AdminUserSecretQuery(),
|
||||
ReadScope.users(List.of(11L))).getItems()).isEmpty();
|
||||
|
||||
assertThat(infoMessages()).anyMatch(m -> m.contains("主管可见集与公司范围交集为空"));
|
||||
assertThat(infoMessages()).noneMatch(m -> m.contains("公司或分组筛后无匹配用户"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("算出的范围必须真的下推成 SQL 的 user_id IN:只算不推 = tab 是装饰品,3722 支一支不红")
|
||||
void scopedIdsArePushedIntoTheUserIdInClause() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(any())).thenReturn("super_admin");
|
||||
when(adminGroupMapper.selectUserIdsByGroupId(7L)).thenReturn(List.of(12L, 13L));
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
UserApiSecretEntity.class);
|
||||
|
||||
AdminUserSecretQuery query = new AdminUserSecretQuery();
|
||||
query.setGroupId(7L);
|
||||
// 公司成员集只有 12 ⇒ 分组集 {12,13} 与它取交集后,SQL 里只该出现 12。
|
||||
service.adminPage(operator, query, ReadScope.users(List.of(12L)));
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
ArgumentCaptor<LambdaQueryWrapper<UserApiSecretEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaQueryWrapper.class);
|
||||
verify(mapper).selectList(captor.capture());
|
||||
LambdaQueryWrapper<UserApiSecretEntity> wrapper = captor.getValue();
|
||||
wrapper.getSqlSegment();
|
||||
assertThat(wrapper.getSqlSegment()).contains("user_id");
|
||||
assertThat(wrapper.getSqlSegment()).contains("IN");
|
||||
assertThat(wrapper.getParamNameValuePairs().values()).contains(12L);
|
||||
assertThat(wrapper.getParamNameValuePairs().values()).doesNotContain(13L);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("不传公司=不筛:另一侧的变异「把 null 也当成筛」必须当场红")
|
||||
void missingCompanyLeavesTheQueryUnfiltered() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(any())).thenReturn("super_admin");
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
UserApiSecretEntity.class);
|
||||
|
||||
service.adminPage(operator, new AdminUserSecretQuery(), ReadScope.unfiltered());
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
ArgumentCaptor<LambdaQueryWrapper<UserApiSecretEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaQueryWrapper.class);
|
||||
verify(mapper).selectList(captor.capture());
|
||||
LambdaQueryWrapper<UserApiSecretEntity> wrapper = captor.getValue();
|
||||
wrapper.getSqlSegment();
|
||||
// 不筛 = wrapper 里没有 user_id 条件,也没有任何账号 id 参数(反向错是静默少行)。
|
||||
assertThat(wrapper.getParamNameValuePairs()).isEmpty();
|
||||
assertThat(wrapper.getSqlSegment()).doesNotContain("user_id");
|
||||
}
|
||||
|
||||
@Test
|
||||
void adminClearByUserDeletesAllRowsOfUser() {
|
||||
UserApiSecretService service = newService();
|
||||
|
||||
+123
-1
@@ -1,5 +1,13 @@
|
||||
package com.nanri.aiimage.modules.usersecret.service;
|
||||
|
||||
import ch.qos.logback.classic.Level;
|
||||
import ch.qos.logback.classic.Logger;
|
||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
||||
import ch.qos.logback.core.read.ListAppender;
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.service.ReadScope;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
@@ -10,10 +18,15 @@ import com.nanri.aiimage.modules.shopkey.model.dto.UserGroupRef;
|
||||
import com.nanri.aiimage.modules.usersecret.mapper.UserSecretUsageMapper;
|
||||
import com.nanri.aiimage.modules.usersecret.model.dto.AdminUserSecretUsageQuery;
|
||||
import com.nanri.aiimage.modules.usersecret.model.entity.UserSecretUsageEntity;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
@@ -31,6 +44,8 @@ class UserSecretUsageServiceTest {
|
||||
private final AdminAuthSupport adminAuthSupport = mock(AdminAuthSupport.class);
|
||||
private final ShopManageGroupMapper adminGroupMapper = mock(ShopManageGroupMapper.class);
|
||||
private final UserDataScopeSupport userDataScopeSupport = mock(UserDataScopeSupport.class);
|
||||
/** 早退那两条「筛空」日志按角色分开,断言必须挂在 logback 事件上,而不是包内布尔。 */
|
||||
private ListAppender<ILoggingEvent> logEvents;
|
||||
|
||||
private UserSecretUsageService newService() {
|
||||
// 默认按主管(admin)判定;超管用例里单独改打桩。
|
||||
@@ -205,7 +220,6 @@ class UserSecretUsageServiceTest {
|
||||
assertThat(service.scopedUserIds(operator, 7L, ReadScope.users(List.of(11L, 12L, 13L))))
|
||||
.containsExactlyInAnyOrder(12L, 13L);
|
||||
|
||||
when(adminGroupMapper.selectUserIdsByGroupId(7L)).thenReturn(List.of(99L));
|
||||
AdminUserSecretUsageQuery query = new AdminUserSecretUsageQuery();
|
||||
query.setGroupId(7L);
|
||||
var page = service.adminPage(operator, query, ReadScope.users(List.of(11L)));
|
||||
@@ -227,4 +241,112 @@ class UserSecretUsageServiceTest {
|
||||
.containsExactlyInAnyOrder(1L, 2L, 88L);
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void attachLogAppender() {
|
||||
Logger logger = (Logger) LoggerFactory.getLogger(UserSecretUsageService.class);
|
||||
logEvents = new ListAppender<>();
|
||||
logEvents.setContext(logger.getLoggerContext());
|
||||
logEvents.start();
|
||||
logger.addAppender(logEvents);
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void detachLogAppender() {
|
||||
((Logger) LoggerFactory.getLogger(UserSecretUsageService.class)).detachAppender(logEvents);
|
||||
logEvents.stop();
|
||||
}
|
||||
|
||||
/** 只取 INFO 级、已插值的消息:早退那两条日志按角色分开,断言必须挂在 logback 事件上。 */
|
||||
private List<String> infoMessages() {
|
||||
List<String> messages = new ArrayList<>();
|
||||
for (ILoggingEvent event : logEvents.list) {
|
||||
if (event.getLevel() == Level.INFO) {
|
||||
messages.add(event.getFormattedMessage());
|
||||
}
|
||||
}
|
||||
return messages;
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("超管筛空与主管无子账户是两条日志:排障要分得清「筛空」还是「查空」,挂错角色等于把排障带偏")
|
||||
void superAdminEmptyByFilterLogsFilterMessageNotLeaderMessage() {
|
||||
UserSecretUsageService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(any())).thenReturn("super_admin");
|
||||
when(adminGroupMapper.selectUserIdsByGroupId(7L)).thenReturn(List.of(99L));
|
||||
|
||||
AdminUserSecretUsageQuery query = new AdminUserSecretUsageQuery();
|
||||
query.setGroupId(7L);
|
||||
assertThat(service.adminPage(operator, query, ReadScope.users(List.of(11L))).getItems()).isEmpty();
|
||||
|
||||
assertThat(infoMessages()).anyMatch(m -> m.contains("公司或分组筛后无匹配用户"));
|
||||
assertThat(infoMessages()).noneMatch(m -> m.contains("主管可见集与公司范围交集为空"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("主管无子账户那条走另一支日志:不许和超管的「筛空」混成一条")
|
||||
void leaderWithoutChildrenLogsLeaderMessage() {
|
||||
UserSecretUsageService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(userDataScopeSupport.resolveVisibleUserIds(88L)).thenReturn(List.of());
|
||||
|
||||
assertThat(service.adminPage(operator, new AdminUserSecretUsageQuery(),
|
||||
ReadScope.users(List.of(11L))).getItems()).isEmpty();
|
||||
|
||||
assertThat(infoMessages()).anyMatch(m -> m.contains("主管可见集与公司范围交集为空"));
|
||||
assertThat(infoMessages()).noneMatch(m -> m.contains("公司或分组筛后无匹配用户"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("算出的范围必须真的下推成 SQL 的 user_id IN:只算不推 = tab 是装饰品,全量绿不能算过")
|
||||
void scopedIdsArePushedIntoTheUserIdInClause() {
|
||||
UserSecretUsageService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(any())).thenReturn("super_admin");
|
||||
when(adminGroupMapper.selectUserIdsByGroupId(7L)).thenReturn(List.of(12L, 13L));
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
UserSecretUsageEntity.class);
|
||||
|
||||
AdminUserSecretUsageQuery query = new AdminUserSecretUsageQuery();
|
||||
query.setGroupId(7L);
|
||||
// 公司成员集只有 12 ⇒ 分组集 {12,13} 与它取交集后,SQL 里只该出现 12。
|
||||
service.adminPage(operator, query, ReadScope.users(List.of(12L)));
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
ArgumentCaptor<LambdaQueryWrapper<UserSecretUsageEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaQueryWrapper.class);
|
||||
verify(usageMapper).selectList(captor.capture());
|
||||
LambdaQueryWrapper<UserSecretUsageEntity> wrapper = captor.getValue();
|
||||
wrapper.getSqlSegment();
|
||||
assertThat(wrapper.getSqlSegment()).contains("user_id");
|
||||
assertThat(wrapper.getSqlSegment()).contains("IN");
|
||||
assertThat(wrapper.getParamNameValuePairs().values()).contains(12L);
|
||||
assertThat(wrapper.getParamNameValuePairs().values()).doesNotContain(13L);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("不传公司=不筛:反向变异「把 null 也当成筛」会让整页变成空白,必须当场红")
|
||||
void missingCompanyLeavesTheQueryUnfiltered() {
|
||||
UserSecretUsageService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(any())).thenReturn("super_admin");
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
UserSecretUsageEntity.class);
|
||||
|
||||
service.adminPage(operator, new AdminUserSecretUsageQuery(), ReadScope.unfiltered());
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
ArgumentCaptor<LambdaQueryWrapper<UserSecretUsageEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaQueryWrapper.class);
|
||||
verify(usageMapper).selectList(captor.capture());
|
||||
LambdaQueryWrapper<UserSecretUsageEntity> wrapper = captor.getValue();
|
||||
wrapper.getSqlSegment();
|
||||
assertThat(wrapper.getParamNameValuePairs()).isEmpty();
|
||||
assertThat(wrapper.getSqlSegment()).doesNotContain("user_id");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user