lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-05-18 06:17:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 支持从domain中查询子域名托管

Browse Source
This commit is contained in:
xiaojunnuo
2026-01-31 02:39:28 +08:00
parent 8b96f218d5
commit 873654669e
7 changed files with 115 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/plugins/plugin-lib/src/cert/dns-provider/api.ts
+1
View File
@@ -62,6 +62,7 @@ export interface IDnsProvider<T = any> {
export interface ISubDomainsGetter {
getSubDomains(): Promise<string[]>;
hasSubDomain(domain: string): Promise<string>;
}
export interface IDomainParser {
packages/plugins/plugin-lib/src/cert/dns-provider/domain-parser.ts
+17 -9
View File
@@ -38,20 +38,28 @@ export class DomainParser implements IDomainParser {
return value;
}
const subDomains = await this.subDomainsGetter.getSubDomains();
if (subDomains && subDomains.length > 0) {
const fullDomainDot = "." + fullDomain;
for (const subDomain of subDomains) {
if (fullDomainDot.endsWith("." + subDomain)) {
//找到子域名托管
//检查是否有子域名托管
const subDomain = await this.subDomainsGetter.hasSubDomain(fullDomain);
if (subDomain) {
utils.cache.set(cacheKey, subDomain, {
ttl: 60 * 1000,
});
this.logger.info(`获取到子域名托管域名:${fullDomain}->${subDomain}`);
this.logger.info(`获取到托管域名:${fullDomain}->${subDomain}`);
return subDomain;
}
}
}
// if (subDomains && subDomains.length > 0) {
// const fullDomainDot = "." + fullDomain;
// for (const subDomain of subDomains) {
// if (fullDomainDot.endsWith("." + subDomain)) {
// //找到子域名托管
// utils.cache.set(cacheKey, subDomain, {
// ttl: 60 * 1000,
// });
// this.logger.info(`获取到子域名托管域名:${fullDomain}->${subDomain}`);
// return subDomain;
// }
// }
// }
const res = this.parseDomainByPsl(fullDomain);
this.logger.info(`从psl获取主域名:${fullDomain}->${res}`);
packages/ui/certd-server/src/controller/user/pipeline/sub-domain-controller.ts
+8 -4
View File
@@ -1,8 +1,8 @@
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';
import { SubDomainsGetter } from '../../../modules/pipeline/service/getter/sub-domain-getter.js';
import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
import { SubDomainService } from "../../../modules/pipeline/service/sub-domain-service.js";
import { TaskServiceBuilder } from '../../../modules/pipeline/service/getter/task-service-getter.js';
/**
* 子域名托管
@@ -13,6 +13,9 @@ export class SubDomainController extends CrudController<SubDomainService> {
@Inject()
service: SubDomainService;
@Inject()
taskServiceBuilder: TaskServiceBuilder;
getService() {
return this.service;
}
@@ -20,7 +23,8 @@ export class SubDomainController extends CrudController<SubDomainService> {
@Post('/parseDomain', { summary: Constants.per.authOnly })
async parseDomain(@Body("fullDomain") fullDomain:string) {
const userId = this.getUserId()
const subDomainGetter = new SubDomainsGetter(userId, this.service)
const taskService = this.taskServiceBuilder.create({ userId: userId });
const subDomainGetter = await taskService.getSubDomainsGetter();
const domainParser = new DomainParser(subDomainGetter)
const domain = await domainParser.parse(fullDomain)
return this.ok(domain);
packages/ui/certd-server/src/modules/cert/service/domain-service.ts
+6 -4
View File
@@ -12,7 +12,6 @@ import { CnameRecordEntity } from "../../cname/entity/cname-record.js";
import { CnameRecordService } from '../../cname/service/cname-record-service.js';
import { UserDomainImportSetting } from '../../mine/service/models.js';
import { UserSettingsService } from '../../mine/service/user-settings-service.js';
import { SubDomainsGetter } from '../../pipeline/service/getter/sub-domain-getter.js';
import { TaskServiceBuilder } from '../../pipeline/service/getter/task-service-getter.js';
import { SubDomainService } from "../../pipeline/service/sub-domain-service.js";
import { DomainEntity } from '../entity/domain.js';
@@ -112,7 +111,8 @@ export class DomainService extends BaseService<DomainEntity> {
async getDomainVerifiers(userId: number, domains: string[]): Promise<DomainVerifiers> {
const mainDomainMap: Record<string, string> = {}
const subDomainGetter = new SubDomainsGetter(userId, this.subDomainService)
const taskService = this.taskServiceBuilder.create({ userId: userId });
const subDomainGetter = await taskService.getSubDomainsGetter();
const domainParser = new DomainParser(subDomainGetter)
const mainDomains = []
@@ -241,9 +241,11 @@ export class DomainService extends BaseService<DomainEntity> {
private async _syncFromProvider(req: SyncFromProviderReq, task: BackTask) {
const { userId, dnsProviderType, dnsProviderAccessId } = req;
const subDomainGetter = new SubDomainsGetter(userId, this.subDomainService)
const domainParser = new DomainParser(subDomainGetter)
const serviceGetter = this.taskServiceBuilder.create({ userId });
const subDomainGetter = await serviceGetter.getSubDomainsGetter();
const domainParser = new DomainParser(subDomainGetter)
const access = await this.accessService.getById(dnsProviderAccessId, userId);
const context = { access, logger, http, utils, domainParser, serviceGetter };
// 翻页查询dns的记录
packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts
+16 -16
View File
@@ -1,6 +1,5 @@
import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
import { InjectEntityModel } from "@midwayjs/typeorm";
import { Repository } from "typeorm";
import { createChallengeFn, getAuthoritativeDnsResolver } from "@certd/acme-client";
import { cache, http, isDev, logger, utils } from "@certd/basic";
import {
AccessService,
BaseService,
@@ -9,20 +8,19 @@ import {
SysSettingsService,
ValidateException
} from "@certd/lib-server";
import { CnameRecordEntity, CnameRecordStatusType } from "../entity/cname-record.js";
import { createDnsProvider, IDnsProvider } from "@certd/plugin-cert";
import { CnameProvider, CnameRecord } from "@certd/pipeline";
import { cache, http, isDev, logger, utils } from "@certd/basic";
import { getAuthoritativeDnsResolver, createChallengeFn } from "@certd/acme-client";
import { CnameProviderService } from "./cname-provider-service.js";
import { CnameProviderEntity } from "../entity/cname-provider.js";
import { CommonDnsProvider } from "./common-provider.js";
import { DomainParser } from "@certd/plugin-cert";
import { createDnsProvider, DomainParser, IDnsProvider } from "@certd/plugin-cert";
import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
import { InjectEntityModel } from "@midwayjs/typeorm";
import punycode from "punycode.js";
import { SubDomainService } from "../../pipeline/service/sub-domain-service.js";
import { SubDomainsGetter } from "../../pipeline/service/getter/sub-domain-getter.js";
import { TaskServiceBuilder } from "../../pipeline/service/getter/task-service-getter.js";
import { Repository } from "typeorm";
import { BackTask, taskExecutor } from "../../basic/service/task-executor.js";
import { TaskServiceBuilder } from "../../pipeline/service/getter/task-service-getter.js";
import { SubDomainService } from "../../pipeline/service/sub-domain-service.js";
import { CnameProviderEntity } from "../entity/cname-provider.js";
import { CnameRecordEntity, CnameRecordStatusType } from "../entity/cname-record.js";
import { CnameProviderService } from "./cname-provider-service.js";
import { CommonDnsProvider } from "./common-provider.js";
type CnameCheckCacheValue = {
validating: boolean;
@@ -106,7 +104,8 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
private async cnameProviderChanged(userId: number, param: any, cnameProvider: CnameProviderEntity) {
param.cnameProviderId = cnameProvider.id;
const subDomainGetter = new SubDomainsGetter(userId, this.subDomainService);
const taskService = this.taskServiceBuilder.create({ userId: userId });
const subDomainGetter = await taskService.getSubDomainsGetter();
const domainParser = new DomainParser(subDomainGetter);
const realDomain = await domainParser.parse(param.domain);
@@ -254,7 +253,8 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
await this.getByDomain(bean.domain, bean.userId);
const subDomainGetter = new SubDomainsGetter(bean.userId, this.subDomainService);
const taskService = this.taskServiceBuilder.create({ userId: bean.userId });
const subDomainGetter = await taskService.getSubDomainsGetter();
const domainParser = new DomainParser(subDomainGetter);
const cacheKey = `cname.record.verify.${bean.id}`;
packages/ui/certd-server/src/modules/pipeline/service/getter/sub-domain-getter.ts
+33 -1
View File
@@ -1,17 +1,49 @@
import {ISubDomainsGetter} from "@certd/plugin-cert";
import {SubDomainService} from "../sub-domain-service.js";
import { DomainService } from "../../../cert/service/domain-service.js";
export class SubDomainsGetter implements ISubDomainsGetter {
userId: number;
subDomainService: SubDomainService;
domainService: DomainService;
constructor(userId: number, subDomainService: SubDomainService) {
constructor(userId: number, subDomainService: SubDomainService, domainService: DomainService) {
this.userId = userId;
this.subDomainService = subDomainService;
this.domainService = domainService;
}
async getSubDomains() {
return await this.subDomainService.getListByUserId(this.userId)
}
async hasSubDomain(fullDomain: string) {
const subDomains = await this.getSubDomains()
if (subDomains && subDomains.length > 0) {
const fullDomainDot = "." + fullDomain;
for (const subDomain of subDomains) {
if (fullDomainDot.endsWith("." + subDomain)) {
//找到子域名托管
return subDomain;
}
}
}
let arr = fullDomain.split(".")
while(arr.length>0){
const subDomain = arr.join(".")
const domain = await this.domainService.findOne({
where: {
userId: this.userId,
domain: subDomain,
challengeType: "dns",
}
})
if(domain){
return subDomain
}
arr = arr.slice(1)
}
return null
}
}
packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
+2 -1
View File
@@ -45,7 +45,8 @@ export class TaskServiceGetter implements IServiceGetter{
async getSubDomainsGetter(): Promise<SubDomainsGetter> {
const subDomainsService:SubDomainService = await this.appCtx.getAsync("subDomainService")
return new SubDomainsGetter(this.userId, subDomainsService)
const domainService:DomainService = await this.appCtx.getAsync("domainService")
return new SubDomainsGetter(this.userId, subDomainsService,domainService)
}
async getAccessService(): Promise<AccessGetter> {