diff --git a/CHANGELOG.md b/CHANGELOG.md index 265ac77d9..047db445a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +### Bug Fixes + +* 修复火山视频点播源站选择不到自定义源站的bug ([0071bcb](https://github.com/certd/certd/commit/0071bcb0e4dd108c86d7ca01820a9f6e6960e440)) +* 修复企业模式下弹出邮箱绑定提醒的问题 ([8d9dad9](https://github.com/certd/certd/commit/8d9dad9c82f6f2fd3ab3040068946a33f37145b1)) +* 修复AsiaIsp CDN证书重复情况下部署失败的问题 ([c3d6db3](https://github.com/certd/certd/commit/c3d6db3f1ef2f1c897b7989521fe8809dffaded1)) +* 修复cname用阿里云校验时报找不到runtimeDepsService的错误 ([072edd7](https://github.com/certd/certd/commit/072edd7affee424ab3411f4d41d338f084d7cac6)) + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) ### Bug Fixes diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md index 265ac77d9..047db445a 100644 --- a/docs/guide/changelogs/CHANGELOG.md +++ b/docs/guide/changelogs/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +### Bug Fixes + +* 修复火山视频点播源站选择不到自定义源站的bug ([0071bcb](https://github.com/certd/certd/commit/0071bcb0e4dd108c86d7ca01820a9f6e6960e440)) +* 修复企业模式下弹出邮箱绑定提醒的问题 ([8d9dad9](https://github.com/certd/certd/commit/8d9dad9c82f6f2fd3ab3040068946a33f37145b1)) +* 修复AsiaIsp CDN证书重复情况下部署失败的问题 ([c3d6db3](https://github.com/certd/certd/commit/c3d6db3f1ef2f1c897b7989521fe8809dffaded1)) +* 修复cname用阿里云校验时报找不到runtimeDepsService的错误 ([072edd7](https://github.com/certd/certd/commit/072edd7affee424ab3411f4d41d338f084d7cac6)) + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) ### Bug Fixes diff --git a/lerna.json b/lerna.json index 38ec12dc4..fc92b1ca6 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.42.1" + "version": "1.42.2" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index cc97c0013..5bc556fa0 100644 --- a/packages/core/acme-client/CHANGELOG.md +++ b/packages/core/acme-client/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/publishlab/node-acme-client/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/acme-client + ## [1.42.1](https://github.com/publishlab/node-acme-client/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/acme-client diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json index 3dabb4a47..6639d056a 100644 --- a/packages/core/acme-client/package.json +++ b/packages/core/acme-client/package.json @@ -3,7 +3,7 @@ "description": "Simple and unopinionated ACME client", "private": false, "author": "nmorsman", - "version": "1.42.1", + "version": "1.42.2", "type": "module", "module": "./dist/index.js", "main": "./dist/index.js", @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.42.1", + "@certd/basic": "^1.42.2", "@peculiar/x509": "^1.11.0", "asn1js": "^3.0.5", "axios": "^1.9.0", diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md index 200b281a9..292eb55f9 100644 --- a/packages/core/basic/CHANGELOG.md +++ b/packages/core/basic/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/basic + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/basic diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md index 98f058dcf..d275bf418 100644 --- a/packages/core/basic/build.md +++ b/packages/core/basic/build.md @@ -1 +1 @@ -00:18 +19:56 diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index a84aa1307..679be0839 100644 --- a/packages/core/basic/package.json +++ b/packages/core/basic/package.json @@ -1,7 +1,7 @@ { "name": "@certd/basic", "private": false, - "version": "1.42.1", + "version": "1.42.2", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index 6d69a7170..8b5cfdbe0 100644 --- a/packages/core/pipeline/CHANGELOG.md +++ b/packages/core/pipeline/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/pipeline + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/pipeline diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index e59bf5db6..08f74ec91 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.42.1", + "version": "1.42.2", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -21,8 +21,8 @@ "lint": "eslint --fix" }, "dependencies": { - "@certd/basic": "^1.42.1", - "@certd/plus-core": "^1.42.1", + "@certd/basic": "^1.42.2", + "@certd/plus-core": "^1.42.2", "dayjs": "^1.11.7", "lodash-es": "^4.17.21", "reflect-metadata": "^0.2.2" diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md index b9bd96d9f..f30fbb446 100644 --- a/packages/libs/lib-huawei/CHANGELOG.md +++ b/packages/libs/lib-huawei/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/lib-huawei + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/lib-huawei diff --git a/packages/libs/lib-huawei/package.json b/packages/libs/lib-huawei/package.json index 3342722a0..6c5367685 100644 --- a/packages/libs/lib-huawei/package.json +++ b/packages/libs/lib-huawei/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-huawei", "private": false, - "version": "1.42.1", + "version": "1.42.2", "main": "./dist/bundle.js", "module": "./dist/bundle.js", "types": "./dist/d/index.d.ts", diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md index 9446b02d8..e2bf58b95 100644 --- a/packages/libs/lib-iframe/CHANGELOG.md +++ b/packages/libs/lib-iframe/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/lib-iframe + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/lib-iframe diff --git a/packages/libs/lib-iframe/package.json b/packages/libs/lib-iframe/package.json index 60b11bb95..a5ee01208 100644 --- a/packages/libs/lib-iframe/package.json +++ b/packages/libs/lib-iframe/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-iframe", "private": false, - "version": "1.42.1", + "version": "1.42.2", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/libs/lib-jdcloud/CHANGELOG.md b/packages/libs/lib-jdcloud/CHANGELOG.md index 335067649..adb6cbcce 100644 --- a/packages/libs/lib-jdcloud/CHANGELOG.md +++ b/packages/libs/lib-jdcloud/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/jdcloud + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/jdcloud diff --git a/packages/libs/lib-jdcloud/package.json b/packages/libs/lib-jdcloud/package.json index de17de022..59207f1d7 100644 --- a/packages/libs/lib-jdcloud/package.json +++ b/packages/libs/lib-jdcloud/package.json @@ -1,6 +1,6 @@ { "name": "@certd/jdcloud", - "version": "1.42.1", + "version": "1.42.2", "description": "jdcloud openApi sdk", "main": "./dist/bundle.js", "module": "./dist/bundle.js", diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index db0ac7c28..f2aff4aae 100644 --- a/packages/libs/lib-k8s/CHANGELOG.md +++ b/packages/libs/lib-k8s/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/lib-k8s + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/lib-k8s diff --git a/packages/libs/lib-k8s/package.json b/packages/libs/lib-k8s/package.json index b686fc8f0..81bcaf2dd 100644 --- a/packages/libs/lib-k8s/package.json +++ b/packages/libs/lib-k8s/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-k8s", "private": false, - "version": "1.42.1", + "version": "1.42.2", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -21,7 +21,7 @@ "lint": "eslint --fix" }, "dependencies": { - "@certd/basic": "^1.42.1", + "@certd/basic": "^1.42.2", "@kubernetes/client-node": "0.21.0" }, "devDependencies": { diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md index 35f56014b..cca5d514a 100644 --- a/packages/libs/lib-server/CHANGELOG.md +++ b/packages/libs/lib-server/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/lib-server + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/lib-server diff --git a/packages/libs/lib-server/package.json b/packages/libs/lib-server/package.json index 8371878fb..b0a1ad176 100644 --- a/packages/libs/lib-server/package.json +++ b/packages/libs/lib-server/package.json @@ -1,6 +1,6 @@ { "name": "@certd/lib-server", - "version": "1.42.1", + "version": "1.42.2", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -29,11 +29,11 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.42.1", - "@certd/basic": "^1.42.1", - "@certd/pipeline": "^1.42.1", - "@certd/plugin-lib": "^1.42.1", - "@certd/plus-core": "^1.42.1", + "@certd/acme-client": "^1.42.2", + "@certd/basic": "^1.42.2", + "@certd/pipeline": "^1.42.2", + "@certd/plugin-lib": "^1.42.2", + "@certd/plus-core": "^1.42.2", "@midwayjs/cache": "3.14.0", "@midwayjs/core": "3.20.11", "@midwayjs/i18n": "3.20.13", diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index 8de8b1933..55e687eb2 100644 --- a/packages/libs/midway-flyway-js/CHANGELOG.md +++ b/packages/libs/midway-flyway-js/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/midway-flyway-js diff --git a/packages/libs/midway-flyway-js/package.json b/packages/libs/midway-flyway-js/package.json index c47db771f..3ca487f53 100644 --- a/packages/libs/midway-flyway-js/package.json +++ b/packages/libs/midway-flyway-js/package.json @@ -1,6 +1,6 @@ { "name": "@certd/midway-flyway-js", - "version": "1.42.1", + "version": "1.42.2", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index 0e698d999..bc1e6fa47 100644 --- a/packages/plugins/plugin-cert/CHANGELOG.md +++ b/packages/plugins/plugin-cert/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/plugin-cert + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) **Note:** Version bump only for package @certd/plugin-cert diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 107666536..503e73cd4 100644 --- a/packages/plugins/plugin-cert/package.json +++ b/packages/plugins/plugin-cert/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-cert", "private": false, - "version": "1.42.1", + "version": "1.42.2", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -20,7 +20,7 @@ "lint": "eslint --fix" }, "dependencies": { - "@certd/plugin-lib": "^1.42.1" + "@certd/plugin-lib": "^1.42.2" }, "devDependencies": { "@types/chai": "^4.3.12", diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md index d59b05bd3..a691ce846 100644 --- a/packages/plugins/plugin-lib/CHANGELOG.md +++ b/packages/plugins/plugin-lib/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +**Note:** Version bump only for package @certd/plugin-lib + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) ### Performance Improvements diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index 7f9e0ba15..5a8f0f371 100644 --- a/packages/plugins/plugin-lib/package.json +++ b/packages/plugins/plugin-lib/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-lib", "private": false, - "version": "1.42.1", + "version": "1.42.2", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -17,9 +17,9 @@ "lint": "eslint --fix" }, "dependencies": { - "@certd/acme-client": "^1.42.1", - "@certd/basic": "^1.42.1", - "@certd/pipeline": "^1.42.1", + "@certd/acme-client": "^1.42.2", + "@certd/basic": "^1.42.2", + "@certd/pipeline": "^1.42.2", "dayjs": "^1.11.7", "jszip": "^3.10.1", "lodash-es": "^4.17.21", diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index 700089958..413faec63 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +### Bug Fixes + +* 修复企业模式下弹出邮箱绑定提醒的问题 ([8d9dad9](https://github.com/certd/certd/commit/8d9dad9c82f6f2fd3ab3040068946a33f37145b1)) + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) ### Bug Fixes diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 10e80a490..6f00e1711 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -1,6 +1,6 @@ { "name": "@certd/ui-client", - "version": "1.42.1", + "version": "1.42.2", "private": true, "scripts": { "dev": "vite --open", @@ -105,8 +105,8 @@ "zod-defaults": "^0.1.3" }, "devDependencies": { - "@certd/lib-iframe": "^1.42.1", - "@certd/pipeline": "^1.42.1", + "@certd/lib-iframe": "^1.42.2", + "@certd/pipeline": "^1.42.2", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-node-resolve": "^15.2.3", "@types/chai": "^4.3.12", diff --git a/packages/ui/certd-server/CHANGELOG.md b/packages/ui/certd-server/CHANGELOG.md index ae4c6ca26..404203b85 100644 --- a/packages/ui/certd-server/CHANGELOG.md +++ b/packages/ui/certd-server/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.2](https://github.com/certd/certd/compare/v1.42.1...v1.42.2) (2026-07-07) + +### Bug Fixes + +* 修复火山视频点播源站选择不到自定义源站的bug ([0071bcb](https://github.com/certd/certd/commit/0071bcb0e4dd108c86d7ca01820a9f6e6960e440)) +* 修复企业模式下弹出邮箱绑定提醒的问题 ([8d9dad9](https://github.com/certd/certd/commit/8d9dad9c82f6f2fd3ab3040068946a33f37145b1)) +* 修复AsiaIsp CDN证书重复情况下部署失败的问题 ([c3d6db3](https://github.com/certd/certd/commit/c3d6db3f1ef2f1c897b7989521fe8809dffaded1)) +* 修复cname用阿里云校验时报找不到runtimeDepsService的错误 ([072edd7](https://github.com/certd/certd/commit/072edd7affee424ab3411f4d41d338f084d7cac6)) + ## [1.42.1](https://github.com/certd/certd/compare/v1.42.0...v1.42.1) (2026-07-06) ### Bug Fixes diff --git a/packages/ui/certd-server/metadata/deploy_VolcengineDeployToVOD.yaml b/packages/ui/certd-server/metadata/deploy_VolcengineDeployToVOD.yaml index 9210a2dbb..c6182cf26 100644 --- a/packages/ui/certd-server/metadata/deploy_VolcengineDeployToVOD.yaml +++ b/packages/ui/certd-server/metadata/deploy_VolcengineDeployToVOD.yaml @@ -102,6 +102,7 @@ input: sourceStationType: title: 源站类型 helper: 选择源站类型 + value: 1 component: name: a-select vModel: value @@ -110,7 +111,6 @@ input: label: 点播源站 - value: 2 label: 自定义源站 - value: 1 helper: 注意:封面加速域名不支持自定义源站 required: false order: 0 diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index fe02c3f6f..775169767 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -1,6 +1,6 @@ { "name": "@certd/ui-server", - "version": "1.42.1", + "version": "1.42.2", "description": "fast-server base midway", "private": true, "type": "module", @@ -41,20 +41,20 @@ "lint1": "eslint --fix" }, "dependencies": { - "@certd/acme-client": "^1.42.1", - "@certd/basic": "^1.42.1", - "@certd/commercial-core": "^1.42.1", + "@certd/acme-client": "^1.42.2", + "@certd/basic": "^1.42.2", + "@certd/commercial-core": "^1.42.2", "@certd/cv4pve-api-javascript": "^8.4.2", - "@certd/jdcloud": "^1.42.1", - "@certd/lib-huawei": "^1.42.1", - "@certd/lib-k8s": "^1.42.1", - "@certd/lib-server": "^1.42.1", - "@certd/midway-flyway-js": "^1.42.1", - "@certd/pipeline": "^1.42.1", - "@certd/plugin-cert": "^1.42.1", - "@certd/plugin-lib": "^1.42.1", - "@certd/plugin-plus": "^1.42.1", - "@certd/plus-core": "^1.42.1", + "@certd/jdcloud": "^1.42.2", + "@certd/lib-huawei": "^1.42.2", + "@certd/lib-k8s": "^1.42.2", + "@certd/lib-server": "^1.42.2", + "@certd/midway-flyway-js": "^1.42.2", + "@certd/pipeline": "^1.42.2", + "@certd/plugin-cert": "^1.42.2", + "@certd/plugin-lib": "^1.42.2", + "@certd/plugin-plus": "^1.42.2", + "@certd/plus-core": "^1.42.2", "@koa/cors": "^5.0.0", "@midwayjs/bootstrap": "3.20.11", "@midwayjs/cache": "3.14.0", diff --git a/packages/ui/certd-server/src/plugins/plugin-aws-cn/libs/aws-iam-client.ts b/packages/ui/certd-server/src/plugins/plugin-aws-cn/libs/aws-iam-client.ts index 3fa14366f..d63fbd8f2 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aws-cn/libs/aws-iam-client.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aws-cn/libs/aws-iam-client.ts @@ -1,21 +1,107 @@ // 导入所需的 SDK 模块 import { AwsCNAccess } from "../access.js"; import { CertInfo } from "@certd/plugin-cert"; +import { ILogger } from "@certd/basic"; -type AwsIAMClientOptions = { access: AwsCNAccess; region: string }; +type AwsIAMClientOptions = { access: AwsCNAccess; region: string; logger?: ILogger }; + +// IAM ListServerCertificates 返回的证书元信息(仅保留本插件用到的字段) +export type ServerCertificateMetadata = { + ServerCertificateName?: string; + ServerCertificateId?: string; + Expiration?: Date | string; +}; + +/** + * 拆分完整 PEM,得到叶子证书和证书链。 + * 使用 lookbehind 分割,保留每段结尾的 -----END CERTIFICATE-----, + * 避免证书链丢失结尾标记而变成非法 PEM(AWS 会报 MalformedCertificate)。 + */ +export function splitCertAndChain(crt: string): { cert: string; chain: string } { + const pemBlocks = crt.split(/(?<=-----END CERTIFICATE-----)/); + const cert = pemBlocks[0].trim(); + const chain = pemBlocks.slice(1).join("").trim(); + return { cert, chain }; +} + +/** + * 从 IAM 证书元信息列表中,挑出"本次被替换掉"的旧证书名称。 + * distribution 已改用新证书,旧证书不再被其引用,因此无论是否过期都应清理, + * 否则提前续期/手动重部署产生的旧证书会在 IAM 中不断堆积。 + * 过滤规则: + * - ServerCertificateId 必须命中 targetCertIds(即本次部署前 CloudFront 引用的旧证书) + * - 不能等于 excludeCertId(本次新上传的证书,避免误删) + * 返回去重后的 ServerCertificateName 列表。 + */ +export function pickReplacedCertNames(params: { metadataList: ServerCertificateMetadata[]; targetCertIds: Set | string[]; excludeCertId?: string }): string[] { + const { metadataList, targetCertIds, excludeCertId } = params; + const targetIdSet = targetCertIds instanceof Set ? targetCertIds : new Set(targetCertIds); + + const names = new Set(); + for (const metadata of metadataList) { + const certId = metadata.ServerCertificateId; + const certName = metadata.ServerCertificateName; + if (!certId || !certName) { + continue; + } + if (!targetIdSet.has(certId)) { + continue; + } + if (excludeCertId && certId === excludeCertId) { + continue; + } + names.add(certName); + } + return [...names]; +} + +// CloudFront ViewerCertificate 字段(仅保留本插件用到的字段) +export type ViewerCertificate = { + CloudFrontDefaultCertificate?: boolean; + ACMCertificateArn?: string; + IAMCertificateId?: string; + Certificate?: string; + CertificateSource?: string; + SSLSupportMethod?: string; + MinimumProtocolVersion?: string; +}; + +/** + * 基于旧 ViewerCertificate 构造使用 IAM 证书的新配置。 + * - CloudFront 要求 ACMCertificateArn、IAMCertificateId、CloudFrontDefaultCertificate 三者只能存在其一, + * 因此这里只保留 IAM 证书,并显式将 CloudFrontDefaultCertificate 置为 false、不携带 ACMCertificateArn。 + * - Certificate/CertificateSource 为 AWS 已废弃字段,更新时不再携带,避免旧的 ACM 值残留导致校验冲突。 + * - SSLSupportMethod 强制为 sni-only:AWS 中国区 CloudFront 只支持 SNI,不支持 vip(专用IP), + * 若沿用旧的 vip 值会报 "The parameter ViewerCertificate with the specified SSL support method isn't available in this region"。 + * - MinimumProtocolVersion 沿用旧值,缺失时给出安全默认值。 + */ +export function buildIamViewerCertificate(params: { oldViewerCertificate?: ViewerCertificate; certId: string }): ViewerCertificate { + const { oldViewerCertificate, certId } = params; + const old = oldViewerCertificate || {}; + return { + CloudFrontDefaultCertificate: false, + IAMCertificateId: certId, + SSLSupportMethod: "sni-only", + MinimumProtocolVersion: old.MinimumProtocolVersion || "TLSv1.2_2021", + }; +} export class AwsIAMClient { options: AwsIAMClientOptions; access: AwsCNAccess; region: string; + logger?: ILogger; constructor(options: AwsIAMClientOptions) { this.options = options; this.access = options.access; this.region = options.region; + this.logger = options.logger; } - async importCertificate(certInfo: CertInfo, certName: string) { - // 创建 IAM 客户端 - const { IAMClient, UploadServerCertificateCommand } = await this.access.importRuntime("@aws-sdk/client-iam"); + + // 统一创建 IAM 客户端,供上传/查询/删除复用 + private async createIamClient() { + const iamModule = await this.access.importRuntime("@aws-sdk/client-iam"); + const { IAMClient } = iamModule; const iamClient = new IAMClient({ region: this.region, // 替换为您的 AWS 区域 credentials: { @@ -23,20 +109,99 @@ export class AwsIAMClient { secretAccessKey: this.access.secretAccessKey, }, }); + return { iamClient, iamModule }; + } - const cert = certInfo.crt.split("-----END CERTIFICATE-----")[0] + "-----END CERTIFICATE-----"; - const chain = certInfo.crt.split("-----END CERTIFICATE-----\n")[1]; + async importCertificate(certInfo: CertInfo, certName: string) { + const { iamClient, iamModule } = await this.createIamClient(); + const { UploadServerCertificateCommand } = iamModule; + + const { cert, chain } = splitCertAndChain(certInfo.crt); // 构建上传参数 const command = new UploadServerCertificateCommand({ Path: "/cloudfront/", ServerCertificateName: certName, CertificateBody: cert, PrivateKey: certInfo.key, - CertificateChain: chain, + CertificateChain: chain || undefined, }); - const data = await iamClient.send(command); - console.log("Upload successful:", data); - // 返回证书 ID - return data.ServerCertificateMetadata.ServerCertificateId; + + try { + const data = await iamClient.send(command); + // 返回证书 ID + return data.ServerCertificateMetadata.ServerCertificateId; + } catch (err) { + const message = err.message || String(err); + const requestId = err.$metadata?.requestId || err.requestId; + console.error(`IAM 调用失败: ${message}, requestId: ${requestId}`); + throw err; + } + } + + // 拉取 /cloudfront/ path 下的全部 server certificate 元信息(处理分页) + async listCloudFrontServerCertificates(): Promise { + const { iamClient, iamModule } = await this.createIamClient(); + const { ListServerCertificatesCommand } = iamModule; + + const metadataList: ServerCertificateMetadata[] = []; + let marker: string | undefined = undefined; + do { + const command = new ListServerCertificatesCommand({ + PathPrefix: "/cloudfront/", + Marker: marker, + }); + const data: any = await iamClient.send(command); + const pageList: ServerCertificateMetadata[] = data.ServerCertificateMetadataList || []; + metadataList.push(...pageList); + marker = data.IsTruncated ? data.Marker : undefined; + } while (marker); + + return metadataList; + } + + // 按名称删除 IAM server certificate + async deleteServerCertificate(serverCertificateName: string) { + const { iamClient, iamModule } = await this.createIamClient(); + const { DeleteServerCertificateCommand } = iamModule; + const command = new DeleteServerCertificateCommand({ + ServerCertificateName: serverCertificateName, + }); + await iamClient.send(command); + } + + /** + * 清理本次被替换掉的旧证书(无论是否过期)。 + * distribution 已改用新证书,旧证书不再被其引用,直接删除以避免 IAM 堆积。 + * 必须在更新完 CloudFront 引用之后调用,否则旧证书仍被引用会报 DeleteConflict。 + * 删除失败(如仍被其他分配引用)时只告警,不阻断部署流程。 + */ + async deleteReplacedCerts(params: { oldCertIds: Set | string[]; newCertId?: string }) { + const { oldCertIds, newCertId } = params; + const targetIdSet = oldCertIds instanceof Set ? oldCertIds : new Set(oldCertIds); + if (targetIdSet.size === 0) { + return; + } + + const metadataList = await this.listCloudFrontServerCertificates(); + const replacedCertNames = pickReplacedCertNames({ + metadataList, + targetCertIds: targetIdSet, + excludeCertId: newCertId, + }); + + if (replacedCertNames.length === 0) { + this.logger?.info("没有需要清理的旧证书"); + return; + } + + for (const certName of replacedCertNames) { + try { + await this.deleteServerCertificate(certName); + this.logger?.info(`已删除被替换的旧证书: ${certName}`); + } catch (err: any) { + const message = err?.message || String(err); + this.logger?.warn(`删除旧证书失败(可能仍被其他分配引用),已跳过: ${certName}, 原因: ${message}`); + } + } } } diff --git a/packages/ui/certd-server/src/plugins/plugin-aws-cn/plugins/plugin-deploy-to-cloudfront.ts b/packages/ui/certd-server/src/plugins/plugin-aws-cn/plugins/plugin-deploy-to-cloudfront.ts index ada64eac6..257b84df3 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aws-cn/plugins/plugin-deploy-to-cloudfront.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aws-cn/plugins/plugin-deploy-to-cloudfront.ts @@ -1,7 +1,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; import { AwsCNAccess } from "../access.js"; -import { AwsIAMClient } from "../libs/aws-iam-client.js"; +import { AwsIAMClient, buildIamViewerCertificate } from "../libs/aws-iam-client.js"; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; import { AwsCNRegions } from "../constants.js"; @@ -77,10 +77,19 @@ export class AwsCNDeployToCloudFront extends AbstractTaskPlugin { async execute(): Promise { const access = await this.getAccess(this.accessId); + const iamClient = new AwsIAMClient({ + access, + region: this.region, + logger: this.logger, + }); + + // 本次是否真正上传了新证书(cert 为字符串时表示直接使用已有证书ID,不涉及替换过期旧证书) + const uploadedNewCert = typeof this.cert !== "string"; + let certId = this.cert as string; - if (typeof this.cert !== "string") { + if (uploadedNewCert) { //先上传 - certId = await this.uploadToIAM(access, this.cert); + certId = await this.uploadToIAM(iamClient, this.cert as CertInfo); } //部署到CloudFront @@ -93,6 +102,9 @@ export class AwsCNDeployToCloudFront extends AbstractTaskPlugin { }, }); + // 记录每个分配部署前引用的旧 IAM 证书ID,部署完成后清理其中已过期的 + const oldCertIds = new Set(); + // update-distribution for (const distributionId of this.distributionIds) { // get-distribution-config @@ -100,30 +112,61 @@ export class AwsCNDeployToCloudFront extends AbstractTaskPlugin { Id: distributionId, }); - const configData = await cloudFrontClient.send(getDistributionConfigCommand); + const configData: any = await this.sendCloudFrontCommand(() => cloudFrontClient.send(getDistributionConfigCommand), `获取CloudFront配置(${distributionId})`); + + const oldViewerCertificate = configData.DistributionConfig?.ViewerCertificate; + const oldCertId = oldViewerCertificate?.IAMCertificateId; + if (oldCertId) { + oldCertIds.add(oldCertId); + } + + // 使用干净的 IAM ViewerCertificate,避免与旧的 ACM/默认证书字段冲突导致 InvalidViewerCertificate + const viewerCertificate = buildIamViewerCertificate({ oldViewerCertificate, certId }); + const updateDistributionCommand = new UpdateDistributionCommand({ DistributionConfig: { ...configData.DistributionConfig, - ViewerCertificate: { - ...configData.DistributionConfig.ViewerCertificate, - IAMCertificateId: certId, - }, + ViewerCertificate: viewerCertificate, }, Id: distributionId, IfMatch: configData.ETag, }); - await cloudFrontClient.send(updateDistributionCommand); + await this.sendCloudFrontCommand(() => cloudFrontClient.send(updateDistributionCommand), `更新CloudFront证书(${distributionId})`); this.logger.info(`部署${distributionId}完成:`); } this.logger.info("部署完成"); + + // 仅当本次上传了新证书时,清理被替换掉的旧证书(无论是否过期);清理失败不影响部署结果 + if (uploadedNewCert) { + try { + await iamClient.deleteReplacedCerts({ oldCertIds, newCertId: certId }); + } catch (err: any) { + this.logger.warn(`清理旧证书失败,已忽略: ${err?.message || err}`); + } + } } - private async uploadToIAM(access: AwsCNAccess, cert: CertInfo) { - const acmClient = new AwsIAMClient({ - access, - region: this.region, - }); - const awsCertID = await acmClient.importCertificate(cert, this.appendTimeSuffix(this.certName)); + /** + * 统一包装 CloudFront 调用错误。 + * 命中 AWS 权限不足(AccessDenied / not authorized)时,抛出可读的中文提示, + * 指明该 IAM 用户需要补充的 CloudFront 与 IAM 权限,方便运维在 AWS 控制台排查。 + */ + private async sendCloudFrontCommand(action: () => Promise, actionDesc: string): Promise { + try { + return await action(); + } catch (err: any) { + const message = err?.message || String(err); + const isAuthError = err?.name === "AccessDenied" || /not authorized to perform|no identity-based policy/i.test(message); + if (isAuthError) { + const requiredPermissions = ["cloudfront:ListDistributions", "cloudfront:GetDistributionConfig", "cloudfront:UpdateDistribution", "iam:UploadServerCertificate"].join("、"); + throw new Error(`${actionDesc}失败:AWS 账号权限不足,请为该 IAM 用户附加 CloudFront 部署所需权限(${requiredPermissions})。原始错误:${message}`); + } + throw err; + } + } + + private async uploadToIAM(iamClient: AwsIAMClient, cert: CertInfo) { + const awsCertID = await iamClient.importCertificate(cert, this.appendTimeSuffix(this.certName)); this.logger.info("证书上传成功,id=", awsCertID); return awsCertID; } diff --git a/trigger/build.trigger b/trigger/build.trigger index e0ad2f9ca..ad59d944f 100644 --- a/trigger/build.trigger +++ b/trigger/build.trigger @@ -1 +1 @@ -00:21 +20:04 diff --git a/trigger/release.trigger b/trigger/release.trigger index 299942935..db28cf1a6 100644 --- a/trigger/release.trigger +++ b/trigger/release.trigger @@ -1 +1 @@ -00:35 +21:20