From 5750bb706779da274d8e7a87e71416cb64d2df79 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 19 Apr 2025 15:00:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0=E5=95=86=E7=94=A8?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=EF=BC=8C=E7=9B=B4=E6=8E=A5=E7=B2=98=E8=B4=B4?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?ec=E5=8A=A0=E5=AF=86=E8=AF=81=E4=B9=A6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certd-client/src/components/pem-input.vue | 13 +------
 .../src/views/certd/pipeline/api.ts           |  8 ++++
 .../certd/pipeline/cert-upload/index.vue      | 37 +++++++++++++-----
 .../views/certd/pipeline/cert-upload/use.tsx  |  2 +-
 .../src/views/certd/pipeline/utils.ts         | 38 +++++--------------
 .../user/pipeline/cert-controller.ts          | 13 ++++++-
 6 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/packages/ui/certd-client/src/components/pem-input.vue b/packages/ui/certd-client/src/components/pem-input.vue
index fed8c308..ec0ac685 100644
--- a/packages/ui/certd-client/src/components/pem-input.vue
+++ b/packages/ui/certd-client/src/components/pem-input.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="pem-input">
     <FileInput v-bind="fileInput" class="mb-5" type="primary" text="选择文件" @change="onChange" />
-    <a-textarea v-bind="textarea" v-model:value="textRef"></a-textarea>
+    <a-textarea v-bind="textarea" :value="modelValue" @update:value="emitValue"></a-textarea>
   </div>
 </template>
 
@@ -17,7 +17,6 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits(["update:modelValue"]);
-const textRef = ref();
 
 function emitValue(value: string) {
   emit("update:modelValue", value);
@@ -39,16 +38,6 @@ function onChange(e: any) {
   };
   fileReader.readAsText(file); // 以文本形式读取文件
 }
-
-watch(
-  () => props.modelValue,
-  value => {
-    textRef.value = value;
-  },
-  {
-    immediate: true,
-  }
-);
 </script>
 
 <style lang="less">
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/api.ts b/packages/ui/certd-client/src/views/certd/pipeline/api.ts
index 99972be0..fd6b2753 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/api.ts
+++ b/packages/ui/certd-client/src/views/certd/pipeline/api.ts
@@ -122,3 +122,11 @@ export async function GetCert(pipelineId: number): Promise<CertInfo> {
     params: { id: pipelineId },
   });
 }
+
+export async function ReadCertDetail(crt: string): Promise<any> {
+  return await request({
+    url: certApiPrefix + "/readCertDetail",
+    method: "post",
+    data: { crt },
+  });
+}
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/cert-upload/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/cert-upload/index.vue
index 47ad261e..e0c014b6 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/cert-upload/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/cert-upload/index.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script lang="tsx" setup>
-import { computed, inject } from "vue";
+import { computed, inject, watch, ref } from "vue";
 import { useCertUpload } from "./use";
 import { getAllDomainsFromCrt } from "/@/views/certd/pipeline/utils";
 
@@ -27,19 +27,36 @@ const emit = defineEmits(["updated", "update:modelValue"]);
 
 const { openUpdateCertDialog } = useCertUpload();
 
