perf: 1panel支持先上传证书再选择证书

packages/plugins/plugin-lib/src/cert/cert-reader.ts

@@ -7,6 +7,9 @@ import { ILogger } from "@certd/basic";
 import dayjs from "dayjs";
 import { uniq } from "lodash-es";
 
+export interface ICertInfoGetter {
+  getByPipelineId: (pipelineId: number) => Promise<CertInfo>;
+}
 export type CertInfo = {
   crt: string; //fullchain证书
   key: string; //私钥

packages/plugins/plugin-lib/src/cert/consts.ts

@@ -1,2 +1,2 @@
 export const CertApplyPluginNames = [":cert:"];
-export const EVENT_CERT_APPLY_SUCCESS = "CertApply.success";
+export const EVENT_CERT_APPLY_SUCCESS = "CertApply.success";

packages/plugins/plugin-lib/src/cert/index.ts

@@ -1,4 +1,4 @@
 export * from "./convert.js";
 export * from "./cert-reader.js";
 export * from "./consts.js";
-export * from "./dns-provider/index.js";
+export * from "./dns-provider/index.js";

packages/plugins/plugin-lib/src/common/util.ts

@@ -44,6 +44,10 @@ export function createRemoteSelectInputDefine(opts?: {
   component?: any;
   value?: any;
   pageSize?: number;
+  uploadCert?: {
+    title?: string;
+    columns?: Record<string, any>;
+  };
 }) {
   const title = opts?.title || "请选择";
   const certDomainsInputKey = opts?.certDomainsInputKey || "certDomains";
@@ -74,6 +78,7 @@ export function createRemoteSelectInputDefine(opts?: {
       multi,
       pageSize: opts?.pageSize,
       watches: [certDomainsInputKey, accessIdInputKey, ...watches],
+      uploadCert: opts?.uploadCert,
       ...opts.component,
     },
     value: opts.value,

packages/ui/certd-client/src/components/plugins/common/remote-select.vue

@@ -25,8 +25,9 @@
           </div>
         </template>
       </a-select>
-      <div class="ml-5">
+      <div class="ml-5 flex flex-row no-wrap">
         <fs-button :loading="loading" title="刷新选项" icon="ion:refresh-outline" @click="refreshOptions"></fs-button>
+        <UploadCert v-if="uploadCert" class="ml-5" v-bind="uploadCert" @submit="refreshOptions"></UploadCert>
       </div>
     </div>
     <div class="helper" :class="{ error: hasError }">
@@ -39,6 +40,8 @@ import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
 import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
 import { PluginDefine } from "@certd/pipeline";
 import { getInputFromForm } from "./utils";
+import UploadCert from "./upload-cert.vue";
+import { UploadCertProps } from "./types";
 
 defineOptions({
   name: "RemoteSelect",
@@ -65,9 +68,10 @@ const props = defineProps<
     pager?: boolean;
     multi?: boolean;
     pageSize?: number;
+    uploadCert?: UploadCertProps;
   } & ComponentPropsType
 >();
-
+debugger;
 const emit = defineEmits<{
   "update:value": any;
 }>();

packages/ui/certd-client/src/components/plugins/common/types.ts

@@ -0,0 +1,5 @@
+export interface UploadCertProps {
+  title?: string;
+  columns?: Record<string, any>;
+  button?: any;
+}

packages/ui/certd-client/src/components/plugins/common/upload-cert.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="upload-cert">
+    <fs-button v-model:loading="loading" type="primary" text="上传" v-bind="props.button" @click="openUploadCertDialog"></fs-button>
+  </div>
+</template>
+<script lang="ts" setup>
+import { message } from "ant-design-vue";
+import { useFormDialog } from "../../../use/use-dialog";
+import { computed, inject, ref } from "vue";
+import { doRequest } from "../lib";
+import { getInputFromForm } from "./utils";
+import { UploadCertProps } from "./types";
+import { merge } from "lodash-es";
+
+const props = defineProps<UploadCertProps>();
+const loading = ref(false);
+
+const emit = defineEmits(["submit"]);
+const { openFormDialog } = useFormDialog();
+const pipeline = inject("pipeline", null);
+
+const getCurrentPluginDefine: any = inject("getCurrentPluginDefine", () => {
+  return {};
+});
+const getScope: any = inject("get:scope", () => {
+  return {};
+});
+const getPluginType: any = inject("get:plugin:type", () => {
+  return "plugin";
+});
+const title = computed(() => props.title || "上传证书");
+function openUploadCertDialog() {
+  const columns = merge(
+    {
+      certName: {
+        title: "证书名称",
+        form: {
+          component: {
+            name: "a-input",
+            vModel: "value",
+          },
+          helper: "上传后证书显示名称",
+        },
+      },
+    },
+    props.columns
+  );
+  openFormDialog({
+    title: title.value,
+    columns: {
+      certName: {
+        title: "证书名称",
+        form: {
+          component: {
+            name: "a-input",
+            vModel: "value",
+          },
+        },
+      },
+      ...props.columns,
+    },
+    onSubmit: async (form: any) => {
+      const pluginType = getPluginType();
+      const scope = getScope();
+      const { input, record } = getInputFromForm(scope.form, pluginType);
+      loading.value = true;
+      try {
+        const res = await doRequest(
+          {
+            type: pluginType,
+            typeName: scope.form.type,
+            action: "onUploadCert",
+            input,
+            record,
+            data: {
+              pipelineId: pipeline?.value?.id,
+              ...form,
+            },
+          },
+          {
+            // onError(err: any) {
+            //   message.error(err.message);
+            // },
+            showErrorNotify: true,
+          }
+        );
+        message.success("上传成功");
+        emit("submit");
+      } finally {
+        loading.value = false;
+      }
+    },
+  });
+}
+</script>
+<style lang="less">
+.upload-cert {
+  display: flex;
+  align-items: center;
+}
+</style>

packages/ui/certd-server/src/modules/pipeline/service/getter/cert-info-getter.ts

@@ -0,0 +1,32 @@
+import { CertInfo, CertReader, ICertInfoGetter } from '@certd/plugin-lib';
+import { CertInfoService } from '../../../monitor/index.js';
+
+export class CertInfoGetter implements ICertInfoGetter  {
+  userId: number;
+  projectId: number;
+  certInfoService: CertInfoService;
+  constructor(userId: number, projectId: number, certInfoService: CertInfoService) {
+    this.userId = userId;
+    this.projectId = projectId;
+    this.certInfoService = certInfoService;
+  }
+  async getByPipelineId(pipelineId: number): Promise<CertInfo> {
+    if (!pipelineId) {
+      throw new Error(`流水线id不能为空`)
+    }
+    const query :any= {
+        pipelineId,
+        userId: this.userId,
+    }
+    if (this.projectId) {
+       query.projectId = this.projectId
+    }
+    const entity =  await this.certInfoService.findOne({
+      where:query
+    })
+    if (!entity || !entity.certInfo) {
+      throw new Error(`流水线(${pipelineId})还未生成证书，请先运行一次流水线`)
+    }
+    return new CertReader(JSON.parse(entity.certInfo)).cert;
+  }
+}

packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts

@@ -9,6 +9,9 @@ import { SubDomainsGetter } from "./sub-domain-getter.js";
 import { DomainVerifierGetter } from "./domain-verifier-getter.js";
 import { DomainService } from "../../../cert/service/domain-service.js";
 import { SubDomainService } from "../sub-domain-service.js";
+import { CertInfoGetter } from "./cert-info-getter.js";
+import { CertInfoService } from "../../../monitor/index.js";
+import { ICertInfoGetter } from "@certd/plugin-lib";
 
 const serviceNames = [
   'ocrService',
@@ -34,6 +37,8 @@ export class TaskServiceGetter implements IServiceGetter{
       return await this.getNotificationService() as T
     } else if (serviceName === 'domainVerifierGetter') {
       return await this.getDomainVerifierGetter() as T
+    } else if (serviceName === 'certInfoGetter') {
+      return await this.getCertInfoGetter() as T
     }else{
       if(!serviceNames.includes(serviceName)){
         throw new Error(`${serviceName} not in whitelist`)
@@ -51,6 +56,11 @@ export class TaskServiceGetter implements IServiceGetter{
     return new SubDomainsGetter(this.userId,this.projectId, subDomainsService,domainService)
   }
 
+  async getCertInfoGetter(): Promise<ICertInfoGetter> {
+    const certInfoService:CertInfoService = await  this.appCtx.getAsync("certInfoService")
+    return new CertInfoGetter(this.userId, this.projectId, certInfoService)
+  }
+
   async getAccessService(): Promise<AccessGetter> {
     const accessService:AccessService = await  this.appCtx.getAsync("accessService")
     return new AccessGetter(this.userId, this.projectId, accessService.getById.bind(accessService));

packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/deploy-to-website.ts

@@ -2,7 +2,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput
 
 import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
 import { OnePanelAccess } from "../access.js";
-import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
+import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine, ICertInfoGetter } from "@certd/plugin-lib";
 import { OnePanelClient } from "../client.js";
 
 @IsTaskPlugin({
@@ -66,6 +66,7 @@ export class OnePanelDeployToWebsitePlugin extends AbstractTaskPlugin {
       watches: ["accessId"],
       helper: "要更新的1Panel证书id，选择授权之后，从下拉框中选择\nIP需要加白名单，如果是同一台机器部署的，可以试试172.16.0.0/12",
       required: true,
+      uploadCert: {}
     })
   )
   sslIds!: string[];
@@ -213,5 +214,36 @@ export class OnePanelDeployToWebsitePlugin extends AbstractTaskPlugin {
     });
     return this.ctx.utils.options.buildGroupOptions(list, this.certDomains);
   }
+
+  async onUploadCert(data: { pipelineId: string, certName: string }) {
+    if (!this.access) {
+      throw new Error("请先选择1panel授权");
+    }
+    const certInfoGetter = await this.ctx.serviceGetter.get<ICertInfoGetter>("certInfoGetter")
+    const cert = await certInfoGetter.getByPipelineId(Number(data.pipelineId));
+
+    const client = new OnePanelClient({
+      access: this.access,
+      http: this.http,
+      logger: this.logger,
+      utils: this.ctx.utils,
+    });
+
+    await client.doRequest({
+      url: `/api/${this.access.apiVersion}/websites/ssl/upload`,
+      method: "post",
+      data: {
+        sslId: 0,
+        certificate: cert.crt,
+        certificatePath: "",
+        description: data.certName,
+        privateKey: cert.key,
+        privateKeyPath: "",
+        type: "paste",
+      },
+      currentNode: this.currentNode,
+    });
+
+  }
 }
 new OnePanelDeployToWebsitePlugin();