fix(user-secret): 白名单「获取当前 IP」改走服务端回显,第三方回显只作兜底
无影云桌面等受限网络里 myip.ipip.net 不可达,页面却能正常调自家接口, 导致青果白名单拿不到本机出口 IP。新增 /api/user-secrets/client-ip 回显服务端看到的来源 IP(XFF 逐跳取首个公网地址),前端优先用它, 失败再退回第三方回显。
This commit is contained in:
+15
@@ -1,6 +1,7 @@
|
||||
package com.nanri.aiimage.modules.usersecret.controller;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.modules.usersecret.model.dto.UserApiSecretCheckRequest;
|
||||
@@ -13,11 +14,13 @@ import com.nanri.aiimage.modules.usersecret.model.vo.UserProxyWhitelistVo;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBundleVo;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretCheckResultVo;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretItemVo;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.UserClientIpVo;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.UserProxyPlanVo;
|
||||
import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService;
|
||||
import com.nanri.aiimage.modules.usersecret.service.UserProxyBalanceService;
|
||||
import com.nanri.aiimage.modules.usersecret.service.UserProxyPlanService;
|
||||
import com.nanri.aiimage.modules.usersecret.service.UserProxyWhitelistService;
|
||||
import com.nanri.aiimage.modules.usersecret.support.ClientIpResolver;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -116,6 +119,18 @@ public class UserApiSecretController {
|
||||
return ApiResponse.success(userProxyPlanService.get(currentUserId(request)));
|
||||
}
|
||||
|
||||
@GetMapping("/client-ip")
|
||||
@Operation(summary = "回显调用方公网 IP",
|
||||
description = "受限网络(如阿里云无影桌面)连不上第三方回显服务时,用服务端看到的来源 IP 回填白名单输入框;仍需用户点击加入白名单。")
|
||||
public ApiResponse<UserClientIpVo> clientIp(HttpServletRequest request) {
|
||||
currentUserId(request);
|
||||
String ip = ClientIpResolver.resolve(request);
|
||||
if (ip == null) {
|
||||
throw new BusinessException("无法识别当前出口 IP,请手动填写");
|
||||
}
|
||||
return ApiResponse.success(new UserClientIpVo(ip));
|
||||
}
|
||||
|
||||
@PutMapping("/proxy-plan")
|
||||
@Operation(summary = "保存当前用户的 jikip 套餐配置",
|
||||
description = "套餐 ID / 用户 ID 用于查询余量;套餐 key 加密保存,仅用于白名单添加(留空=保留已存值)。")
|
||||
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.nanri.aiimage.modules.usersecret.model.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@Schema(description = "服务端看到的调用方公网 IP")
|
||||
public class UserClientIpVo {
|
||||
|
||||
@Schema(description = "公网 IP(IPv4/IPv6 字面量)")
|
||||
private String ip;
|
||||
}
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package com.nanri.aiimage.modules.usersecret.support;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* 从请求头还原调用方公网 IP:白名单要加的是本机出口 IP,服务端能看到的来源就是它。
|
||||
*
|
||||
* <p>优先级 X-Forwarded-For(逐跳取第一个合法公网地址)→ X-Real-IP → remoteAddr。
|
||||
* 只认 {@link PublicIpValidator} 认可的地址,回环/内网/域名一律跳过——nginx 会在
|
||||
* X-Forwarded-For 末尾追加自己的 127.0.0.1,直接取首段也可能拿到伪造值,
|
||||
* 但这段值只用于回填输入框,真正加白名单仍由用户确认后单独提交。</p>
|
||||
*/
|
||||
public final class ClientIpResolver {
|
||||
|
||||
private ClientIpResolver() {
|
||||
}
|
||||
|
||||
public static String resolve(HttpServletRequest request) {
|
||||
String forwarded = request.getHeader("X-Forwarded-For");
|
||||
if (forwarded != null) {
|
||||
for (String part : forwarded.split(",")) {
|
||||
String ip = PublicIpValidator.normalize(part);
|
||||
if (ip != null) {
|
||||
return ip;
|
||||
}
|
||||
}
|
||||
}
|
||||
String realIp = PublicIpValidator.normalize(request.getHeader("X-Real-IP"));
|
||||
if (realIp != null) {
|
||||
return realIp;
|
||||
}
|
||||
return PublicIpValidator.normalize(request.getRemoteAddr());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user