feat: switch payment callbacks to rsa signatures

This commit is contained in:
lu7213 committed 2026-10-15 04:37:41 -04:00
1 parent a75869342c
commit ad965d086b
4 files changed
+72 -22

No files matched your search

@@ -35,6 +35,8 @@ import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.PublicKey;
import java.security.Signature;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -62,7 +64,7 @@ public class SysUsdtDemoController {
@PostMapping("/notify")
public ResponseEntity<String> notify(
@RequestHeader(value = "X-Payment-Api-Key", required = false) String apiKey,
@RequestHeader(value = "X-Payment-Signature", required = false) String signature,
@RequestHeader(value = "X-Payment-Rsa-Signature", required = false) String signature,
@RequestBody(required = false) String body) {
try {
JSONObject payload = parseCallbackPayload(body);
@@ -224,10 +226,16 @@ public class SysUsdtDemoController {
/** API Key和签名均使用常量时间比较,避免泄露匹配前缀。 */
private boolean verifyCallback(Map<String, ?> values, String apiKey, String signature) {
String expectedApiKey = requiredEnvWithAlias("PAYMENT_API_KEY", "PAYMENT_API_KEK");
if (!constantTimeEquals(expectedApiKey, apiKey)) {
if (!constantTimeEquals(expectedApiKey, apiKey) || StringUtils.isBlank(signature)) return false;
try {
PublicKey publicKey = RsaKeyUtil.loadPublicKey(requiredEnv("PAYMENT_CALLBACK_PUBLIC_KEY").replace("\\n", "\n"));
Signature verifier = Signature.getInstance("SHA256withRSA");
verifier.initVerify(publicKey);
verifier.update(PaymentSignatureService.canonicalText(values).getBytes(StandardCharsets.UTF_8));
return verifier.verify(Base64.getDecoder().decode(signature));
} catch (Exception ex) {
return false;
}
return PaymentSignatureService.verify(values, requiredEnv("PAYMENT_API_SECRET"), signature);
}
private boolean constantTimeEquals(String expected, String actual) {
@@ -9,21 +9,34 @@ import org.springframework.http.ResponseEntity;
import java.util.HashMap;
import java.util.Map;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PrivateKey;
import java.util.Base64;
import static org.junit.Assert.assertEquals;
public class SysUsdtDemoControllerTest {
private static final String API_KEY = "demo-api-key";
private static final String API_SECRET = "demo-api-secret-value";
private static final String API_SECRET = "unused-rsa-migration-value";
private SysUsdtDemoController controller;
private Map<String, Object> values;
private PrivateKey privateKey;
@Before
public void setUp() {
try {
KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");
generator.initialize(2048);
KeyPair pair = generator.generateKeyPair();
privateKey = pair.getPrivate();
final String publicKey = "-----BEGIN PUBLIC KEY-----\n"
+ Base64.getEncoder().encodeToString(pair.getPublic().getEncoded())
+ "\n-----END PUBLIC KEY-----";
controller = new SysUsdtDemoController() {
@Override
protected String requiredEnv(String name) {
return API_SECRET;
return publicKey;
}
@Override
@@ -31,6 +44,9 @@ public class SysUsdtDemoControllerTest {
return API_KEY;
}
};
} catch (Exception ex) {
throw new IllegalStateException(ex);
}
values = new HashMap<String, Object>();
values.put("order_id", "merchant-1001");
values.put("trade_id", "trade-1001");
@@ -40,7 +56,7 @@ public class SysUsdtDemoControllerTest {
@Test
public void notifyShouldAcceptValidSignature() {
String signature = PaymentSignatureService.sign(values, API_SECRET);
String signature = PaymentSignatureService.signRsa(values, privateKey);
ResponseEntity<String> response = controller.notify(API_KEY, signature,
JSON.toJSONString(values));
@@ -60,7 +76,7 @@ public class SysUsdtDemoControllerTest {
@Test
public void notifyShouldRejectWrongApiKey() {
String signature = PaymentSignatureService.sign(values, API_SECRET);
String signature = PaymentSignatureService.signRsa(values, privateKey);
ResponseEntity<String> response = controller.notify("wrong-key", signature,
JSON.toJSONString(values));
@@ -70,7 +86,7 @@ public class SysUsdtDemoControllerTest {
@Test
public void redirectShouldAcceptValidSignature() {
String signature = PaymentSignatureService.sign(values, API_SECRET);
String signature = PaymentSignatureService.signRsa(values, privateKey);
ResponseEntity<String> response = controller.redirect("merchant-1001", "trade-1001",
2, "tx-1001", API_KEY, signature);