mirror of
https://github.com/certd/certd.git
synced 2026-04-24 04:17:25 +08:00
fix: 修复西部数码使用域名级别的key申请证书失败的问题
This commit is contained in:
@@ -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<any, any>({
|
||||
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({
|
||||
|
||||
@@ -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<westRecord> {
|
||||
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<any> {
|
||||
/**
|
||||
* 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<westRecord>): Promise<void> {
|
||||
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));
|
||||
}
|
||||
}
|
||||
@@ -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<westRecord> {
|
||||
//...
|
||||
}
|
||||
|
||||
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<any> {
|
||||
|
||||
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<westRecord> {
|
||||
* @param options
|
||||
*/
|
||||
async removeRecord(options: RemoveRecordOptions<westRecord>): Promise<void> {
|
||||
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);
|
||||
|
||||
Reference in New Issue
Block a user