diff --git a/src/main/java/com/youlai/boot/common/result/ResultCode.java b/src/main/java/com/youlai/boot/common/result/ResultCode.java index cbbfb29e..49dd7ddb 100644 --- a/src/main/java/com/youlai/boot/common/result/ResultCode.java +++ b/src/main/java/com/youlai/boot/common/result/ResultCode.java @@ -82,7 +82,18 @@ public enum ResultCode implements IResultCode, Serializable { MOBILE_TIMESTAMP_EXPIRED("A0805", "请求已过期,请重试"), MOBILE_SIGN_REQUIRED("A0806", "签名不能为空"), MOBILE_SIGN_INVALID("A0807", "签名验证失败"), - MOBILE_DEVICE_NOT_REGISTERED("A0808", "设备未注册"), + /** 后台已录入该 SN,但设备尚未通过 bind_phone 上传公钥(即未完成绑定手机) */ + MOBILE_DEVICE_NOT_BOUND("A0808", "设备未绑定手机号,请先完成设备绑定"), + /** 后台未录入该 SN */ + MOBILE_DEVICE_NOT_FOUND("A0809", "设备不存在,请先在后台添加设备"), + /** 设备被封禁(status=0),需管理员解封 */ + MOBILE_DEVICE_BANNED("A0810", "设备已被封禁,请联系管理员"), + /** 设备公钥与请求声明的密钥指纹不一致(重置后密钥重新生成) */ + MOBILE_DEVICE_KEY_CHANGED("A0811", "设备密钥已变更,需要重新绑定"), + /** nonce 已被使用(重放请求) */ + MOBILE_REQUEST_REPLAYED("A0812", "请求重复,请重试"), + /** 已解除绑定:公钥仍在、snMobile 已清空 */ + MOBILE_DEVICE_UNBOUND("A0813", "设备已解除绑定,请重新绑定"), /** 一级宏观错误码:系统端错误(服务端内部异常/超时/不可用等,需后端排查修复) */ SYSTEM_ERROR("B0001", "系统执行出错"), diff --git a/src/main/java/com/youlai/boot/framework/security/filter/MobileApiSignatureFilter.java b/src/main/java/com/youlai/boot/framework/security/filter/MobileApiSignatureFilter.java index 6f649166..54a81a97 100644 --- a/src/main/java/com/youlai/boot/framework/security/filter/MobileApiSignatureFilter.java +++ b/src/main/java/com/youlai/boot/framework/security/filter/MobileApiSignatureFilter.java @@ -28,8 +28,10 @@ import java.util.concurrent.TimeUnit; *
绑定手机接口 {@code /api/v1/sn/bind_phone} 豁免:设备首次绑定前可能尚未注册 @@ -45,6 +47,8 @@ public class MobileApiSignatureFilter extends OncePerRequestFilter { private static final String HEADER_NONCE = "X-Nonce"; private static final String HEADER_TIMESTAMP = "X-Timestamp"; private static final String HEADER_SIGN = "X-Sign"; + /** 客户端当前公钥指纹(X.509 DER 的 SHA-256 小写 hex),用于识别密钥变更 */ + private static final String HEADER_KEY_ID = "X-Device-Key-Id"; /** 签名有效期(毫秒),默认2分钟 */ private static final long SIGN_VALID_DURATION = 2 * 60 * 1000L; @@ -128,21 +132,30 @@ public class MobileApiSignatureFilter extends OncePerRequestFilter { .setIfAbsent(NONCE_PREFIX + deviceId + ":" + nonce, "1", SIGN_VALID_DURATION, TimeUnit.MILLISECONDS); if (Boolean.FALSE.equals(setIfAbsent)) { // nonce 已被使用(重放) - writeErrorResponse(response, ResultCode.MOBILE_SIGN_INVALID); + writeErrorResponse(response, ResultCode.MOBILE_REQUEST_REPLAYED); return; } - // 5. 查设备公钥 + 封禁检查 + // 5. 查设备 + 状态判定(顺序决定返回码):未录入 → 封禁 → 未上传公钥 → 密钥变更 SnDeviceInfo device = deviceService.lambdaQuery() .eq(SnDeviceInfo::getSerialno, deviceId) .one(); - if (device == null || StrUtil.isBlank(device.getPublicKey())) { - writeErrorResponse(response, ResultCode.MOBILE_DEVICE_NOT_REGISTERED); + if (device == null) { + writeErrorResponse(response, ResultCode.MOBILE_DEVICE_NOT_FOUND); return; } if (device.getStatus() != null && device.getStatus() == DEVICE_STATUS_BANNED) { - // 设备被封禁 - writeErrorResponse(response, ResultCode.MOBILE_SIGN_INVALID); + writeErrorResponse(response, ResultCode.MOBILE_DEVICE_BANNED); + return; + } + if (StrUtil.isBlank(device.getPublicKey())) { + writeErrorResponse(response, ResultCode.MOBILE_DEVICE_NOT_BOUND); + return; + } + // 客户端声明了当前公钥指纹且与库里不一致:设备重置/清数据后重新生成了密钥 + String keyId = request.getHeader(HEADER_KEY_ID); + if (StrUtil.isNotBlank(keyId) && !keyId.equalsIgnoreCase(verifier.keyId(device.getPublicKey()))) { + writeErrorResponse(response, ResultCode.MOBILE_DEVICE_KEY_CHANGED); return; } @@ -165,12 +178,18 @@ public class MobileApiSignatureFilter extends OncePerRequestFilter { return; } - // 8. 设备信息存入请求属性,供后续使用 + // 8. 已解除绑定:公钥仍可验签,但 snMobile 已被后台清空 + if (StrUtil.isBlank(device.getSnMobile())) { + writeErrorResponse(response, ResultCode.MOBILE_DEVICE_UNBOUND); + return; + } + + // 9. 设备信息存入请求属性,供后续使用 request.setAttribute("deviceId", deviceId); request.setAttribute("deviceAuthenticated", true); request.setAttribute("device", device); - // 9. 继续过滤器链(有 body 时用缓存 body 的 wrapper,确保 Controller 能再次读取) + // 10. 继续过滤器链(有 body 时用缓存 body 的 wrapper,确保 Controller 能再次读取) if (cachedWrapper != null) { filterChain.doFilter(cachedWrapper, response); } else { diff --git a/src/main/java/com/youlai/boot/framework/security/signature/DeviceSignatureVerifier.java b/src/main/java/com/youlai/boot/framework/security/signature/DeviceSignatureVerifier.java index 23d09676..8f5c6fd9 100644 --- a/src/main/java/com/youlai/boot/framework/security/signature/DeviceSignatureVerifier.java +++ b/src/main/java/com/youlai/boot/framework/security/signature/DeviceSignatureVerifier.java @@ -75,6 +75,26 @@ public class DeviceSignatureVerifier { return keyFactory.generatePublic(new X509EncodedKeySpec(keyBytes)); } + /** + * 计算公钥指纹:X.509 DER 字节的 SHA-256 十六进制小写串。 + * + *
与 Android 端 {@code DeviceKeyManager#getKeyId()} 一致,用于比对 + * 请求头 {@code X-Device-Key-Id} 与库里存留的公钥,识别设备重置导致的密钥变更。
+ * + * @param publicKeyBase64 公钥(X.509 Base64) + * @return 指纹;公钥为空或解析失败返回空串 + */ + public String keyId(String publicKeyBase64) { + try { + if (publicKeyBase64 == null || publicKeyBase64.isBlank()) { + return ""; + } + return sha256Hex(Base64.getDecoder().decode(publicKeyBase64)); + } catch (Exception e) { + return ""; + } + } + /** * 计算字节数组的 SHA-256 十六进制小写串。 *