feat(客户端凭据): 新增 /api/client/credentials 下发口,客户端不再随包携带凭据
4.0.43 客户端因 exe 内置默认值被清空而断供(zn_password/mysql_password/ internal_token 三把同时缺)。这三把不再进客户端静态副本,改为登录态按需领取: - ClientCredentialProperties(aiimage.client-credentials.*)+ PropertiesConfig 注册; - GET /api/client/credentials:requireUser(JWT),返回 internalToken + 紫鸟账号 + mysqlPassword;服务端未配紫鸟账号时显式 500 并点名配置项,不返回空值让客户端猜; - AdminAuthSupport.currentInternalToken():下发的必须是当前值(不含过渡期旧值); - /api/admin/shop-manages/credential 放行登录态通道(令牌通道原样保留,存量客户端不受影响)。 本批无数据库迁移;单测 ClientCredentialControllerTest(6) + ShopManageCredentialAuthTest(3)。
This commit is contained in:
+130
@@ -0,0 +1,130 @@
|
||||
package com.nanri.aiimage.modules.client.controller;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.config.ClientCredentialProperties;
|
||||
import com.nanri.aiimage.modules.client.model.vo.ClientCredentialVo;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 客户端凭据领取口的鉴权与配置缺项行为。
|
||||
*
|
||||
* <p>两条底线:未登录不得领取(这是"客户机不再随包带凭据"之后的唯一来源);
|
||||
* 服务端没配紫鸟账号时必须显式失败并点名配置项,不能下发空口令让紫鸟回一句
|
||||
* "账号密码错误"把配置缺项伪装成账号问题。</p>
|
||||
*/
|
||||
class ClientCredentialControllerTest {
|
||||
|
||||
private final AdminAuthSupport adminAuthSupport = mock(AdminAuthSupport.class);
|
||||
private final ClientCredentialProperties properties = new ClientCredentialProperties();
|
||||
private final HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
|
||||
private ClientCredentialController newController() {
|
||||
return new ClientCredentialController(adminAuthSupport, properties);
|
||||
}
|
||||
|
||||
private void configureAll() {
|
||||
properties.setZiniaoCompany("company-x");
|
||||
properties.setZiniaoUsername("user-x");
|
||||
properties.setZiniaoPassword("password-x");
|
||||
properties.setMysqlPassword("mysql-pass-x");
|
||||
}
|
||||
|
||||
@Test
|
||||
void rejectsAnonymousCaller() {
|
||||
when(adminAuthSupport.requireUser(any())).thenThrow(new BusinessException(401, "未登录"));
|
||||
configureAll();
|
||||
|
||||
assertThatThrownBy(() -> newController().credentials(request))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("未登录");
|
||||
verify(adminAuthSupport, never()).currentInternalToken();
|
||||
}
|
||||
|
||||
@Test
|
||||
void failsLoudlyWhenZiniaoAccountIsNotConfigured() {
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(7L);
|
||||
when(adminAuthSupport.requireUser(any())).thenReturn(user);
|
||||
|
||||
assertThatThrownBy(() -> newController().credentials(request))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("ziniao-company");
|
||||
}
|
||||
|
||||
@Test
|
||||
void rejectsPartiallyConfiguredAccount() {
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(7L);
|
||||
when(adminAuthSupport.requireUser(any())).thenReturn(user);
|
||||
properties.setZiniaoCompany("company-x");
|
||||
properties.setZiniaoUsername("user-x");
|
||||
// 口令留空:正是 4.0.43 事故里客户端遇到的那种"看起来配了"的状态
|
||||
|
||||
assertThatThrownBy(() -> newController().credentials(request))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("ziniao");
|
||||
}
|
||||
|
||||
@Test
|
||||
void handsOutCredentialsWithInternalTokenForLoggedInUser() {
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(7L);
|
||||
user.setUsername("operator");
|
||||
when(adminAuthSupport.requireUser(any())).thenReturn(user);
|
||||
when(adminAuthSupport.currentInternalToken()).thenReturn("token-x");
|
||||
configureAll();
|
||||
|
||||
ApiResponse<ClientCredentialVo> response = newController().credentials(request);
|
||||
|
||||
assertThat(response.isSuccess()).isTrue();
|
||||
ClientCredentialVo vo = response.getData();
|
||||
assertThat(vo.getInternalToken()).isEqualTo("token-x");
|
||||
assertThat(vo.getZiniaoCompany()).isEqualTo("company-x");
|
||||
assertThat(vo.getZiniaoUsername()).isEqualTo("user-x");
|
||||
assertThat(vo.getZiniaoPassword()).isEqualTo("password-x");
|
||||
assertThat(vo.getMysqlPassword()).isEqualTo("mysql-pass-x");
|
||||
}
|
||||
|
||||
@Test
|
||||
void deliversEmptyMysqlPasswordWithoutFailingTheWholeResponse() {
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(7L);
|
||||
when(adminAuthSupport.requireUser(any())).thenReturn(user);
|
||||
when(adminAuthSupport.currentInternalToken()).thenReturn("token-x");
|
||||
configureAll();
|
||||
properties.setMysqlPassword(" ");
|
||||
// MySQL 口令缺席不该把紫鸟账号的下发一起打掉:客户端只在用到库的那一刻显式失败
|
||||
ClientCredentialVo vo = newController().credentials(request).getData();
|
||||
|
||||
assertThat(vo.getMysqlPassword()).isEmpty();
|
||||
assertThat(vo.getZiniaoPassword()).isEqualTo("password-x");
|
||||
}
|
||||
|
||||
@Test
|
||||
void trimsConfiguredValues() {
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(7L);
|
||||
when(adminAuthSupport.requireUser(any())).thenReturn(user);
|
||||
properties.setZiniaoCompany(" company-x ");
|
||||
properties.setZiniaoUsername("user-x\n");
|
||||
properties.setZiniaoPassword(" password-x ");
|
||||
|
||||
ClientCredentialVo vo = newController().credentials(request).getData();
|
||||
|
||||
assertThat(vo.getZiniaoCompany()).isEqualTo("company-x");
|
||||
assertThat(vo.getZiniaoUsername()).isEqualTo("user-x");
|
||||
assertThat(vo.getZiniaoPassword()).isEqualTo("password-x");
|
||||
}
|
||||
}
|
||||
+73
@@ -0,0 +1,73 @@
|
||||
package com.nanri.aiimage.modules.shopkey.controller;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.shopkey.model.vo.ShopManageCredentialVo;
|
||||
import com.nanri.aiimage.modules.shopkey.service.ShopManageGroupService;
|
||||
import com.nanri.aiimage.modules.shopkey.service.ShopManageService;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 按店铺名取明文凭据的两条通道。
|
||||
*
|
||||
* <p>存量客户端(4.0.42 及更早)随包带着内部令牌,走令牌通道;4.0.44 起不再携带,
|
||||
* 改用登录态 JWT —— 放开 JWT 通道时不能把令牌通道收掉,否则线上没升级的机器当场断。</p>
|
||||
*/
|
||||
class ShopManageCredentialAuthTest {
|
||||
|
||||
private final ShopManageService shopManageService = mock(ShopManageService.class);
|
||||
private final ShopManageGroupService shopManageGroupService = mock(ShopManageGroupService.class);
|
||||
private final AdminAuthSupport adminAuthSupport = mock(AdminAuthSupport.class);
|
||||
private final HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
|
||||
private ShopManageController newController() {
|
||||
return new ShopManageController(shopManageService, shopManageGroupService, adminAuthSupport);
|
||||
}
|
||||
|
||||
@Test
|
||||
void trustedInternalTokenStillWorksWithoutJwt() {
|
||||
when(adminAuthSupport.isTrustedSuppliedToken("tok")).thenReturn(true);
|
||||
when(shopManageService.getCredentialByShopName("魏振峰")).thenReturn(new ShopManageCredentialVo());
|
||||
|
||||
ApiResponse<ShopManageCredentialVo> response = newController().getCredentialByShopName(request, "魏振峰", "tok");
|
||||
|
||||
assertThat(response.isSuccess()).isTrue();
|
||||
verify(adminAuthSupport, never()).requireUser(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void loggedInUserCanReadCredentialWithoutToken() {
|
||||
when(adminAuthSupport.isTrustedSuppliedToken(any())).thenReturn(false);
|
||||
AdminUserEntity caller = new AdminUserEntity();
|
||||
caller.setId(9L);
|
||||
when(adminAuthSupport.requireUser(request)).thenReturn(caller);
|
||||
when(shopManageService.getCredentialByShopName("魏振峰")).thenReturn(new ShopManageCredentialVo());
|
||||
|
||||
ApiResponse<ShopManageCredentialVo> response = newController().getCredentialByShopName(request, "魏振峰", null);
|
||||
|
||||
assertThat(response.isSuccess()).isTrue();
|
||||
verify(adminAuthSupport).requireUser(request);
|
||||
}
|
||||
|
||||
@Test
|
||||
void anonymousCallerIsRejected() {
|
||||
when(adminAuthSupport.isTrustedSuppliedToken(any())).thenReturn(false);
|
||||
when(adminAuthSupport.requireUser(request)).thenThrow(new BusinessException(401, "未登录"));
|
||||
|
||||
assertThatThrownBy(() -> newController().getCredentialByShopName(request, "魏振峰", null))
|
||||
.isInstanceOf(BusinessException.class);
|
||||
verify(shopManageService, never()).getCredentialByShopName(eq("魏振峰"));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user