Merge branch 'v2-dev' into v2-dev-buy

packages/ui/certd-server/src/controller/sys/access/access-controller.ts

@@ -1,7 +1,6 @@
-import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { AccessService, Constants } from '@certd/lib-server';
-import { AccessController } from '../../user/pipeline/access-controller.js';
-import { checkComm } from '@certd/plus-core';
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { AccessService, Constants } from "@certd/lib-server";
+import { AccessController } from "../../user/pipeline/access-controller.js";
 
 /**
  * 授权
@@ -17,7 +16,7 @@ export class SysAccessController extends AccessController {
   }
 
   getUserId() {
-    checkComm();
+    // checkComm();
     return 0;
   }
 

packages/ui/certd-server/src/controller/sys/nettest/nettest-controller.ts

@@ -0,0 +1,47 @@
+import { BaseController } from '@certd/lib-server';
+import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
+import { NetTestService } from '../../../modules/sys/nettest/nettest-service.js';
+
+
+@Provide()
+@Controller('/api/sys/nettest/')
+export class SysNetTestController extends BaseController {
+  
+  @Inject()
+  netTestService: NetTestService;
+
+
+  @Post('/domainResolve', { summary: 'sys:settings:view' })
+  public async domainResolve(@Body(ALL) body: { domain: string }) {
+
+    const { domain } = body;
+    const result = await this.netTestService.domainResolve(domain);
+    return this.ok(result);
+  }
+
+  // ping
+  @Post('/ping', { summary: 'sys:settings:view' })
+  public async ping(@Body(ALL) body: { domain: string }) {
+
+    const { domain } = body;
+    const result = await this.netTestService.ping(domain);
+    return this.ok(result);
+  }
+
+  // telnet 
+  @Post('/telnet', { summary: 'sys:settings:view' })
+  public async telnet(@Body(ALL) body: { domain: string, port: number }) {
+
+    const { domain, port } = body;
+    const result = await this.netTestService.telnet(domain, port);
+    return this.ok(result);
+  }
+
+    // telnet 
+  @Post('/serverInfo', { summary: 'sys:settings:view' })
+  public async serverInfo() {
+
+    const result = await this.netTestService.serverInfo();
+    return this.ok(result);
+  }
+}

packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts

@@ -192,4 +192,11 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
     await this.service.saveSetting(blankSetting);
     return this.ok({});
   }
+
+
+  @Post("/captchaTest", { summary: "sys:settings:edit" })
+  async captchaTest(@Body(ALL) body: any) {
+    await this.codeService.checkCaptcha(body)
+    return this.ok({});
+  }
 }

packages/ui/certd-server/src/controller/user/addon/addon-controller.ts

@@ -11,56 +11,59 @@ import {
 import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
 import { checkPlus } from "@certd/plus-core";
 import { http, logger, utils } from "@certd/basic";
+import { TaskServiceBuilder } from "../../../modules/pipeline/service/getter/task-service-getter.js";
 
 /**
  * Addon
  */
 @Provide()
