v1.24.3

.github/workflows/build-image.yml

@@ -67,7 +67,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           push: true
           context: ./packages/ui/
           tags: |

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.24.3](https://github.com/certd/certd/compare/v1.24.2...v1.24.3) (2024-09-06)
+
+### Performance Improvements
+
+* 支持多吉云cdn证书部署 ([65ef685](https://github.com/certd/certd/commit/65ef6857296784ca765926e09eafcb6fc8b6ecde))
+
 ## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
 
 ### Bug Fixes

build.trigger

@@ -1 +1 @@
-23:58
+22:35

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.24.2"
+  "version": "1.24.3"
 }

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.24.3](https://github.com/publishlab/node-acme-client/compare/v1.24.2...v1.24.3) (2024-09-06)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.24.2](https://github.com/publishlab/node-acme-client/compare/v1.24.1...v1.24.2) (2024-09-06)
 
 ### Performance Improvements

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.24.2",
+    "version": "1.24.3",
     "main": "src/index.js",
     "types": "types/index.d.ts",
     "license": "MIT",
@@ -59,5 +59,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
+    "gitHead": "c49ccbde93dbad7062ac39d4f18eca7d561f573f"
 }

packages/core/pipeline/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.24.3](https://github.com/certd/certd/compare/v1.24.2...v1.24.3) (2024-09-06)
+
+### Performance Improvements
+
+* 支持多吉云cdn证书部署 ([65ef685](https://github.com/certd/certd/commit/65ef6857296784ca765926e09eafcb6fc8b6ecde))
+
 ## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
 
 ### Performance Improvements

packages/core/pipeline/build.md

@@ -1 +1 @@
-22:33
+23:19

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.24.2",
+  "version": "1.24.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -57,5 +57,5 @@
     "vite": "^4.3.8",
     "vue-tsc": "^1.6.5"
   },
-  "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
+  "gitHead": "c49ccbde93dbad7062ac39d4f18eca7d561f573f"
 }

packages/core/pipeline/src/plugin/group.ts

@@ -21,5 +21,6 @@ export const pluginGroups = {
   huawei: new PluginGroup("huawei", "华为云", 3),
   tencent: new PluginGroup("tencent", "腾讯云", 4),
   host: new PluginGroup("host", "主机", 5),
+  cdn: new PluginGroup("cdn", "CDN", 6),
   other: new PluginGroup("other", "其他", 7),
 };

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.24.3](https://github.com/certd/certd/compare/v1.24.2...v1.24.3) (2024-09-06)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
 
 **Note:** Version bump only for package @certd/lib-huawei

packages/libs/lib-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.24.2",
+  "version": "1.24.3",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -16,5 +16,5 @@
     "axios": "^1.7.2",
     "rollup": "^3.7.4"
   },
-  "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
+  "gitHead": "c49ccbde93dbad7062ac39d4f18eca7d561f573f"
 }

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.24.3](https://github.com/certd/certd/compare/v1.24.2...v1.24.3) (2024-09-06)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
 
 **Note:** Version bump only for package @certd/lib-k8s

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.24.2",
+  "version": "1.24.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,7 +16,7 @@
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.24.2",
+    "@certd/pipeline": "^1.24.3",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -37,5 +37,5 @@
     "tslib": "^2.5.2",
     "typescript": "^4.8.4"
   },
-  "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
+  "gitHead": "c49ccbde93dbad7062ac39d4f18eca7d561f573f"
 }

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.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

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.24.2",
+  "version": "1.24.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,8 +13,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.24.2",
-    "@certd/pipeline": "^1.24.2",
+    "@certd/acme-client": "^1.24.3",
+    "@certd/pipeline": "^1.24.3",
     "jszip": "^3.10.1",
     "node-forge": "^0.10.0",
     "psl": "^1.9.0"
@@ -53,5 +53,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
+  "gitHead": "c49ccbde93dbad7062ac39d4f18eca7d561f573f"
 }

