feat(密钥管理): 后台可代填并锁定用户代理设置,客户端只读并回填本地配置
代理是选配、不进 items 也不参与门禁,但客户端各任务链读的是本地 app.json 的
proxy_url,用户自填值与后台不一致时排查成本高。改法:
- 后台 PUT/DELETE /api/admin/user-secrets/{userId}/modules/{moduleKey} 代填/解锁,
写入后该行 source=admin;数据权限走 resolveVisibleUserIds,超管不限;
- 客户端 save/clear 命中锁定行时服务端直接拒绝并给出原因(只置灰挡不住直接调接口);
- 密钥包把代理单独放 proxy 字段下发(仍不进 items、不影响 complete 判定),
锁定时带 full 明文,客户端据此幂等地对齐本地配置;解锁 = 删除该行。
只开放代理代填:密钥模块要客户端提交任务时携带本地明文,代填会把用户卡死。
This commit is contained in:
+161
@@ -1,6 +1,10 @@
|
||||
package com.nanri.aiimage.modules.usersecret.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import com.nanri.aiimage.common.security.ShopCredentialCryptoService;
|
||||
import com.nanri.aiimage.config.UserSecretProperties;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
@@ -340,6 +344,9 @@ class UserApiSecretServiceTest {
|
||||
assertThat(bundle.getItems()).extracting(item -> item.getModuleKey())
|
||||
.containsExactlyInAnyOrder("appearance-patent", "similar-asin");
|
||||
assertThat(bundle.getRequiredModules()).doesNotContain("proxy");
|
||||
// 未锁定的代理既不下发明文,也不参与门禁
|
||||
assertThat(bundle.getProxy().getLocked()).isFalse();
|
||||
assertThat(bundle.getProxy().getFull()).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -569,6 +576,160 @@ class UserApiSecretServiceTest {
|
||||
verify(mapper).delete(any());
|
||||
}
|
||||
|
||||
/** 后台代填并锁定的代理:客户端再提交就被拒(不落库),文案说明原因与出路。 */
|
||||
@Test
|
||||
void clientSaveRejectedWhenAdminLocked() {
|
||||
UserApiSecretService service = newService();
|
||||
UserApiSecretEntity locked = new UserApiSecretEntity();
|
||||
locked.setId(5L);
|
||||
locked.setUserId(7L);
|
||||
locked.setModuleKey("proxy");
|
||||
locked.setSecretValue("enc:https://api.jikip.com/ip-get?num=1&key=abc");
|
||||
locked.setSource(UserApiSecretService.SOURCE_ADMIN);
|
||||
when(mapper.selectOne(any())).thenReturn(locked);
|
||||
|
||||
org.assertj.core.api.Assertions.assertThatThrownBy(() -> service.save(7L, "proxy", "http://1.2.3.4:8080"))
|
||||
.isInstanceOf(com.nanri.aiimage.common.exception.BusinessException.class)
|
||||
.hasMessageContaining("已由管理员设置并锁定")
|
||||
.hasMessageContaining("修改");
|
||||
verify(mapper, never()).updateById(any(UserApiSecretEntity.class));
|
||||
verify(mapper, never()).insert(any(UserApiSecretEntity.class));
|
||||
}
|
||||
|
||||
/** 锁定行同样不可清空:清空按钮绕不过服务端。 */
|
||||
@Test
|
||||
void clientClearRejectedWhenAdminLocked() {
|
||||
UserApiSecretService service = newService();
|
||||
UserApiSecretEntity locked = new UserApiSecretEntity();
|
||||
locked.setId(5L);
|
||||
locked.setSecretValue("enc:https://api.jikip.com/ip-get?num=1&key=abc");
|
||||
locked.setSource("ADMIN");
|
||||
when(mapper.selectOne(any())).thenReturn(locked);
|
||||
|
||||
org.assertj.core.api.Assertions.assertThatThrownBy(() -> service.clear(7L, "proxy"))
|
||||
.isInstanceOf(com.nanri.aiimage.common.exception.BusinessException.class)
|
||||
.hasMessageContaining("已由管理员设置并锁定")
|
||||
.hasMessageContaining("清空");
|
||||
verify(mapper, never()).delete(any());
|
||||
}
|
||||
|
||||
/** 非锁定行不受影响:客户端照常覆盖自己的配置。 */
|
||||
@Test
|
||||
void clientSaveStillWorksWhenSourceIsClient() {
|
||||
UserApiSecretService service = newService();
|
||||
UserApiSecretEntity existing = new UserApiSecretEntity();
|
||||
existing.setId(5L);
|
||||
existing.setSecretValue("enc:old");
|
||||
existing.setSource(UserApiSecretService.SOURCE_CLIENT);
|
||||
when(mapper.selectOne(any())).thenReturn(existing);
|
||||
|
||||
service.save(7L, "proxy", "http://1.2.3.4:8080");
|
||||
|
||||
assertThat(existing.getSource()).isEqualTo(UserApiSecretService.SOURCE_CLIENT);
|
||||
assertThat(existing.getSecretValue()).isEqualTo("enc:http://1.2.3.4:8080");
|
||||
}
|
||||
|
||||
/** 后台代填:写入 source=admin(锁定)并把完整地址回给后台列表。 */
|
||||
@Test
|
||||
void adminSaveModuleLocksProxyAndReturnsLockedVo() {
|
||||
UserApiSecretService service = newService();
|
||||
UserApiSecretEntity stored = new UserApiSecretEntity();
|
||||
when(mapper.selectOne(any())).thenAnswer(inv -> stored.getId() == null ? null : stored);
|
||||
when(mapper.insert(any(UserApiSecretEntity.class))).thenAnswer(inv -> {
|
||||
UserApiSecretEntity arg = inv.getArgument(0);
|
||||
stored.setId(1L);
|
||||
stored.setUserId(arg.getUserId());
|
||||
stored.setModuleKey(arg.getModuleKey());
|
||||
stored.setSecretValue(arg.getSecretValue());
|
||||
stored.setSource(arg.getSource());
|
||||
stored.setCheckStatus(arg.getCheckStatus());
|
||||
return 1;
|
||||
});
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
|
||||
AdminUserSecretModuleVo vo = service.adminSaveModule(operator, 7L, "proxy",
|
||||
"https://api.jikip.com/ip-get?num=1&key=abc");
|
||||
|
||||
assertThat(stored.getSource()).isEqualTo(UserApiSecretService.SOURCE_ADMIN);
|
||||
assertThat(vo.getExists()).isTrue();
|
||||
assertThat(vo.getLocked()).isTrue();
|
||||
assertThat(vo.getFull()).isEqualTo("https://api.jikip.com/ip-get?num=1&key=abc");
|
||||
assertThat(vo.getMasked()).isEqualTo("https://api.jikip.com");
|
||||
}
|
||||
|
||||
/** 密钥模块不开放后台代填:客户端提交任务要本地明文,代填会把用户卡死。 */
|
||||
@Test
|
||||
void adminSaveModuleRejectsKeyModules() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
|
||||
org.assertj.core.api.Assertions.assertThatThrownBy(
|
||||
() -> service.adminSaveModule(operator, 7L, "similar-asin", "sk-x"))
|
||||
.isInstanceOf(com.nanri.aiimage.common.exception.BusinessException.class)
|
||||
.hasMessageContaining("仅支持后台代填并锁定代理设置");
|
||||
verify(mapper, never()).insert(any(UserApiSecretEntity.class));
|
||||
}
|
||||
|
||||
/** 代填代理同样要过数据权限:主管只能代填自己范围内的用户。 */
|
||||
@Test
|
||||
void adminSaveModuleEnforcesDataScope() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(userDataScopeSupport.resolveVisibleUserIds(88L)).thenReturn(List.of(1L, 88L));
|
||||
|
||||
org.assertj.core.api.Assertions.assertThatThrownBy(
|
||||
() -> service.adminSaveModule(operator, 7L, "proxy", "http://1.2.3.4:8080"))
|
||||
.isInstanceOf(com.nanri.aiimage.common.exception.BusinessException.class)
|
||||
.hasMessageContaining("无权操作该用户");
|
||||
verify(mapper, never()).insert(any(UserApiSecretEntity.class));
|
||||
}
|
||||
|
||||
/** 后台清空某模块 = 解除锁定:删掉该行,客户端恢复自行配置。 */
|
||||
@Test
|
||||
void adminClearModuleDeletesOnlyThatModule() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
|
||||
service.adminClearModule(operator, 7L, "proxy");
|
||||
|
||||
verify(mapper).delete(any());
|
||||
}
|
||||
|
||||
/** 密钥包带代理状态(不占 items、不影响门禁);锁定时下发完整地址供客户端对齐本地配置。 */
|
||||
@Test
|
||||
void bundleShipsLockedProxyOutsideItems() {
|
||||
UserApiSecretService service = newService();
|
||||
UserApiSecretEntity proxyRow = new UserApiSecretEntity();
|
||||
proxyRow.setUserId(7L);
|
||||
proxyRow.setModuleKey("proxy");
|
||||
proxyRow.setSecretValue("enc:https://api.jikip.com/ip-get?num=1&key=abc");
|
||||
proxyRow.setSource(UserApiSecretService.SOURCE_ADMIN);
|
||||
// 条件值要构建 SQL 段才写入参数表,而 mock 不会建 SQL;先注册实体元数据,stub 内手动触发一次
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
UserApiSecretEntity.class);
|
||||
when(mapper.selectOne(any())).thenAnswer(inv -> {
|
||||
LambdaQueryWrapper<UserApiSecretEntity> wrapper = inv.getArgument(0);
|
||||
wrapper.getSqlSegment();
|
||||
return wrapper.getParamNameValuePairs().containsValue("proxy") ? proxyRow : null;
|
||||
});
|
||||
|
||||
UserApiSecretBundleVo bundle = service.bundle(7L);
|
||||
|
||||
assertThat(bundle.getItems()).hasSize(2);
|
||||
assertThat(bundle.getComplete()).isFalse();
|
||||
assertThat(bundle.getProxy().getExists()).isTrue();
|
||||
assertThat(bundle.getProxy().getLocked()).isTrue();
|
||||
assertThat(bundle.getProxy().getFull()).isEqualTo("https://api.jikip.com/ip-get?num=1&key=abc");
|
||||
assertThat(bundle.getProxy().getMasked()).isEqualTo("https://api.jikip.com");
|
||||
}
|
||||
|
||||
private AdminUserSecretModuleVo moduleVo(boolean exists, String status) {
|
||||
AdminUserSecretModuleVo vo = new AdminUserSecretModuleVo();
|
||||
vo.setExists(exists);
|
||||
|
||||
Reference in New Issue
Block a user