-@Controller('/api/addon')
+@Controller("/api/addon")
 export class AddonController extends CrudController<AddonService> {
   @Inject()
   service: AddonService;
   @Inject()
   authService: AuthService;
+  @Inject()
+  taskServiceBuilder:TaskServiceBuilder
 
   getService(): AddonService {
     return this.service;
   }
 
-  @Post('/page', { summary: Constants.per.authOnly })
+  @Post("/page", { summary: Constants.per.authOnly })
   async page(@Body(ALL) body) {
     body.query = body.query ?? {};
     delete body.query.userId;
     const buildQuery = qb => {
-      qb.andWhere('user_id = :userId', { userId: this.getUserId() });
+      qb.andWhere("user_id = :userId", { userId: this.getUserId() });
     };
     const res = await this.service.page({
       query: body.query,
       page: body.page,
       sort: body.sort,
-      buildQuery,
+      buildQuery
     });
     return this.ok(res);
   }
 
-  @Post('/list', { summary: Constants.per.authOnly })
+  @Post("/list", { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
     body.query = body.query ?? {};
     body.query.userId = this.getUserId();
     return super.list(body);
   }
 
-  @Post('/add', { summary: Constants.per.authOnly })
+  @Post("/add", { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean) {
     bean.userId = this.getUserId();
     const type = bean.type;
     const addonType = bean.addonType;
-    if (! type || !addonType){
-        throw new ValidateException('请选择Addon类型');
+    if (!type || !addonType) {
+      throw new ValidateException("请选择Addon类型");
     }
-    const define: AddonDefine = this.service.getDefineByType(type,addonType);
+    const define: AddonDefine = this.service.getDefineByType(type, addonType);
     if (!define) {
-      throw new ValidateException('Addon类型不存在');
+      throw new ValidateException("Addon类型不存在");
     }
     if (define.needPlus) {
       checkPlus();
@@ -68,19 +71,19 @@ export class AddonController extends CrudController<AddonService> {
     return super.add(bean);
   }
 
-  @Post('/update', { summary: Constants.per.authOnly })
+  @Post("/update", { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
     await this.service.checkUserId(bean.id, this.getUserId());
     const old = await this.service.info(bean.id);
     if (!old) {
-      throw new ValidateException('Addon配置不存在');
+      throw new ValidateException("Addon配置不存在");
     }
-    if (old.type !== bean.type ) {
+    if (old.type !== bean.type) {
       const addonType = old.type;
       const type = bean.type;
-      const define: AddonDefine = this.service.getDefineByType(type,addonType);
+      const define: AddonDefine = this.service.getDefineByType(type, addonType);
       if (!define) {
-        throw new ValidateException('Addon类型不存在');
+        throw new ValidateException("Addon类型不存在");
       }
       if (define.needPlus) {
         checkPlus();
@@ -89,26 +92,27 @@ export class AddonController extends CrudController<AddonService> {
     delete bean.userId;
     return super.update(bean);
   }
-  @Post('/info', { summary: Constants.per.authOnly })
-  async info(@Query('id') id: number) {
+
+  @Post("/info", { summary: Constants.per.authOnly })
+  async info(@Query("id") id: number) {
     await this.service.checkUserId(id, this.getUserId());
     return super.info(id);
   }
 
-  @Post('/delete', { summary: Constants.per.authOnly })
-  async delete(@Query('id') id: number) {
+  @Post("/delete", { summary: Constants.per.authOnly })
+  async delete(@Query("id") id: number) {
     await this.service.checkUserId(id, this.getUserId());
     return super.delete(id);
   }
 
-  @Post('/define', { summary: Constants.per.authOnly })
-  async define(@Query('type') type: string,@Query('addonType') addonType: string) {
-    const notification = this.service.getDefineByType(type,addonType);
+  @Post("/define", { summary: Constants.per.authOnly })
+  async define(@Query("type") type: string, @Query("addonType") addonType: string) {
+    const notification = this.service.getDefineByType(type, addonType);
     return this.ok(notification);
   }
 
-  @Post('/getTypeDict', { summary: Constants.per.authOnly })
-  async getTypeDict(@Query('addonType') addonType: string) {
+  @Post("/getTypeDict", { summary: Constants.per.authOnly })
+  async getTypeDict(@Query("addonType") addonType: string) {
     const list: any = this.service.getDefineList(addonType);
     let dict = [];
     for (const item of list) {
@@ -116,7 +120,7 @@ export class AddonController extends CrudController<AddonService> {
         value: item.name,
         label: item.title,
         needPlus: item.needPlus ?? false,
-        icon: item.icon,
+        icon: item.icon
       });
     }
     dict = dict.sort(a => {
@@ -125,13 +129,13 @@ export class AddonController extends CrudController<AddonService> {
     return this.ok(dict);
   }
 
-  @Post('/simpleInfo', { summary: Constants.per.authOnly })
-  async simpleInfo(@Query('addonType') addonType: string,@Query('id') id: number) {
+  @Post("/simpleInfo", { summary: Constants.per.authOnly })
+  async simpleInfo(@Query("addonType") addonType: string, @Query("id") id: number) {
     if (id === 0) {
       //获取默认
-      const res = await this.service.getDefault(this.getUserId(),addonType);
+      const res = await this.service.getDefault(this.getUserId(), addonType);
       if (!res) {
-        throw new ValidateException('默认Addon配置不存在');
+        throw new ValidateException("默认Addon配置不存在");
       }
       const simple = await this.service.getSimpleInfo(res.id);
       return this.ok(simple);
@@ -141,27 +145,27 @@ export class AddonController extends CrudController<AddonService> {
     return this.ok(res);
   }
 
-  @Post('/getDefaultId', { summary: Constants.per.authOnly })
-  async getDefaultId(@Query('addonType') addonType: string) {
-    const res = await this.service.getDefault(this.getUserId(),addonType);
+  @Post("/getDefaultId", { summary: Constants.per.authOnly })
+  async getDefaultId(@Query("addonType") addonType: string) {
+    const res = await this.service.getDefault(this.getUserId(), addonType);
     return this.ok(res?.id);
   }
 
-  @Post('/setDefault', { summary: Constants.per.authOnly })
-  async setDefault(@Query('addonType') addonType: string,@Query('id') id: number) {
+  @Post("/setDefault", { summary: Constants.per.authOnly })
+  async setDefault(@Query("addonType") addonType: string, @Query("id") id: number) {
     await this.service.checkUserId(id, this.getUserId());
-    const res = await this.service.setDefault(id, this.getUserId(),addonType);
+    const res = await this.service.setDefault(id, this.getUserId(), addonType);
     return this.ok(res);
   }
 
 
-  @Post('/options', { summary: Constants.per.authOnly })
-  async options(@Query('addonType') addonType: string) {
+  @Post("/options", { summary: Constants.per.authOnly })
+  async options(@Query("addonType") addonType: string) {
     const res = await this.service.list({
       query: {
         userId: this.getUserId(),
         addonType
-      },
+      }
     });
     for (const item of res) {
       delete item.setting;
@@ -170,7 +174,7 @@ export class AddonController extends CrudController<AddonService> {
   }
 
 
-  @Post('/handle', { summary: Constants.per.authOnly })
+  @Post("/handle", { summary: Constants.per.authOnly })
   async handle(@Body(ALL) body: AddonRequestHandleReq) {
     const userId = this.getUserId();
     let inputAddon = body.input.addon;
@@ -178,21 +182,24 @@ export class AddonController extends CrudController<AddonService> {
       const oldEntity = await this.service.info(body.input.id);
       if (oldEntity) {
         if (oldEntity.userId !== userId) {
-          throw new Error('addon not found');
+          throw new Error("addon not found");
         }
         // const param: any = {
         //   type: body.typeName,
         //   setting: JSON.stringify(body.input.access),
         // };
-        inputAddon = JSON.parse( oldEntity.setting)
+        inputAddon = JSON.parse(oldEntity.setting);
       }
     }
+    const serviceGetter = this.taskServiceBuilder.create({ userId });
+
     const ctx = {
       http: http,
-      logger:logger,
-      utils:utils,
-    }
-    const addon = await newAddon(body.addonType,body.typeName, inputAddon,ctx);
+      logger: logger,
+      utils: utils,
+      serviceGetter
+    };
+    const addon = await newAddon(body.addonType, body.typeName, inputAddon, ctx);
     const res = await addon.onRequest(body);
     return this.ok(res);
   }

packages/ui/certd-server/src/controller/user/basic/group-controller.ts

@@ -0,0 +1,78 @@
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
+import { Constants, CrudController } from '@certd/lib-server';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { GroupService } from '../../../modules/basic/service/group-service.js';
+
+/**
+ * 通知
+ */
+@Provide()
+@Controller('/api/basic/group')
+export class GroupController extends CrudController<GroupService> {
+  @Inject()
+  service: GroupService;
+  @Inject()
+  authService: AuthService;
+
+  getService(): GroupService {
+    return this.service;
+  }
+
+  @Post('/page', { summary: Constants.per.authOnly })
+  async page(@Body(ALL) body: any) {
+    body.query = body.query ?? {};
+    delete body.query.userId;
+    const buildQuery = qb => {
+      qb.andWhere('user_id = :userId', { userId: this.getUserId() });
+    };
+    const res = await this.service.page({
+      query: body.query,
+      page: body.page,
+      sort: body.sort,
+      buildQuery,
+    });
+    return this.ok(res);
+  }
+
+  @Post('/list', { summary: Constants.per.authOnly })
+  async list(@Body(ALL) body: any) {
+    body.query = body.query ?? {};
+    body.query.userId = this.getUserId();
+    return await super.list(body);
+  }
+
+  @Post('/add', { summary: Constants.per.authOnly })
+  async add(@Body(ALL) bean: any) {
+    bean.userId = this.getUserId();
+    return await super.add(bean);
+  }
+
+  @Post('/update', { summary: Constants.per.authOnly })
+  async update(@Body(ALL) bean) {
+    await this.service.checkUserId(bean.id, this.getUserId());
+    delete bean.userId;
+    return await super.update(bean);
+  }
+  @Post('/info', { summary: Constants.per.authOnly })
+  async info(@Query('id') id: number) {
+    await this.service.checkUserId(id, this.getUserId());
+    return await super.info(id);
+  }
+
+  @Post('/delete', { summary: Constants.per.authOnly })
+  async delete(@Query('id') id: number) {
+    await this.service.checkUserId(id, this.getUserId());
+    return await super.delete(id);
+  }
+
+  @Post('/all', { summary: Constants.per.authOnly })
+  async all(@Query('type') type: string) {
+    const list: any = await this.service.find({
+      where: {
+        userId: this.getUserId(),
+        type,
+      },
+    });
+    return this.ok(list);
+  }
+}

packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts

@@ -85,10 +85,18 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
   }
 
   @Post('/verify', { summary: Constants.per.authOnly })
-  async verify(@Body(ALL) body: { id: string }) {
+  async verify(@Body(ALL) body: { id: number }) {
     const userId = this.getUserId();
     await this.service.checkUserId(body.id, userId);
     const res = await this.service.verify(body.id);
     return this.ok(res);
   }
+
+  @Post('/resetStatus', { summary: Constants.per.authOnly })
+  async resetStatus(@Body(ALL) body: { id: number }) {
+    const userId = this.getUserId();
+    await this.service.checkUserId(body.id, userId);
+    const res = await this.service.resetStatus(body.id);
+    return this.ok(res);
+  }
 }

packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts

@@ -92,6 +92,14 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
     return await super.delete(id);
   }
 
+
+  @Post('/batchDelete', { summary: Constants.per.authOnly })
+  async batchDelete(@Body(ALL) body: any) {
+    const userId = this.getUserId();
+    await this.service.batchDelete(body.ids,userId);
+    return this.ok();
+  }
+
   @Post('/check', { summary: Constants.per.authOnly })
   async check(@Body('id') id: number) {
     await this.service.checkUserId(id, this.getUserId());
@@ -111,6 +119,7 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
     const userId = this.getUserId();
     await this.service.doImport({
       text:body.text,
+      groupId:body.groupId,
       userId
     })
     return this.ok();

packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts

@@ -107,6 +107,9 @@ export class NotificationController extends CrudController<NotificationService>
         icon: item.icon,
       });
     }
+    dict = dict.sort(a => {
+      return a.order ? 0 : -1;
+    });
     dict = dict.sort(a => {
       return a.needPlus ? 0 : -1;
     });

packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts

@@ -4,6 +4,8 @@ import { PipelineService } from '../../../modules/pipeline/service/pipeline-serv
 import { PipelineEntity } from '../../../modules/pipeline/entity/pipeline.js';
 import { HistoryService } from '../../../modules/pipeline/service/history-service.js';
 import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { SiteInfoService } from '../../../modules/monitor/index.js';
+import { isPlus } from '@certd/plus-core';
 
 /**
  * 证书
@@ -20,6 +22,9 @@ export class PipelineController extends CrudController<PipelineService> {
   @Inject()
   sysSettingsService: SysSettingsService;
 
+  @Inject()
+  siteInfoService: SiteInfoService;
+
   getService() {
     return this.service;
   }
@@ -74,13 +79,30 @@ export class PipelineController extends CrudController<PipelineService> {
   }
 
   @Post('/save', { summary: Constants.per.authOnly })
-  async save(@Body(ALL) bean: PipelineEntity) {
+  async save(@Body(ALL) bean: {addToMonitorEnabled: boolean, addToMonitorDomains: string} & PipelineEntity) {
     if (bean.id > 0) {
       await this.authService.checkEntityUserId(this.ctx, this.getService(), bean.id);
     } else {
       bean.userId = this.getUserId();
     }
+
+    if(!this.isAdmin()){
+      // 非管理员用户 不允许设置流水线有效期
+      delete bean.validTime
+    }
+
     await this.service.save(bean);
+    //是否增加证书监控
+    if (bean.addToMonitorEnabled && bean.addToMonitorDomains) {
+      const sysPublicSettings = await this.sysSettingsService.getPublicSettings();
+      if (isPlus() && sysPublicSettings.certDomainAddToMonitorEnabled) {
+        //增加证书监控
+        await this.siteInfoService.doImport({
+          text: bean.addToMonitorDomains,
+          userId: this.getUserId(),
+        });
+      }
+    }
     return this.ok(bean.id);
   }
 
@@ -101,7 +123,7 @@ export class PipelineController extends CrudController<PipelineService> {
   @Post('/trigger', { summary: Constants.per.authOnly })
   async trigger(@Query('id') id: number, @Query('stepId') stepId?: string) {
     await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
-    await this.service.trigger(id, stepId);
+    await this.service.trigger(id, stepId,true);
     return this.ok({});
   }
 

packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts

@@ -1,7 +1,7 @@
 import {ALL, Body, Controller, Inject, Post, Provide, Query} from '@midwayjs/core';
 import {Constants, CrudController} from '@certd/lib-server';
 import {SubDomainService} from "../../../modules/pipeline/service/sub-domain-service.js";
-import {DomainParser} from '@certd/plugin-cert/dist/dns-provider/domain-parser.js';
+import {DomainParser} from '@certd/plugin-cert';
 import { SubDomainsGetter } from '../../../modules/pipeline/service/getter/sub-domain-getter.js';
 
 /**