fix(proxy): 青果检测改真探并按供应商分码,三面收口凭据外漏与「无法判定」
用户报「青果也要加检测」,往下挖出四层假象,一次收口: - 后端:probeProxy 的青果短路(过去无条件回「提取成功(青果隧道端点,连接鉴权在客户端)」, 依据的注释已过期——存下来的链接里就带 key/pwd)删掉,改成真打一次提取,按供应商返回码 分档出独立 check_code:channel_busy / invalid_key / forbidden / rate_limited / insufficient_balance / tunnel_unverified。文案出口一律抹 key/pwd。 - 后端:巡检遇 channel_busy 不落库也不推通知。通道被占不是「密钥坏了」而是「此刻问不出 结论」,而巡检自己那一发真提取就要占掉唯一一条通道——落库等于把用户早上看到的 「代理异常」写成我们自己造成的。 - 后端:余量口径按供应商分档。青果账号此前会落进「否则查平台套餐」那条,界面显示的是 别人家的 jikip 余量(串档);青果不提供可鉴权的余量/余额查询(余额接口是控制台 appid/appkey 签名档),这一档宁可返回「查不了」也不借极客的数。 - 后端:SecretMasking.maskProxy 的脏值回落不再套 mask()——它保后 4 字符,而青果的 pwd= 恰好挂在末尾,等于把口令尾 4 位交给界面与日志;改成只交「像 host 的那一段」。 - 用户端:去掉「青果账密直连,无需检测」的 disabled 例外,未保存账密现拼链接送检; 「无法判定」回落改成后端文案原样显示+可重试语义;代理卡不再套 LLM 渠道字典 (「龙抬头」错标的真根因就在这行)。 - 后管:货源标签拆成两张互不相通的字典,代理列只读 masked 且不回落到原文,删掉 user-select:all 的全选复制旁路,「修改代理」改成重填 Authkey/Authpwd 的弹窗。 判据:SecretMaskingTest(5)、UserProxyBalanceServiceTest(6)、UserApiSecretServiceTest (+1 巡检不落库)、UserApiSecretCheckServiceTest(+138 行分码)、ProxyLinkKeyTest、 用户端 node 5 支+mount 10 支、后管 node 9 支+mount 8 支。后端整量 5187/0 失败, full 闸门四面绿。
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
package com.nanri.aiimage.common.text;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* 代理串脱敏的残余外漏面:{@link SecretMasking#maskProxy} 的回落分支**一个凭据字符都不许给**。
|
||||
*
|
||||
* <p>钉住的形状:脏值(无 scheme 的 {@code host/get?key=..&pwd=..}、裸凭据串)过去回落到
|
||||
* {@link SecretMasking#mask},而它保前 4 <b>和后 4</b>——青果的 {@code pwd=} 恰好挂在末尾,
|
||||
* 于是后管「密钥管理」列与日志里都会留下口令尾 4 位。改成只交「像 host 的那一段」。</p>
|
||||
*/
|
||||
class SecretMaskingTest {
|
||||
|
||||
@Test
|
||||
void 正常链接保留scheme与hostPort() {
|
||||
assertThat(SecretMasking.maskProxy("http://u:pass@proxy.example.com:9000/get?k=1"))
|
||||
.isEqualTo("http://***@proxy.example.com:9000");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 无scheme的提取链接不吐出pwd尾字符() {
|
||||
String masked = SecretMasking.maskProxy(
|
||||
"overseas.proxy.qg.net/get?key=fakekey&pwd=SuperSecret99");
|
||||
|
||||
assertThat(masked).isEqualTo("****overseas.proxy.qg.net");
|
||||
assertThat(masked).doesNotContain("SuperSecret99").doesNotContain("fakekey")
|
||||
.doesNotContain("ret99");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 裸凭据串只给掩码不给字符() {
|
||||
assertThat(SecretMasking.maskProxy("abcdef1234567890")).isEqualTo("****");
|
||||
assertThat(SecretMasking.maskProxy("key=fakekey&pwd=fakepwd")).isEqualTo("****");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 带账号密码的host形状只留host() {
|
||||
assertThat(SecretMasking.maskProxy("user:pass@10.0.0.1:8080")).isEqualTo("****10.0.0.1:8080");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 空值仍是空串不打异常() {
|
||||
assertThat(SecretMasking.maskProxy(null)).isEmpty();
|
||||
assertThat(SecretMasking.maskProxy(" ")).isEmpty();
|
||||
}
|
||||
}
|
||||
+138
@@ -302,6 +302,144 @@ class UserApiSecretCheckServiceTest {
|
||||
"{\"code\":\"SUCCESS\",\"data\":[]}", 60)).isNull();
|
||||
}
|
||||
|
||||
// ---------- 2026-11-02:青果检测不再「提取成功=passed」,且一档一码(现网 uid=1301 的「无法判定」就是这么来的)
|
||||
|
||||
/**
|
||||
* 通道占用必须是独立码:混进 {@code provider_error} 后界面只剩「无法判定」,
|
||||
* 用户既不知道是自己在占用、也不知道等 3 分钟就好。
|
||||
*/
|
||||
@Test
|
||||
void qingguoChannelBusyIsItsOwnCodeWithHumanMessage() {
|
||||
UserApiSecretCheckService.CheckOutcome outcome = service.classifyProviderRejection(
|
||||
com.nanri.aiimage.modules.usersecret.support.ProxyProvider.QINGGUO,
|
||||
"{\"code\":\"NO_AVAILABLE_CHANNEL\",\"message\":\"没有可用的空闲通道\",\"request_id\":\"x\"}", 88);
|
||||
|
||||
assertThat(outcome).isNotNull();
|
||||
assertThat(outcome.code()).isEqualTo(UserApiSecretCheckService.CODE_CHANNEL_BUSY);
|
||||
assertThat(outcome.code()).isNotEqualTo(UserApiSecretCheckService.CODE_PROVIDER_ERROR);
|
||||
assertThat(outcome.status()).isEqualTo(UserApiSecretCheckService.STATUS_ERROR);
|
||||
assertThat(outcome.message())
|
||||
.isEqualTo(UserApiSecretCheckService.CHANNEL_BUSY_MESSAGE)
|
||||
.contains("青果通道正被你自己的采集占着")
|
||||
.contains("3 分钟");
|
||||
}
|
||||
|
||||
/**
|
||||
* 五档失败各自可辨(欠费/通道占用/限流/密钥失效/鉴权未过)——
|
||||
* 把任意一档改回 provider_error 或彼此合并,本例即红。
|
||||
*/
|
||||
@Test
|
||||
void qingguoFailureCodesArePairwiseDistinguishable() {
|
||||
java.util.Map<String, String> byProviderCode = new java.util.LinkedHashMap<>();
|
||||
byProviderCode.put("BALANCE_INSUFFICIENT", UserApiSecretCheckService.CODE_INSUFFICIENT_BALANCE);
|
||||
byProviderCode.put("NO_AVAILABLE_CHANNEL", UserApiSecretCheckService.CODE_CHANNEL_BUSY);
|
||||
byProviderCode.put("REQUEST_LIMIT_EXCEEDED", UserApiSecretCheckService.CODE_RATE_LIMITED);
|
||||
byProviderCode.put("INVALID_KEY", UserApiSecretCheckService.CODE_INVALID_KEY);
|
||||
byProviderCode.put("API_AUTH_DENY", UserApiSecretCheckService.CODE_FORBIDDEN);
|
||||
|
||||
java.util.Set<String> resolved = new java.util.LinkedHashSet<>();
|
||||
for (java.util.Map.Entry<String, String> entry : byProviderCode.entrySet()) {
|
||||
UserApiSecretCheckService.CheckOutcome outcome = service.classifyProviderRejection(
|
||||
com.nanri.aiimage.modules.usersecret.support.ProxyProvider.QINGGUO,
|
||||
"{\"code\":\"" + entry.getKey() + "\",\"message\":\"m\",\"request_id\":\"x\"}", 50);
|
||||
assertThat(outcome).as(entry.getKey()).isNotNull();
|
||||
assertThat(outcome.code()).isEqualTo(entry.getValue());
|
||||
// 说人话:文案不得只剩「无法判定」这种界面兜底词,也不得是英文异常串
|
||||
assertThat(outcome.message()).doesNotContain("无法判定");
|
||||
resolved.add(outcome.code());
|
||||
}
|
||||
assertThat(resolved).hasSize(5).doesNotContain(UserApiSecretCheckService.CODE_PROVIDER_ERROR);
|
||||
}
|
||||
|
||||
/** 限流与欠费不是「密钥坏了」:前者 error(放行但警示),后者 failed(拦下)。 */
|
||||
@Test
|
||||
void qingguoRateLimitedStaysJudgementAndBalanceStaysBlocking() {
|
||||
UserApiSecretCheckService.CheckOutcome limited = service.classifyProviderRejection(
|
||||
com.nanri.aiimage.modules.usersecret.support.ProxyProvider.QINGGUO,
|
||||
"{\"code\":\"REQUEST_LIMIT_EXCEEDED\",\"message\":\"请求过于频繁\"}", 40);
|
||||
assertThat(limited.status()).isEqualTo(UserApiSecretCheckService.STATUS_ERROR);
|
||||
assertThat(limited.message()).contains("限流").contains("1 分钟");
|
||||
|
||||
UserApiSecretCheckService.CheckOutcome broke = service.classifyProviderRejection(
|
||||
com.nanri.aiimage.modules.usersecret.support.ProxyProvider.QINGGUO,
|
||||
"{\"code\":\"BALANCE_INSUFFICIENT\",\"message\":\"余额不足\"}", 40);
|
||||
assertThat(broke.status()).isEqualTo(UserApiSecretCheckService.STATUS_FAILED);
|
||||
}
|
||||
|
||||
/** 供应商文案整条回显请求链接时,出口前必须抹掉 key/pwd 原文(假凭据,不涉真值)。 */
|
||||
@Test
|
||||
void providerRejectionMessageNeverEchoesLinkCredentials() {
|
||||
String extractLink = "https://overseas.proxy.qg.net/get?key=fakekey&pwd=fakepwd";
|
||||
UserApiSecretCheckService.CheckOutcome outcome = service.classifyProviderRejection(
|
||||
com.nanri.aiimage.modules.usersecret.support.ProxyProvider.QINGGUO,
|
||||
"{\"code\":\"INVALID_KEY\",\"message\":\"Key 无效: https://overseas.proxy.qg.net/get?key=fakekey&pwd=fakepwd\"}",
|
||||
70, extractLink);
|
||||
|
||||
assertThat(outcome).isNotNull();
|
||||
assertThat(outcome.code()).isEqualTo(UserApiSecretCheckService.CODE_INVALID_KEY);
|
||||
assertThat(outcome.message()).doesNotContain("fakekey").doesNotContain("fakepwd").contains("****");
|
||||
// 参数名形状之外的裸值也要盖掉(供应商只回显值、不带 key= 前缀的形态)
|
||||
assertThat(UserApiSecretCheckService.redactCredentials("裸值 fakekey 与 fakepwd 都要抹", extractLink))
|
||||
.doesNotContain("fakekey").doesNotContain("fakepwd");
|
||||
}
|
||||
|
||||
/** 极客链接不带凭据型参数名时,通用抹除不能把正常参数吃成 ****。 */
|
||||
@Test
|
||||
void redactKeepsNonCredentialQueryParamsIntact() {
|
||||
assertThat(UserApiSecretCheckService.redactCredentials(
|
||||
"https://overseas.proxy.qg.net/get?num=1&format=json", null))
|
||||
.contains("num=1").contains("format=json");
|
||||
}
|
||||
|
||||
// ---------- 青果隧道组链:账密就在链接里,所以必须真经隧道打一次(旧短路已废)
|
||||
|
||||
/** 隧道端点 + 链接里的 key/pwd = 可直接验连的代理地址;日志侧只允许出现掩码形态。 */
|
||||
@Test
|
||||
void qingguoTunnelProxyUrlSplicesLinkCredentialsIntoEndpoint() {
|
||||
String tunnelUrl = UserApiSecretCheckService.qingguoTunnelProxyUrl(
|
||||
"https://overseas.proxy.qg.net/get?key=fakekey&pwd=fakepwd&format=json",
|
||||
"http://tun1.qg.net:16359");
|
||||
|
||||
assertThat(tunnelUrl).isEqualTo("http://fakekey:fakepwd@tun1.qg.net:16359");
|
||||
// 组出来的地址含凭据:任何日志/文案只能用它掩码后的形态
|
||||
assertThat(com.nanri.aiimage.common.text.SecretMasking.maskProxy(tunnelUrl))
|
||||
.isEqualTo("http://***@tun1.qg.net:16359")
|
||||
.doesNotContain("fakekey").doesNotContain("fakepwd");
|
||||
}
|
||||
|
||||
/** 补不出安全地址就返回 null:缺 pwd、账密含会切歪 host 的分隔符、端点没端口,一律不猜。 */
|
||||
@Test
|
||||
void qingguoTunnelProxyUrlRefusesMissingOrUnsafeCredentials() {
|
||||
// 白名单档(只有 key、没有 pwd):青果只做账密档,组不出鉴权地址
|
||||
assertThat(UserApiSecretCheckService.qingguoTunnelProxyUrl(
|
||||
"https://overseas.proxy.qg.net/get?key=fakekey", "http://tun1.qg.net:16359")).isNull();
|
||||
// pwd 里的 @ 会把 userinfo 吞进 host(AGENTS.md 铁律 25 实录)
|
||||
assertThat(UserApiSecretCheckService.qingguoTunnelProxyUrl(
|
||||
"https://overseas.proxy.qg.net/get?key=fakekey&pwd=a%40b", "http://tun1.qg.net:16359")).isNull();
|
||||
assertThat(UserApiSecretCheckService.qingguoTunnelProxyUrl(
|
||||
"https://overseas.proxy.qg.net/get?key=fake%3Akey&pwd=fakepwd", "http://tun1.qg.net:16359")).isNull();
|
||||
// 端点缺端口:不是可连的代理地址
|
||||
assertThat(UserApiSecretCheckService.qingguoTunnelProxyUrl(
|
||||
"https://overseas.proxy.qg.net/get?key=fakekey&pwd=fakepwd", "http://tun1.qg.net")).isNull();
|
||||
}
|
||||
|
||||
/**
|
||||
* 组不出链时的结论必须如实是「没验成」(error/tunnel_unverified),
|
||||
* **不得**退回旧的 passed/ok 短路——那正是本次要消灭的假通过。
|
||||
*/
|
||||
@Test
|
||||
void qingguoTunnelWithoutUsableCredentialsReportsUnverifiedNotPassed() {
|
||||
UserApiSecretCheckService.CheckOutcome outcome = service.probeQingguoTunnel(
|
||||
"https://overseas.proxy.qg.net/get?key=fakekey", "http://tun1.qg.net:16359",
|
||||
System.currentTimeMillis());
|
||||
|
||||
assertThat(outcome.status()).isEqualTo(UserApiSecretCheckService.STATUS_ERROR);
|
||||
assertThat(outcome.code()).isEqualTo(UserApiSecretCheckService.CODE_TUNNEL_UNVERIFIED);
|
||||
assertThat(outcome.status()).isNotEqualTo(UserApiSecretCheckService.STATUS_PASSED);
|
||||
assertThat(outcome.message()).contains("无法确认").doesNotContain("fakekey");
|
||||
assertThat(outcome.viaProxy()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void jikipBalanceShortageStillClassified() {
|
||||
UserApiSecretCheckService.CheckOutcome outcome = service.classifyProviderRejection(
|
||||
|
||||
+97
-5
@@ -550,7 +550,70 @@ class UserApiSecretServiceTest {
|
||||
assertThat(rowVo.getSimilarAsin().getFull()).isNull();
|
||||
assertThat(rowVo.getProxy().getExists()).isTrue();
|
||||
assertThat(rowVo.getProxy().getMasked()).isEqualTo("http://***@1.2.3.4:8080");
|
||||
assertThat(rowVo.getProxy().getFull()).isEqualTo("http://user:pass@1.2.3.4:8080");
|
||||
// 2026-11-02 收口:后台读路不再下发代理明文(链接里就带着账密)
|
||||
assertThat(rowVo.getProxy().getFull()).isNull();
|
||||
}
|
||||
|
||||
/**
|
||||
* 后管列表的代理列:响应体里不得出现提取链接的 key/pwd 原文(同页 LLM 列一直是脱敏的,
|
||||
* 代理列此前把 {@code https://overseas.proxy.qg.net/get?key=…&pwd=…} 整串交给界面)。
|
||||
* 断言打在真正发出去的 JSON 上,不是只打 VO 字段——界面拿到的是序列化后的字节。
|
||||
*/
|
||||
@Test
|
||||
void adminPageProxyColumnNeverShipsExtractLinkCredentials() throws Exception {
|
||||
UserApiSecretService service = newService();
|
||||
when(mapper.selectList(any())).thenReturn(List.of(
|
||||
row(1L, "proxy", "enc:https://overseas.proxy.qg.net/get?key=fakekey&pwd=fakepwd", "error")));
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(1L);
|
||||
user.setUsername("张三");
|
||||
when(adminUserMapper.selectById(1L)).thenReturn(user);
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
|
||||
AdminUserSecretModuleVo proxy = service
|
||||
.adminPage(operator, new AdminUserSecretQuery(), ReadScope.unfiltered())
|
||||
.getItems().get(0).getProxy();
|
||||
|
||||
assertThat(proxy.getExists()).isTrue();
|
||||
assertThat(proxy.getMasked()).isEqualTo("https://overseas.proxy.qg.net");
|
||||
assertThat(proxy.getFull()).isNull();
|
||||
|
||||
// 断言打在序列化后的响应体上;用 Boot 同款 mapper(new ObjectMapper() 不挂 jsr310,日期会直接炸)
|
||||
String body = com.fasterxml.jackson.databind.json.JsonMapper.builder()
|
||||
.addModule(new com.fasterxml.jackson.datatype.jsr310.JavaTimeModule())
|
||||
.build()
|
||||
.writeValueAsString(proxy);
|
||||
assertThat(body).doesNotContain("fakekey").doesNotContain("fakepwd");
|
||||
}
|
||||
|
||||
/**
|
||||
* 代理行的「货源」只可能是供应商:后端把 LLM 渠道词表贴到 proxy 行上(现网看到「龙抬头」)
|
||||
* 从来不是这里的产出——存量脏值(channel 列写着 longtaitou)也会被 {@code channelOrDefault}
|
||||
* 按链接域名归一到 qingguo/jikip。界面那一列拿到什么,由本例钉住。
|
||||
*/
|
||||
@Test
|
||||
void adminPageProxyChannelIsProviderNeverLlmChannel() {
|
||||
UserApiSecretService service = newService();
|
||||
UserApiSecretEntity dirty = row(1L, "proxy",
|
||||
"enc:https://overseas.proxy.qg.net/get?key=fakekey&pwd=fakepwd", "error");
|
||||
dirty.setChannel("longtaitou");
|
||||
when(mapper.selectList(any())).thenReturn(List.of(dirty));
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(1L);
|
||||
user.setUsername("张三");
|
||||
when(adminUserMapper.selectById(1L)).thenReturn(user);
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
|
||||
AdminUserSecretModuleVo proxy = service
|
||||
.adminPage(operator, new AdminUserSecretQuery(), ReadScope.unfiltered())
|
||||
.getItems().get(0).getProxy();
|
||||
|
||||
assertThat(proxy.getChannel()).isEqualTo("qingguo");
|
||||
assertThat(proxy.getChannel()).isNotIn("longtaitou", "t8star");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -914,7 +977,7 @@ class UserApiSecretServiceTest {
|
||||
assertThat(existing.getSecretValue()).isEqualTo("enc:http://1.2.3.4:8080");
|
||||
}
|
||||
|
||||
/** 后台代填:写入 source=admin(锁定)并把完整地址回给后台列表。 */
|
||||
/** 后台代填:写入 source=admin(锁定),回包只给脱敏值——代填的链接里带着账密,不再原文回显。 */
|
||||
@Test
|
||||
void adminSaveModuleLocksProxyAndReturnsLockedVo() {
|
||||
UserApiSecretService service = newService();
|
||||
@@ -940,7 +1003,7 @@ class UserApiSecretServiceTest {
|
||||
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.getFull()).isNull();
|
||||
assertThat(vo.getMasked()).isEqualTo("https://api.jikip.com");
|
||||
}
|
||||
|
||||
@@ -1119,6 +1182,35 @@ class UserApiSecretServiceTest {
|
||||
anyString(), anyString(), anyString(), any());
|
||||
}
|
||||
|
||||
/**
|
||||
* 巡检遇到「青果通道被占」必须**什么都不改**:既不落 error 也不推通知。
|
||||
*
|
||||
* <p>通道被占不是密钥坏了,而是"此刻问不出结论"——巡检自己那一发真提取就要占掉唯一一条通道
|
||||
* (2026-11-02 青果控制台核实:通道数 1 个、存活周期 3 分钟)。把 channel_busy 落库等于
|
||||
* 用户早上看到的「代理异常」是我们自己造成的(现网 uid=1301 那条「无法判定」就是这形状)。</p>
|
||||
*/
|
||||
@Test
|
||||
void schedulerWritesNothingWhenQingguoChannelIsBusy() {
|
||||
UserApiSecretService service = newService();
|
||||
String cipher = "enc:https://overseas.proxy.qg.net/get?key=fakekey&pwd=fakepwd";
|
||||
stubInspectionStore(Map.of(11L, storedRow(11L, "proxy", cipher)));
|
||||
when(checkService.probe(any(), anyString(), any())).thenReturn(
|
||||
outcome("error", UserApiSecretCheckService.CODE_CHANNEL_BUSY,
|
||||
"青果通道正被你自己的采集占着,等约 3 分钟释放后再点检测", 70));
|
||||
when(mapper.selectList(any())).thenReturn(List.of(
|
||||
inspectionRow(1L, 11L, "proxy", cipher)), List.of());
|
||||
stubAdminNotificationPath();
|
||||
|
||||
var summary = service.checkAllForScheduler(500, 20);
|
||||
|
||||
assertThat(summary.checked()).isEqualTo(0);
|
||||
assertThat(summary.skipped()).isEqualTo(1);
|
||||
assertThat(summary.probed()).isEqualTo(1);
|
||||
assertThat(inspectionWrites).isEmpty();
|
||||
verify(notificationDispatchService, never()).pushToUser(any(), anyString(), anyString(),
|
||||
anyString(), anyString(), anyString());
|
||||
}
|
||||
|
||||
/** 只有一个账号在用的密钥保持原口径:仍然点名「用户密钥异常:{用户名}」,去重键与改动前一致。 */
|
||||
@Test
|
||||
void schedulerKeepsNamedAdminAlertWhenSecretIsUsedByOneAccount() {
|
||||
@@ -1252,8 +1344,8 @@ class UserApiSecretServiceTest {
|
||||
}
|
||||
|
||||
private UserProxyBalanceService newBalanceService() {
|
||||
return new UserProxyBalanceService(userProxyPlanService, jikipProxyClient,
|
||||
notificationDispatchService, userSecretProperties);
|
||||
return new UserProxyBalanceService(userProxyPlanService, mock(UserApiSecretService.class),
|
||||
jikipProxyClient, notificationDispatchService, userSecretProperties);
|
||||
}
|
||||
|
||||
private UserProxyPlanEntity proxyPlan(long userId, String planId, String jikipUserId) {
|
||||
|
||||
+143
@@ -0,0 +1,143 @@
|
||||
package com.nanri.aiimage.modules.usersecret.service;
|
||||
|
||||
import com.nanri.aiimage.config.UserSecretProperties;
|
||||
import com.nanri.aiimage.modules.notification.service.NotificationDispatchService;
|
||||
import com.nanri.aiimage.modules.usersecret.client.JikipProxyClient;
|
||||
import com.nanri.aiimage.modules.usersecret.model.entity.UserProxyPlanEntity;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBalanceVo;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentMatchers;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.verifyNoInteractions;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 用户级代理余量按供应商分档:jikip 的数只能给 jikip 账号看。
|
||||
*
|
||||
* <p>钉住的现网缺陷:青果账号走到这套余量口径里会落进「否则查平台套餐」那一条,
|
||||
* 设置弹窗显示的是别人家的极客余量(串档),用户据此判断"我还有量",实际青果那边
|
||||
* 通道早被占满。青果不提供可鉴权的余量/余额查询(余额接口是控制台 appid/appkey 签名档),
|
||||
* 所以这一档必须返回"查不了"、并且一次都不许打极客接口。</p>
|
||||
*/
|
||||
class UserProxyBalanceServiceTest {
|
||||
|
||||
private static final Long USER_ID = 7L;
|
||||
private static final String QINGGUO_LINK = "https://overseas.proxy.qg.net/get?key=fakekey&pwd=fakepwd";
|
||||
private static final String QINGGUO_SHARE_LINK = "https://share.proxy.qg.net/get?key=fakekey";
|
||||
private static final String JIKIP_LINK = "https://api.jikip.com/ip-get?key=fakekey";
|
||||
|
||||
private final UserProxyPlanService userProxyPlanService = mock(UserProxyPlanService.class);
|
||||
private final UserApiSecretService userApiSecretService = mock(UserApiSecretService.class);
|
||||
private final JikipProxyClient jikipProxyClient = mock(JikipProxyClient.class);
|
||||
private final NotificationDispatchService notificationDispatchService =
|
||||
mock(NotificationDispatchService.class);
|
||||
private final UserSecretProperties userSecretProperties = mock(UserSecretProperties.class);
|
||||
|
||||
private final UserProxyBalanceService service = new UserProxyBalanceService(
|
||||
userProxyPlanService, userApiSecretService, jikipProxyClient,
|
||||
notificationDispatchService, userSecretProperties);
|
||||
|
||||
private void storedProxyLink(String link) {
|
||||
when(userApiSecretService.findPlainValue(anyLong(), anyString())).thenReturn(link);
|
||||
}
|
||||
|
||||
private static UserApiSecretBalanceVo jikipReply(String surplus, String balance) {
|
||||
UserApiSecretBalanceVo vo = new UserApiSecretBalanceVo();
|
||||
vo.setAvailable(true);
|
||||
vo.setSurplus(surplus);
|
||||
vo.setBalance(balance);
|
||||
return vo;
|
||||
}
|
||||
|
||||
@Test
|
||||
void 青果账号不打极客接口也不借用平台套餐() {
|
||||
storedProxyLink(QINGGUO_LINK);
|
||||
|
||||
UserApiSecretBalanceVo vo = service.balance(USER_ID);
|
||||
|
||||
assertThat(vo.getAvailable()).isFalse();
|
||||
assertThat(vo.getScope()).isEqualTo("none");
|
||||
assertThat(vo.getLow()).isFalse();
|
||||
assertThat(vo.getMessage()).contains("青果不提供").contains("检测");
|
||||
verifyNoInteractions(jikipProxyClient);
|
||||
verifyNoInteractions(userProxyPlanService);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 青果分享域名的存量链接同样认得不会被当成极客() {
|
||||
storedProxyLink(QINGGUO_SHARE_LINK);
|
||||
|
||||
assertThat(service.balance(USER_ID).getScope()).isEqualTo("none");
|
||||
verifyNoInteractions(jikipProxyClient);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 极客账号填了套餐就查自己那份() {
|
||||
storedProxyLink(JIKIP_LINK);
|
||||
UserProxyPlanEntity plan = new UserProxyPlanEntity();
|
||||
plan.setUserId(USER_ID);
|
||||
plan.setPlanId("plan-1");
|
||||
plan.setJikipUserId("jiku-1");
|
||||
when(userProxyPlanService.getEntity(USER_ID)).thenReturn(plan);
|
||||
when(jikipProxyClient.fetchBalance(any(JikipProxyClient.PlanRef.class)))
|
||||
.thenReturn(jikipReply("120", "30"));
|
||||
|
||||
UserApiSecretBalanceVo vo = service.balance(USER_ID);
|
||||
|
||||
assertThat(vo.getScope()).isEqualTo("user");
|
||||
assertThat(vo.getSurplus()).isEqualTo("120");
|
||||
verify(jikipProxyClient).fetchBalance(new JikipProxyClient.PlanRef("plan-1", "jiku-1"));
|
||||
verify(jikipProxyClient, never()).fetchBalance();
|
||||
}
|
||||
|
||||
@Test
|
||||
void 极客账号没填套餐才落平台套餐() {
|
||||
storedProxyLink(JIKIP_LINK);
|
||||
when(userProxyPlanService.getEntity(USER_ID)).thenReturn(null);
|
||||
when(jikipProxyClient.fetchBalance()).thenReturn(jikipReply("900", "900"));
|
||||
|
||||
UserApiSecretBalanceVo vo = service.balance(USER_ID);
|
||||
|
||||
assertThat(vo.getScope()).isEqualTo("platform");
|
||||
assertThat(vo.getLow()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void 同一用户五分钟内复用缓存不再打供应商() {
|
||||
storedProxyLink(JIKIP_LINK);
|
||||
when(userProxyPlanService.getEntity(USER_ID)).thenReturn(null);
|
||||
when(jikipProxyClient.fetchBalance()).thenReturn(jikipReply("900", "900"));
|
||||
|
||||
service.balance(USER_ID);
|
||||
service.balance(USER_ID);
|
||||
|
||||
verify(jikipProxyClient, times(1)).fetchBalance();
|
||||
}
|
||||
|
||||
@Test
|
||||
void 改过代理配置后缓存作废下一次按新供应商走() {
|
||||
storedProxyLink(JIKIP_LINK);
|
||||
when(userProxyPlanService.getEntity(USER_ID)).thenReturn(null);
|
||||
when(jikipProxyClient.fetchBalance()).thenReturn(jikipReply("900", "900"));
|
||||
service.balance(USER_ID);
|
||||
|
||||
service.invalidate(USER_ID);
|
||||
storedProxyLinkAfter(QINGGUO_LINK);
|
||||
UserApiSecretBalanceVo vo = service.balance(USER_ID);
|
||||
|
||||
assertThat(vo.getScope()).isEqualTo("none");
|
||||
}
|
||||
|
||||
private void storedProxyLinkAfter(String link) {
|
||||
when(userApiSecretService.findPlainValue(ArgumentMatchers.eq(USER_ID), anyString()))
|
||||
.thenReturn(link);
|
||||
}
|
||||
}
|
||||
+17
@@ -26,4 +26,21 @@ class ProxyLinkKeyTest {
|
||||
assertThat(ProxyLinkKey.fromUrl("")).isNull();
|
||||
assertThat(ProxyLinkKey.fromUrl(null)).isNull();
|
||||
}
|
||||
|
||||
/**
|
||||
* 隧道验连要用链接里的密码:青果的参数名是 {@code pwd},极客旧链接是 {@code password},
|
||||
* 两者都要认(AGENTS.md 铁律 25:青果只做账密档,pwd 必填)。
|
||||
*/
|
||||
@Test
|
||||
void passwordReadsPwdThenLegacyPasswordParam() {
|
||||
assertThat(ProxyLinkKey.passwordFromUrl(
|
||||
"https://overseas.proxy.qg.net/get?key=fakekey&pwd=fakepwd")).isEqualTo("fakepwd");
|
||||
assertThat(ProxyLinkKey.passwordFromUrl(
|
||||
"https://api.jikip.com/ip-get?password=fakepwd")).isEqualTo("fakepwd");
|
||||
assertThat(ProxyLinkKey.passwordFromUrl(
|
||||
"https://overseas.proxy.qg.net/get?key=fakekey")).isNull();
|
||||
// 大小写不敏感 + 值按 URL 组件解码(含 %40 的 pwd 解码后才能判定它不能直接拼进 userinfo)
|
||||
assertThat(ProxyLinkKey.passwordFromUrl("https://overseas.proxy.qg.net/get?PWD=fake%40pwd"))
|
||||
.isEqualTo("fake@pwd");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user