fix(user-secret): 白名单「获取当前 IP」改走服务端回显,第三方回显只作兜底

无影云桌面等受限网络里 myip.ipip.net 不可达,页面却能正常调自家接口,
导致青果白名单拿不到本机出口 IP。新增 /api/user-secrets/client-ip
回显服务端看到的来源 IP(XFF 逐跳取首个公网地址),前端优先用它,
失败再退回第三方回显。
This commit is contained in:
2026-10-30 17:07:32 +08:00
parent 1c0cc350be
commit c7b035dce9
10 changed files with 184 additions and 6 deletions
@@ -0,0 +1,53 @@
package com.nanri.aiimage.modules.usersecret.support;
import jakarta.servlet.http.HttpServletRequest;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* 服务端回显调用方 IP 的取数口径:无影一类受限网络里第三方回显不可达时,
* 白名单输入框靠这条兜底,取错段会把代理出口写进白名单(配了也不通)。
*/
class ClientIpResolverTest {
private HttpServletRequest request(String forwardedFor, String realIp, String remoteAddr) {
HttpServletRequest request = mock(HttpServletRequest.class);
when(request.getHeader("X-Forwarded-For")).thenReturn(forwardedFor);
when(request.getHeader("X-Real-IP")).thenReturn(realIp);
when(request.getRemoteAddr()).thenReturn(remoteAddr);
return request;
}
@Test
void takesFirstPublicHopAndSkipsNginxAppendedLoopback() {
assertThat(ClientIpResolver.resolve(request("8.149.69.98, 127.0.0.1", null, "172.19.0.1")))
.isEqualTo("8.149.69.98");
}
@Test
void skipsSpoofedHostnameAndPrivateHops() {
assertThat(ClientIpResolver.resolve(request("evil.example, 10.0.0.8, 36.251.68.43", null, "127.0.0.1")))
.isEqualTo("36.251.68.43");
}
@Test
void fallsBackToRealIpWhenForwardedChainHasNoPublicAddress() {
assertThat(ClientIpResolver.resolve(request("192.168.1.5, 127.0.0.1", "36.251.68.43", "10.1.2.3")))
.isEqualTo("36.251.68.43");
}
@Test
void fallsBackToRemoteAddrWithoutProxyHeaders() {
assertThat(ClientIpResolver.resolve(request(null, null, "36.251.68.43")))
.isEqualTo("36.251.68.43");
}
@Test
void returnsNullWhenOnlyPrivateAddressesAreVisible() {
assertThat(ClientIpResolver.resolve(request("10.0.0.8, 127.0.0.1", null, "172.19.0.1")))
.isNull();
}
}