packages/ui/certd-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.24.3](https://github.com/certd/certd/compare/v1.24.2...v1.24.3) (2024-09-06)
+
+**Note:** Version bump only for package @certd/ui-client
+
 ## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
 
 ### Bug Fixes

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.24.2",
+  "version": "1.24.3",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -58,7 +58,7 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.24.2",
+    "@certd/pipeline": "^1.24.3",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-server/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.24.3](https://github.com/certd/certd/compare/v1.24.2...v1.24.3) (2024-09-06)
+
+### Performance Improvements
+
+* 支持多吉云cdn证书部署 ([65ef685](https://github.com/certd/certd/commit/65ef6857296784ca765926e09eafcb6fc8b6ecde))
+
 ## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
 
 ### Bug Fixes

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.24.2",
+  "version": "1.24.3",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -21,13 +21,13 @@
   "dependencies": {
     "@alicloud/cs20151215": "^3.0.3",
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/acme-client": "^1.24.2",
-    "@certd/lib-huawei": "^1.24.2",
-    "@certd/lib-k8s": "^1.24.2",
+    "@certd/acme-client": "^1.24.3",
+    "@certd/lib-huawei": "^1.24.3",
+    "@certd/lib-k8s": "^1.24.3",
     "@certd/midway-flyway-js": "^1.22.6",
-    "@certd/pipeline": "^1.24.2",
-    "@certd/plugin-cert": "^1.24.2",
-    "@certd/plugin-plus": "^1.24.2",
+    "@certd/pipeline": "^1.24.3",
+    "@certd/plugin-cert": "^1.24.3",
+    "@certd/plugin-plus": "^1.24.3",
     "@koa/cors": "^5.0.0",
     "@midwayjs/bootstrap": "^3.16.2",
     "@midwayjs/cache": "^3.14.0",
@@ -62,6 +62,7 @@
     "nanoid": "^4.0.0",
     "nodemailer": "^6.9.3",
     "pg": "^8.12.0",
+    "querystring": "^0.2.1",
     "reflect-metadata": "^0.1.13",
     "ssh2": "^1.15.0",
     "strip-ansi": "^7.1.0",

packages/ui/certd-server/src/plugins/index.ts

@@ -7,3 +7,4 @@ export * from './plugin-huawei/index.js';
 export * from './plugin-demo/index.js';
 export * from './plugin-other/index.js';
 export * from './plugin-west/index.js';
+export * from './plugin-doge/index.js';

packages/ui/certd-server/src/plugins/plugin-doge/access.ts

@@ -0,0 +1,39 @@
+import { IsAccess, AccessInput } from '@certd/pipeline';
+
+/**
+ * 这个注解将注册一个授权配置
+ * 在certd的后台管理系统中，用户可以选择添加此类型的授权
+ */
+@IsAccess({
+  name: 'dogecloud',
+  title: '多吉云',
+  desc: '',
+})
+export class DogeCloudAccess {
+  /**
+   * 授权属性配置
+   */
+  @AccessInput({
+    title: 'AccessKey',
+    component: {
+      placeholder: 'AccessKey',
+    },
+    helper: '请前往[多吉云-密钥管理](https://console.dogecloud.com/user/keys)获取',
+    required: true,
+    encrypt: false,
+  })
+  accessKey = '';
+
+  @AccessInput({
+    title: 'SecretKey',
+    component: {
+      placeholder: 'SecretKey',
+    },
+    helper: '请前往[多吉云-密钥管理](https://console.dogecloud.com/user/keys)获取',
+    required: true,
+    encrypt: true,
+  })
+  secretKey = '';
+}
+
+new DogeCloudAccess();

packages/ui/certd-server/src/plugins/plugin-doge/index.ts

@@ -0,0 +1,3 @@
+export * from './access.js';
+export * from './lib/index.js';
+export * from './plugins/index.js';

packages/ui/certd-server/src/plugins/plugin-doge/lib/index.ts

@@ -0,0 +1,42 @@
+import crypto from 'crypto';
+import querystring from 'querystring';
+import { DogeCloudAccess } from '../access.js';
+import { AxiosInstance } from 'axios';
+
+export class DogeClient {
+  accessKey: string;
+  secretKey: string;
+  http: AxiosInstance;
+  constructor(access: DogeCloudAccess, http: AxiosInstance) {
+    this.accessKey = access.accessKey;
+    this.secretKey = access.secretKey;
+    this.http = http;
+  }
+
+  async request(apiPath: string, data: any = {}, jsonMode = false) {
+    // 这里替换为你的多吉云永久 AccessKey 和 SecretKey，可在用户中心 - 密钥管理中查看
+    // 请勿在客户端暴露 AccessKey 和 SecretKey，那样恶意用户将获得账号完全控制权
+
+    const body = jsonMode ? JSON.stringify(data) : querystring.encode(data);
+    const sign = crypto
+      .createHmac('sha1', this.secretKey)
+      .update(Buffer.from(apiPath + '\n' + body, 'utf8'))
+      .digest('hex');
+    const authorization = 'TOKEN ' + this.accessKey + ':' + sign;
+    const res: any = await this.http.request({
+      url: 'https://api.dogecloud.com' + apiPath,
+      method: 'POST',
+      data: body,
+      responseType: 'json',
+      headers: {
+        'Content-Type': jsonMode ? 'application/json' : 'application/x-www-form-urlencoded',
+        Authorization: authorization,
+      },
+    });
+
+    if (res.code !== 200) {
+      throw new Error('API Error: ' + res.msg);
+    }
+    return res.data;
+  }
+}

packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts

@@ -0,0 +1,75 @@
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { CertInfo, CertReader } from '@certd/plugin-cert';
+import { DogeClient } from '../../lib/index.js';
+import dayjs from 'dayjs';
+
+@IsTaskPlugin({
+  name: 'DogeCloudDeployToCDN',
+  title: '部署证书到多吉云CDN',
+  group: pluginGroups.cdn.key,
+  default: {
+    strategy: {
+      runStrategy: RunStrategy.SkipWhenSucceed,
+    },
+  },
+})
+export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin {
+  @TaskInput({
+    title: '域名',
+    helper: 'CDN域名',
+    required: true,
+  })
+  domain!: string;
+  //证书选择，此项必须要有
+  @TaskInput({
+    title: '证书',
+    helper: '请选择前置任务输出的域名证书',
+    component: {
+      name: 'pi-output-selector',
+      from: 'CertApply',
+    },
+    required: true,
+  })
+  cert!: CertInfo;
+
+  //授权选择框
+  @TaskInput({
+    title: '多吉云授权',
+    helper: '多吉云AccessKey',
+    component: {
+      name: 'pi-access-selector',
+      type: 'dogecloud',
+    },
+    rules: [{ required: true, message: '此项必填' }],
+  })
+  accessId!: string;
+
+  dogeClient!: DogeClient;
+
+  async onInstance() {
+    const access = await this.accessService.getById(this.accessId);
+    this.dogeClient = new DogeClient(access, this.ctx.http);
+  }
+  async execute(): Promise<void> {
+    const certId: number = await this.updateCert();
+    await this.bindCert(certId);
+  }
+
+  async updateCert() {
+    const certReader = new CertReader(this.cert);
+    const data = await this.dogeClient.request('/cdn/cert/upload.json', {
+      note: 'certd-' + dayjs().format('YYYYMMDDHHmmss'),
+      cert: certReader.crt,
+      private: certReader.key,
+    });
+    return data.id;
+  }
+
+  async bindCert(certId: number) {
+    await this.dogeClient.request('/cdn/cert/bind.json', {
+      id: certId,
+      domain: this.domain,
+    });
+  }
+}
+new DogeCloudDeployToCDNPlugin();

packages/ui/certd-server/src/plugins/plugin-doge/plugins/index.ts

@@ -0,0 +1 @@
+export * from './deploy-to-cdn/index.js';