diff --git a/packages/ui/certd-server/src/plugins/plugin-west/access.ts b/packages/ui/certd-server/src/plugins/plugin-west/access.ts index a4e36ea68..fbaffa6aa 100644 --- a/packages/ui/certd-server/src/plugins/plugin-west/access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-west/access.ts @@ -91,6 +91,27 @@ export class WestAccess extends BaseAccess { apidomainkey = ''; + /** + * 授权属性配置 + */ + @AccessInput({ + title: '域名', + component: { + placeholder: '域名级别的key对应的域名', + }, + encrypt: false, + required: false, + mergeScript: ` + return { + show:ctx.compute(({form})=>{ + return form.access.scope === 'domain' + }) + } + `, + }) + domain = ''; + + @AccessInput({ title: "测试", component: { @@ -102,10 +123,44 @@ export class WestAccess extends BaseAccess { testRequest = true; async onTestRequest() { + + if(this.scope === 'domain'){ + if(!this.domain){ + throw new Error('domain 必填'); + } + await this.getDomainRecordList({limit:1}); + return "ok"; + } + await this.getDomainList(); return "ok"; } + async getDomainRecordList(req:{limit:number}){ + // 获取域名解析记录列表 + return await this.doDoimainApiRequest('https://api.west.cn/API/v2/domain/dns/',{ + act:'dnsrec.list', + domain:this.domain, + limit: req.limit || 10, + }) + } + + + async doDoimainApiRequest(url: string, data: any = null, method = 'post') { + data.apidomainkey = this.apidomainkey; + const res = await this.ctx.http.request({ + url, + method, + data, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + }, + }); + if (res.msg !== 'success') { + throw new Error(`${JSON.stringify(res.msg)}`); + } + return res; + } async getDomainList() { const res = await this.doRequest({ diff --git a/packages/ui/certd-server/src/plugins/plugin-west/dns-provider-domain.ts b/packages/ui/certd-server/src/plugins/plugin-west/dns-provider-domain.ts new file mode 100644 index 000000000..9d922e898 --- /dev/null +++ b/packages/ui/certd-server/src/plugins/plugin-west/dns-provider-domain.ts @@ -0,0 +1,91 @@ +import { AbstractDnsProvider, CreateRecordOptions, RemoveRecordOptions } from '@certd/plugin-cert'; + +import { WestAccess } from './access.js'; + +type westRecord = { + // 这里定义Record记录的数据结构,跟对应云平台接口返回值一样即可,一般是拿到id就行,用于删除txt解析记录,清理申请痕迹 + code: number; + msg: string; + body: { + record_id: number; + }; +}; + + +export class WestDnsProviderDomain extends AbstractDnsProvider { + access!: WestAccess; + + async onInstance() { + this.access = this.ctx.access as WestAccess + // 也可以通过ctx成员变量传递context + this.logger.debug('access:', this.access); + //初始化的操作 + //... + } + + /** + * 创建dns解析记录,用于验证域名所有权 + */ + async createRecord(options: CreateRecordOptions): Promise { + /** + * options 参数说明 + * fullRecord: '_acme-challenge.example.com', + * value: 一串uuid + * type: 'TXT', + * domain: 'example.com' + */ + const { fullRecord, value, type, domain } = options; + this.logger.info('添加域名解析:', fullRecord, value, type, domain); + + // 准备要发送到API的请求体 + const requestBody = { + act: 'dnsrec.add', // API动作类型 + domain: domain, // 域名 + record_type: 'TXT', // DNS记录类型 + hostname: fullRecord, // 完整的记录名 + record_value: value, // 记录的值 + record_line: '', // 记录线路 + record_ttl: 60, // TTL (生存时间),设置为60秒 + }; + + const url = 'https://api.west.cn/API/v2/domain/dns/'; + const res = await this.access.doDoimainApiRequest(url, requestBody); + const record = res as westRecord; + this.logger.info(`添加域名解析成功:fullRecord=${fullRecord},value=${value}`); + this.logger.info(`dns解析记录:${JSON.stringify(record)}`); + // 西部数码生效较慢 增加90秒等待 提高成功率 + this.logger.info('等待解析生效:wait 90s'); + await new Promise(resolve => setTimeout(resolve, 90000)); + return record; + } + + /** + * 删除dns解析记录,清理申请痕迹 + * @param options + */ + async removeRecord(options: RemoveRecordOptions): Promise { + const { fullRecord, value, domain } = options.recordReq; + const record = options.recordRes; + this.logger.info('删除域名解析:', fullRecord, value, record); + if (!record) { + this.logger.info('record不存在'); + return; + } + //这里调用删除txt dns解析记录接口 + + // 准备要发送到API的请求体 + const requestBody = { + act: 'dnsrec.remove', // API动作类型 + domain: domain, // 域名 + record_id: record.body.record_id, + hostname: fullRecord, // 完整的记录名 + record_type: 'TXT', // DNS记录类型 + record_line: '', // 记录线路 + }; + + const url = 'https://api.west.cn/API/v2/domain/dns/'; + const res = await this.access.doDoimainApiRequest(url, requestBody); + const result = res.result; + this.logger.info('删除域名解析成功:', fullRecord, value, JSON.stringify(result)); + } +} diff --git a/packages/ui/certd-server/src/plugins/plugin-west/dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-west/dns-provider.ts index 9179f121b..1d2ab6abc 100644 --- a/packages/ui/certd-server/src/plugins/plugin-west/dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-west/dns-provider.ts @@ -1,5 +1,5 @@ import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert'; - +import { WestDnsProviderDomain } from './dns-provider-domain.js'; import { WestAccess } from './access.js'; type westRecord = { @@ -31,10 +31,26 @@ export class WestDnsProvider extends AbstractDnsProvider { //... } + getDomainProvider(){ + const provider = new WestDnsProviderDomain(); + provider.access = this.access; + provider.logger = this.logger; + provider.ctx = this.ctx; + provider.http = this.http; + return provider; + } + /** * 创建dns解析记录,用于验证域名所有权 */ async createRecord(options: CreateRecordOptions): Promise { + + if(this.access.scope === 'domain'){ + //如果是域名级别的,走老接口 + const provider = this.getDomainProvider(); + return provider.createRecord(options); + } + /** * options 参数说明 * fullRecord: '_acme-challenge.example.com', @@ -77,6 +93,12 @@ export class WestDnsProvider extends AbstractDnsProvider { * @param options */ async removeRecord(options: RemoveRecordOptions): Promise { + if(this.access.scope === 'domain'){ + //如果是域名级别的,走老接口 + const provider = this.getDomainProvider(); + return provider.removeRecord(options as any); + } + const { fullRecord, value, domain } = options.recordReq; const record = options.recordRes; this.logger.info('删除域名解析:', fullRecord, value, record); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7e67306a9..df5e2e8d3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,7 +46,7 @@ importers: packages/core/acme-client: dependencies: '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../basic '@peculiar/x509': specifier: ^1.11.0 @@ -210,10 +210,10 @@ importers: packages/core/pipeline: dependencies: '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../basic '@certd/plus-core': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../pro/plus-core dayjs: specifier: ^1.11.7 @@ -409,7 +409,7 @@ importers: packages/libs/lib-k8s: dependencies: '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/basic '@kubernetes/client-node': specifier: 0.21.0 @@ -449,19 +449,19 @@ importers: packages/libs/lib-server: dependencies: '@certd/acme-client': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/pipeline '@certd/plugin-lib': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../plugins/plugin-lib '@certd/plus-core': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../pro/plus-core '@midwayjs/cache': specifier: 3.14.0 @@ -607,16 +607,16 @@ importers: packages/plugins/plugin-cert: dependencies: '@certd/acme-client': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/pipeline '@certd/plugin-lib': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../plugin-lib '@google-cloud/publicca': specifier: ^1.3.0 @@ -695,10 +695,10 @@ importers: specifier: ^3.787.0 version: 3.810.0(aws-crt@1.26.2) '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/pipeline '@kubernetes/client-node': specifier: 0.21.0 @@ -783,19 +783,19 @@ importers: packages/pro/commercial-core: dependencies: '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/basic '@certd/lib-server': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../libs/lib-server '@certd/pipeline': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/pipeline '@certd/plugin-plus': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../plugin-plus '@certd/plus-core': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../plus-core '@midwayjs/core': specifier: 3.20.11 @@ -880,22 +880,22 @@ importers: specifier: ^1.0.2 version: 1.0.3 '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/basic '@certd/lib-k8s': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../libs/lib-k8s '@certd/pipeline': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/pipeline '@certd/plugin-cert': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../plugins/plugin-cert '@certd/plugin-lib': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../plugins/plugin-lib '@certd/plus-core': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../plus-core ali-oss: specifier: ^6.21.0 @@ -998,7 +998,7 @@ importers: packages/pro/plus-core: dependencies: '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/basic dayjs: specifier: ^1.11.7 @@ -1294,10 +1294,10 @@ importers: version: 0.1.3(zod@3.24.4) devDependencies: '@certd/lib-iframe': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../libs/lib-iframe '@certd/pipeline': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/pipeline '@rollup/plugin-commonjs': specifier: ^25.0.7 @@ -1480,46 +1480,46 @@ importers: specifier: ^3.705.0 version: 3.810.0(aws-crt@1.26.2) '@certd/acme-client': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/basic '@certd/commercial-core': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../pro/commercial-core '@certd/cv4pve-api-javascript': specifier: ^8.4.2 version: 8.4.2 '@certd/jdcloud': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../libs/lib-jdcloud '@certd/lib-huawei': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../libs/lib-huawei '@certd/lib-k8s': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../libs/lib-k8s '@certd/lib-server': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../libs/lib-server '@certd/midway-flyway-js': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../libs/midway-flyway-js '@certd/pipeline': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../core/pipeline '@certd/plugin-cert': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../plugins/plugin-cert '@certd/plugin-lib': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../plugins/plugin-lib '@certd/plugin-plus': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../pro/plugin-plus '@certd/plus-core': - specifier: ^1.37.10 + specifier: ^1.37.12 version: link:../../pro/plus-core '@huaweicloud/huaweicloud-sdk-cdn': specifier: ^3.1.120 @@ -20394,13 +20394,13 @@ snapshots: resolve: 1.22.10 semver: 6.3.1 - eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8): + eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8): dependencies: eslint: 7.32.0 prettier: 2.8.8 prettier-linter-helpers: 1.0.0 optionalDependencies: - eslint-config-prettier: 8.10.0(eslint@7.32.0) + eslint-config-prettier: 8.10.0(eslint@8.57.0) eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8): dependencies: @@ -22810,7 +22810,7 @@ snapshots: eslint: 7.32.0 eslint-config-prettier: 8.10.0(eslint@7.32.0) eslint-plugin-node: 11.1.0(eslint@7.32.0) - eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8) + eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8) execa: 5.1.1 inquirer: 7.3.3 json5: 2.2.3