feat: cert download

packages/core/pipeline/package.json

@@ -20,7 +20,8 @@
     "axios": "^1.4.0",
     "node-forge": "^1.3.1",
     "nodemailer": "^6.9.3",
-    "qs": "^6.11.2"
+    "qs": "^6.11.2",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@certd/acme-client": "^1.0.6",
@@ -33,6 +34,7 @@
     "@types/lodash": "^4.14.194",
     "@types/mocha": "^10.0.1",
     "@types/node-forge": "^1.3.2",
+    "@types/uuid": "^9.0.2",
     "@typescript-eslint/eslint-plugin": "^5.59.7",
     "@typescript-eslint/parser": "^5.59.7",
     "chai": "^4.3.7",

packages/core/pipeline/src/core/executor.ts

@@ -29,6 +29,7 @@ export class Executor {
   logger: Logger;
   pipelineContext!: IContext;
   lastStatusMap!: RunnableCollection;
+  lastRuntime!: RunHistory;
   options: ExecutorOptions;
   onChanged: (history: RunHistory) => void;
   constructor(options: ExecutorOptions) {
@@ -45,6 +46,7 @@ export class Executor {
 
   async init() {
     const lastRuntime = await this.pipelineContext.getObj(`lastRuntime`);
+    this.lastRuntime = lastRuntime;
     this.lastStatusMap = new RunnableCollection(lastRuntime?.pipeline);
   }
 
@@ -59,6 +61,9 @@ export class Executor {
       await this.runWithHistory(this.pipeline, "pipeline", async () => {
         await this.runStages(this.pipeline);
       });
+      if (this.lastRuntime && this.lastRuntime.pipeline.status?.status === ResultType.error) {
+        await this.notification("turnToSuccess");
+      }
       await this.notification("success");
     } catch (e) {
       await this.notification("error", e);
@@ -233,6 +238,9 @@ export class Executor {
     } else if (when === "success") {
       subject = `【CertD】执行成功，${this.pipeline.title}, buildId:${this.runtime.id}`;
       content = subject;
+    } else if (when === "turnToSuccess") {
+      subject = `【CertD】执行成功（错误转成功），${this.pipeline.title}, buildId:${this.runtime.id}`;
+      content = subject;
     } else if (when === "error") {
       subject = `【CertD】执行失败，${this.pipeline.title}, buildId:${this.runtime.id}`;
       content = `<pre>${error.message}</pre>`;

packages/core/pipeline/src/core/run-history.ts

@@ -119,25 +119,25 @@ export class RunnableCollection {
     this.collection = map;
   }
 
-  private each<T extends Runnable>(list: T[], exec: (item: Runnable) => void) {
+  static each<T extends Runnable>(list: T[], exec: (item: Runnable) => void) {
     list.forEach((item) => {
       exec(item);
       if (item.runnableType === "pipeline") {
         // @ts-ignore
-        this.each<Stage>(item.stages, exec);
+        RunnableCollection.each<Stage>(item.stages, exec);
       } else if (item.runnableType === "stage") {
         // @ts-ignore
-        this.each<Task>(item.tasks, exec);
+        RunnableCollection.each<Task>(item.tasks, exec);
       } else if (item.runnableType === "task") {
         // @ts-ignore
-        this.each<Step>(item.steps, exec);
+        RunnableCollection.each<Step>(item.steps, exec);
       }
     });
   }
-  private toMap(pipeline: Pipeline) {
+  public toMap(pipeline: Pipeline) {
     const map: RunnableMap = {};
 
-    this.each(pipeline.stages, (item) => {
+    RunnableCollection.each(pipeline.stages, (item) => {
       map[item.id] = item;
     });
     return map;
@@ -151,7 +151,7 @@ export class RunnableCollection {
     if (!this.pipeline) {
       return;
     }
-    this.each(this.pipeline.stages, (item) => {
+    RunnableCollection.each(this.pipeline.stages, (item) => {
       item.status = undefined;
     });
   }

packages/core/pipeline/src/d.ts/pipeline.ts

@@ -56,6 +56,7 @@ export type Trigger = {
 };
 
 export type FileItem = {
+  id: string;
   filename: string;
   path: string;
 };
@@ -68,13 +69,12 @@ export type Runnable = {
   default?: {
     [key: string]: any;
   };
-  files?: FileItem[];
 };
 
 export type EmailOptions = {
   receivers: string[];
 };
-export type NotificationWhen = "error" | "success" | "start";
+export type NotificationWhen = "error" | "success" | "turnToSuccess" | "start";
 export type NotificationType = "email" | "url";
 export type Notification = {
   type: NotificationType;

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

@@ -6,7 +6,7 @@ import { IAccessService } from "../access";
 import { IEmailService } from "../service";
 import { IContext } from "../core";
 import { AxiosInstance } from "axios";
-
+import { v4 as uuidv4 } from "uuid";
 export enum ContextScope {
   global,
   pipeline,
@@ -81,6 +81,7 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
   saveFile(filename: string, file: Buffer) {
     const filePath = this.ctx.fileStore.writeFile(filename, file);
     this._result.files!.push({
+      id: uuidv4(),
       filename,
       path: filePath,
     });

packages/ui/certd-client/package.json

@@ -74,7 +74,7 @@
     "@vue/compiler-sfc": "^3.2.45",
     "@vue/eslint-config-typescript": "^11.0.2",
     "@vue/test-utils": "^2.2.6",
-    "autoprefixer": "^10.4.12",
+    "autoprefixer": "^10.4.14",
     "caller-path": "^4.0.0",
     "chai": "^4.3.7",
     "eslint": "8.29.0",
@@ -89,7 +89,7 @@
     "less": "^4.1.3",
     "less-loader": "^11.0.0",
     "lint-staged": "^13.1.0",
-    "postcss": "^8.4.20",
+    "postcss": "^8.4.23",
     "prettier": "2.8.1",
     "pretty-quick": "^3.1.3",
     "rimraf": "^3.0.2",
@@ -98,7 +98,7 @@
     "stylelint": "^14.16.0",
     "stylelint-config-prettier": "^9.0.4",
     "stylelint-order": "^5.0.0",
-    "tailwindcss": "^3.2.4",
+    "tailwindcss": "^3.3.2",
     "ts-node": "^10.9.1",
     "typescript": "4.9.4",
     "vite": "^4.0.1",

packages/ui/certd-client/postcss.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {}
+  }
+};

packages/ui/certd-client/src/App.vue

@@ -11,9 +11,9 @@ import { provide, ref, nextTick } from "vue";
 import { usePageStore } from "/src/store/modules/page";
 import { useResourceStore } from "/src/store/modules/resource";
 import { useSettingStore } from "/@/store/modules/settings";
-import  'dayjs/locale/zh-cn';
-import  'dayjs/locale/en';
-import dayjs from 'dayjs'
+import "dayjs/locale/zh-cn";
+import "dayjs/locale/en";
+import dayjs from "dayjs";
 export default {
   name: "App",
   setup() {
@@ -29,13 +29,13 @@ export default {
       console.log("locale changed:", value);
       if (value === "zh-cn") {
         locale.value = zhCN;
-        dayjs.locale('zh-cn');
+        dayjs.locale("zh-cn");
       } else if (value === "en") {
         locale.value = enUS;
-        dayjs.locale('en');
+        dayjs.locale("en");
       }
     }
-    localeChanged('zh-cn')
+    localeChanged("zh-cn");
     provide("fn:router.reload", reload);
     provide("fn:locale.changed", localeChanged);
 

packages/ui/certd-client/src/api/tools.ts

@@ -53,7 +53,7 @@ export function errorLog(error: any) {
     error.message = error?.response?.data?.message;
   }
   // 打印到控制台
-  console.error(error);
+  console.error("errorLog", error);
   // 显示提示
   uiContext.get().notification.error({ message: error.message });
 }
@@ -64,6 +64,7 @@ export function errorLog(error: any) {
  */
 export function errorCreate(msg: string) {
   const err = new Error(msg);
+  console.error("errorCreate", err);
   uiContext.get().notification.error({ message: err.message });
   throw err;
 }

packages/ui/certd-client/src/layout/layout-framework.vue

@@ -1,4 +1,4 @@
-<template xmlns:w="http://www.w3.org/1999/xhtml">
+<template>
   <a-layout class="fs-framework">
     <a-layout-sider v-model:collapsed="asideCollapsed" :trigger="null" collapsible>
       <div class="header-logo">
@@ -95,7 +95,7 @@ export default {
     }
     onErrorCaptured((e) => {
       console.error("ErrorCaptured:", e);
-      notification.error({ message: e.message });
+      // notification.error({ message: e.message });
       //阻止错误向上传递
       return false;
     });

packages/ui/certd-client/src/main.ts

@@ -2,8 +2,6 @@ import { createApp } from "vue";
 import App from "./App.vue";
 import router from "./router";
 import Antd from "ant-design-vue";
-import "ant-design-vue/dist/antd.less";
-// import "virtual:windi.css";
 import "./style/common.less";
 import "./mock";
 import i18n from "./i18n";

packages/ui/certd-client/src/style/common.less

@@ -1,3 +1,5 @@
+@import './tailwind.less';
+@import "ant-design-vue/dist/antd.less";
 @import './theme/index.less';
 @import './theme/default.less';
 @import './scroll.less';
@@ -49,9 +51,7 @@ h1, h2, h3, h4, h5, h6 {
   text-align: center;
 }
 
-.red{
-  color:red
-}
+
 
 .font12{
   font-size: 12px;
@@ -88,27 +88,6 @@ h1, h2, h3, h4, h5, h6 {
   }
 }
 
-.mt-10{
-  margin-top:10px;
-}
-.ml-5{
-  margin-left:5px;
-}
-.ml-10{
-  margin-left: 10px;
-}
-.mtb-5{
-  margin: 5px 0 5px 0;
-}
-
-.mb-10{
-  margin-bottom: 10px;
-}
-
-.mlr-5{
-  margin: 0 5px 0 5px;
-}
-
 .gray{
   color:gray;
 }
@@ -125,10 +104,6 @@ h1, h2, h3, h4, h5, h6 {
   color:yellow;
 }
 
-.ml-2{
-  margin-left: 2px;
-}
-
 .font-20{
   font-size:20px
 }

packages/ui/certd-client/src/style/fix-windicss.less

@@ -1,3 +1,4 @@
 img.ant-image-preview-img{
   display: initial;
 }
+

packages/ui/certd-client/src/style/tailwind.less

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

packages/ui/certd-client/src/views/certd/pipeline/api.ts

@@ -1,7 +1,9 @@
 import { request } from "/src/api/service";
-const apiPrefix = "/pi/pipeline";
 
-export function GetList(query) {
+const apiPrefix = "/pi/pipeline";
+const historyApiPrefix = "/pi/history";
+
+export function GetList(query: any) {
   return request({
     url: apiPrefix + "/page",
     method: "post",
@@ -9,7 +11,7 @@ export function GetList(query) {
   });
 }
 
-export function AddObj(obj) {
+export function AddObj(obj: any) {
   return request({
     url: apiPrefix + "/add",
     method: "post",
@@ -17,7 +19,7 @@ export function AddObj(obj) {
   });
 }
 
-export function UpdateObj(obj) {
+export function UpdateObj(obj: any) {
   return request({
     url: apiPrefix + "/update",
     method: "post",
@@ -25,7 +27,7 @@ export function UpdateObj(obj) {
   });
 }
 
-export function DelObj(id) {
+export function DelObj(id: any) {
   return request({
     url: apiPrefix + "/delete",
     method: "post",
@@ -33,7 +35,7 @@ export function DelObj(id) {
   });
 }
 
-export function GetObj(id) {
+export function GetObj(id: any) {
   return request({
     url: apiPrefix + "/info",
     method: "post",
@@ -41,7 +43,7 @@ export function GetObj(id) {
   });
 }
 
-export function GetDetail(id) {
+export function GetDetail(id: any) {
   return request({
     url: apiPrefix + "/detail",
     method: "post",
@@ -49,7 +51,7 @@ export function GetDetail(id) {
   });
 }
 
-export function Save(pipelineEntity) {
+export function Save(pipelineEntity: any) {
   return request({
     url: apiPrefix + "/save",
     method: "post",
@@ -57,10 +59,18 @@ export function Save(pipelineEntity) {
   });
 }
 
-export function Trigger(id) {
+export function Trigger(id: any) {
   return request({
     url: apiPrefix + "/trigger",
     method: "post",
     params: { id }
   });
 }
+
+export async function GetFiles(pipelineId: number) {
+  return request({
+    url: historyApiPrefix + "/files",
+    method: "post",
+    params: { pipelineId }
+  });
+}

packages/ui/certd-client/src/views/certd/pipeline/crud.tsx

@@ -5,7 +5,9 @@ import { useRouter } from "vue-router";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
 import { nanoid } from "nanoid";
-import { message } from "ant-design-vue";
+import { message, Modal } from "ant-design-vue";
+import { env } from "/@/utils/util.env";
+import { useUserStore } from "/@/store/modules/user";
 
 export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -73,6 +75,7 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
       router.push({ path: "/certd/pipeline/detail", query: { id, editMode: "true" } });
     });
   }
+  const userStore = useUserStore();
   return {
     crudOptions: {
       request: {
@@ -124,6 +127,33 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
             order: 2,
             icon: "ant-design:setting-outlined"
           },
+          download: {
+            order: 3,
+            title: null,
+            type: "link",
+            icon: "ant-design:download-outlined",
+            async click({ row }) {
+              const files = await api.GetFiles(row.id);
+              Modal.success({
+                title: "文件下载",
+                content: () => {
+                  const children = [];
+                  for (const file of files) {
+                    const downloadUrl = `${env.API}/pi/history/download?pipelineId=${row.id}&fileId=${file.id}`;
+                    children.push(
+                      <p>
+                        <a href={downloadUrl} target={"_blank"}>
+                          {file.filename}
+                        </a>
+                      </p>
+                    );
+                  }
+
+                  return <div class={"mt-3"}>{children}</div>;
+                }
+              });
+            }
+          },
           remove: {
             order: 5
           }

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/history-timeline-item.vue

@@ -5,7 +5,7 @@
     </template>
     <p>
       <fs-date-format :model-value="runnable.status?.startTime"></fs-date-format>
-      <a-tag class="ml-10" :color="status.color">{{ status.label }}</a-tag>
+      <a-tag class="ml-1" :color="status.color">{{ status.label }}</a-tag>
 
       <a-tag v-if="isCurrent" class="pointer" color="green" :closable="true" @close="cancel">当前</a-tag>
       <a-tag v-else-if="!editMode" class="pointer" color="blue" @click="view">查看</a-tag>

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/notification-form/index.vue

@@ -38,6 +38,7 @@
                 options: [
                   { value: 'start', label: '开始时' },
                   { value: 'success', label: '成功时' },
+                  { value: 'turnToSuccess', label: '错误转成功时' },
                   { value: 'error', label: '错误时' }
                 ]
               },

packages/ui/certd-client/src/views/crud/form/independent/index.vue

@@ -7,7 +7,7 @@
           <div style="margin-top: 10px">
             <a-button @click="formSubmit">提交表单</a-button>
             <a-button @click="formReset">重置表单</a-button>
-            <a-button class="ml-10" @click="setFormDataTest">setFormData</a-button>
+            <a-button class="ml-1" @click="setFormDataTest">setFormData</a-button>
           </div>
         </a-card>
       </a-col>

packages/ui/certd-client/tailwind.config.js

@@ -1,11 +1,10 @@
+/** @type {import('tailwindcss').Config} */
 module.exports = {
-  purge: [],
-  darkMode: false, // or 'media' or 'class'
+  darkMode: "class",
+  important: true,
+  content: ["./index.html", "./src/**/*.{vue,js,ts,jsx,tsx}"],
   theme: {
     extend: {}
   },
-  variants: {
-    extend: {}
-  },
   plugins: []
 };

packages/ui/certd-client/vite.config.ts

@@ -4,7 +4,6 @@ import visualizer from "rollup-plugin-visualizer";
 import viteCompression from "vite-plugin-compression";
 import PurgeIcons from "vite-plugin-purge-icons";
 import * as path from "path";
-// import WindiCSS from "vite-plugin-windicss";
 // import { generateModifyVars } from "./build/modify-vars";
 // import { configThemePlugin } from "./build/theme-plugin";
 // import OptimizationPersist from "vite-plugin-optimize-persist";

packages/ui/certd-server/package.json

@@ -45,10 +45,10 @@
     "@midwayjs/validate": "^3.9.0",
     "cache-manager": "^3.6.3",
     "dayjs": "^1.11.7",
-    "dotenv": "^16.0.3",
     "glob": "^7.2.3",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^8.5.1",
+    "koa-send": "^5.0.1",
     "kubernetes-client": "^9.0.0",
     "lodash": "^4.17.21",
     "log4js": "^6.7.1",

packages/ui/certd-server/src/basic/exception/permission-exception.ts

@@ -4,7 +4,7 @@ import { BaseException } from './base-exception';
  * 授权异常
  */
 export class PermissionException extends BaseException {
-  constructor(message) {
+  constructor(message?: string) {
     super(
       'PermissionException',
       Constants.res.permission.code,

packages/ui/certd-server/src/middleware/authority.ts

@@ -25,6 +25,11 @@ export class AuthorityMiddleware implements IWebMiddleware {
         ctx.path,
         ctx.method
       );
+      if (routeInfo == null) {
+        // 404
+        await next();
+        return;
+      }
       const permission = routeInfo.summary;
       if (permission == null || permission === '') {
         ctx.status = 500;
@@ -41,6 +46,14 @@ export class AuthorityMiddleware implements IWebMiddleware {
 
       let token = ctx.get('Authorization') || '';
       token = token.replace('Bearer ', '').trim();
+      if (token === '') {
+        //尝试从cookie中获取token
+        token = ctx.cookies.get('token') || '';
+      }
+      if (token === '') {
+        //尝试从query中获取token
+        token = (ctx.query.token as string) || '';
+      }
       try {
         ctx.user = jwt.verify(token, this.secret);
       } catch (err) {

packages/ui/certd-server/src/modules/login/controller/login-controller.ts

@@ -23,6 +23,11 @@ export class LoginController extends BaseController {
     user
   ) {
     const token = await this.loginService.login(user);
+
+    this.ctx.cookies.set('token', token.token, {
+      maxAge: 1000 * token.expire,
+    });
+
     return this.ok(token);
   }
 

packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts

@@ -2,6 +2,7 @@ import {
   ALL,
   Body,
   Controller,
+  Get,
   Inject,
   Post,
   Provide,
@@ -13,7 +14,11 @@ import { HistoryService } from '../service/history-service';
 import { HistoryLogService } from '../service/history-log-service';
 import { HistoryEntity } from '../entity/history';
 import { HistoryLogEntity } from '../entity/history-log';
-import {Constants} from "../../../basic/constants";
+import { Constants } from '../../../basic/constants';
+import { PipelineService } from '../service/pipeline-service';
+import { CommonException } from '../../../basic/exception/common-exception';
+import { PermissionException } from '../../../basic/exception/permission-exception';
+import * as fs from 'fs';
 
 /**
  * 证书
@@ -24,6 +29,8 @@ export class HistoryController extends CrudController<HistoryService> {
   @Inject()
   service: HistoryService;
   @Inject()
+  pipelineService: PipelineService;
+  @Inject()
   logService: HistoryLogService;
 
   getService() {
@@ -104,4 +111,51 @@ export class HistoryController extends CrudController<HistoryService> {
     const logInfo = await this.logService.info(id);
     return this.ok(logInfo);
   }
+
+  @Post('/files', { summary: Constants.per.authOnly })
+  async files(@Query('pipelineId') pipelineId, @Query('historyId') historyId) {
+    const files = await this.getFiles(historyId, pipelineId);
+    return this.ok(files);
+  }
+
+  private async getFiles(historyId, pipelineId) {
+    let history = null;
+    if (historyId != null) {
+      // nothing
+      history = await this.service.info(historyId);
+    } else if (pipelineId != null) {
+      history = await this.service.getLastHistory(pipelineId);
+    }
+    if (history == null) {
+      throw new CommonException('historyId is null');
+    }
+    if (history.userId !== this.ctx.user.id) {
+      throw new PermissionException();
+    }
+    return await this.service.getFiles(history);
+  }
+
+  @Get('/download', { summary: Constants.per.authOnly })
+  async download(
+    @Query('pipelineId') pipelineId,
+    @Query('historyId') historyId,
+    @Query('fileId') fileId
+  ) {
+    const files = await this.getFiles(historyId, pipelineId);
+    const file = files.find(f => f.id === fileId);
+    if (file == null) {
+      throw new CommonException('file not found');
+    }
+    // koa send file
+    // 下载文件的名称
+    // const filename = file.filename;
+    // 要下载的文件的完整路径
+    const path = file.path;
+
+    // 以流的形式下载文件
+    this.ctx.attachment(path);
+    this.ctx.set('Content-Type', 'application/octet-stream');
+
+    return fs.createReadStream(path);
+  }
 }

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

@@ -1,4 +1,4 @@
-import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/decorator";
+import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/decorator';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
 import { BaseService } from '../../../basic/base-service';
@@ -6,6 +6,7 @@ import { HistoryEntity } from '../entity/history';
 import { PipelineEntity } from '../entity/pipeline';
 import { HistoryDetail } from '../entity/vo/history-detail';
 import { HistoryLogService } from './history-log-service';
+import { FileItem, Pipeline, RunnableCollection } from '@certd/pipeline';
 
 /**
  * 证书申请
@@ -78,4 +79,29 @@ export class HistoryService extends BaseService<HistoryEntity> {
       shouldDeleteCount -= deleteCountBatch;
     }
   }
+
+  async getLastHistory(pipelineId: number) {
+    return await this.repository.findOne({
+      where: {
+        pipelineId,
+      },
+      order: {
+        id: 'DESC',
+      },
+    });
+  }
+
+  async getFiles(history: HistoryEntity) {
+    const status: Pipeline = JSON.parse(history.pipeline);
+    const files: FileItem[] = [];
+    RunnableCollection.each([status], runnable => {
+      if (runnable.runnableType !== 'step') {
+        return;
+      }
+      if (runnable.status?.files != null) {
+        files.push(...runnable.status.files);
+      }
+    });
+    return files;
+  }
 }