允许http回调
This commit is contained in:
1 parent
cfb6a9e389
commit
f15f4162eb
6 files changed
+50
-10
No files matched your search
@@ -149,7 +149,7 @@ WAITING且没有任务表示尚未派单;已有PENDING任务则继续检查Soc
|
|||||||
|
|
||||||
扫描每5秒执行,仅领取已到`next_attempt_at`且租约可用的PENDING/SENDING记录。失败退避重试,累计10次进入DEAD;管理员通过已有回调重投功能重新投递DEAD事件,不直接修改订单或删除回调记录。没有回调URL时沿用既有跳过发送并确认的行为,日志标记`EMPTY_NOTIFY_URL`。
|
扫描每5秒执行,仅领取已到`next_attempt_at`且租约可用的PENDING/SENDING记录。失败退避重试,累计10次进入DEAD;管理员通过已有回调重投功能重新投递DEAD事件,不直接修改订单或删除回调记录。没有回调URL时沿用既有跳过发送并确认的行为,日志标记`EMPTY_NOTIFY_URL`。
|
||||||
|
|
||||||
内网回调配置为`rental.webhook.allow-private-network: ${RENT_WEBHOOK_ALLOW_PRIVATE_NETWORK:true}`,按当前需求默认开启,修改后重启服务生效;设为false恢复仅公网策略。`https://192.168.3.103/api/api/webhook/debug`可通过内网地址检查,实际路由仍取决于Nginx配置。HTTPS证书链和IP SAN仍须有效并被服务端JVM信任,开启内网不跳过证书校验;回调仍仅允许443端口,禁止重定向。
|
内网回调配置为`rental.webhook.allow-private-network: ${RENT_WEBHOOK_ALLOW_PRIVATE_NETWORK:true}`,按当前需求默认开启,修改后重启服务生效;设为false恢复仅公网策略。支持`http://192.168.3.103/api/api/webhook/debug`,也支持`http://192.168.3.103:2020/api/webhook/debug`等内网HTTP自定义端口;路径由Nginx或后端实际路由决定。HTTP按发送时DNS解析结果逐个校验,仅可连接私网,禁止代理及重定向;公网HTTP仍拒绝。HTTPS仍限定443且校验证书链及IP SAN。
|
||||||
|
|
||||||
诊断定向测试3项通过,覆盖内网开关、私网及IPv6 ULA放行、特殊地址继续拒绝和网络/凭证错误分类;未连接实际回调目标或操作生产数据。
|
诊断定向测试3项通过,覆盖内网开关、私网及IPv6 ULA放行、特殊地址继续拒绝和网络/凭证错误分类;未连接实际回调目标或操作生产数据。
|
||||||
|
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ SHA256(实际UTF-8请求体)的小写十六进制
|
|||||||
|
|
||||||
跨语言固定向量:Secret=`test-secret`、scope=`API`、key=`test-key`、timestamp=`1700000000123`、nonce=`abcdefghijklmnop`、method=`POST`、path=`/api/rental/v1/create`、body=`{"amount":"1.000000"}`,结果为 `47241a34f0813881384317eafbfc068dc9f7c6061a8fe269cb815e7820d48430`。此值仅用于测试,不是有效运行凭证。
|
跨语言固定向量:Secret=`test-secret`、scope=`API`、key=`test-key`、timestamp=`1700000000123`、nonce=`abcdefghijklmnop`、method=`POST`、path=`/api/rental/v1/create`、body=`{"amount":"1.000000"}`,结果为 `47241a34f0813881384317eafbfc068dc9f7c6061a8fe269cb815e7820d48430`。此值仅用于测试,不是有效运行凭证。
|
||||||
|
|
||||||
回调使用相同请求头但scope=WEBHOOK;仅HTTPS 443、无用户信息/fragment/query,实际DNS连接地址逐个检查,不跟随重定向。`rental.webhook.allow-private-network`通过`RENT_WEBHOOK_ALLOW_PRIVATE_NETWORK`控制,当前默认true,允许IPv4私网和IPv6 ULA;false恢复仅公网,回环、链路本地等特殊目标始终拒绝。HTTPS证书校验保持开启。HTTP200且正文精确为 `ok` 才确认。最多10次,失败指数退避,终止为DEAD;每次新timestamp/nonce,业务event_no、payload和订单事件序号不变。商户按event_no去重并按序号识别乱序。无回调地址的事件直接确认,不发HTTP。
|
回调使用相同请求头但scope=WEBHOOK;支持HTTPS 443及内网HTTP(可自定义有效端口)、无用户信息/fragment/query,实际DNS连接地址逐个检查,不跟随重定向。`rental.webhook.allow-private-network`通过`RENT_WEBHOOK_ALLOW_PRIVATE_NETWORK`控制,当前默认true,允许IPv4私网和IPv6 ULA;false恢复仅公网,回环、链路本地等特殊目标始终拒绝。HTTPS证书校验保持开启。HTTP200且正文精确为 `ok` 才确认。最多10次,失败指数退避,终止为DEAD;每次新timestamp/nonce,业务event_no、payload和订单事件序号不变。商户按event_no去重并按序号识别乱序。无回调地址的事件直接确认,不发HTTP。
|
||||||
|
|
||||||
## 7. WSS协议与历史资源证明
|
## 7. WSS协议与历史资源证明
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ rental:
|
|||||||
master-key-version: ${RENT_MASTER_KEY_VERSION:v1}
|
master-key-version: ${RENT_MASTER_KEY_VERSION:v1}
|
||||||
confirmations: ${RENT_CONFIRMATIONS:19}
|
confirmations: ${RENT_CONFIRMATIONS:19}
|
||||||
webhook:
|
webhook:
|
||||||
# 允许192.168/10/172.16~31及IPv6 ULA内网HTTPS回调;仍验证证书,拒绝回环/链路本地及重定向。
|
# 允许192.168/10/172.16~31及IPv6 ULA内网HTTP/HTTPS回调;HTTP允许自定义端口,HTTPS仍验证证书。
|
||||||
allow-private-network: ${RENT_WEBHOOK_ALLOW_PRIVATE_NETWORK:true}
|
allow-private-network: ${RENT_WEBHOOK_ALLOW_PRIVATE_NETWORK:true}
|
||||||
# 正常在线、无排队且RPC及时返回时,调度+推送等待约0~5秒,目标10秒左右接单。
|
# 正常在线、无排队且RPC及时返回时,调度+推送等待约0~5秒,目标10秒左右接单。
|
||||||
# 均为上轮执行完成后的等待时间;链上查询耗时不包含在间隔中。修改后重启服务端。
|
# 均为上轮执行完成后的等待时间;链上查询耗时不包含在间隔中。修改后重启服务端。
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import java.net.URI;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
/** 回调专用HTTP客户端:HTTPS、解析结果逐一检查、实际连接复用该DNS结果、拒绝重定向。 */
|
/** 回调专用HTTP客户端:HTTPS或内网HTTP、解析结果逐一检查、拒绝重定向。 */
|
||||||
public final class RentalHttp {
|
public final class RentalHttp {
|
||||||
private RentalHttp() {}
|
private RentalHttp() {}
|
||||||
|
|
||||||
@@ -26,14 +26,15 @@ public final class RentalHttp {
|
|||||||
public static void checkUrl(String url) {
|
public static void checkUrl(String url) {
|
||||||
URI uri = URI.create(url);
|
URI uri = URI.create(url);
|
||||||
require(
|
require(
|
||||||
"https".equalsIgnoreCase(uri.getScheme())
|
("https".equalsIgnoreCase(uri.getScheme()) || "http".equalsIgnoreCase(uri.getScheme()))
|
||||||
&& uri.getHost() != null
|
&& uri.getHost() != null
|
||||||
&& uri.getUserInfo() == null
|
&& uri.getUserInfo() == null
|
||||||
&& uri.getFragment() == null
|
&& uri.getFragment() == null
|
||||||
&& uri.getQuery() == null
|
&& uri.getQuery() == null
|
||||||
&& (uri.getPort() == -1 || uri.getPort() == 443)
|
&& (uri.getPort() == -1 || ("http".equalsIgnoreCase(uri.getScheme())
|
||||||
|
? uri.getPort() >= 1 && uri.getPort() <= 65535 : uri.getPort() == 443))
|
||||||
&& url.length() <= 512,
|
&& url.length() <= 512,
|
||||||
"回调仅允许标准HTTPS地址");
|
"回调仅允许HTTPS 443或内网HTTP有效端口地址,且不能含查询串、片段或用户信息");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean publicAddress(InetAddress address) {
|
public static boolean publicAddress(InetAddress address) {
|
||||||
@@ -72,18 +73,31 @@ public final class RentalHttp {
|
|||||||
* 对解析出的每个地址校验,并将同一结果用于连接,避免校验与连接使用不同DNS结果。
|
* 对解析出的每个地址校验,并将同一结果用于连接,避免校验与连接使用不同DNS结果。
|
||||||
*/
|
*/
|
||||||
public static OkHttpClient callbackClient(boolean allowPrivateNetwork) {
|
public static OkHttpClient callbackClient(boolean allowPrivateNetwork) {
|
||||||
|
return callbackClient(allowPrivateNetwork, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** HTTP专用客户端只连接私网,禁止代理绕过DNS校验;解析结果直接用于实际连接。 */
|
||||||
|
public static OkHttpClient callbackClient(boolean allowPrivateNetwork, boolean privateHttpOnly) {
|
||||||
return new OkHttpClient.Builder()
|
return new OkHttpClient.Builder()
|
||||||
|
.proxy(java.net.Proxy.NO_PROXY)
|
||||||
.connectTimeout(5, TimeUnit.SECONDS)
|
.connectTimeout(5, TimeUnit.SECONDS)
|
||||||
.readTimeout(5, TimeUnit.SECONDS)
|
.readTimeout(5, TimeUnit.SECONDS)
|
||||||
.callTimeout(10, TimeUnit.SECONDS)
|
.callTimeout(10, TimeUnit.SECONDS)
|
||||||
.followRedirects(false)
|
.followRedirects(false)
|
||||||
.followSslRedirects(false)
|
.followSslRedirects(false)
|
||||||
.retryOnConnectionFailure(false)
|
.retryOnConnectionFailure(false)
|
||||||
|
.addInterceptor(chain -> {
|
||||||
|
if (!chain.request().isHttps() && (!privateHttpOnly || !allowPrivateNetwork)) {
|
||||||
|
throw new CallbackTargetRejectedException();
|
||||||
|
}
|
||||||
|
return chain.proceed(chain.request());
|
||||||
|
})
|
||||||
.dns(
|
.dns(
|
||||||
host -> {
|
host -> {
|
||||||
InetAddress[] addresses = InetAddress.getAllByName(host);
|
InetAddress[] addresses = InetAddress.getAllByName(host);
|
||||||
for (InetAddress address : addresses) {
|
for (InetAddress address : addresses) {
|
||||||
if (!callbackAddressAllowed(address, allowPrivateNetwork)) {
|
if (!callbackAddressAllowed(address, allowPrivateNetwork)
|
||||||
|
|| (privateHttpOnly && publicAddress(address))) {
|
||||||
throw new CallbackTargetRejectedException();
|
throw new CallbackTargetRejectedException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ public class RentalWorkers {
|
|||||||
private final RentalSocket socket;
|
private final RentalSocket socket;
|
||||||
private final RentalIdentity identity;
|
private final RentalIdentity identity;
|
||||||
private OkHttpClient callbacks = RentalHttp.callbackClient();
|
private OkHttpClient callbacks = RentalHttp.callbackClient();
|
||||||
|
private OkHttpClient privateHttpCallbacks = RentalHttp.callbackClient(false, true);
|
||||||
@org.springframework.beans.factory.annotation.Value("${rental.webhook.allow-private-network:true}")
|
@org.springframework.beans.factory.annotation.Value("${rental.webhook.allow-private-network:true}")
|
||||||
private boolean allowPrivateNetwork = true;
|
private boolean allowPrivateNetwork = true;
|
||||||
private long walletCursor;
|
private long walletCursor;
|
||||||
@@ -40,6 +41,7 @@ public class RentalWorkers {
|
|||||||
@javax.annotation.PostConstruct
|
@javax.annotation.PostConstruct
|
||||||
public void validateDeliveryIntervals() {
|
public void validateDeliveryIntervals() {
|
||||||
callbacks = RentalHttp.callbackClient(allowPrivateNetwork);
|
callbacks = RentalHttp.callbackClient(allowPrivateNetwork);
|
||||||
|
privateHttpCallbacks = RentalHttp.callbackClient(allowPrivateNetwork, true);
|
||||||
require(dispatchIntervalMs >= 500 && dispatchIntervalMs <= 60000,
|
require(dispatchIntervalMs >= 500 && dispatchIntervalMs <= 60000,
|
||||||
"订单调度间隔必须为500到60000毫秒");
|
"订单调度间隔必须为500到60000毫秒");
|
||||||
require(pushIntervalMs >= 500 && pushIntervalMs <= 60000,
|
require(pushIntervalMs >= 500 && pushIntervalMs <= 60000,
|
||||||
@@ -47,7 +49,7 @@ public class RentalWorkers {
|
|||||||
LOG.info("租赁交付调度配置 dispatchIntervalMs={} pushIntervalMs={}",
|
LOG.info("租赁交付调度配置 dispatchIntervalMs={} pushIntervalMs={}",
|
||||||
dispatchIntervalMs, pushIntervalMs);
|
dispatchIntervalMs, pushIntervalMs);
|
||||||
LOG.info("租赁快照定时扫描已启用 intervalMs=15000 batchSize=20,刷新ACTIVE且快照缺失或过期的钱包");
|
LOG.info("租赁快照定时扫描已启用 intervalMs=15000 batchSize=20,刷新ACTIVE且快照缺失或过期的钱包");
|
||||||
LOG.info("租赁回调扫描已启用 intervalMs=5000 batchSize=20 maxAttempts=10 allowPrivateNetwork={};HTTPS证书校验开启,拒绝重定向、回环及链路本地地址,要求HTTP200且正文严格为ok",
|
LOG.info("租赁回调扫描已启用 intervalMs=5000 batchSize=20 maxAttempts=10 allowPrivateNetwork={};允许内网HTTP,HTTPS仍校验证书,拒绝重定向、回环及链路本地地址,要求HTTP200且正文严格为ok",
|
||||||
allowPrivateNetwork);
|
allowPrivateNetwork);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -341,7 +343,8 @@ public class RentalWorkers {
|
|||||||
stage = "HTTP_EXECUTE";
|
stage = "HTTP_EXECUTE";
|
||||||
LOG.info("租赁回调请求开始 webhookId={} orderId={} method=POST path={} connectTimeoutMs=5000 callTimeoutMs=10000",
|
LOG.info("租赁回调请求开始 webhookId={} orderId={} method=POST path={} connectTimeoutMs=5000 callTimeoutMs=10000",
|
||||||
id, row.get("order_id"), parsed.encodedPath());
|
id, row.get("order_id"), parsed.encodedPath());
|
||||||
try (Response response = callbacks.newCall(request).execute()) {
|
OkHttpClient client = parsed.isHttps() ? callbacks : privateHttpCallbacks;
|
||||||
|
try (Response response = client.newCall(request).execute()) {
|
||||||
LOG.info("租赁回调收到HTTP响应 webhookId={} httpStatus={} contentType={} contentLength={} elapsedMs={}",
|
LOG.info("租赁回调收到HTTP响应 webhookId={} httpStatus={} contentType={} contentLength={} elapsedMs={}",
|
||||||
id, response.code(), response.body() == null ? "" : response.body().contentType(),
|
id, response.code(), response.body() == null ? "" : response.body().contentType(),
|
||||||
response.body() == null ? -1 : response.body().contentLength(),
|
response.body() == null ? -1 : response.body().contentLength(),
|
||||||
|
|||||||
@@ -33,6 +33,29 @@ public class RentalWebhookDiagnosticsTest {
|
|||||||
assertFalse(client.followSslRedirects());
|
assertFalse(client.followSslRedirects());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void httpClientAllowsOnlyResolvedPrivateTargetsAndValidPorts() throws Exception {
|
||||||
|
RentalHttp.checkUrl("http://192.168.3.103/api/api/webhook/debug");
|
||||||
|
RentalHttp.checkUrl("http://192.168.3.103:2020/api/webhook/debug");
|
||||||
|
okhttp3.OkHttpClient client = RentalHttp.callbackClient(true, true);
|
||||||
|
assertFalse(client.dns().lookup("192.168.3.103").isEmpty());
|
||||||
|
assertEquals(java.net.Proxy.NO_PROXY, client.proxy());
|
||||||
|
for (String host : new String[] {"8.8.8.8", "127.0.0.1", "169.254.169.254"}) {
|
||||||
|
try {
|
||||||
|
client.dns().lookup(host);
|
||||||
|
fail("HTTP不能连接公网或特殊地址");
|
||||||
|
} catch (RentalHttp.CallbackTargetRejectedException expected) { }
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
RentalHttp.checkUrl("http://192.168.3.103:65536/path");
|
||||||
|
fail("端口越界应拒绝");
|
||||||
|
} catch (IllegalArgumentException expected) { }
|
||||||
|
try {
|
||||||
|
RentalHttp.callbackClient(false, true).dns().lookup("192.168.3.103");
|
||||||
|
fail("关闭内网配置应拒绝HTTP私网目标");
|
||||||
|
} catch (RentalHttp.CallbackTargetRejectedException expected) { }
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void networkAndCredentialErrorsHaveSafeDistinctReasons() {
|
public void networkAndCredentialErrorsHaveSafeDistinctReasons() {
|
||||||
assertEquals("TLS_CERTIFICATE_OR_HANDSHAKE_FAILED", RentalWorkers.callbackFailure(
|
assertEquals("TLS_CERTIFICATE_OR_HANDSHAKE_FAILED", RentalWorkers.callbackFailure(
|
||||||
|
|||||||
Reference in new issue
Block a user