-const domain = computed(() => {
-  if (!props.modelValue?.crt) {
-    return "";
-  }
-  const domains = getAllDomainsFromCrt(props.modelValue?.crt);
+const domainsRef = ref([]);
 
-  return domains[0];
+watch(
+  () => {
+    return props.modelValue?.crt;
+  },
+  async crt => {
+    if (crt) {
+      domainsRef.value = await getAllDomainsFromCrt(crt);
+    } else {
+      domainsRef.value = [];
+    }
+
+    emit("updated", { domains: domainsRef.value });
+  },
+  {
+    immediate: true,
+  }
+);
+
+const domain = computed(() => {
+  if (domainsRef.value && domainsRef.value.length > 0) {
+    return domainsRef.value[0];
+  }
+
+  return "";
 });
 
-function onUpdated(res: { uploadCert: any }) {
+async function onUpdated(res: { uploadCert: any }) {
   emit("update:modelValue", res.uploadCert);
-  const domains = getAllDomainsFromCrt(res.uploadCert.crt);
-  emit("updated", { domains });
 }
 
 const pipeline: any = inject("pipeline");
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/cert-upload/use.tsx b/packages/ui/certd-client/src/views/certd/pipeline/cert-upload/use.tsx
index 06b6de9d..f8faed0a 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/cert-upload/use.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/cert-upload/use.tsx
@@ -135,7 +135,7 @@ export function useCertUpload() {
             },
             async doSubmit({ form }: any) {
               const cert = form.uploadCert;
-              const domains = getAllDomainsFromCrt(cert.crt);
+              const domains = await getAllDomainsFromCrt(cert.crt);
 
               const notifications = [];
               if (form.notification != null) {
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/utils.ts b/packages/ui/certd-client/src/views/certd/pipeline/utils.ts
index b8b5bcfe..08c19d7e 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/utils.ts
+++ b/packages/ui/certd-client/src/views/certd/pipeline/utils.ts
@@ -2,8 +2,7 @@ import { forEach } from "lodash-es";
 import { mySuiteApi } from "/@/views/certd/suite/mine/api";
 import { notification } from "ant-design-vue";
 import { useSettingStore } from "/@/store/settings";
-//@ts-ignore
-import forge from "node-forge";
+import { ReadCertDetail } from "./api";
 export function eachStages(list: any[], exec: (item: any, runnableType: string) => void, runnableType: string = "stage") {
   if (!list || list.length <= 0) {
     return;
@@ -70,33 +69,16 @@ export async function checkPipelineLimit() {
   }
 }
 
-export function readCertDetail(crt: string) {
-  const detail = forge.pki.certificateFromPem(crt);
-  const expires = detail.notAfter;
-  return { detail, expires };
+export async function readCertDetail(crt: string) {
+  return await ReadCertDetail(crt);
 }
 
-export function getAllDomainsFromCrt(crt: string) {
-  const { detail } = readCertDetail(crt);
-  const domains = [];
-
-  // 1. 提取SAN中的DNS名称
-  const sanExtension = detail.extensions.find((ext: any) => ext.name === "subjectAltName");
-  if (sanExtension) {
-    sanExtension.altNames.forEach((altName: any) => {
-      if (altName.type === 2) {
-        // type=2 表示DNS名称
-        domains.push(altName.value);
-      }
-    });
+export async function getAllDomainsFromCrt(crt: string) {
+  const { detail } = await readCertDetail(crt);
+  const altNames = detail.domains.altNames;
+  const commonName = detail.domains.commonName;
+  if (altNames.includes(commonName)) {
+    return altNames;
   }
-
-  // 2. 如果没有SAN，回退到CN（通用名称）
-  if (domains.length === 0) {
-    const cnAttr = detail.subject.attributes.find((attr: any) => attr.name === "commonName");
-    if (cnAttr) {
-      domains.push(cnAttr.value);
-    }
-  }
-  return domains;
+  return [commonName, ...altNames];
 }
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/cert-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/cert-controller.ts
index 7cc6c1f8..200c550d 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/cert-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/cert-controller.ts
@@ -1,7 +1,8 @@
-import { Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
+import {Body, Controller, Inject, Post, Provide, Query} from '@midwayjs/core';
 import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
 import { BaseController, Constants } from '@certd/lib-server';
 import { StorageService } from '../../../modules/pipeline/service/storage-service.js';
+import {CertReader} from "@certd/plugin-cert";
 
 @Provide()
 @Controller('/api/pi/cert')
@@ -18,4 +19,14 @@ export class CertController extends BaseController {
     const privateVars = await this.storeService.getPipelinePrivateVars(id);
     return this.ok(privateVars.cert);
   }
+
+
+  @Post('/readCertDetail', { summary: Constants.per.authOnly })
+  async readCertDetail(@Body('crt') crt: string) {
+    if (!crt) {
+       throw new Error('crt is required');
+    }
+    const certDetail = CertReader.readCertDetail(crt)
+    return this.ok(certDetail);
+  }
 }