diff --git a/docs/guide/plugins/deploy.md b/docs/guide/plugins/deploy.md index bf0477fe0..ec4f424f1 100644 --- a/docs/guide/plugins/deploy.md +++ b/docs/guide/plugins/deploy.md @@ -1,5 +1,5 @@ # 任务插件 -共 `109` 款任务插件 +共 `110` 款任务插件 ## 1. 证书申请 | 序号 | 名称 | 说明 | @@ -63,10 +63,11 @@ | 12.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress | | 13.| **K8S-Apply自定义yaml** | apply自定义yaml到k8s | | 14.| **1Panel-部署证书到1Panel** | 更新1Panel的证书 | -| 15.| **Plesk-部署Plesk网站证书** | | -| 16.| **雷池-更新证书** | 更新长亭雷池WAF的证书 | -| 17.| **lucky-更新Lucky证书** | | -| 18.| **uniCloud-部署到服务空间** | 部署到服务空间 | +| 15.| **1Panel-部署面板证书** | 更新1Panel的面板证书 | +| 16.| **Plesk-部署Plesk网站证书** | | +| 17.| **雷池-更新证书** | 更新长亭雷池WAF的证书 | +| 18.| **lucky-更新Lucky证书** | | +| 19.| **uniCloud-部署到服务空间** | 部署到服务空间 | ## 5. 阿里云 | 序号 | 名称 | 说明 | diff --git a/packages/ui/certd-server/metadata/access_wxpay.yaml b/packages/ui/certd-server/metadata/access_wxpay.yaml index bed929e64..5a5d77536 100644 --- a/packages/ui/certd-server/metadata/access_wxpay.yaml +++ b/packages/ui/certd-server/metadata/access_wxpay.yaml @@ -15,19 +15,21 @@ input: required: true encrypt: false publicKey: - title: 公钥 + title: 证书公钥 component: name: a-textarea rows: 3 - placeholder: MIIBIjANBg... + placeholder: '-----BEGIN CERTIFICATE-----' + helper: 微信商户平台—>账户设置—>API安全—>验证商户身份—>商户API证书—>管理证书—>apiclient_cert.pem required: true encrypt: true privateKey: title: 私钥 component: - placeholder: MIIEvQIBADANB... + placeholder: '-----BEGIN PRIVATE KEY-----' name: a-textarea rows: 3 + helper: 证书私钥 apiclient_key.pem required: true encrypt: true key: diff --git a/packages/ui/certd-server/metadata/deploy_1PanelDeployToPanel.yaml b/packages/ui/certd-server/metadata/deploy_1PanelDeployToPanel.yaml new file mode 100644 index 000000000..d87bf7487 --- /dev/null +++ b/packages/ui/certd-server/metadata/deploy_1PanelDeployToPanel.yaml @@ -0,0 +1,77 @@ +showRunStrategy: false +default: + strategy: + runStrategy: 1 +name: 1PanelDeployToPanel +title: 1Panel-部署面板证书 +icon: svg:icon-onepanel +desc: 更新1Panel的面板证书 +group: panel +needPlus: false +input: + cert: + title: 域名证书 + helper: 请选择前置任务输出的域名证书 + component: + name: output-selector + from: + - ':cert:' + required: true + order: 0 + certDomains: + title: 当前证书域名 + component: + name: cert-domains-getter + mergeScript: |2- + + return { + component:{ + inputKey: ctx.compute(({form})=>{ + return form.cert + }), + } + } + + template: false + required: true + order: 0 + accessId: + title: 1Panel授权 + helper: 1Panel授权 + component: + name: access-selector + type: 1panel + required: true + order: 0 + currentNode: + title: 1Panel节点 + component: + name: remote-select + vModel: value + mode: tags + type: plugin + typeName: OnePanelDeployToPanelPlugin + action: onGetNodes + search: false + pager: false + watches: + - certDomains + - accessId + value: local + required: true + mergeScript: |2- + + return { + component:{ + form: ctx.compute(({form})=>{ + return form + }) + }, + } + + helper: 要更新的1Panel证书的节点信息，目前只有v2存在此概念 + order: 0 +output: {} +pluginType: deploy +type: builtIn +scriptFilePath: /plugins/plugin-plus/1panel/plugins/deploy-to-panel.js diff --git a/packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/deploy-to-panel.ts b/packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/deploy-to-panel.ts new file mode 100644 index 000000000..2f934d376 --- /dev/null +++ b/packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/deploy-to-panel.ts @@ -0,0 +1,155 @@ +import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; + +import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; +import { OnePanelAccess } from "../access.js"; +import { CertReader, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; +import { OnePanelClient } from "../client.js"; + +@IsTaskPlugin({ + name: "1PanelDeployToPanel", + title: "1Panel-部署面板证书", + icon: "svg:icon-onepanel", + desc: "更新1Panel的面板证书", + group: pluginGroups.panel.key, + default: { + strategy: { + runStrategy: RunStrategy.SkipWhenSucceed, + }, + }, + needPlus: false, +}) +export class OnePanelDeployToPanelPlugin extends AbstractTaskPlugin { + //证书选择，此项必须要有 + @TaskInput({ + title: "域名证书", + helper: "请选择前置任务输出的域名证书", + component: { + name: "output-selector", + from: [...CertApplyPluginNames], + }, + required: true, + }) + cert!: CertInfo; + + @TaskInput(createCertDomainGetterInputDefine()) + certDomains!: string[]; + + //授权选择框 + @TaskInput({ + title: "1Panel授权", + helper: "1Panel授权", + component: { + name: "access-selector", + type: "1panel", + }, + required: true, + }) + accessId!: string; + + @TaskInput( + createRemoteSelectInputDefine({ + title: "1Panel节点", + helper: "要更新的1Panel证书的节点信息，目前只有v2存在此概念", + typeName: "OnePanelDeployToPanelPlugin", + action: OnePanelDeployToPanelPlugin.prototype.onGetNodes.name, + value: "local", + required: true, + }) + ) + currentNode!: string; + + + access: OnePanelAccess; + async onInstance() { + this.access = await this.getAccess(this.accessId); + } + //http://xxx:xxxx/1panel/swagger/index.html#/App/get_apps__key + async execute(): Promise { + + const client = new OnePanelClient({ + access: this.access, + http: this.http, + logger: this.logger, + utils: this.ctx.utils, + }); + + + const certReader = new CertReader(this.cert); + const domain = certReader.getMainDomain(); + + if (this.access.apiVersion === "v1") { + const uploadRes = await client.doRequest({ + // api/v1/settings/ssl/update + url: `/api/v1/settings/ssl/update`, + method: "post", + data: { + cert: this.cert.crt, + key: this.cert.key, + domain: domain, + ssl: "enable", + sslID: null, + sslType: "import-paste", + }, + currentNode: this.currentNode, + }); + console.log("uploadRes", JSON.stringify(uploadRes)); + } else { + const uploadRes = await client.doRequest({ + // api/v2/core/settings/ssl/update + url: `/api/v2/core/settings/ssl/update`, + method: "post", + data: { + cert: this.cert.crt, + key: this.cert.key, + domain: domain, + ssl: "Enable", + sslID: null, + sslType: "import-paste", + }, + currentNode: this.currentNode, + }); + console.log("uploadRes", JSON.stringify(uploadRes)); + } + + await this.ctx.utils.sleep(10000); + this.logger.info(`证书更新完成`); + + } + + isNeedUpdate(certRes: any) { + if (certRes.pem === this.cert.crt && certRes.key === this.cert.key) { + this.logger.info(`证书(id:${certRes.id})已经是最新的了，不需要更新`); + return false; + } + return true; + } + + + + async onGetNodes() { + const options = [{ label: "主节点", value: "local" }]; + if (this.access.apiVersion === "v1") { + return options; + } + if (!this.access) { + throw new Error("请先选择授权"); + } + const client = new OnePanelClient({ + access: this.access, + http: this.http, + logger: this.logger, + utils: this.ctx.utils, + }); + + const resp = await client.doRequest({ + url: `/api/${this.access.apiVersion}/core/nodes/list`, + method: "post", + data: {}, + }); + + // console.log('resp', resp) + return [...options, ...(resp?.map(item => ({ label: `${item.addr}(${item.name})`, value: item.name })) || [])]; + } + +} +new OnePanelDeployToPanelPlugin(); diff --git a/packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/index.ts b/packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/index.ts index 1c360e693..85177a80d 100644 --- a/packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/index.ts @@ -1 +1,2 @@ export * from "./deploy-to-website.js"; +export * from "./deploy-to-panel.js"; \ No newline at end of file