Repository navigation
Conversation
- 新增 jdk15on 发行线,版本 0.3.0-jdk15on.1,供已有 bcprov-jdk15on 的项目直接使用 - bcprov-jdk18on 1.85 → bcprov-jdk15on 1.70(15on 最后一版) - 增加 BC 版本下限守卫(>=1.65),低于下限抛明确配置错误而非 NoSuchMethodError - README 增加双发行线选择说明 - 全量 verify:448 tests 全绿,行/分支覆盖率 100%,japicmp 无公共 API 变更
- 静态初始化抛出的运行时异常会被 JVM 包装为 ExceptionInInitializerError, 调用方按 WopError catch 不到;改为 provider() 取用时校验,1.64 实测直抛 WopError - BouncyCastleHolder 公共成员保持与基线一致,避免 japicmp 误判 API 变更 - 补 requireSupported(Provider) 拒绝路径与单例访问测试
- 新增 docs/release-lines.md:双线选择、Renovate/Dependabot 跨线升级限制、维护者发布约定 - 新增 SECURITY.md:支持范围、漏洞上报流程、BC 15on EOL 边界 - README 增加锁版本与文档入口 - CI 增加 release/** 分支触发;.zcode-review 审查产物不入库
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars.
|
审阅者指南实现添加运行时 BC 版本检查,并确保 SM2、SM3 和 SM4 路径在执行加密操作前先进行检查,同时将配置错误置于异常包装代码块之外。
配置将父项目和各模块切换到 jdk15on 发布版本及对应的 BC 构件(包括 japicmp 基准版本),确保已发布的模块始终解析到 bcprov-jdk15on 1.70。
在发布分支上运行 CI,并将审查产物从仓库中忽略。
文档向用户和维护者说明 jdk15on 发布系列、其选择依据及更新工具带来的风险、维护边界和安全问题报告流程。
测试为新增的运行时检查器测试受支持的版本下限、拒绝路径、提供程序标识和单例访问。
提示和命令与 Sourcery 交互
自定义使用体验访问你的控制面板,以便:
获取帮助Original review guide in EnglishReviewer's GuideImplementationAdd a runtime BC version guard and ensure SM2, SM3, and SM4 paths check it before cryptographic work, while keeping configuration errors outside exception-wrapping blocks.
ConfigurationSwitch the parent and modules to the jdk15on release version and BC artifact, including the japicmp baseline, so published modules consistently resolve bcprov-jdk15on 1.70.
Run CI on release branches and ignore the review artifact in the repository.
DocumentationExplain the jdk15on release line, its selection and update-tool risks, maintenance boundary, and security reporting process for users and maintainers.
TestsTest the supported-version threshold, rejection path, provider identity, and singleton access for the new runtime guard.
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
|
There was a problem hiding this comment.
您好——我发现了 6 个问题
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location path="docs/release-lines.md" line_range="60" />
<code_context>
+ interval: "weekly"
+ ignore:
+ # 18on 线的版本,按主干实际发布逐个补充
+ - dependency-name: "com.wanlianyida:wop-sdk-core"
+ versions: ["0.3.0"]
+```
</code_context>
<issue_to_address>
**Adapter updates restore BC conflict**
When a consumer follows the sample and directly depends on an SDK adapter, `ignore` covers only `wop-sdk-core`, so Dependabot can propose an 18on adapter release that brings in the 18on core alongside the consumer's 15on BC jar; accepting it restores both BC jars on the classpath.
Extend the Dependabot ignore rules to cover the 18on adapter artifacts as well as `wop-sdk-core`.
</issue_to_address>
### Comment 2
<location path="pom.xml" line_range="9" />
<code_context>
<groupId>com.wanlianyida</groupId>
<artifactId>wop-sdk-core</artifactId>
- <version>0.3.0</version>
+ <version>0.3.0-jdk15on.1</version>
</dependency>
</code_context>
<issue_to_address>
**Release line sorts as newer**
When an update tool compares available versions for a consumer currently on the 18on `0.3.0` release, maven treats the unknown `jdk15on` qualifier as newer than the unqualified release, so an updater checking versions for a project on `0.3.0` can select `0.3.0-jdk15on.1`. That moves an 18on consumer onto the 15on line and can reintroduce both BC jars on its classpath.
Use a release-line scheme that sorts in the intended direction, such as separate artifactIds, or constrain update tools for 18on consumers as well.
Also at `README.md:35`, `README.en.md:35`, `docs/release-lines.md:25`.
</issue_to_address>
### Comment 3
<location path="docs/release-lines.md" line_range="25-27" />
<code_context>
+
+## 为什么不能"自动升级"
+
+Maven 版本排序中 `0.3.0-jdk15on.1 < 0.3.0`。Renovate / Dependabot /
+`mvn versions:display-dependency-updates` 会把 18on 线的 `0.3.0` 视为可用升级,
+接受后消费者的 classpath 上会同时出现两个 BC jar,重新触发本仓库要解决的冲突。
+
+**使用 15on 线时,必须锁定精确版本并限制更新工具。**
</code_context>
<issue_to_address>
**Updates can switch release lines**
When an 18on consumer runs Maven-aware dependency updates, maven `ComparableVersion` orders the unrecognized `jdk15on` qualifier after the release version, so Maven-aware update tools can offer `0.3.0-jdk15on.1` as an upgrade from `0.3.0`. Accepting it adds `bcprov-jdk15on` alongside an existing `bcprov-jdk18on`, recreating the classpath conflict.
Correct the Maven ordering guidance and document constraints for both release lines, or publish the lines under distinct artifactIds.
Also at `README.md:35`, `README.en.md:35`.
</issue_to_address>
### Comment 4
<location path="wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuard.java" line_range="27" />
<code_context>
+
+ /** 版本守卫:低于 {@link #MIN_VERSION} 明确拒绝。 */
+ static Provider requireSupported(Provider provider) {
+ requireSupportedVersion(provider.getVersion());
+ return provider;
+ }
</code_context>
<issue_to_address>
**SM2 skips version rejection**
When a consumer resolves `bcprov-jdk15on` below 1.65 and invokes an SM2 strategy directly, `Sm2SignatureStrategy` and `Sm2KeyEncryptStrategy` call lightweight BC APIs without reaching `BouncyCastleHolder.provider()` or `BouncyCastleVersionGuard.requireSupported`, so the operation bypasses the fail-fast check and proceeds without the promised configuration error.
Make every exposed SM2 strategy check the BC version before invoking BC APIs.
Also at `wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleHolder.java:33`, `docs/release-lines.md:20-21`.
</issue_to_address>
### Comment 5
<location path="wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleHolder.java" line_range="33" />
<code_context>
+ */
public static Provider provider() {
- return PROVIDER;
+ return BouncyCastleVersionGuard.requireSupported(PROVIDER);
}
</code_context>
<issue_to_address>
**Configuration errors become crypto failures**
When BC is below 1.65 and a caller uses an SM3 or SM4 strategy, `Sm3DigestStrategy` and the SM4 paths catch the guard's `WopError` as `Exception` and wrap it in `CryptoException`; `WopClient` can then return a generic inbound failure, so callers see an operation or verification failure instead of a configuration error.
Rethrow the guard's `WopError` before the SM3 and SM4 strategies handle other exceptions.
</issue_to_address>
### Comment 6
<location path="wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleHolder.java" line_range="33" />
<code_context>
+ */
public static Provider provider() {
- return PROVIDER;
+ return BouncyCastleVersionGuard.requireSupported(PROVIDER);
}
</code_context>
<issue_to_address>
**Rejected provider stays registered**
When the classpath supplies BC below 1.65 and no provider named BC was already registered, `BouncyCastleHolder` initializes `PROVIDER` through `register()`, which calls `Security.addProvider` before `requireSupported` rejects it, leaving the unsupported provider visible to JVM-wide default lookup; later consumers can select it.
Check the provider version before registering it, or remove it from the registry if the check fails.
</issue_to_address>Sourcery 评估
需要人工审查。 需要先处理 6 项发现;此外,此发布线使 SM2/SM3/SM4 操作使用 BouncyCastle 1.70,这是一个明确已停止维护的版本,因此采用此版本的使用者,其加密操作可能会因该实现中的缺陷而受到影响。回退只能阻止未来继续使用,但无法撤销已经暴露的密钥或数据,也无法撤销已经生成的签名。
阻塞性发现:docs/release-lines.md:60、pom.xml:9、docs/release-lines.md:27、wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuard.java:27、wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleHolder.java:33,以及另外 1 项
Original comment in English
Hey - I've found 6 issues
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location path="docs/release-lines.md" line_range="60" />
<code_context>
+ interval: "weekly"
+ ignore:
+ # 18on 线的版本,按主干实际发布逐个补充
+ - dependency-name: "com.wanlianyida:wop-sdk-core"
+ versions: ["0.3.0"]
+```
</code_context>
<issue_to_address>
**Adapter updates restore BC conflict**
When a consumer follows the sample and directly depends on an SDK adapter, `ignore` covers only `wop-sdk-core`, so Dependabot can propose an 18on adapter release that brings in the 18on core alongside the consumer's 15on BC jar; accepting it restores both BC jars on the classpath.
Extend the Dependabot ignore rules to cover the 18on adapter artifacts as well as `wop-sdk-core`.
</issue_to_address>
### Comment 2
<location path="pom.xml" line_range="9" />
<code_context>
<groupId>com.wanlianyida</groupId>
<artifactId>wop-sdk-core</artifactId>
- <version>0.3.0</version>
+ <version>0.3.0-jdk15on.1</version>
</dependency>
</code_context>
<issue_to_address>
**Release line sorts as newer**
When an update tool compares available versions for a consumer currently on the 18on `0.3.0` release, maven treats the unknown `jdk15on` qualifier as newer than the unqualified release, so an updater checking versions for a project on `0.3.0` can select `0.3.0-jdk15on.1`. That moves an 18on consumer onto the 15on line and can reintroduce both BC jars on its classpath.
Use a release-line scheme that sorts in the intended direction, such as separate artifactIds, or constrain update tools for 18on consumers as well.
Also at `README.md:35`, `README.en.md:35`, `docs/release-lines.md:25`.
</issue_to_address>
### Comment 3
<location path="docs/release-lines.md" line_range="25-27" />
<code_context>
+
+## 为什么不能"自动升级"
+
+Maven 版本排序中 `0.3.0-jdk15on.1 < 0.3.0`。Renovate / Dependabot /
+`mvn versions:display-dependency-updates` 会把 18on 线的 `0.3.0` 视为可用升级,
+接受后消费者的 classpath 上会同时出现两个 BC jar,重新触发本仓库要解决的冲突。
+
+**使用 15on 线时,必须锁定精确版本并限制更新工具。**
</code_context>
<issue_to_address>
**Updates can switch release lines**
When an 18on consumer runs Maven-aware dependency updates, maven `ComparableVersion` orders the unrecognized `jdk15on` qualifier after the release version, so Maven-aware update tools can offer `0.3.0-jdk15on.1` as an upgrade from `0.3.0`. Accepting it adds `bcprov-jdk15on` alongside an existing `bcprov-jdk18on`, recreating the classpath conflict.
Correct the Maven ordering guidance and document constraints for both release lines, or publish the lines under distinct artifactIds.
Also at `README.md:35`, `README.en.md:35`.
</issue_to_address>
### Comment 4
<location path="wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuard.java" line_range="27" />
<code_context>
+
+ /** 版本守卫:低于 {@link #MIN_VERSION} 明确拒绝。 */
+ static Provider requireSupported(Provider provider) {
+ requireSupportedVersion(provider.getVersion());
+ return provider;
+ }
</code_context>
<issue_to_address>
**SM2 skips version rejection**
When a consumer resolves `bcprov-jdk15on` below 1.65 and invokes an SM2 strategy directly, `Sm2SignatureStrategy` and `Sm2KeyEncryptStrategy` call lightweight BC APIs without reaching `BouncyCastleHolder.provider()` or `BouncyCastleVersionGuard.requireSupported`, so the operation bypasses the fail-fast check and proceeds without the promised configuration error.
Make every exposed SM2 strategy check the BC version before invoking BC APIs.
Also at `wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleHolder.java:33`, `docs/release-lines.md:20-21`.
</issue_to_address>
### Comment 5
<location path="wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleHolder.java" line_range="33" />
<code_context>
+ */
public static Provider provider() {
- return PROVIDER;
+ return BouncyCastleVersionGuard.requireSupported(PROVIDER);
}
</code_context>
<issue_to_address>
**Configuration errors become crypto failures**
When BC is below 1.65 and a caller uses an SM3 or SM4 strategy, `Sm3DigestStrategy` and the SM4 paths catch the guard's `WopError` as `Exception` and wrap it in `CryptoException`; `WopClient` can then return a generic inbound failure, so callers see an operation or verification failure instead of a configuration error.
Rethrow the guard's `WopError` before the SM3 and SM4 strategies handle other exceptions.
</issue_to_address>
### Comment 6
<location path="wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleHolder.java" line_range="33" />
<code_context>
+ */
public static Provider provider() {
- return PROVIDER;
+ return BouncyCastleVersionGuard.requireSupported(PROVIDER);
}
</code_context>
<issue_to_address>
**Rejected provider stays registered**
When the classpath supplies BC below 1.65 and no provider named BC was already registered, `BouncyCastleHolder` initializes `PROVIDER` through `register()`, which calls `Security.addProvider` before `requireSupported` rejects it, leaving the unsupported provider visible to JVM-wide default lookup; later consumers can select it.
Check the provider version before registering it, or remove it from the registry if the check fails.
</issue_to_address>Sourcery assessment
Needs a human reviewer. 6 findings to address first, and this release line makes SM2/SM3/SM4 operations use BouncyCastle 1.70, an explicitly unmaintained version, so a flaw in that implementation could compromise cryptographic operations for consumers who adopt it. Reverting would stop future use but could not undo any keys or data already exposed or signatures already produced.
Blocking findings: docs/release-lines.md:60, pom.xml:9, docs/release-lines.md:27, wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuard.java:27, wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleHolder.java:33, and 1 more
关于
|
| 漏洞 | 影响面 | 本 SDK 是否使用相关 API |
|---|---|---|
| CVE-2024-34447 | 证书路径 / DNS 名校验 | 否 |
| CVE-2024-29857 | X.509 证书解析 CPU DoS | 否 |
| CVE-2023-33201 | X500Name / LDAP DN 注入 | 否 |
| CVE-2024-30171 | RSA PKCS#1 v1.5 解密计时侧信道(Marvin) | 否 |
| CVE-2023-33202 | 不可信 ASN.1 解析 DoS | 否(仅解析自身生成的 DER) |
核对依据(wop-sdk-core/src/main):
- 无证书解析调用(
CertificateFactory/X509Certificate),无 LDAP / DNS 相关代码; - RSA 加签使用
SHA256withRSA(RsaPkcs1SignatureStrategy),PKCS#1 v1.5 仅用于签名,不用于解密; - DEK 解包使用
RSA/ECB/OAEPPadding+ SHA-256 / MGF1-SHA-256(RsaOaepKeyEncryptStrategy); - SM2 验签输入为定长 64 字节 r‖s,不解析外部 ASN.1/DER。
因此上述 CVE 的触发路径在当前实现中不可达;但它们确实存在于 1.70 的代码里,Snyk 按版本判定失败。
请求
bcprov-jdk15on 1.70 是该 artifact 的最后一版(2021-12),15on 发行线只能使用它。发行线定位与安全边界见 docs/release-lines.md、SECURITY.md。
恳请维护者在 im47cn 的 Snyk 组织中为本 PR / 15on 发行线配置 ignore 或 waiver,建议带复核期限(例如 6 个月),到期重新评估迁移。
如果贵方安全策略不接受豁免,我们也可以改为在 wop-sdk-core 内 shade + relocate BC 1.85:消费者同样零改动,且不引入 1.70 的 CVE,代价是 jar 增大 ~8MB,并需要把 Sm2Support 等公共 API 中的 BC 类型清理掉。
请告知倾向,我们按结论调整。谢谢!
- SM2 策略走 BC 轻量 API,不经过 BouncyCastleHolder,此前可绕过版本守卫; 现在 sign/verify/encrypt/decrypt 与 Sm2Support 入口均先校验 - SM3/SM4/SM2 的 provider 校验移到 try 之外,配置错误不再被包装为 CryptoException - 移除 Security.addProvider:所有查找显式传 provider,避免被拒绝的实例残留在全局表
- Maven ComparableVersion 把未知限定符排在发布版之后:0.3.0-jdk15on.1 > 0.3.0 - 补充 18on 与 15on 两个方向的跨线升级限制,Dependabot 覆盖全部四个构件 - 注明版本方案为临时折中,结构性隔离需独立 artifactId
已处理 Sourcery 的 6 条意见推送
验证
Snyk 的 4 项失败仍来自 |
背景
本仓库当前依赖
bcprov-jdk18on。jdk15on与jdk18on是两个不同的 artifact,但包含同名org.bouncycastle.*包;消费者项目只要已经引入bcprov-jdk15on(存量项目常见于 PDF/证书/老支付 SDK 的传递依赖),classpath 上就会同时出现两个 BC jar,表现为随机NoSuchMethodError/NoClassDefFoundError。已确认单纯降低
bcprov-jdk18on的版本号无效——Maven 只按groupId:artifactId仲裁,不同 artifact 必然共存。方案
新增一条
jdk15on发行线,与现有 18on 线并行发布,消费者按依赖树选择,无需修改或排除现有依赖:0.3.0-jdk15on.1bcprov-jdk15on(≥1.65)0.3.0bcprov-jdk18on选择方法:
mvn dependency:tree -Dincludes=org.bouncycastle。改动
bcprov-jdk15on:1.70(该 artifact 最后一版),japicmp 老 classpath 同步更新0.3.0-jdk15on.1,避免覆盖 Central 上已发布的0.3.0BouncyCastleVersionGuard:BC < 1.65 时抛WopError(category=configuration)。校验放在provider()取用时而非静态初始化块——静态初始化抛出的运行时异常会被 JVM 包装为ExceptionInInitializerError,调用方无法按契约捕获(已用 1.64 实测确认)BouncyCastleHolder公共成员保持不变,japicmp 无 API 变更docs/release-lines.md:双线选择、Renovate/Dependabot 跨线升级限制、维护者发布约定SECURITY.md:支持范围、漏洞上报流程、BC 15on EOL 边界release/**分支验证
mvn -B -ntp verify:5 模块全部 SUCCESS1.64拒绝并直抛WopError;1.65/1.70通过org.bouncycastle:bcprov-jdk15on:jar:1.70:compile需要确认的点
bcprov-jdk15on1.70 是最后一版(2021-12),此后安全修复只进入 18on 分支。该线定位为存量项目的过渡发行线,需要明确生命周期与迁移计划。0.3.0-jdk15on.1 < 0.3.0,依赖更新工具会提示跨线升级。文档已给出 RenovateallowedVersions/ Dependabotignore配置;若要结构性消除,需要为 15on 线使用独立 artifactId。main。相关提交:
d53af2f、5162d7b、b8f8a5dSourcery 摘要
为已使用 bcprov-jdk15on 的项目提供一个兼容性发布线,同时避免在类路径中引入两种 BouncyCastle 工件。
新功能:
错误修复:
增强:
CI:
文档:
测试:
杂项:
Original summary in English
Sourcery 摘要
为使用 bcprov-jdk15on 的用户提供兼容的发布线,同时避免 Bouncy Castle 依赖项在类路径上发生冲突。
新功能:
错误修复:
增强:
构建:
CI:
文档:
测试:
杂项:
Original summary in English
Summary by Sourcery
Provide a compatibility release line for consumers using bcprov-jdk15on while preventing Bouncy Castle artifact conflicts on the classpath.
New Features:
Bug Fixes:
Enhancements:
Build:
CI:
Documentation:
Tests:
Chores: