From 7b55337c5edb470cca7aa62201eda8d274784004 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 29 Nov 2024 19:00:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E3=80=81=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/pipeline/src/core/executor.ts | 1 - .../src/plugin/cert-plugin/base.ts | 1 - packages/plugins/plugin-lib/.eslintrc | 23 + packages/plugins/plugin-lib/.gitignore | 26 + packages/plugins/plugin-lib/.mocharc.json | 5 + packages/plugins/plugin-lib/.npmignore | 2 + packages/plugins/plugin-lib/.npmrc | 2 + packages/plugins/plugin-lib/.prettierrc | 3 + packages/plugins/plugin-lib/CHANGELOG.md | 479 +++++++++++++ packages/plugins/plugin-lib/LICENSE | 661 ++++++++++++++++++ packages/plugins/plugin-lib/README.md | 16 + packages/plugins/plugin-lib/package.json | 48 ++ .../src/aliyun/access/aliyun-access.ts | 30 + .../plugin-lib/src/aliyun/access/index.ts | 1 + .../plugins/plugin-lib/src/aliyun/index.ts | 2 + .../plugin-lib/src/aliyun/lib/base-client.ts | 78 +++ .../plugin-lib/src/aliyun/lib/index.ts | 2 + .../plugin-lib/src/aliyun/lib/ssl-client.ts | 130 ++++ .../plugins/plugin-lib/src/common/index.ts | 76 ++ packages/plugins/plugin-lib/src/index.ts | 3 + packages/plugins/plugin-lib/src/ssh/index.ts | 2 + .../plugins/plugin-lib/src/ssh/ssh-access.ts | 105 +++ .../lib => plugins/plugin-lib/src/ssh}/ssh.ts | 119 ++-- packages/plugins/plugin-lib/tsconfig.json | 41 ++ .../src/views/framework/login/image-code.vue | 36 + .../src/views/framework/login/index.vue | 79 +-- .../src/views/framework/login/sms-code.vue | 71 ++ .../views/framework/register/email-code.vue | 67 ++ .../src/views/framework/register/index.vue | 162 +++-- packages/ui/certd-server/.env.production.yaml | 5 + packages/ui/certd-server/package.json | 4 +- .../certd-server/src/config/config.default.ts | 2 +- .../controller/login/register-controller.ts | 7 +- .../src/modules/basic/service/code-service.ts | 4 +- .../src/modules/basic/sms/aliyun-sms.ts | 2 +- .../sys/authority/service/user-service.ts | 40 +- packages/ui/certd-server/src/plugins/index.ts | 1 + .../dns-provider/aliyun-dns-provider.ts | 2 +- .../plugin/deploy-to-cdn/index.ts | 2 +- .../plugin/deploy-to-dcdn/index.ts | 2 +- .../plugin/deploy-to-oss/index.ts | 2 +- .../plugin/deploy-to-waf/index.ts | 10 +- .../plugin/upload-to-aliyun/index.ts | 4 +- .../plugin-demo/plugins/plugin-test.ts | 2 +- .../src/plugins/plugin-host/access/index.ts | 1 - .../plugins/plugin-host/access/ssh-access.ts | 105 --- .../src/plugins/plugin-host/index.ts | 2 - .../plugin/host-shell-execute/index.ts | 2 +- .../plugin/upload-to-host/index.ts | 3 +- .../plugins/deploy-to-cdn/index.ts | 2 +- .../plugin-other/plugins/plugin-db-backup.ts | 2 +- .../plugin/deploy-to-cdn/index.ts | 3 +- .../plugin-qnap/plugins/plugin-qnap.ts | 2 +- .../plugin/deploy-to-cdn-v2/index.ts | 3 +- .../plugin/deploy-to-cos/index.ts | 2 +- 55 files changed, 2150 insertions(+), 337 deletions(-) create mode 100644 packages/plugins/plugin-lib/.eslintrc create mode 100644 packages/plugins/plugin-lib/.gitignore create mode 100644 packages/plugins/plugin-lib/.mocharc.json create mode 100644 packages/plugins/plugin-lib/.npmignore create mode 100644 packages/plugins/plugin-lib/.npmrc create mode 100644 packages/plugins/plugin-lib/.prettierrc create mode 100644 packages/plugins/plugin-lib/CHANGELOG.md create mode 100644 packages/plugins/plugin-lib/LICENSE create mode 100644 packages/plugins/plugin-lib/README.md create mode 100644 packages/plugins/plugin-lib/package.json create mode 100644 packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts create mode 100644 packages/plugins/plugin-lib/src/aliyun/access/index.ts create mode 100644 packages/plugins/plugin-lib/src/aliyun/index.ts create mode 100644 packages/plugins/plugin-lib/src/aliyun/lib/base-client.ts create mode 100644 packages/plugins/plugin-lib/src/aliyun/lib/index.ts create mode 100644 packages/plugins/plugin-lib/src/aliyun/lib/ssl-client.ts create mode 100644 packages/plugins/plugin-lib/src/common/index.ts create mode 100644 packages/plugins/plugin-lib/src/index.ts create mode 100644 packages/plugins/plugin-lib/src/ssh/index.ts create mode 100644 packages/plugins/plugin-lib/src/ssh/ssh-access.ts rename packages/{ui/certd-server/src/plugins/plugin-host/lib => plugins/plugin-lib/src/ssh}/ssh.ts (74%) create mode 100644 packages/plugins/plugin-lib/tsconfig.json create mode 100644 packages/ui/certd-client/src/views/framework/login/image-code.vue create mode 100644 packages/ui/certd-client/src/views/framework/login/sms-code.vue create mode 100644 packages/ui/certd-client/src/views/framework/register/email-code.vue delete mode 100644 packages/ui/certd-server/src/plugins/plugin-host/access/index.ts delete mode 100644 packages/ui/certd-server/src/plugins/plugin-host/access/ssh-access.ts diff --git a/packages/core/pipeline/src/core/executor.ts b/packages/core/pipeline/src/core/executor.ts index 8114c4095..374db9351 100644 --- a/packages/core/pipeline/src/core/executor.ts +++ b/packages/core/pipeline/src/core/executor.ts @@ -391,7 +391,6 @@ export class Executor { if (notification.type === "email") { try { await this.options.emailService?.send({ - userId: this.pipeline.userId, subject, content, receivers: notification.options.receivers, diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts index 91d0027a3..d367c6608 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -335,7 +335,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { async sendSuccessEmail(body: NotificationBody) { this.logger.info("发送邮件通知:" + this.email); await this.ctx.emailService.send({ - userId: this.ctx.pipeline.userId, receivers: [this.email], subject: body.title, content: body.content, diff --git a/packages/plugins/plugin-lib/.eslintrc b/packages/plugins/plugin-lib/.eslintrc new file mode 100644 index 000000000..a591578c0 --- /dev/null +++ b/packages/plugins/plugin-lib/.eslintrc @@ -0,0 +1,23 @@ +{ + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "plugin:@typescript-eslint/recommended", + "plugin:prettier/recommended", + "prettier" + ], + "env": { + "mocha": true + }, + "rules": { + "@typescript-eslint/no-var-requires": "off", + "@typescript-eslint/ban-ts-comment": "off", + "@typescript-eslint/ban-ts-ignore": "off", + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/no-empty-function": "off", +// "no-unused-expressions": "off", + "max-len": [0, 160, 2, { "ignoreUrls": true }] + } +} diff --git a/packages/plugins/plugin-lib/.gitignore b/packages/plugins/plugin-lib/.gitignore new file mode 100644 index 000000000..0e8680524 --- /dev/null +++ b/packages/plugins/plugin-lib/.gitignore @@ -0,0 +1,26 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + +test/user.secret.* diff --git a/packages/plugins/plugin-lib/.mocharc.json b/packages/plugins/plugin-lib/.mocharc.json new file mode 100644 index 000000000..24b75f3e1 --- /dev/null +++ b/packages/plugins/plugin-lib/.mocharc.json @@ -0,0 +1,5 @@ +{ + "extension": ["ts"], + "spec": "test/**/*.test.ts", + "require": "ts-node/register" +} \ No newline at end of file diff --git a/packages/plugins/plugin-lib/.npmignore b/packages/plugins/plugin-lib/.npmignore new file mode 100644 index 000000000..bf40d278c --- /dev/null +++ b/packages/plugins/plugin-lib/.npmignore @@ -0,0 +1,2 @@ +node_modules +src \ No newline at end of file diff --git a/packages/plugins/plugin-lib/.npmrc b/packages/plugins/plugin-lib/.npmrc new file mode 100644 index 000000000..beae5694f --- /dev/null +++ b/packages/plugins/plugin-lib/.npmrc @@ -0,0 +1,2 @@ +link-workspace-packages=deep +prefer-workspace-packages=true diff --git a/packages/plugins/plugin-lib/.prettierrc b/packages/plugins/plugin-lib/.prettierrc new file mode 100644 index 000000000..1d96ee86b --- /dev/null +++ b/packages/plugins/plugin-lib/.prettierrc @@ -0,0 +1,3 @@ +{ + "printWidth": 160 +} \ No newline at end of file diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md new file mode 100644 index 000000000..55c9527ed --- /dev/null +++ b/packages/plugins/plugin-lib/CHANGELOG.md @@ -0,0 +1,479 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25) + +### Performance Improvements + +* 谷歌EAB绑定邮箱改成必填 ([81a8123](https://github.com/certd/certd/commit/81a8123725d7bf4bd6a32a64a066bd760b7b6a7f)) +* 优化插件开发,dnsProvider无需写http logger 变量 ([fcbb5e4](https://github.com/certd/certd/commit/fcbb5e46a112174150a62648319b8224fce3b7ed)) +* 支持企业微信群聊机器人通知 ([b805a29](https://github.com/certd/certd/commit/b805a2925984144a31575b8aaa622f0c30d41b56)) + +## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +### Bug Fixes + +* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1)) + +### Performance Improvements + +* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d)) +* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572)) +* 专业版试用,无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232)) + +## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) + +### Bug Fixes + +* 修复未设置pfx密码,导致jks转换报错的bug ([c3cfbd8](https://github.com/certd/certd/commit/c3cfbd8474155aed4379f91075de37d5d8c73ef0)) + +## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13) + +### Performance Improvements + +* 支持jks ([889eaae](https://github.com/certd/certd/commit/889eaaea92818f628b922dae540c026630611707)) + +## [1.27.2](https://github.com/certd/certd/compare/v1.27.1...v1.27.2) (2024-11-08) + +### Performance Improvements + +* 支持公共cname服务 ([3c919ee](https://github.com/certd/certd/commit/3c919ee5d1aef5d26cf3620a7c49d920786bc941)) + +## [1.27.1](https://github.com/certd/certd/compare/v1.27.0...v1.27.1) (2024-11-04) + +**Note:** Version bump only for package @certd/plugin-cert + +# [1.27.0](https://github.com/certd/certd/compare/v1.26.16...v1.27.0) (2024-10-31) + +### Bug Fixes + +* pfx兼容windows server 2016 ([e5e468a](https://github.com/certd/certd/commit/e5e468a463f66d02f235de54b7c1e09ace5f1cb1)) + +### Features + +* 首页全新改版 ([63ec5b5](https://github.com/certd/certd/commit/63ec5b5519c760a3330569c0da6dac157302a330)) + +### Performance Improvements + +* lego 升级到 4.19.2 ([129bf53](https://github.com/certd/certd/commit/129bf53edc9bbb001fe49fbd7e239bd1d09cc128)) + +## [1.26.16](https://github.com/certd/certd/compare/v1.26.15...v1.26.16) (2024-10-30) + +### Bug Fixes + +* 修复lego No help topic for 错误 ([aaaf8d7](https://github.com/certd/certd/commit/aaaf8d7db34896cf8f2ff8f12eec1ab0cae58f0f)) + +## [1.26.15](https://github.com/certd/certd/compare/v1.26.14...v1.26.15) (2024-10-28) + +### Performance Improvements + +* 默认证书更新时间设置为35天,增加腾讯云删除过期证书插件,可以避免腾讯云过期证书邮件 ([51b6fed](https://github.com/certd/certd/commit/51b6fed468eaa6f28ce4497ce303ace1a52abb96)) + +## [1.26.14](https://github.com/certd/certd/compare/v1.26.13...v1.26.14) (2024-10-26) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.26.13](https://github.com/certd/certd/compare/v1.26.12...v1.26.13) (2024-10-26) + +### Bug Fixes + +* deprecated的运行时不要报错,只报警告 ([bcbefaa](https://github.com/certd/certd/commit/bcbefaaa35cf6d0eec085b3a2c5bfc7c6a8de9e1)) + +## [1.26.12](https://github.com/certd/certd/compare/v1.26.11...v1.26.12) (2024-10-25) + +### Performance Improvements + +* 支持配置公共ZeroSSL授权 ([a90d1e6](https://github.com/certd/certd/commit/a90d1e68ee9cbc3705223457b8a86f071b150968)) + +## [1.26.11](https://github.com/certd/certd/compare/v1.26.10...v1.26.11) (2024-10-23) + +### Performance Improvements + +* 申请证书启用新的反代地址 ([a705182](https://github.com/certd/certd/commit/a705182b85e51157883e48f23463263793bf3c12)) +* 优化证书申请速度和成功率,反代地址优化,google基本可以稳定请求。增加请求重试。 ([41d9c3a](https://github.com/certd/certd/commit/41d9c3ac8398def541e65351cbe920d4a927182d)) +* 优化pfx密码密码输入框,让浏览器不自动填写密码 ([ffeede3](https://github.com/certd/certd/commit/ffeede38afa70c5ff6f2015516bead23d2c4df87)) + +## [1.26.10](https://github.com/certd/certd/compare/v1.26.9...v1.26.10) (2024-10-20) + +### Bug Fixes + +* 修复cname服务普通用户access访问权限问题 ([c1e3e2e](https://github.com/certd/certd/commit/c1e3e2ee1f923ee5806479dd5f178c3286a01ae0)) + +## [1.26.9](https://github.com/certd/certd/compare/v1.26.8...v1.26.9) (2024-10-19) + +### Performance Improvements + +* 触发证书重新申请input变化对比规则优化,减少升级版本后触发申请证书的情况 ([c46a2a9](https://github.com/certd/certd/commit/c46a2a9a399c2a9a8bb59a48b9fb6e93227cce9b)) + +## [1.26.8](https://github.com/certd/certd/compare/v1.26.7...v1.26.8) (2024-10-15) + +### Performance Improvements + +* 密钥备份 ([1c6028a](https://github.com/certd/certd/commit/1c6028abcf8849163462bb2f8441b6838357e09b)) +* 证书直接查看 ([5dde5bd](https://github.com/certd/certd/commit/5dde5bd3f76db3959d411619d29bfb8064e3b307)) +* sqlite数据库备份插件 ([77f1631](https://github.com/certd/certd/commit/77f163144f7dcfb0431475c55508fecfd6d969f8)) + +## [1.26.7](https://github.com/certd/certd/compare/v1.26.6...v1.26.7) (2024-10-14) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.26.6](https://github.com/certd/certd/compare/v1.26.5...v1.26.6) (2024-10-14) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.26.5](https://github.com/certd/certd/compare/v1.26.4...v1.26.5) (2024-10-14) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.26.4](https://github.com/certd/certd/compare/v1.26.3...v1.26.4) (2024-10-14) + +### Performance Improvements + +* [comm] 支持插件管理 ([e8b617b](https://github.com/certd/certd/commit/e8b617b80ce882dd63006f0cfc719a80a1cc6acc)) +* 新增代理设置功能 ([273ab61](https://github.com/certd/certd/commit/273ab6139f5807f4d7fe865cc353b97f51b9a668)) +* EAB授权支持绑定邮箱,支持公共EAB设置 ([07043af](https://github.com/certd/certd/commit/07043aff0ca7fd29c56dd3c363002cb15d78b464)) + +## [1.26.3](https://github.com/certd/certd/compare/v1.26.2...v1.26.3) (2024-10-12) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.26.2](https://github.com/certd/certd/compare/v1.26.1...v1.26.2) (2024-10-11) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.26.1](https://github.com/certd/certd/compare/v1.26.0...v1.26.1) (2024-10-10) + +**Note:** Version bump only for package @certd/plugin-cert + +# [1.26.0](https://github.com/certd/certd/compare/v1.25.9...v1.26.0) (2024-10-10) + +### Features + +* 域名验证方法支持CNAME间接方式,此方式支持所有域名注册商,且无需提供Access授权,但是需要手动添加cname解析 ([f3d3508](https://github.com/certd/certd/commit/f3d35084ed44f9f33845f7045e520be5c27eed93)) + +### Performance Improvements + +* 调整静态资源到static目录 ([0584b36](https://github.com/certd/certd/commit/0584b3672b40f9042a2ed87e5627022606d046cd)) +* 检查cname是否正确配置 ([b5d8935](https://github.com/certd/certd/commit/b5d8935159374fbe7fc7d4c48ae0ed9396861bdd)) +* 域名输入增加校验提示,避免输入错误的域名 ([0c8e83e](https://github.com/certd/certd/commit/0c8e83e1254a9ce4d5a4e7888eb1710394a4b77c)) +* cname校验配置增加未校验通过提示 ([77cc3c4](https://github.com/certd/certd/commit/77cc3c4a5cbd81f8233a8e0bb33fab0621c0905f)) +* google eab授权支持自动获取,不过要配置代理 ([592791d](https://github.com/certd/certd/commit/592791d1356fc252fbb70d7f168567aee9585507)) + +## [1.25.9](https://github.com/certd/certd/compare/v1.25.8...v1.25.9) (2024-10-01) + +### Bug Fixes + +* 修复西部数码账户级别apikey不可用的bug ([f8f3e8b](https://github.com/certd/certd/commit/f8f3e8b43fd5d815887bcb53b95f46dc96424b79)) + +## [1.25.8](https://github.com/certd/certd/compare/v1.25.7...v1.25.8) (2024-09-30) + +### Bug Fixes + +* 修复pfxPassword无效的bug ([251e450](https://github.com/certd/certd/commit/251e450fabfe62405bac13e39f2153736c081ef0)) + +## [1.25.7](https://github.com/certd/certd/compare/v1.25.6...v1.25.7) (2024-09-29) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.25.6](https://github.com/certd/certd/compare/v1.25.5...v1.25.6) (2024-09-29) + +### Performance Improvements + +* 部署支持1Panel ([d047234](https://github.com/certd/certd/commit/d047234d98d31504f2e5a472b66e1b75806af26e)) + +## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24) + +**Note:** Version bump only for package @certd/plugin-cert + +# [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24) + +### Features + +* 支持中间证书 ([e86756e](https://github.com/certd/certd/commit/e86756e4c65a53dd23106d7ecbfe2fa987cc13f3)) + +### Performance Improvements + +* 证书支持旧版RSA,pkcs1 ([3d9c3ec](https://github.com/certd/certd/commit/3d9c3ecb3eb604b2458154f608bde0f01915d116)) +* plugins增加图标 ([a8da658](https://github.com/certd/certd/commit/a8da658a9723342b4f43a579f7805bfef0648efb)) + +## [1.24.4](https://github.com/certd/certd/compare/v1.24.3...v1.24.4) (2024-09-09) + +### Performance Improvements + +* 支持群晖 ([5c270b6](https://github.com/certd/certd/commit/5c270b6b9d45a2152f9fdb3c07bd98b7c803cb8e)) + +## [1.24.3](https://github.com/certd/certd/compare/v1.24.2...v1.24.3) (2024-09-06) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06) + +### Performance Improvements + +* 任务配置不需要的字段可以自动隐藏 ([192d9dc](https://github.com/certd/certd/commit/192d9dc7e36737d684c769f255f407c28b1152ac)) +* 修复windows下无法执行第二条命令的bug ([d5bfcdb](https://github.com/certd/certd/commit/d5bfcdb6de1dcc1702155442e2e00237d0bbb6e5)) +* 优化跳过处理逻辑 ([b80210f](https://github.com/certd/certd/commit/b80210f24bf5db1c958d06ab27c9e5d3db452eda)) +* 支持pfx、der ([fbeaed2](https://github.com/certd/certd/commit/fbeaed203519f59b6d9396c4e8953353ccb5e723)) + +## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02) + +### Performance Improvements + +* 授权配置支持加密 ([42a56b5](https://github.com/certd/certd/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb)) + +# [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25) + +### Bug Fixes + +* 修复成功后跳过之后丢失腾讯云证书id的bug ([37eb762](https://github.com/certd/certd/commit/37eb762afe25c5896b75dee25f32809f8426e7b7)) +* 修复创建流水线后立即运行时报no id错误的bug ([17ead54](https://github.com/certd/certd/commit/17ead547aab25333603980304aa3aad3db1f73d5)) +* 修复使用代理的情况下申请证书失败的bug ([95122e2](https://github.com/certd/certd/commit/95122e28609333f4df55c266e5434897954c0fb3)) + +### Features + +* 支持ECC类型 ([a7424e0](https://github.com/certd/certd/commit/a7424e02f5c7e02ac1688791040785920ce67473)) + +### Performance Improvements + +* 更新k8s底层api库 ([746bb9d](https://github.com/certd/certd/commit/746bb9d385e2f397daef4976eca1d4782a2f5ebd)) +* 优化成功后跳过的提示 ([7b451bb](https://github.com/certd/certd/commit/7b451bbf6e6337507f4627b5a845f5bd96ab4f7b)) +* 优化证书申请成功率 ([968c469](https://github.com/certd/certd/commit/968c4690a07f69c08dcb3d3a494da4e319627345)) + +## [1.23.1](https://github.com/certd/certd/compare/v1.23.0...v1.23.1) (2024-08-06) + +### Performance Improvements + +* 优化插件字段的default value ([24c7be2](https://github.com/certd/certd/commit/24c7be2c9cb39c14f7a97b674127c88033280b02)) + +## [1.22.8](https://github.com/certd/certd/compare/v1.22.7...v1.22.8) (2024-08-05) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.22.7](https://github.com/certd/certd/compare/v1.22.6...v1.22.7) (2024-08-04) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.22.6](https://github.com/certd/certd/compare/v1.22.5...v1.22.6) (2024-08-03) + +### Performance Improvements + +* 流水线支持名称模糊查询 ([59897c4](https://github.com/certd/certd/commit/59897c4ceae992ebe2972ca9e8f9196616ffdfd7)) + +## [1.22.5](https://github.com/certd/certd/compare/v1.22.4...v1.22.5) (2024-07-26) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.22.4](https://github.com/certd/certd/compare/v1.22.3...v1.22.4) (2024-07-26) + +### Performance Improvements + +* 证书申请支持反向代理,letsencrypt无法访问时的备用方案 ([b7b5df0](https://github.com/certd/certd/commit/b7b5df0587e0f7ea288c1b2af6f87211f207395f)) + +## [1.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20) + +### Performance Improvements + +* 创建证书任务可以选择lege插件 ([affef13](https://github.com/certd/certd/commit/affef130378030c517250c58a4e787b0fc85d7d1)) + +# [1.22.0](https://github.com/certd/certd/compare/v1.21.2...v1.22.0) (2024-07-19) + +### Features + +* 升级midway,支持esm ([485e603](https://github.com/certd/certd/commit/485e603b5165c28bc08694997726eaf2a585ebe7)) +* 支持lego,海量DNS提供商 ([0bc6d0a](https://github.com/certd/certd/commit/0bc6d0a211920fb0084d705e1db67ee1e7262c44)) + +## [1.21.2](https://github.com/certd/certd/compare/v1.21.1...v1.21.2) (2024-07-08) + +### Performance Improvements + +* 申请证书时可以选择跳过本地dns校验 ([fe91d94](https://github.com/certd/certd/commit/fe91d94090d22ed0a3ea753ba74dfaa1bf057c17)) + +## [1.21.1](https://github.com/certd/certd/compare/v1.21.0...v1.21.1) (2024-07-08) + +### Performance Improvements + +* 说明优化,默认值优化 ([970c7fd](https://github.com/certd/certd/commit/970c7fd8a0f557770e973d8462ee5684ef742810)) + +# [1.21.0](https://github.com/certd/certd/compare/v1.20.17...v1.21.0) (2024-07-03) + +### Features + +* 支持zero ssl ([eade2c2](https://github.com/certd/certd/commit/eade2c2b681569f03e9cd466e7d5bcd6703ed492)) + +## [1.20.17](https://github.com/certd/certd/compare/v1.20.16...v1.20.17) (2024-07-03) + +### Performance Improvements + +* 优化cname verify ([eba333d](https://github.com/certd/certd/commit/eba333de7a5b5ef4b0b7eaa904f578720102fa61)) + +## [1.20.16](https://github.com/certd/certd/compare/v1.20.15...v1.20.16) (2024-07-01) + +### Bug Fixes + +* 修复配置了cdn cname后申请失败的bug ([4a5fa76](https://github.com/certd/certd/commit/4a5fa767edc347d03d29a467e86c9a4d70b0220c)) + +## [1.20.15](https://github.com/certd/certd/compare/v1.20.14...v1.20.15) (2024-06-28) + +### Performance Improvements + +* 腾讯云dns provider 支持腾讯云的accessId ([e0eb3a4](https://github.com/certd/certd/commit/e0eb3a441384d474fe2923c69b25318264bdc9df)) + +## [1.20.14](https://github.com/certd/certd/compare/v1.20.13...v1.20.14) (2024-06-23) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.20.13](https://github.com/certd/certd/compare/v1.20.12...v1.20.13) (2024-06-18) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.20.12](https://github.com/certd/certd/compare/v1.20.10...v1.20.12) (2024-06-17) + +### Bug Fixes + +* 修复aliyun域名超过100个找不到域名的bug ([5b1494b](https://github.com/certd/certd/commit/5b1494b3ce93d1026dc56ee741342fbb8bf7be24)) + +### Performance Improvements + +* 支持cloudflare域名 ([fbb9a47](https://github.com/certd/certd/commit/fbb9a47e8f7bb805289b9ee64bd46ffee0f01c06)) + +## [1.20.10](https://github.com/certd/certd/compare/v1.20.9...v1.20.10) (2024-05-30) + +### Performance Improvements + +* 上传到主机插件支持复制到本机路径 ([92446c3](https://github.com/certd/certd/commit/92446c339936f98f08f654b8971a7393d8435224)) +* 优化文件下载包名 ([d9eb927](https://github.com/certd/certd/commit/d9eb927b0a1445feab08b1958aa9ea80637a5ae6)) + +## [1.20.9](https://github.com/certd/certd/compare/v1.20.8...v1.20.9) (2024-03-22) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.20.8](https://github.com/certd/certd/compare/v1.20.7...v1.20.8) (2024-03-22) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.20.7](https://github.com/certd/certd/compare/v1.20.6...v1.20.7) (2024-03-22) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.20.6](https://github.com/certd/certd/compare/v1.20.5...v1.20.6) (2024-03-21) + +### Performance Improvements + +* 插件贡献文档及示例 ([72fb20a](https://github.com/certd/certd/commit/72fb20abf3ba5bdd862575d2907703a52fd7eb17)) + +## [1.20.5](https://github.com/certd/certd/compare/v1.20.2...v1.20.5) (2024-03-11) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/plugin-cert + +**Note:** Version bump only for package @certd/plugin-cert + +# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03) + +### Performance Improvements + +* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f)) + +## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28) + +**Note:** Version bump only for package @certd/plugin-cert + +# [1.1.0](https://github.com/certd/certd/compare/v1.0.6...v1.1.0) (2023-06-28) + +### Bug Fixes + +* 修复access选择类型trigger ([2851a33](https://github.com/certd/certd/commit/2851a33eb2510f038fadb55da29512597a4ba512)) + +### Features + +* save files ([99522fb](https://github.com/certd/certd/commit/99522fb49adb42c1dfdf7bec3dd52d641158285b)) +* save files ([671d273](https://github.com/certd/certd/commit/671d273e2f9136d16896536b0ca127cf372f1619)) + +## [1.0.6](https://github.com/certd/certd/compare/v1.0.5...v1.0.6) (2023-05-25) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.0.5](https://github.com/certd/certd/compare/v1.0.4...v1.0.5) (2023-05-25) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.0.4](https://github.com/certd/certd/compare/v1.0.3...v1.0.4) (2023-05-25) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.0.3](https://github.com/certd/certd/compare/v1.0.2...v1.0.3) (2023-05-25) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.0.2](https://github.com/certd/certd/compare/v1.0.1...v1.0.2) (2023-05-24) + +**Note:** Version bump only for package @certd/plugin-cert + +## [1.0.1](https://github.com/certd/certd/compare/v1.0.0...v1.0.1) (2023-05-24) + +**Note:** Version bump only for package @certd/plugin-cert diff --git a/packages/plugins/plugin-lib/LICENSE b/packages/plugins/plugin-lib/LICENSE new file mode 100644 index 000000000..0ad25db4b --- /dev/null +++ b/packages/plugins/plugin-lib/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/packages/plugins/plugin-lib/README.md b/packages/plugins/plugin-lib/README.md new file mode 100644 index 000000000..30b15e215 --- /dev/null +++ b/packages/plugins/plugin-lib/README.md @@ -0,0 +1,16 @@ +# Vue 3 + TypeScript + Vite + +This template should help get you started developing with Vue 3 and TypeScript in Vite. The template uses Vue 3 ` diff --git a/packages/ui/certd-client/src/views/framework/login/index.vue b/packages/ui/certd-client/src/views/framework/login/index.vue index 794f6556f..ad53187e4 100644 --- a/packages/ui/certd-client/src/views/framework/login/index.vue +++ b/packages/ui/certd-client/src/views/framework/login/index.vue @@ -40,31 +40,17 @@ -
- - - -
- -
-
+
-
- - - -
- - {{ smsTime <= 0 ? "发送" : smsTime + " s" }} - -
-
+
@@ -80,15 +66,16 @@ diff --git a/packages/ui/certd-client/src/views/framework/register/email-code.vue b/packages/ui/certd-client/src/views/framework/register/email-code.vue new file mode 100644 index 000000000..8636d594d --- /dev/null +++ b/packages/ui/certd-client/src/views/framework/register/email-code.vue @@ -0,0 +1,67 @@ + + diff --git a/packages/ui/certd-client/src/views/framework/register/index.vue b/packages/ui/certd-client/src/views/framework/register/index.vue index babdd286a..6c1161aeb 100644 --- a/packages/ui/certd-client/src/views/framework/register/index.vue +++ b/packages/ui/certd-client/src/views/framework/register/index.vue @@ -7,20 +7,37 @@ :model="formState" :rules="rules" v-bind="layout" - :label-col="{ span: 5 }" + :label-col="{ span: 6 }" @finish="handleFinish" @finish-failed="handleFinishFailed" > - + @@ -28,60 +45,36 @@ - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - {{ smsTime <= 0 ? "发送" : smsTime + " s" }} - - - + + + + + + - - - - - - - - - - @@ -96,10 +89,13 @@ import { defineComponent, reactive, ref, toRaw } from "vue"; import { useUserStore } from "/src/store/modules/user"; import { utils } from "@fast-crud/fast-crud"; +import ImageCode from "/@/views/framework/login/image-code.vue"; +import EmailCode from "./email-code.vue"; export default defineComponent({ name: "RegisterPage", + components: { EmailCode, ImageCode }, setup() { - const registerType = ref("email"); + const registerType = ref("username"); const userStore = useUserStore(); const formRef = ref(); const formState: any = reactive({ @@ -108,7 +104,8 @@ export default defineComponent({ email: "", username: "", password: "", - confirmPassword: "" + confirmPassword: "", + randomStr: "" }); const rules = { @@ -124,6 +121,10 @@ export default defineComponent({ required: true, trigger: "change", message: "请输入邮箱" + }, + { + type: "email", + message: "请输入正确的邮箱" } ], password: [ @@ -138,6 +139,33 @@ export default defineComponent({ required: true, trigger: "change", message: "请确认密码" + }, + { + validator: async (rule: any, value: any) => { + if (value !== formState.password) { + throw new Error("两次输入密码不一致"); + } + return true; + } + } + ], + + imgCode: [ + { + required: true, + message: "请输入图片验证码" + } + ], + smsCode: [ + { + required: true, + message: "请输入短信验证码" + } + ], + validateCode: [ + { + required: true, + message: "请输入邮件验证码" } ] }; @@ -153,8 +181,13 @@ export default defineComponent({ const handleFinish = async (values: any) => { await userStore.register( toRaw({ + type: registerType.value, password: formState.password, - username: formState.username + username: formState.username, + imgCode: formState.imgCode, + randomStr: formState.randomStr, + email: formState.email, + validateCode: formState.validateCode }) as any ); }; @@ -197,6 +230,28 @@ export default defineComponent({ font-size: 14px; } + .ant-input-affix-wrapper { + line-height: 1.8 !important; + font-size: 14px !important; + > * { + line-height: 1.8 !important; + font-size: 14px !important; + } + } + + .getCaptcha { + display: block; + width: 100%; + } + + .image-code { + height: 34px; + } + .input-right { + width: 160px; + margin-left: 10px; + } + .login-title { // color: @primary-color; font-size: 18px; @@ -204,11 +259,6 @@ export default defineComponent({ margin: 30px; margin-top: 50px; } - .getCaptcha { - display: block; - width: 100%; - height: 40px; - } .forge-password { font-size: 14px; diff --git a/packages/ui/certd-server/.env.production.yaml b/packages/ui/certd-server/.env.production.yaml index 3a26ea4b9..05522de6b 100644 --- a/packages/ui/certd-server/.env.production.yaml +++ b/packages/ui/certd-server/.env.production.yaml @@ -1,3 +1,8 @@ +koa: + port: 7001 +https: + port: 7002 + preview: enabled: false diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index e0bd1779b..c7705e4e1 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -28,12 +28,13 @@ "tsc": "tsc --skipLibCheck" }, "dependencies": { + "@certd/plugin-lib": "^1.27.9", "@alicloud/pop-core": "^1.7.10", "@certd/acme-client": "^1.27.9", "@certd/basic": "^1.27.9", "@certd/commercial-core": "^1.27.9", - "@certd/lib-huawei": "^1.27.9", "@certd/lib-k8s": "^1.27.9", + "@certd/lib-huawei": "^1.27.9", "@certd/lib-server": "^1.27.9", "@certd/midway-flyway-js": "^1.27.9", "@certd/pipeline": "^1.27.9", @@ -90,7 +91,6 @@ "rimraf": "^5.0.5", "socks": "^2.8.3", "socks-proxy-agent": "^8.0.4", - "ssh2": "^1.15.0", "strip-ansi": "^7.1.0", "svg-captcha": "^1.4.0", "tencentcloud-sdk-nodejs": "^4.0.44", diff --git a/packages/ui/certd-server/src/config/config.default.ts b/packages/ui/certd-server/src/config/config.default.ts index c5fa3ff7a..c1cb967a1 100644 --- a/packages/ui/certd-server/src/config/config.default.ts +++ b/packages/ui/certd-server/src/config/config.default.ts @@ -71,7 +71,7 @@ const development = { type: 'better-sqlite3', database: './data/db.sqlite', synchronize: false, // 如果第一次使用,不存在表,有同步的需求可以写 true - logging: false, + logging: true, // 配置实体模型 或者 entities: '/entity', entities: ['**/modules/**/entity/*.js', ...libServerEntities, ...commercialEntities, PipelineEntity, FlywayHistory, UserEntity], diff --git a/packages/ui/certd-server/src/controller/login/register-controller.ts b/packages/ui/certd-server/src/controller/login/register-controller.ts index f5ad112b0..3f04506b7 100644 --- a/packages/ui/certd-server/src/controller/login/register-controller.ts +++ b/packages/ui/certd-server/src/controller/login/register-controller.ts @@ -12,7 +12,7 @@ export type RegisterReq = { phoneCode?: string; validateCode: string; - imageCode: string; + imgCode: string; randomStr: string; }; @@ -40,16 +40,17 @@ export class RegisterController extends BaseController { } if (body.type === 'username') { - if (sysPublicSettings.usernameRegisterEnabled) { + if (sysPublicSettings.usernameRegisterEnabled === false) { throw new Error('当前站点已禁止用户名注册功能'); } + await this.codeService.checkCaptcha(body.randomStr, body.imgCode); const newUser = await this.userService.register(body.type, { username: body.username, password: body.password, } as any); return this.ok(newUser); } else if (body.type === 'mobile') { - if (sysPublicSettings.mobileRegisterEnabled) { + if (sysPublicSettings.mobileRegisterEnabled === false) { throw new Error('当前站点已禁止手机号注册功能'); } //验证短信验证码 diff --git a/packages/ui/certd-server/src/modules/basic/service/code-service.ts b/packages/ui/certd-server/src/modules/basic/service/code-service.ts index e0bf27a85..4c7500ba8 100644 --- a/packages/ui/certd-server/src/modules/basic/service/code-service.ts +++ b/packages/ui/certd-server/src/modules/basic/service/code-service.ts @@ -88,7 +88,7 @@ export class CodeService { /** */ async sendEmailCode(email: string, randomStr: string) { - console.assert(!email, '手机号不能为空'); + console.assert(!email, 'Email不能为空'); console.assert(!randomStr, 'randomStr不能为空'); const code = randomNumber(4); @@ -98,7 +98,7 @@ export class CodeService { receivers: [email], }); - const key = this.buildEmailCodeKey(email, code); + const key = this.buildEmailCodeKey(email, randomStr); cache.set(key, code, { ttl: 5 * 60 * 1000, //5分钟 }); diff --git a/packages/ui/certd-server/src/modules/basic/sms/aliyun-sms.ts b/packages/ui/certd-server/src/modules/basic/sms/aliyun-sms.ts index 22cb5bda6..8588f985f 100644 --- a/packages/ui/certd-server/src/modules/basic/sms/aliyun-sms.ts +++ b/packages/ui/certd-server/src/modules/basic/sms/aliyun-sms.ts @@ -1,6 +1,6 @@ -import { AliyunAccess, AliyunClient } from '@certd/plugin-plus'; import { logger } from '@certd/basic'; import { ISmsService, PluginInputs, SmsPluginCtx } from './api.js'; +import { AliyunAccess, AliyunClient } from '@certd/plugin-lib'; export type AliyunSmsConfig = { accessId: string; regionId: string; diff --git a/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts b/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts index dc1b512fe..212ae86cc 100644 --- a/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts +++ b/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts @@ -154,30 +154,30 @@ export class UserService extends BaseService { } async register(type: string, user: UserEntity) { - if (type !== 'username') { + if (!user.password) { + user.password = simpleNanoId(); + } + if (!user.username) { user.username = 'user_' + simpleNanoId(); - if (!user.password) { - user.password = simpleNanoId(); + } + + if (type === 'username') { + const username = user.username; + const old = await this.findOne([{ username: username }, { mobile: username }, { email: username }]); + if (old != null) { + throw new CommonException('用户名已被注册'); } - } - if (type === 'mobile') { - user.nickName = user.mobile.substring(0, 3) + '****' + user.mobile.substring(7); - } + } else if (type === 'mobile') { + const mobile = user.mobile; - const old = await this.findOne({ username: user.username }); - if (old != null) { - throw new CommonException('用户名已被注册'); - } - - if (user.mobile) { - const old = await this.findOne({ mobile: user.mobile }); + user.nickName = mobile.substring(0, 3) + '****' + mobile.substring(7); + const old = await this.findOne([{ username: mobile }, { mobile: mobile }, { email: mobile }]); if (old != null) { throw new CommonException('手机号已被注册'); } - } - - if (user.email) { - const old = await this.findOne({ email: user.email }); + } else if (type === 'email') { + const email = user.email; + const old = await this.findOne([{ username: email }, { mobile: email }, { email: email }]); if (old != null) { throw new CommonException('邮箱已被注册'); } @@ -186,10 +186,10 @@ export class UserService extends BaseService { let newUser: UserEntity = UserEntity.of({ username: user.username, password: user.password, - nickName: user.nickName || user.username, - avatar: user.avatar || '', email: user.email || '', mobile: user.mobile || '', + nickName: user.nickName || user.username, + avatar: user.avatar || '', phoneCode: user.phoneCode || '86', status: 1, passwordVersion: 2, diff --git a/packages/ui/certd-server/src/plugins/index.ts b/packages/ui/certd-server/src/plugins/index.ts index b8da818ab..a2eda0cd4 100644 --- a/packages/ui/certd-server/src/plugins/index.ts +++ b/packages/ui/certd-server/src/plugins/index.ts @@ -12,3 +12,4 @@ export * from './plugin-qiniu/index.js'; export * from './plugin-woai/index.js'; export * from './plugin-cachefly/index.js'; export * from './plugin-gcore/index.js'; +export * from './plugin-qnap/index.js'; diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts index e45450489..5dfb2acdc 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts @@ -1,7 +1,7 @@ import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert'; import { Autowire } from '@certd/pipeline'; -import { AliyunAccess, AliyunClient } from '@certd/plugin-plus'; +import { AliyunAccess, AliyunClient } from '@certd/plugin-lib'; @IsDnsProvider({ name: 'aliyun', diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts index 8ea4f304d..8ba4fd384 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts @@ -1,5 +1,5 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { AliyunAccess, AliyunClient, AliyunSslClient, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-plus'; +import { AliyunAccess, AliyunClient, AliyunSslClient, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; import { optionsUtils } from '@certd/basic/dist/utils/util.options.js'; @IsTaskPlugin({ diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts index 89035aeb8..6b6eddec0 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts @@ -1,6 +1,6 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; import dayjs from 'dayjs'; -import { AliyunAccess, AliyunClient, createCertDomainGetterInputDefine } from '@certd/plugin-plus'; +import { AliyunAccess, AliyunClient, createCertDomainGetterInputDefine } from '@certd/plugin-lib'; import { CertInfo } from '@certd/plugin-cert'; @IsTaskPlugin({ diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts index 1b6ff5f11..9d6bb579d 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts @@ -1,5 +1,5 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { AliyunAccess } from '@certd/plugin-plus'; +import { AliyunAccess } from '@certd/plugin-lib'; import { CertInfo } from '@certd/plugin-cert'; @IsTaskPlugin({ name: 'DeployCertToAliyunOSS', diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts index 1f20d22c1..3d440735f 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts @@ -1,13 +1,7 @@ import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; import { CertInfo } from '@certd/plugin-cert'; -import { - AbstractPlusTaskPlugin, - AliyunAccess, - AliyunClient, - AliyunSslClient, - createCertDomainGetterInputDefine, - createRemoteSelectInputDefine, -} from '@certd/plugin-plus'; +import { AliyunAccess, AliyunClient, AliyunSslClient, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; +import { AbstractPlusTaskPlugin } from '@certd/plugin-plus'; @IsTaskPlugin({ name: 'AliyunDeployCertToWaf', diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts index 014df40bf..fdca21ae0 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts @@ -1,6 +1,6 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline'; -import { AliyunAccess } from '@certd/plugin-plus'; -import { AliyunSslClient } from '@certd/plugin-plus'; +import { AliyunAccess } from '@certd/plugin-lib'; +import { AliyunSslClient } from '@certd/plugin-lib'; /** * 华东1(杭州) cn-hangzhou cas.aliyuncs.com cas-vpc.cn-hangzhou.aliyuncs.com diff --git a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts index 2df790843..5af60c644 100644 --- a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts +++ b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts @@ -1,6 +1,6 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; import { CertInfo, CertReader } from '@certd/plugin-cert'; -import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-plus'; +import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; import { optionsUtils } from '@certd/basic/dist/utils/util.options.js'; @IsTaskPlugin({ diff --git a/packages/ui/certd-server/src/plugins/plugin-host/access/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/access/index.ts deleted file mode 100644 index a9a902538..000000000 --- a/packages/ui/certd-server/src/plugins/plugin-host/access/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './ssh-access.js'; diff --git a/packages/ui/certd-server/src/plugins/plugin-host/access/ssh-access.ts b/packages/ui/certd-server/src/plugins/plugin-host/access/ssh-access.ts deleted file mode 100644 index f5cc66eb6..000000000 --- a/packages/ui/certd-server/src/plugins/plugin-host/access/ssh-access.ts +++ /dev/null @@ -1,105 +0,0 @@ -import { AccessInput, BaseAccess, IsAccess } from '@certd/pipeline'; -import { ConnectConfig } from 'ssh2'; - -@IsAccess({ - name: 'ssh', - title: '主机登录授权', - desc: '', - input: {}, -}) -export class SshAccess extends BaseAccess implements ConnectConfig { - @AccessInput({ - title: '主机地址', - component: { - placeholder: '主机域名或IP地址', - }, - required: true, - }) - host!: string; - @AccessInput({ - title: '端口', - value: 22, - component: { - name: 'a-input-number', - placeholder: '22', - }, - rules: [{ required: true, message: '此项必填' }], - }) - port!: number; - @AccessInput({ - title: '用户名', - value: 'root', - rules: [{ required: true, message: '此项必填' }], - }) - username!: string; - @AccessInput({ - title: '密码', - component: { - name: 'a-input-password', - vModel: 'value', - }, - encrypt: true, - helper: '登录密码或密钥必填一项', - }) - password!: string; - @AccessInput({ - title: '私钥登录', - helper: '私钥或密码必填一项', - component: { - name: 'a-textarea', - vModel: 'value', - }, - encrypt: true, - }) - privateKey!: string; - - @AccessInput({ - title: '私钥密码', - helper: '如果你的私钥有密码的话', - component: { - name: 'a-input-password', - vModel: 'value', - }, - encrypt: true, - }) - passphrase!: string; - - @AccessInput({ - title: 'socks代理', - helper: 'socks代理配置,格式:socks5://user:password@host:port', - component: { - name: 'a-input', - vModel: 'value', - placeholder: 'socks5://user:password@host:port', - }, - encrypt: false, - }) - socksProxy!: string; - - @AccessInput({ - title: '是否Windows', - helper: '如果是Windows主机,请勾选此项\n并且需要windows[安装OpenSSH](https://certd.docmirror.cn/guide/use/host/windows.html)', - component: { - name: 'a-switch', - vModel: 'checked', - }, - }) - windows = false; - - @AccessInput({ - title: '命令编码', - helper: '如果是Windows主机,且出现乱码了,请尝试设置为GBK', - component: { - name: 'a-select', - vModel: 'value', - options: [ - { value: '', label: '默认' }, - { value: 'GBK', label: 'GBK' }, - { value: 'UTF8', label: 'UTF-8' }, - ], - }, - }) - encoding: string; -} - -new SshAccess(); diff --git a/packages/ui/certd-server/src/plugins/plugin-host/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/index.ts index 72f3920ee..640fdbe36 100644 --- a/packages/ui/certd-server/src/plugins/plugin-host/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-host/index.ts @@ -1,3 +1 @@ -export * from './access/index.js'; -export * from './lib/ssh.js'; export * from './plugin/index.js'; diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts index f671577d3..98bbb1e10 100644 --- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts @@ -1,5 +1,5 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { SshClient } from '../../lib/ssh.js'; +import { SshClient } from '@certd/plugin-lib'; @IsTaskPlugin({ name: 'hostShellExecute', diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts index 6937206a3..933ead20f 100644 --- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts @@ -1,9 +1,8 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline'; -import { SshClient } from '../../lib/ssh.js'; import { CertInfo, CertReader, CertReaderHandleContext } from '@certd/plugin-cert'; import * as fs from 'fs'; -import { SshAccess } from '../../access/index.js'; import dayjs from 'dayjs'; +import { SshAccess, SshClient } from '@certd/plugin-lib'; @IsTaskPlugin({ name: 'uploadCertToHost', diff --git a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-cdn/index.ts index 132ef9f32..16e098576 100644 --- a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-cdn/index.ts @@ -1,7 +1,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; import { HuaweiAccess } from '../../access/index.js'; import { CertInfo } from '@certd/plugin-cert'; -import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-plus'; +import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; import { resetLogConfigure } from '@certd/basic'; @IsTaskPlugin({ diff --git a/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-db-backup.ts b/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-db-backup.ts index ac40be3b0..c231372b5 100644 --- a/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-db-backup.ts +++ b/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-db-backup.ts @@ -2,10 +2,10 @@ import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipel import fs from 'fs'; import path from 'path'; import dayjs from 'dayjs'; -import { SshAccess, SshClient } from '../../plugin-host/index.js'; import { AbstractPlusTaskPlugin } from '@certd/plugin-plus'; import JSZip from 'jszip'; import * as os from 'node:os'; +import { SshAccess, SshClient } from '@certd/plugin-lib'; const defaultBackupDir = 'certd_backup'; const defaultFilePrefix = 'db-backup'; diff --git a/packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts index 4234457c6..de62a8cf1 100644 --- a/packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts @@ -1,7 +1,8 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine, QiniuAccess, QiniuClient } from '@certd/plugin-plus'; +import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; import { CertInfo } from '@certd/plugin-cert'; import { optionsUtils } from '@certd/basic/dist/utils/util.options.js'; +import { QiniuAccess, QiniuClient } from '@certd/plugin-plus'; @IsTaskPlugin({ name: 'QiniuDeployCertToCDN', diff --git a/packages/ui/certd-server/src/plugins/plugin-qnap/plugins/plugin-qnap.ts b/packages/ui/certd-server/src/plugins/plugin-qnap/plugins/plugin-qnap.ts index a4a2cea63..c42aa8ec6 100644 --- a/packages/ui/certd-server/src/plugins/plugin-qnap/plugins/plugin-qnap.ts +++ b/packages/ui/certd-server/src/plugins/plugin-qnap/plugins/plugin-qnap.ts @@ -1,9 +1,9 @@ import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; import { CertInfo } from '@certd/plugin-cert'; import { AbstractPlusTaskPlugin } from '@certd/plugin-plus'; -import { SshAccess, SshClient } from '../../plugin-host/index.js'; import { tmpdir } from 'node:os'; import fs from 'fs'; +import { SshAccess, SshClient } from '@certd/plugin-lib'; @IsTaskPlugin({ name: 'QnapDeploy', diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn-v2/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn-v2/index.ts index b48b690d8..19532976f 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn-v2/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn-v2/index.ts @@ -1,7 +1,8 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { createRemoteSelectInputDefine, TencentAccess } from '@certd/plugin-plus'; +import { TencentAccess } from '@certd/plugin-plus'; import { CertInfo } from '@certd/plugin-cert'; import { TencentSslClient } from '../../lib/index.js'; +import { createRemoteSelectInputDefine } from '@certd/plugin-lib'; @IsTaskPlugin({ name: 'TencentDeployCertToCDNv2', diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cos/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cos/index.ts index 7db87ba2e..3a4dd230e 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cos/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cos/index.ts @@ -1,6 +1,6 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; import { CertInfo } from '@certd/plugin-cert'; -import { createRemoteSelectInputDefine } from '@certd/plugin-plus'; +import { createRemoteSelectInputDefine } from '@certd/plugin-lib'; import { TencentSslClient } from '../../lib/index.js'; @IsTaskPlugin({