mirror of
https://github.com/certd/certd.git
synced 2026-04-28 16:17:25 +08:00
Compare commits
29 Commits
v1.37.5
...
c5105c29b0
| Author | SHA1 | Date | |
|---|---|---|---|
| c5105c29b0 | |||
| 730f614024 | |||
| 2e4eb17a48 | |||
| 55d2a1f09b | |||
| e3a5bcb907 | |||
| d56567c9de | |||
| d7c381e05d | |||
| 1d23dd2426 | |||
| 86ce00adf9 | |||
| e1eef013a8 | |||
| c31bfd8b94 | |||
| f443675f4f | |||
| a44bd8849d | |||
| 274c887140 | |||
| 44973ebd00 | |||
| 88f74163ff | |||
| 481e866011 | |||
| a78450ba79 | |||
| 9fcdeca692 | |||
| 8e10c56304 | |||
| 591f600b11 | |||
| af03e55a73 | |||
| 1462cddd1e | |||
| aac569a925 | |||
| acdf0912d4 | |||
| 32e4e91ab8 | |||
| b59ca329f3 | |||
| beb9099bdc | |||
| a013d95f0f |
Vendored
+5
-1
@@ -4,5 +4,9 @@
|
|||||||
"typescript.tsc.autoDetect": "watch",
|
"typescript.tsc.autoDetect": "watch",
|
||||||
"git.scanRepositories": [
|
"git.scanRepositories": [
|
||||||
"./packages/pro"
|
"./packages/pro"
|
||||||
]
|
],
|
||||||
|
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
|
||||||
|
"[typescript]": {
|
||||||
|
"editor.defaultFormatter": "vscode.typescript-language-features"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,30 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复点击立即触发运行报错的bug ([e1eef01](https://github.com/certd/certd/commit/e1eef013a856d26fe80a05d9ec6e505e2e31e5f9))
|
||||||
|
* 账号绑定页面某些情况下打不开的bug ([44973eb](https://github.com/certd/certd/commit/44973ebd00e89c0fee8f3b91174157757ce0160f))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/certd/certd/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
|
||||||
|
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复创建流水线报id不能为空的bug ([aac569a](https://github.com/certd/certd/commit/aac569a9259ede43399e0ed5d668e936b984d6dd))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 增加vip时间同步按钮 ([32e4e91](https://github.com/certd/certd/commit/32e4e91ab81008dda422fb53fd6f4d1711c5d80c))
|
||||||
|
* 支持letencrypt测试环境,支持IP证书? ([1462cdd](https://github.com/certd/certd/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec))
|
||||||
|
* server 增加 "@peculiar/x509" 依赖 ([acdf091](https://github.com/certd/certd/commit/acdf0912d452029f158279fb78155086e4fbac17))
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -152,8 +152,11 @@ https://certd.handfree.work/
|
|||||||
|
|
||||||
## 八、捐赠
|
## 八、捐赠
|
||||||
************************
|
************************
|
||||||
支持开源,为爱发电,我已入驻爱发电
|
开源为什么要做专业版收费?
|
||||||
https://afdian.com/a/greper
|
1. 纯靠为爱发电不可持续(比如:我的dev-sidecar项目即便是拥有20K+star,也差点凉凉,幸亏有另外大佬接手用爱发电)
|
||||||
|
2. 没有赞助的项目,作者不会用心倾听用户的心声,不顾用户体验(比如:下意识拒绝需求、频繁破坏性变更升级、全盘推倒重来之类的)
|
||||||
|
3. 没有赞助的项目,交流群的戾气有时候比较重,容易起冲突
|
||||||
|
|
||||||
|
|
||||||
发电权益:
|
发电权益:
|
||||||
1. 可加入发电专属群,可以获得作者一对一技术支持
|
1. 可加入发电专属群,可以获得作者一对一技术支持
|
||||||
@@ -173,7 +176,6 @@ https://afdian.com/a/greper
|
|||||||
|
|
||||||
************************
|
************************
|
||||||
|
|
||||||
************************
|
|
||||||
|
|
||||||
## 九、贡献代码
|
## 九、贡献代码
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,49 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复点击立即触发运行报错的bug ([e1eef01](https://github.com/certd/certd/commit/e1eef013a856d26fe80a05d9ec6e505e2e31e5f9))
|
||||||
|
* 账号绑定页面某些情况下打不开的bug ([44973eb](https://github.com/certd/certd/commit/44973ebd00e89c0fee8f3b91174157757ce0160f))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/certd/certd/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
|
||||||
|
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复创建流水线报id不能为空的bug ([aac569a](https://github.com/certd/certd/commit/aac569a9259ede43399e0ed5d668e936b984d6dd))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 增加vip时间同步按钮 ([32e4e91](https://github.com/certd/certd/commit/32e4e91ab81008dda422fb53fd6f4d1711c5d80c))
|
||||||
|
* 支持letencrypt测试环境,支持IP证书? ([1462cdd](https://github.com/certd/certd/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec))
|
||||||
|
* server 增加 "@peculiar/x509" 依赖 ([acdf091](https://github.com/certd/certd/commit/acdf0912d452029f158279fb78155086e4fbac17))
|
||||||
|
|
||||||
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复某些情况下编辑流水线,没有立即展示变更效果的bug ([65e5309](https://github.com/certd/certd/commit/65e53092e8d677eb34b7d04d68c6f738165f5de2))
|
||||||
|
* 修复批量修改定时没有立即显示生效的bug ([c166602](https://github.com/certd/certd/commit/c16660254b8d637bd3ca100695934b343875fcbf))
|
||||||
|
* 修复新部署的无法保存公共eab配置的bug ([6b7631e](https://github.com/certd/certd/commit/6b7631ed5e920582d8e2162ec788b9429238ac29))
|
||||||
|
* 修复在苹果手机下输入框被放大的问题 ([5ff7e6e](https://github.com/certd/certd/commit/5ff7e6ef0eaa6bc111d0dd3c5713e1658f9113ad))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持记忆字段排序 ([d46b9c5](https://github.com/certd/certd/commit/d46b9c54b14ec5c892f4eed141fb549485941edd))
|
||||||
|
* 优化任务参数配置界面在手机版下的展示效果 ([0203aa2](https://github.com/certd/certd/commit/0203aa2b6e86e58e5e66a1b9d0278d186aa92554))
|
||||||
|
* 支持列表展示时固定证书最大天数,有助于列表进度条整齐展示 ([4a94eab](https://github.com/certd/certd/commit/4a94eab3935c89a63892661d9cf0d0891e54aa81))
|
||||||
|
* 子域名托管说明 ([b5d8161](https://github.com/certd/certd/commit/b5d8161bc2e686e6c8b552de0c29117a5d405313))
|
||||||
|
* cname方式hostRecord增加user校验 ([bc174f7](https://github.com/certd/certd/commit/bc174f70545e487bd549eff250f8ef69c6d343f3))
|
||||||
|
* doge云插件支持选择CDN域名,以及支持同时部署多个域名 ([041954c](https://github.com/certd/certd/commit/041954c0674fabed54ed2cf5e727fecfb6943d19))
|
||||||
|
* doge云支持删除过期证书 ([335cf93](https://github.com/certd/certd/commit/335cf9397080a5e09074d5a89d03f59bd051cda5))
|
||||||
|
|
||||||
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -9,15 +9,16 @@
|
|||||||
| 5.| **新网** | 新网域名解析 |
|
| 5.| **新网** | 新网域名解析 |
|
||||||
| 6.| **新网(代理方式)** | 新网域名解析(代理方式) |
|
| 6.| **新网(代理方式)** | 新网域名解析(代理方式) |
|
||||||
| 7.| **腾讯云** | 腾讯云域名DNS解析提供者 |
|
| 7.| **腾讯云** | 腾讯云域名DNS解析提供者 |
|
||||||
| 8.| **华为云** | 华为云DNS解析提供商 |
|
| 8.| **腾讯云EO DNS** | 腾讯云EO DNS解析提供者 |
|
||||||
| 9.| **西部数码** | west dns provider |
|
| 9.| **华为云** | 华为云DNS解析提供商 |
|
||||||
| 10.| **dns.la** | dns.la |
|
| 10.| **西部数码** | west dns provider |
|
||||||
| 11.| **雨云** | 雨云DNS解析提供商 |
|
| 11.| **dns.la** | dns.la |
|
||||||
| 12.| **cloudflare** | cloudflare dns provider |
|
| 12.| **雨云** | 雨云DNS解析提供商 |
|
||||||
| 13.| **namesilo** | namesilo dns provider |
|
| 13.| **cloudflare** | cloudflare dns provider |
|
||||||
| 14.| **godaddy** | GoDaddy |
|
| 14.| **namesilo** | namesilo dns provider |
|
||||||
| 15.| **51dns** | 51DNS |
|
| 15.| **godaddy** | GoDaddy |
|
||||||
| 16.| **新网互联** | 新网互联 |
|
| 16.| **51dns** | 51DNS |
|
||||||
|
| 17.| **新网互联** | 新网互联 |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
+1
-1
@@ -9,5 +9,5 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npmClient": "pnpm",
|
"npmClient": "pnpm",
|
||||||
"version": "1.37.5"
|
"version": "1.37.7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,19 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/publishlab/node-acme-client/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/publishlab/node-acme-client/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
|
||||||
|
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/publishlab/node-acme-client/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/publishlab/node-acme-client/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持letencrypt测试环境,支持IP证书? ([1462cdd](https://github.com/publishlab/node-acme-client/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec))
|
||||||
|
|
||||||
## [1.37.5](https://github.com/publishlab/node-acme-client/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/publishlab/node-acme-client/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/acme-client
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"description": "Simple and unopinionated ACME client",
|
"description": "Simple and unopinionated ACME client",
|
||||||
"private": false,
|
"private": false,
|
||||||
"author": "nmorsman",
|
"author": "nmorsman",
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"module": "scr/index.js",
|
"module": "scr/index.js",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
"types"
|
"types"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.37.5",
|
"@certd/basic": "^1.37.7",
|
||||||
"@peculiar/x509": "^1.11.0",
|
"@peculiar/x509": "^1.11.0",
|
||||||
"asn1js": "^3.0.5",
|
"asn1js": "^3.0.5",
|
||||||
"axios": "^1.7.2",
|
"axios": "^1.7.2",
|
||||||
@@ -70,5 +70,5 @@
|
|||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/publishlab/node-acme-client/issues"
|
"url": "https://github.com/publishlab/node-acme-client/issues"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,9 @@
|
|||||||
import { readCsrDomains } from "./crypto/index.js";
|
import { readCsrDomains } from "./crypto/index.js";
|
||||||
import { wait } from "./wait.js";
|
import { wait } from "./wait.js";
|
||||||
import { CancelError } from "./error.js";
|
import { CancelError } from "./error.js";
|
||||||
|
import { domainUtils } from '@certd/basic';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const defaultOpts = {
|
const defaultOpts = {
|
||||||
@@ -65,7 +68,7 @@ export default async (client, userOpts) => {
|
|||||||
* Parse domains from CSR
|
* Parse domains from CSR
|
||||||
*/
|
*/
|
||||||
|
|
||||||
log("[auto] Parsing domains from Certificate Signing Request ");
|
log("[auto] Parsing domains from Certificate Signing Request");
|
||||||
const { commonName, altNames } = readCsrDomains(opts.csr);
|
const { commonName, altNames } = readCsrDomains(opts.csr);
|
||||||
const uniqueDomains = Array.from(new Set([commonName].concat(altNames).filter((d) => d)));
|
const uniqueDomains = Array.from(new Set([commonName].concat(altNames).filter((d) => d)));
|
||||||
|
|
||||||
@@ -76,9 +79,21 @@ export default async (client, userOpts) => {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
log("[auto] Placing new certificate order with ACME provider");
|
log("[auto] Placing new certificate order with ACME provider");
|
||||||
const orderPayload = { identifiers: uniqueDomains.map((d) => ({ type: "dns", value: d })) };
|
|
||||||
if (opts.profile && client.sslProvider === 'letsencrypt' ){
|
let hasIp = false
|
||||||
|
const orderPayload = { identifiers: uniqueDomains.map((d) =>{
|
||||||
|
// 判断是否为IP(v4或v6),否则按域名处理
|
||||||
|
const type = domainUtils.isIp(d) ? 'ip' : 'dns';
|
||||||
|
if(type === 'ip'){
|
||||||
|
hasIp = true
|
||||||
|
}
|
||||||
|
return { type, value: d }
|
||||||
|
}) };
|
||||||
|
if (opts.profile && client.sslProvider.startsWith("letsencrypt") ){
|
||||||
orderPayload.profile = opts.profile;
|
orderPayload.profile = opts.profile;
|
||||||
|
if(hasIp){
|
||||||
|
orderPayload.profile = "shortlived"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const order = await client.createOrder(orderPayload);
|
const order = await client.createOrder(orderPayload);
|
||||||
const authorizations = await client.getAuthorizations(order);
|
const authorizations = await client.getAuthorizations(order);
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { createHash } from 'crypto';
|
|||||||
import { getPemBodyAsB64u } from './crypto/index.js';
|
import { getPemBodyAsB64u } from './crypto/index.js';
|
||||||
import HttpClient from './http.js';
|
import HttpClient from './http.js';
|
||||||
import AcmeApi from './api.js';
|
import AcmeApi from './api.js';
|
||||||
import verify from './verify.js';
|
import {createChallengeFn} from './verify.js';
|
||||||
import * as util from './util.js';
|
import * as util from './util.js';
|
||||||
import auto from './auto.js';
|
import auto from './auto.js';
|
||||||
import { CancelError } from './error.js';
|
import { CancelError } from './error.js';
|
||||||
@@ -492,6 +492,9 @@ class AcmeClient {
|
|||||||
throw new Error('Unable to verify ACME challenge, URL not found');
|
throw new Error('Unable to verify ACME challenge, URL not found');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const {challenges} = createChallengeFn({logger:this.logger});
|
||||||
|
|
||||||
|
const verify = challenges
|
||||||
if (typeof verify[challenge.type] === 'undefined') {
|
if (typeof verify[challenge.type] === 'undefined') {
|
||||||
throw new Error(`Unable to verify ACME challenge, unknown type: ${challenge.type}`);
|
throw new Error(`Unable to verify ACME challenge, unknown type: ${challenge.type}`);
|
||||||
}
|
}
|
||||||
@@ -507,7 +510,12 @@ class AcmeClient {
|
|||||||
};
|
};
|
||||||
|
|
||||||
this.log('Waiting for ACME challenge verification(等待ACME检查验证)');
|
this.log('Waiting for ACME challenge verification(等待ACME检查验证)');
|
||||||
return util.retry(verifyFn, this.backoffOpts);
|
|
||||||
|
|
||||||
|
const log = (...args)=>{
|
||||||
|
this.logger.info(...args)
|
||||||
|
}
|
||||||
|
return util.retry(verifyFn, this.backoffOpts,log);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -21,6 +21,9 @@ export const directory = {
|
|||||||
staging: 'https://acme-staging-v02.api.letsencrypt.org/directory',
|
staging: 'https://acme-staging-v02.api.letsencrypt.org/directory',
|
||||||
production: 'https://acme-v02.api.letsencrypt.org/directory',
|
production: 'https://acme-v02.api.letsencrypt.org/directory',
|
||||||
},
|
},
|
||||||
|
letsencrypt_staging: {
|
||||||
|
production: 'https://acme-staging-v02.api.letsencrypt.org/directory',
|
||||||
|
},
|
||||||
zerossl: {
|
zerossl: {
|
||||||
staging: 'https://acme.zerossl.com/v2/DV90',
|
staging: 'https://acme.zerossl.com/v2/DV90',
|
||||||
production: 'https://acme.zerossl.com/v2/DV90',
|
production: 'https://acme.zerossl.com/v2/DV90',
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ class Backoff {
|
|||||||
* @returns {Promise}
|
* @returns {Promise}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
async function retryPromise(fn, attempts, backoff) {
|
async function retryPromise(fn, attempts, backoff, logger = log) {
|
||||||
let aborted = false;
|
let aborted = false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -60,12 +60,12 @@ async function retryPromise(fn, attempts, backoff) {
|
|||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
log(`Promise rejected: ${e.message}`);
|
logger(`Promise rejected: ${e.message}`);
|
||||||
const duration = backoff.duration();
|
const duration = backoff.duration();
|
||||||
log(`Promise rejected attempt #${backoff.attempts}, ${duration}ms 后重试: ${e.message}`);
|
logger(`Promise rejected attempt #${backoff.attempts}, ${duration}ms 后重试: ${e.message}`);
|
||||||
|
|
||||||
await new Promise((resolve) => { setTimeout(resolve, duration); });
|
await new Promise((resolve) => { setTimeout(resolve, duration); });
|
||||||
return retryPromise(fn, attempts, backoff);
|
return retryPromise(fn, attempts, backoff, logger);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,9 +80,9 @@ async function retryPromise(fn, attempts, backoff) {
|
|||||||
* @returns {Promise}
|
* @returns {Promise}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function retry(fn, { attempts = 5, min = 5000, max = 30000 } = {}) {
|
function retry(fn, { attempts = 5, min = 5000, max = 30000 } = {}, logger = log) {
|
||||||
const backoff = new Backoff({ min, max });
|
const backoff = new Backoff({ min, max });
|
||||||
return retryPromise(fn, attempts, backoff);
|
return retryPromise(fn, attempts, backoff, logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -216,21 +216,21 @@ function formatResponseError(resp) {
|
|||||||
* @returns {Promise<string>} Root domain name
|
* @returns {Promise<string>} Root domain name
|
||||||
*/
|
*/
|
||||||
|
|
||||||
async function resolveDomainBySoaRecord(recordName) {
|
async function resolveDomainBySoaRecord(recordName, logger = log) {
|
||||||
try {
|
try {
|
||||||
await dns.resolveSoa(recordName);
|
await dns.resolveSoa(recordName);
|
||||||
log(`找到${recordName}的SOA记录`);
|
logger(`找到${recordName}的SOA记录`);
|
||||||
return recordName;
|
return recordName;
|
||||||
}
|
}
|
||||||
catch (e) {
|
catch (e) {
|
||||||
log(`找不到${recordName}的SOA记录,继续往主域名查找`);
|
logger(`找不到${recordName}的SOA记录,继续往主域名查找`);
|
||||||
const parentRecordName = recordName.split('.').slice(1).join('.');
|
const parentRecordName = recordName.split('.').slice(1).join('.');
|
||||||
|
|
||||||
if (!parentRecordName.includes('.')) {
|
if (!parentRecordName.includes('.')) {
|
||||||
throw new Error('SOA record查找失败');
|
throw new Error('SOA record查找失败');
|
||||||
}
|
}
|
||||||
|
|
||||||
return resolveDomainBySoaRecord(parentRecordName);
|
return resolveDomainBySoaRecord(parentRecordName,logger);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -241,18 +241,18 @@ async function resolveDomainBySoaRecord(recordName) {
|
|||||||
* @returns {Promise<dns.Resolver>} DNS resolver
|
* @returns {Promise<dns.Resolver>} DNS resolver
|
||||||
*/
|
*/
|
||||||
|
|
||||||
async function getAuthoritativeDnsResolver(recordName) {
|
async function getAuthoritativeDnsResolver(recordName, logger = log) {
|
||||||
log(`获取域名${recordName}的权威NS服务器: `);
|
logger(`获取域名${recordName}的权威NS服务器: `);
|
||||||
const resolver = new dns.Resolver();
|
const resolver = new dns.Resolver();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
/* Resolve root domain by SOA */
|
/* Resolve root domain by SOA */
|
||||||
const domain = await resolveDomainBySoaRecord(recordName);
|
const domain = await resolveDomainBySoaRecord(recordNam,logger);
|
||||||
|
|
||||||
/* Resolve authoritative NS addresses */
|
/* Resolve authoritative NS addresses */
|
||||||
log(`获取到权威NS服务器name: ${domain}`);
|
logger(`获取到权威NS服务器name: ${domain}`);
|
||||||
const nsRecords = await dns.resolveNs(domain);
|
const nsRecords = await dns.resolveNs(domain);
|
||||||
log(`域名权威NS服务器:${nsRecords}`);
|
logger(`域名权威NS服务器:${nsRecords}`);
|
||||||
const nsAddrArray = await Promise.all(nsRecords.map(async (r) => dns.resolve4(r)));
|
const nsAddrArray = await Promise.all(nsRecords.map(async (r) => dns.resolve4(r)));
|
||||||
const nsAddresses = [].concat(...nsAddrArray).filter((a) => a);
|
const nsAddresses = [].concat(...nsAddrArray).filter((a) => a);
|
||||||
|
|
||||||
@@ -261,16 +261,16 @@ async function getAuthoritativeDnsResolver(recordName) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Authoritative NS success */
|
/* Authoritative NS success */
|
||||||
log(`Found ${nsAddresses.length} authoritative NS addresses for domain: ${domain}`);
|
logger(`Found ${nsAddresses.length} authoritative NS addresses for domain: ${domain}`);
|
||||||
resolver.setServers(nsAddresses);
|
resolver.setServers(nsAddresses);
|
||||||
}
|
}
|
||||||
catch (e) {
|
catch (e) {
|
||||||
log(`Authoritative NS lookup error(获取权威NS服务器地址失败): ${e.message}`);
|
logger(`Authoritative NS lookup error(获取权威NS服务器地址失败): ${e.message}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return resolver */
|
/* Return resolver */
|
||||||
const addresses = resolver.getServers();
|
const addresses = resolver.getServers();
|
||||||
log(`DNS resolver addresses(域名的权威NS服务器地址): ${addresses.join(', ')}`);
|
logger(`DNS resolver addresses(域名的权威NS服务器地址): ${addresses.join(', ')}`);
|
||||||
|
|
||||||
return resolver;
|
return resolver;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,14 +4,22 @@
|
|||||||
|
|
||||||
import dnsSdk from "dns"
|
import dnsSdk from "dns"
|
||||||
import https from 'https'
|
import https from 'https'
|
||||||
import {log} from './logger.js'
|
import {log as defaultLog} from './logger.js'
|
||||||
import axios from './axios.js'
|
import axios from './axios.js'
|
||||||
import * as util from './util.js'
|
import * as util from './util.js'
|
||||||
import {isAlpnCertificateAuthorizationValid} from './crypto/index.js'
|
import {isAlpnCertificateAuthorizationValid} from './crypto/index.js'
|
||||||
|
|
||||||
|
|
||||||
const dns = dnsSdk.promises
|
const dns = dnsSdk.promises
|
||||||
/**
|
|
||||||
|
|
||||||
|
export function createChallengeFn(opts = {}){
|
||||||
|
const logger = opts?.logger || {info:defaultLog,error:defaultLog,warn:defaultLog,debug:defaultLog}
|
||||||
|
|
||||||
|
const log = function(...args){
|
||||||
|
logger.info(...args)
|
||||||
|
}
|
||||||
|
/**
|
||||||
* Verify ACME HTTP challenge
|
* Verify ACME HTTP challenge
|
||||||
*
|
*
|
||||||
* https://datatracker.ietf.org/doc/html/rfc8555#section-8.3
|
* https://datatracker.ietf.org/doc/html/rfc8555#section-8.3
|
||||||
@@ -112,7 +120,7 @@ async function walkDnsChallengeRecord(recordName, resolver = dns,deep = 0) {
|
|||||||
return records
|
return records
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function walkTxtRecord(recordName,deep = 0) {
|
async function walkTxtRecord(recordName,deep = 0) {
|
||||||
if(deep >5){
|
if(deep >5){
|
||||||
log(`walkTxtRecord too deep (#${deep}) , skip walk`)
|
log(`walkTxtRecord too deep (#${deep}) , skip walk`)
|
||||||
return []
|
return []
|
||||||
@@ -136,7 +144,7 @@ export async function walkTxtRecord(recordName,deep = 0) {
|
|||||||
try{
|
try{
|
||||||
/* Authoritative DNS resolver */
|
/* Authoritative DNS resolver */
|
||||||
log(`从域名权威服务器获取TXT解析记录`);
|
log(`从域名权威服务器获取TXT解析记录`);
|
||||||
const authoritativeResolver = await util.getAuthoritativeDnsResolver(recordName);
|
const authoritativeResolver = await util.getAuthoritativeDnsResolver(recordName,log);
|
||||||
const res = await walkDnsChallengeRecord(recordName, authoritativeResolver,deep);
|
const res = await walkDnsChallengeRecord(recordName, authoritativeResolver,deep);
|
||||||
if (res && res.length > 0) {
|
if (res && res.length > 0) {
|
||||||
for (const item of res) {
|
for (const item of res) {
|
||||||
@@ -173,7 +181,8 @@ async function verifyDnsChallenge(authz, challenge, keyAuthorization, prefix = '
|
|||||||
recordValues = [...new Set(recordValues)];
|
recordValues = [...new Set(recordValues)];
|
||||||
log(`DNS查询成功, 找到 ${recordValues.length} 条TXT记录:${recordValues}`);
|
log(`DNS查询成功, 找到 ${recordValues.length} 条TXT记录:${recordValues}`);
|
||||||
if (!recordValues.length || !recordValues.includes(keyAuthorization)) {
|
if (!recordValues.length || !recordValues.includes(keyAuthorization)) {
|
||||||
throw new Error(`没有找到需要的DNS TXT记录: ${recordName},期望:${keyAuthorization},结果:${recordValues}`);
|
const err = `没有找到需要的DNS TXT记录: ${recordName},期望:${keyAuthorization},结果:${recordValues}`
|
||||||
|
throw new Error(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
log(`关键授权匹配成功(${challenge.type}/${recordName}):${keyAuthorization},校验成功, ACME challenge verified`);
|
log(`关键授权匹配成功(${challenge.type}/${recordName}):${keyAuthorization},校验成功, ACME challenge verified`);
|
||||||
@@ -207,12 +216,13 @@ async function verifyTlsAlpnChallenge(authz, challenge, keyAuthorization) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
return {
|
||||||
* Export API
|
challenges:{
|
||||||
*/
|
'http-01': verifyHttpChallenge,
|
||||||
|
'dns-01': verifyDnsChallenge,
|
||||||
|
'tls-alpn-01': verifyTlsAlpnChallenge,
|
||||||
|
},
|
||||||
|
walkTxtRecord,
|
||||||
|
}
|
||||||
|
|
||||||
export default {
|
}
|
||||||
'http-01': verifyHttpChallenge,
|
|
||||||
'dns-01': verifyDnsChallenge,
|
|
||||||
'tls-alpn-01': verifyTlsAlpnChallenge,
|
|
||||||
};
|
|
||||||
+5
-1
@@ -108,6 +108,9 @@ export const directory: {
|
|||||||
staging: string,
|
staging: string,
|
||||||
production: string
|
production: string
|
||||||
},
|
},
|
||||||
|
letsencrypt_staging: {
|
||||||
|
production: string
|
||||||
|
},
|
||||||
zerossl: {
|
zerossl: {
|
||||||
staging: string,
|
staging: string,
|
||||||
production: string
|
production: string
|
||||||
@@ -204,7 +207,8 @@ export const agents: any;
|
|||||||
|
|
||||||
export function setLogger(fn: (message: any, ...args: any[]) => void): void;
|
export function setLogger(fn: (message: any, ...args: any[]) => void): void;
|
||||||
|
|
||||||
export function walkTxtRecord(record: any): Promise<string[]>;
|
export function createChallengeFn(opts?: {logger?:any}): any;
|
||||||
|
// export function walkTxtRecord(record: any): Promise<string[]>;
|
||||||
export function getAuthoritativeDnsResolver(record:string): Promise<any>;
|
export function getAuthoritativeDnsResolver(record:string): Promise<any>;
|
||||||
|
|
||||||
export const CancelError: typeof CancelError;
|
export const CancelError: typeof CancelError;
|
||||||
|
|||||||
@@ -3,6 +3,16 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/certd/certd/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/basic
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
05:00
|
01:12
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/basic",
|
"name": "@certd/basic",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -46,5 +46,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,29 +7,29 @@ function match(targetDomains: string | string[], inDomains: string[]) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeof targetDomains === 'string') {
|
if (typeof targetDomains === "string") {
|
||||||
targetDomains = [targetDomains];
|
targetDomains = [targetDomains];
|
||||||
}
|
}
|
||||||
for (let targetDomain of targetDomains) {
|
for (let targetDomain of targetDomains) {
|
||||||
let matched = false;
|
let matched = false;
|
||||||
if (targetDomain.startsWith('.')) {
|
if (targetDomain.startsWith(".")) {
|
||||||
targetDomain = '*' + targetDomain;
|
targetDomain = "*" + targetDomain;
|
||||||
}
|
}
|
||||||
for (let inDomain of inDomains) {
|
for (let inDomain of inDomains) {
|
||||||
if (inDomain.startsWith('.')) {
|
if (inDomain.startsWith(".")) {
|
||||||
inDomain = '*' + inDomain;
|
inDomain = "*" + inDomain;
|
||||||
}
|
}
|
||||||
if (targetDomain === inDomain) {
|
if (targetDomain === inDomain) {
|
||||||
matched = true;
|
matched = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!inDomain.startsWith('*.')) {
|
if (!inDomain.startsWith("*.")) {
|
||||||
//不可能匹配
|
//不可能匹配
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//子域名匹配通配符即可
|
//子域名匹配通配符即可
|
||||||
const firstDotIndex = targetDomain.indexOf('.');
|
const firstDotIndex = targetDomain.indexOf(".");
|
||||||
const targetDomainSuffix = targetDomain.substring(firstDotIndex + 1);
|
const targetDomainSuffix = targetDomain.substring(firstDotIndex + 1);
|
||||||
if (targetDomainSuffix === inDomain.substring(2)) {
|
if (targetDomainSuffix === inDomain.substring(2)) {
|
||||||
matched = true;
|
matched = true;
|
||||||
@@ -46,6 +46,32 @@ function match(targetDomains: string | string[], inDomains: string[]) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isIpv4(d: string) {
|
||||||
|
if (!d) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const isIPv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/;
|
||||||
|
return isIPv4Regex.test(d);
|
||||||
|
}
|
||||||
|
|
||||||
|
function isIpv6(d: string) {
|
||||||
|
if (!d) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const isIPv6Regex = /^([\da-f]{1,4}:){2,7}[\da-f]{1,4}$/i;
|
||||||
|
return isIPv6Regex.test(d);
|
||||||
|
}
|
||||||
|
|
||||||
|
function isIp(d: string) {
|
||||||
|
if (!d) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return isIpv4(d) || isIpv6(d);
|
||||||
|
}
|
||||||
|
|
||||||
export const domainUtils = {
|
export const domainUtils = {
|
||||||
match,
|
match,
|
||||||
|
isIpv4,
|
||||||
|
isIpv6,
|
||||||
|
isIp,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/pipeline
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/pipeline",
|
"name": "@certd/pipeline",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -18,8 +18,8 @@
|
|||||||
"compile": "tsc --skipLibCheck --watch"
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.37.5",
|
"@certd/basic": "^1.37.7",
|
||||||
"@certd/plus-core": "^1.37.5",
|
"@certd/plus-core": "^1.37.7",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"reflect-metadata": "^0.1.13"
|
"reflect-metadata": "^0.1.13"
|
||||||
@@ -45,5 +45,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-huawei
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-huawei",
|
"name": "@certd/lib-huawei",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
"types": "./dist/d/index.d.ts",
|
"types": "./dist/d/index.d.ts",
|
||||||
@@ -24,5 +24,5 @@
|
|||||||
"prettier": "^2.8.8",
|
"prettier": "^2.8.8",
|
||||||
"tslib": "^2.8.1"
|
"tslib": "^2.8.1"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-iframe
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-iframe",
|
"name": "@certd/lib-iframe",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -31,5 +31,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/jdcloud
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/jdcloud",
|
"name": "@certd/jdcloud",
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"description": "jdcloud openApi sdk",
|
"description": "jdcloud openApi sdk",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
@@ -61,5 +61,5 @@
|
|||||||
"fetch"
|
"fetch"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-k8s
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-k8s",
|
"name": "@certd/lib-k8s",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
"pub": "npm publish"
|
"pub": "npm publish"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.37.5",
|
"@certd/basic": "^1.37.7",
|
||||||
"@kubernetes/client-node": "0.21.0"
|
"@kubernetes/client-node": "0.21.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -32,5 +32,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-server",
|
"name": "@certd/lib-server",
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -28,11 +28,11 @@
|
|||||||
],
|
],
|
||||||
"license": "AGPL",
|
"license": "AGPL",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.37.5",
|
"@certd/acme-client": "^1.37.7",
|
||||||
"@certd/basic": "^1.37.5",
|
"@certd/basic": "^1.37.7",
|
||||||
"@certd/pipeline": "^1.37.5",
|
"@certd/pipeline": "^1.37.7",
|
||||||
"@certd/plugin-lib": "^1.37.5",
|
"@certd/plugin-lib": "^1.37.7",
|
||||||
"@certd/plus-core": "^1.37.5",
|
"@certd/plus-core": "^1.37.7",
|
||||||
"@midwayjs/cache": "3.14.0",
|
"@midwayjs/cache": "3.14.0",
|
||||||
"@midwayjs/core": "3.20.11",
|
"@midwayjs/core": "3.20.11",
|
||||||
"@midwayjs/i18n": "3.20.13",
|
"@midwayjs/i18n": "3.20.13",
|
||||||
@@ -64,5 +64,5 @@
|
|||||||
"typeorm": "^0.3.11",
|
"typeorm": "^0.3.11",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/midway-flyway-js
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/midway-flyway-js",
|
"name": "@certd/midway-flyway-js",
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -46,5 +46,5 @@
|
|||||||
"typeorm": "^0.3.11",
|
"typeorm": "^0.3.11",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,19 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/certd/certd/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
|
||||||
|
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持letencrypt测试环境,支持IP证书? ([1462cdd](https://github.com/certd/certd/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec))
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-cert
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-cert",
|
"name": "@certd/plugin-cert",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
"compile": "tsc --skipLibCheck --watch"
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.37.5",
|
"@certd/acme-client": "^1.37.7",
|
||||||
"@certd/basic": "^1.37.5",
|
"@certd/basic": "^1.37.7",
|
||||||
"@certd/pipeline": "^1.37.5",
|
"@certd/pipeline": "^1.37.7",
|
||||||
"@certd/plugin-lib": "^1.37.5",
|
"@certd/plugin-lib": "^1.37.7",
|
||||||
"@google-cloud/publicca": "^1.3.0",
|
"@google-cloud/publicca": "^1.3.0",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"jszip": "^3.10.1",
|
"jszip": "^3.10.1",
|
||||||
@@ -43,5 +43,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ export type CertInfo = {
|
|||||||
one?: string;
|
one?: string;
|
||||||
p7b?: string;
|
p7b?: string;
|
||||||
};
|
};
|
||||||
export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom";
|
export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom" | "letsencrypt_staging";
|
||||||
export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
|
export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
|
||||||
type AcmeServiceOptions = {
|
type AcmeServiceOptions = {
|
||||||
userContext: IContext;
|
userContext: IContext;
|
||||||
@@ -111,7 +111,7 @@ export class AcmeService {
|
|||||||
await this.userContext.setObj(this.buildAccountKey(email), conf);
|
await this.userContext.setObj(this.buildAccountKey(email), conf);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getAcmeClient(email: string, isTest = false): Promise<acme.Client> {
|
async getAcmeClient(email: string): Promise<acme.Client> {
|
||||||
const mappings = {};
|
const mappings = {};
|
||||||
if (this.sslProvider === "letsencrypt") {
|
if (this.sslProvider === "letsencrypt") {
|
||||||
mappings["acme-v02.api.letsencrypt.org"] = this.options.reverseProxy || "le.px.certd.handfree.work";
|
mappings["acme-v02.api.letsencrypt.org"] = this.options.reverseProxy || "le.px.certd.handfree.work";
|
||||||
@@ -128,12 +128,7 @@ export class AcmeService {
|
|||||||
await this.saveAccountConfig(email, conf);
|
await this.saveAccountConfig(email, conf);
|
||||||
this.logger.info(`创建新的Accountkey:${email}`);
|
this.logger.info(`创建新的Accountkey:${email}`);
|
||||||
}
|
}
|
||||||
let directoryUrl = "";
|
const directoryUrl = acme.directory[this.sslProvider].production;
|
||||||
if (isTest) {
|
|
||||||
directoryUrl = acme.directory[this.sslProvider].staging;
|
|
||||||
} else {
|
|
||||||
directoryUrl = acme.directory[this.sslProvider].production;
|
|
||||||
}
|
|
||||||
if (this.options.useMappingProxy) {
|
if (this.options.useMappingProxy) {
|
||||||
urlMapping.enabled = true;
|
urlMapping.enabled = true;
|
||||||
} else {
|
} else {
|
||||||
@@ -327,13 +322,12 @@ export class AcmeService {
|
|||||||
domainsVerifyPlan?: DomainsVerifyPlan;
|
domainsVerifyPlan?: DomainsVerifyPlan;
|
||||||
httpUploader?: any;
|
httpUploader?: any;
|
||||||
csrInfo: any;
|
csrInfo: any;
|
||||||
isTest?: boolean;
|
|
||||||
privateKeyType?: string;
|
privateKeyType?: string;
|
||||||
profile?: string;
|
profile?: string;
|
||||||
preferredChain?: string;
|
preferredChain?: string;
|
||||||
}): Promise<CertInfo> {
|
}): Promise<CertInfo> {
|
||||||
const { email, isTest, csrInfo, dnsProvider, domainsVerifyPlan, profile, preferredChain } = options;
|
const { email, csrInfo, dnsProvider, domainsVerifyPlan, profile, preferredChain } = options;
|
||||||
const client: acme.Client = await this.getAcmeClient(email, isTest);
|
const client: acme.Client = await this.getAcmeClient(email);
|
||||||
|
|
||||||
let domains = options.domains;
|
let domains = options.domains;
|
||||||
const encodingDomains = [];
|
const encodingDomains = [];
|
||||||
@@ -343,7 +337,7 @@ export class AcmeService {
|
|||||||
domains = encodingDomains;
|
domains = encodingDomains;
|
||||||
|
|
||||||
/* Create CSR */
|
/* Create CSR */
|
||||||
const { commonName, altNames } = this.buildCommonNameByDomains(domains);
|
const { altNames } = this.buildCommonNameByDomains(domains);
|
||||||
let privateKey = null;
|
let privateKey = null;
|
||||||
const privateKeyType = options.privateKeyType || "rsa_2048";
|
const privateKeyType = options.privateKeyType || "rsa_2048";
|
||||||
const privateKeyArr = privateKeyType.split("_");
|
const privateKeyArr = privateKeyType.split("_");
|
||||||
@@ -370,15 +364,13 @@ export class AcmeService {
|
|||||||
//兼容老版本
|
//兼容老版本
|
||||||
createCsr = acme.forge.createCsr;
|
createCsr = acme.forge.createCsr;
|
||||||
}
|
}
|
||||||
const [key, csr] = await createCsr(
|
const csrData: any = {
|
||||||
{
|
// commonName,
|
||||||
commonName,
|
...csrInfo,
|
||||||
...csrInfo,
|
altNames,
|
||||||
altNames,
|
// emailAddress: email,
|
||||||
// emailAddress: email,
|
};
|
||||||
},
|
const [key, csr] = await createCsr(csrData, privateKey);
|
||||||
privateKey
|
|
||||||
);
|
|
||||||
|
|
||||||
if (dnsProvider == null && domainsVerifyPlan == null) {
|
if (dnsProvider == null && domainsVerifyPlan == null) {
|
||||||
throw new Error("dnsProvider 、 domainsVerifyPlan不能都为空");
|
throw new Error("dnsProvider 、 domainsVerifyPlan不能都为空");
|
||||||
@@ -423,7 +415,7 @@ export class AcmeService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buildCommonNameByDomains(domains: string | string[]): {
|
buildCommonNameByDomains(domains: string | string[]): {
|
||||||
commonName: string;
|
commonName?: string;
|
||||||
altNames: string[] | undefined;
|
altNames: string[] | undefined;
|
||||||
} {
|
} {
|
||||||
if (typeof domains === "string") {
|
if (typeof domains === "string") {
|
||||||
@@ -432,14 +424,14 @@ export class AcmeService {
|
|||||||
if (domains.length === 0) {
|
if (domains.length === 0) {
|
||||||
throw new Error("domain can not be empty");
|
throw new Error("domain can not be empty");
|
||||||
}
|
}
|
||||||
const commonName = domains[0];
|
// const commonName = domains[0];
|
||||||
let altNames: undefined | string[] = undefined;
|
// let altNames: undefined | string[] = undefined;
|
||||||
if (domains.length > 1) {
|
// if (domains.length > 1) {
|
||||||
altNames = _.slice(domains, 1);
|
// altNames = _.slice(domains, 1);
|
||||||
}
|
// }
|
||||||
return {
|
return {
|
||||||
commonName,
|
// commonName,
|
||||||
altNames,
|
altNames: domains,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -137,6 +137,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
{ value: "google", label: "Google(免费)", icon: "flat-color-icons:google" },
|
{ value: "google", label: "Google(免费)", icon: "flat-color-icons:google" },
|
||||||
{ value: "zerossl", label: "ZeroSSL(免费)", icon: "emojione:digit-zero" },
|
{ value: "zerossl", label: "ZeroSSL(免费)", icon: "emojione:digit-zero" },
|
||||||
{ value: "sslcom", label: "SSL.com(仅主域名和www免费)", icon: "la:expeditedssl" },
|
{ value: "sslcom", label: "SSL.com(仅主域名和www免费)", icon: "la:expeditedssl" },
|
||||||
|
{ value: "letsencrypt_staging", label: "Let's Encrypt测试环境(IP证书)", icon: "simple-icons:letsencrypt" },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
helper: "Let's Encrypt:申请最简单\nGoogle:大厂光环,兼容性好,仅首次需要翻墙获取EAB授权\nZeroSSL:需要EAB授权,无需翻墙\nSSL.com:仅主域名和www免费,必须设置CAA记录",
|
helper: "Let's Encrypt:申请最简单\nGoogle:大厂光环,兼容性好,仅首次需要翻墙获取EAB授权\nZeroSSL:需要EAB授权,无需翻墙\nSSL.com:仅主域名和www免费,必须设置CAA记录",
|
||||||
@@ -412,7 +413,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
async onInit() {
|
async onInit() {
|
||||||
let eab: EabAccess = null;
|
let eab: EabAccess = null;
|
||||||
|
|
||||||
if (this.sslProvider && this.sslProvider !== "letsencrypt") {
|
if (this.sslProvider && !this.sslProvider.startsWith("letsencrypt")) {
|
||||||
if (this.sslProvider === "google" && this.googleAccessId) {
|
if (this.sslProvider === "google" && this.googleAccessId) {
|
||||||
this.logger.info("当前正在使用 google服务账号授权获取EAB");
|
this.logger.info("当前正在使用 google服务账号授权获取EAB");
|
||||||
const googleAccess = await this.getAccess(this.googleAccessId);
|
const googleAccess = await this.getAccess(this.googleAccessId);
|
||||||
@@ -495,7 +496,6 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
dnsProvider,
|
dnsProvider,
|
||||||
domainsVerifyPlan,
|
domainsVerifyPlan,
|
||||||
csrInfo,
|
csrInfo,
|
||||||
isTest: false,
|
|
||||||
privateKeyType: this.privateKeyType,
|
privateKeyType: this.privateKeyType,
|
||||||
profile: this.certProfile,
|
profile: this.certProfile,
|
||||||
preferredChain: this.preferredChain,
|
preferredChain: this.preferredChain,
|
||||||
|
|||||||
@@ -3,6 +3,16 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-lib
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-lib",
|
"name": "@certd/plugin-lib",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -22,8 +22,8 @@
|
|||||||
"@alicloud/pop-core": "^1.7.10",
|
"@alicloud/pop-core": "^1.7.10",
|
||||||
"@alicloud/tea-util": "^1.4.10",
|
"@alicloud/tea-util": "^1.4.10",
|
||||||
"@aws-sdk/client-s3": "^3.787.0",
|
"@aws-sdk/client-s3": "^3.787.0",
|
||||||
"@certd/basic": "^1.37.5",
|
"@certd/basic": "^1.37.7",
|
||||||
"@certd/pipeline": "^1.37.5",
|
"@certd/pipeline": "^1.37.7",
|
||||||
"@kubernetes/client-node": "0.21.0",
|
"@kubernetes/client-node": "0.21.0",
|
||||||
"ali-oss": "^6.22.0",
|
"ali-oss": "^6.22.0",
|
||||||
"basic-ftp": "^5.0.5",
|
"basic-ftp": "^5.0.5",
|
||||||
@@ -53,5 +53,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
"gitHead": "55d2a1f09b617bc73bd81a65796446c4602ed1b2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,4 +64,8 @@ export class TencentAccess extends BaseAccess {
|
|||||||
intlDomain() {
|
intlDomain() {
|
||||||
return this.isIntl() ? "intl." : "";
|
return this.isIntl() ? "intl." : "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
buildEndpoint(endpoint: string) {
|
||||||
|
return `${this.intlDomain()}${endpoint}`;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,23 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复点击立即触发运行报错的bug ([e1eef01](https://github.com/certd/certd/commit/e1eef013a856d26fe80a05d9ec6e505e2e31e5f9))
|
||||||
|
* 账号绑定页面某些情况下打不开的bug ([44973eb](https://github.com/certd/certd/commit/44973ebd00e89c0fee8f3b91174157757ce0160f))
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复创建流水线报id不能为空的bug ([aac569a](https://github.com/certd/certd/commit/aac569a9259ede43399e0ed5d668e936b984d6dd))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 增加vip时间同步按钮 ([32e4e91](https://github.com/certd/certd/commit/32e4e91ab81008dda422fb53fd6f4d1711c5d80c))
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-client",
|
"name": "@certd/ui-client",
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite --open",
|
"dev": "vite --open",
|
||||||
@@ -106,8 +106,8 @@
|
|||||||
"zod-defaults": "^0.1.3"
|
"zod-defaults": "^0.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@certd/lib-iframe": "^1.37.5",
|
"@certd/lib-iframe": "^1.37.7",
|
||||||
"@certd/pipeline": "^1.37.5",
|
"@certd/pipeline": "^1.37.7",
|
||||||
"@rollup/plugin-commonjs": "^25.0.7",
|
"@rollup/plugin-commonjs": "^25.0.7",
|
||||||
"@rollup/plugin-node-resolve": "^15.2.3",
|
"@rollup/plugin-node-resolve": "^15.2.3",
|
||||||
"@types/chai": "^4.3.12",
|
"@types/chai": "^4.3.12",
|
||||||
|
|||||||
+10
-1
@@ -6,7 +6,12 @@
|
|||||||
<div>1. 解析记录应该添加在{{ record.domain }}域名下</div>
|
<div>1. 解析记录应该添加在{{ record.domain }}域名下</div>
|
||||||
<div>2. 要添加的是CNAME类型的记录,不是TXT</div>
|
<div>2. 要添加的是CNAME类型的记录,不是TXT</div>
|
||||||
<div>3. 核对记录值是否是:{{ record.recordValue }}</div>
|
<div>3. 核对记录值是否是:{{ record.recordValue }}</div>
|
||||||
<div>4. 运行下面的命令,查看解析是否正确 <fs-copyable :style="{ color: '#52c41a' }" :model-value="nslookupCmd"></fs-copyable></div>
|
<div>
|
||||||
|
4. 在验证中状态下,运行下面的命令,查看cname和txt解析是否正确
|
||||||
|
<fs-copyable :style="{ color: '#52c41a' }" :model-value="nslookupCmd"></fs-copyable>
|
||||||
|
或者
|
||||||
|
<fs-copyable :style="{ color: '#52c41a' }" :model-value="digCmd"></fs-copyable>
|
||||||
|
</div>
|
||||||
<div>5. 如果以上检查都没有问题,则可能是DNS解析生效时间比较慢,某些提供商延迟可能高达几个小时</div>
|
<div>5. 如果以上检查都没有问题,则可能是DNS解析生效时间比较慢,某些提供商延迟可能高达几个小时</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -23,4 +28,8 @@ const props = defineProps<{
|
|||||||
const nslookupCmd = computed(() => {
|
const nslookupCmd = computed(() => {
|
||||||
return `nslookup -q=txt _acme-challenge.${props.record.domain}`;
|
return `nslookup -q=txt _acme-challenge.${props.record.domain}`;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const digCmd = computed(() => {
|
||||||
|
return `dig _acme-challenge.${props.record.domain}`;
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -340,6 +340,13 @@ function openUpgrade() {
|
|||||||
function showManualActivation() {
|
function showManualActivation() {
|
||||||
manualActiveFlag.value = true;
|
manualActiveFlag.value = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function goBindAccount() {
|
||||||
|
modalRef?.destroy();
|
||||||
|
router.push({
|
||||||
|
path: "/sys/account",
|
||||||
|
});
|
||||||
|
}
|
||||||
const modalRef = modal.success({
|
const modalRef = modal.success({
|
||||||
title,
|
title,
|
||||||
maskClosable: true,
|
maskClosable: true,
|
||||||
@@ -367,6 +374,9 @@ function openUpgrade() {
|
|||||||
<div class="mt-10">
|
<div class="mt-10">
|
||||||
{t("vip.current")} {vipLabel} {t("vip.activated_expire_time")}
|
{t("vip.current")} {vipLabel} {t("vip.activated_expire_time")}
|
||||||
{settingStore.expiresText}
|
{settingStore.expiresText}
|
||||||
|
<a class="ml-15" href="https://app.handfree.work/subject/#/page/detail/1" target="_blank">
|
||||||
|
{t("vip.learn_more")}
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -439,6 +449,10 @@ function openUpgrade() {
|
|||||||
<div class="flex-o w-100">
|
<div class="flex-o w-100">
|
||||||
<span>{t("vip.site_id")}:</span>
|
<span>{t("vip.site_id")}:</span>
|
||||||
<fs-copyable v-model={computedSiteId.value}></fs-copyable>
|
<fs-copyable v-model={computedSiteId.value}></fs-copyable>
|
||||||
|
|
||||||
|
<a class="ml-2" onClick={goBindAccount}>
|
||||||
|
{t("vip.not_effective")}
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{plusInfo}
|
{plusInfo}
|
||||||
|
|||||||
@@ -98,4 +98,6 @@ export default {
|
|||||||
already_comm: "Already Business Edition, can't change to Professional Edition",
|
already_comm: "Already Business Edition, can't change to Professional Edition",
|
||||||
already_perpetual_plus: "You already have a perpetual Professional Edition, can't upgrade",
|
already_perpetual_plus: "You already have a perpetual Professional Edition, can't upgrade",
|
||||||
confirm: "Confirm",
|
confirm: "Confirm",
|
||||||
|
not_effective: "Not effective?",
|
||||||
|
learn_more: "More privileges",
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -97,4 +97,6 @@ export default {
|
|||||||
already_comm: "已经是商业版了,不能降级为专业版",
|
already_comm: "已经是商业版了,不能降级为专业版",
|
||||||
already_perpetual_plus: "您已经是永久专业版了,无法继续升级",
|
already_perpetual_plus: "您已经是永久专业版了,无法继续升级",
|
||||||
confirm: "确认",
|
confirm: "确认",
|
||||||
|
not_effective: "VIP没有生效?",
|
||||||
|
learn_more: "更多特权(加VIP群等)",
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ export async function GetDetail(id: any) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function Save(pipelineEntity: any) {
|
export async function Save(pipelineEntity: any): Promise<{ id: number; version: number }> {
|
||||||
return await request({
|
return await request({
|
||||||
url: apiPrefix + "/save",
|
url: apiPrefix + "/save",
|
||||||
method: "post",
|
method: "post",
|
||||||
|
|||||||
@@ -367,7 +367,7 @@ export function useCertPipelineCreator() {
|
|||||||
|
|
||||||
pipeline = setRunnableIds(pipeline);
|
pipeline = setRunnableIds(pipeline);
|
||||||
const groupId = form.groupId;
|
const groupId = form.groupId;
|
||||||
const id = await api.Save({
|
const { id } = await api.Save({
|
||||||
title: pipeline.title,
|
title: pipeline.title,
|
||||||
content: JSON.stringify(pipeline),
|
content: JSON.stringify(pipeline),
|
||||||
keepHistoryCount: 30,
|
keepHistoryCount: 30,
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ defineOptions({
|
|||||||
name: "PipelineDetail",
|
name: "PipelineDetail",
|
||||||
});
|
});
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const pipelineId: Ref = ref(route.query.id);
|
const pipelineId: Ref = ref(parseInt((route.query.id as string) || "0"));
|
||||||
const historyId = ref(route.query.historyId as string);
|
const historyId: Ref = ref(parseInt((route.query.historyId as string) || "0"));
|
||||||
const pluginStore = usePluginStore();
|
const pluginStore = usePluginStore();
|
||||||
const pipelineOptions: PipelineOptions = {
|
const pipelineOptions: PipelineOptions = {
|
||||||
async getPipelineDetail({ pipelineId }) {
|
async getPipelineDetail({ pipelineId }) {
|
||||||
|
|||||||
@@ -327,11 +327,11 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
pipelineId: {
|
pipelineId: {
|
||||||
type: [Number, String],
|
type: Number,
|
||||||
default: 0,
|
default: 0,
|
||||||
},
|
},
|
||||||
historyId: {
|
historyId: {
|
||||||
type: [Number, String],
|
type: Number,
|
||||||
default: 0,
|
default: 0,
|
||||||
},
|
},
|
||||||
editMode: {
|
editMode: {
|
||||||
@@ -348,6 +348,7 @@ export default defineComponent({
|
|||||||
emits: ["update:modelValue", "update:editMode"],
|
emits: ["update:modelValue", "update:editMode"],
|
||||||
setup(props, ctx) {
|
setup(props, ctx) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
//右侧选中的pipeline
|
||||||
const currentPipeline: Ref<any> = ref({});
|
const currentPipeline: Ref<any> = ref({});
|
||||||
const pipeline: Ref<any> = ref({});
|
const pipeline: Ref<any> = ref({});
|
||||||
const pipelineEntity: Ref<any> = ref({});
|
const pipelineEntity: Ref<any> = ref({});
|
||||||
@@ -399,7 +400,7 @@ export default defineComponent({
|
|||||||
currentPipeline.value = currentHistory.value.pipeline;
|
currentPipeline.value = currentHistory.value.pipeline;
|
||||||
};
|
};
|
||||||
|
|
||||||
async function loadHistoryList(reload = false) {
|
async function loadHistoryList(reload = false, historyId: number) {
|
||||||
if (props.editMode) {
|
if (props.editMode) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -416,11 +417,11 @@ export default defineComponent({
|
|||||||
histories.value = historyList;
|
histories.value = historyList;
|
||||||
|
|
||||||
if (historyList.length > 0) {
|
if (historyList.length > 0) {
|
||||||
//@ts-ignore
|
if (historyId > 0) {
|
||||||
if (props.historyId > 0) {
|
//如果传递了history,优先显示历史记录作为当前
|
||||||
const found = historyList.find(item => {
|
const found = histories.value.find(item => {
|
||||||
//字符串==int
|
//字符串==int
|
||||||
return item.id == props.historyId;
|
return item.id == historyId;
|
||||||
});
|
});
|
||||||
if (found) {
|
if (found) {
|
||||||
await changeCurrentHistory(found);
|
await changeCurrentHistory(found);
|
||||||
@@ -428,7 +429,8 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
if (historyList[0]?.version === pipeline.value.version) {
|
if (historyList[0]?.version === pipeline.value?.version) {
|
||||||
|
//如果当前的流水线版本与历史记录最后一条一致,则将该记录设置为current
|
||||||
await changeCurrentHistory(historyList[0]);
|
await changeCurrentHistory(historyList[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -482,7 +484,7 @@ export default defineComponent({
|
|||||||
if (editMode) {
|
if (editMode) {
|
||||||
changeCurrentHistory();
|
changeCurrentHistory();
|
||||||
} else if (histories.value.length > 0) {
|
} else if (histories.value.length > 0) {
|
||||||
if (histories.value[0].pipeline.version === pipeline.value.version) {
|
if (histories.value[0].pipeline?.version === pipeline.value?.version) {
|
||||||
changeCurrentHistory(histories.value[0]);
|
changeCurrentHistory(histories.value[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -508,7 +510,7 @@ export default defineComponent({
|
|||||||
detail.pipeline
|
detail.pipeline
|
||||||
);
|
);
|
||||||
pipeline.value = currentPipeline.value;
|
pipeline.value = currentPipeline.value;
|
||||||
await loadHistoryList(true);
|
await loadHistoryList(true, props.historyId);
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
immediate: true,
|
immediate: true,
|
||||||
@@ -740,7 +742,11 @@ export default defineComponent({
|
|||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
await changeCurrentHistory(null);
|
await changeCurrentHistory(null);
|
||||||
if (histories.value.length > 0) {
|
if (histories.value.length > 0) {
|
||||||
pipeline.value = histories.value[0].pipeline;
|
//看是不是最新的pipeline版本
|
||||||
|
if (pipeline.value?.version !== histories.value[0].pipeline?.version) {
|
||||||
|
const detail: PipelineDetail = await props.options.getPipelineDetail({ pipelineId: pipeline.value.id });
|
||||||
|
pipeline.value = detail.pipeline;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await props.options.doTrigger({ pipelineId: pipeline.value.id, stepId: stepId });
|
await props.options.doTrigger({ pipelineId: pipeline.value.id, stepId: stepId });
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ export type RunHistory = {
|
|||||||
|
|
||||||
export type PipelineOptions = {
|
export type PipelineOptions = {
|
||||||
doTrigger(options: { pipelineId: number; stepId?: string }): Promise<void>;
|
doTrigger(options: { pipelineId: number; stepId?: string }): Promise<void>;
|
||||||
doSave(pipelineConfig: Pipeline): Promise<void>;
|
doSave(pipelineConfig: Pipeline): Promise<{ id: number; version: number }>;
|
||||||
getPipelineDetail(query: { pipelineId: number }): Promise<PipelineDetail>;
|
getPipelineDetail(query: { pipelineId: number }): Promise<PipelineDetail>;
|
||||||
getHistoryList(query: { pipelineId: number }): Promise<RunHistory[]>;
|
getHistoryList(query: { pipelineId: number }): Promise<RunHistory[]>;
|
||||||
getHistoryDetail(query: { historyId: number }): Promise<RunHistory>;
|
getHistoryDetail(query: { historyId: number }): Promise<RunHistory>;
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ const iframeSrcRef = computed(() => {
|
|||||||
if (!settingStore.installInfo.accountServerBaseUrl) {
|
if (!settingStore.installInfo.accountServerBaseUrl) {
|
||||||
return "#/app/certd/home";
|
return "#/app/certd/home";
|
||||||
}
|
}
|
||||||
return `${settingStore.installInfo.accountServerBaseUrl}/#/app/certd/home`;
|
const timestamp = Date.now();
|
||||||
|
return `${settingStore.installInfo.accountServerBaseUrl}/#/app/certd/home?t=${timestamp}`;
|
||||||
});
|
});
|
||||||
|
|
||||||
type SubjectInfo = {
|
type SubjectInfo = {
|
||||||
|
|||||||
@@ -3,6 +3,18 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
|
||||||
|
|
||||||
|
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* server 增加 "@peculiar/x509" 依赖 ([acdf091](https://github.com/certd/certd/commit/acdf0912d452029f158279fb78155086e4fbac17))
|
||||||
|
|
||||||
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-server",
|
"name": "@certd/ui-server",
|
||||||
"version": "1.37.5",
|
"version": "1.37.7",
|
||||||
"description": "fast-server base midway",
|
"description": "fast-server base midway",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -45,20 +45,20 @@
|
|||||||
"@aws-sdk/client-cloudfront": "^3.699.0",
|
"@aws-sdk/client-cloudfront": "^3.699.0",
|
||||||
"@aws-sdk/client-iam": "^3.699.0",
|
"@aws-sdk/client-iam": "^3.699.0",
|
||||||
"@aws-sdk/client-s3": "^3.705.0",
|
"@aws-sdk/client-s3": "^3.705.0",
|
||||||
"@certd/acme-client": "^1.37.5",
|
"@certd/acme-client": "^1.37.7",
|
||||||
"@certd/basic": "^1.37.5",
|
"@certd/basic": "^1.37.7",
|
||||||
"@certd/commercial-core": "^1.37.5",
|
"@certd/commercial-core": "^1.37.7",
|
||||||
"@certd/cv4pve-api-javascript": "^8.4.2",
|
"@certd/cv4pve-api-javascript": "^8.4.2",
|
||||||
"@certd/jdcloud": "^1.37.5",
|
"@certd/jdcloud": "^1.37.7",
|
||||||
"@certd/lib-huawei": "^1.37.5",
|
"@certd/lib-huawei": "^1.37.7",
|
||||||
"@certd/lib-k8s": "^1.37.5",
|
"@certd/lib-k8s": "^1.37.7",
|
||||||
"@certd/lib-server": "^1.37.5",
|
"@certd/lib-server": "^1.37.7",
|
||||||
"@certd/midway-flyway-js": "^1.37.5",
|
"@certd/midway-flyway-js": "^1.37.7",
|
||||||
"@certd/pipeline": "^1.37.5",
|
"@certd/pipeline": "^1.37.7",
|
||||||
"@certd/plugin-cert": "^1.37.5",
|
"@certd/plugin-cert": "^1.37.7",
|
||||||
"@certd/plugin-lib": "^1.37.5",
|
"@certd/plugin-lib": "^1.37.7",
|
||||||
"@certd/plugin-plus": "^1.37.5",
|
"@certd/plugin-plus": "^1.37.7",
|
||||||
"@certd/plus-core": "^1.37.5",
|
"@certd/plus-core": "^1.37.7",
|
||||||
"@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
|
"@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
|
||||||
"@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
|
"@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
|
||||||
"@koa/cors": "^5.0.0",
|
"@koa/cors": "^5.0.0",
|
||||||
@@ -73,6 +73,7 @@
|
|||||||
"@midwayjs/typeorm": "3.20.11",
|
"@midwayjs/typeorm": "3.20.11",
|
||||||
"@midwayjs/upload": "3.20.13",
|
"@midwayjs/upload": "3.20.13",
|
||||||
"@midwayjs/validate": "3.20.13",
|
"@midwayjs/validate": "3.20.13",
|
||||||
|
"@peculiar/x509": "^1.11.0",
|
||||||
"@volcengine/openapi": "^1.28.1",
|
"@volcengine/openapi": "^1.28.1",
|
||||||
"ali-oss": "^6.21.0",
|
"ali-oss": "^6.21.0",
|
||||||
"axios": "^1.7.2",
|
"axios": "^1.7.2",
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import { CnameRecordEntity, CnameRecordStatusType } from "../entity/cname-record
|
|||||||
import { createDnsProvider, IDnsProvider } from "@certd/plugin-cert";
|
import { createDnsProvider, IDnsProvider } from "@certd/plugin-cert";
|
||||||
import { CnameProvider, CnameRecord } from "@certd/pipeline";
|
import { CnameProvider, CnameRecord } from "@certd/pipeline";
|
||||||
import { cache, http, isDev, logger, utils } from "@certd/basic";
|
import { cache, http, isDev, logger, utils } from "@certd/basic";
|
||||||
import { getAuthoritativeDnsResolver, walkTxtRecord } from "@certd/acme-client";
|
import { getAuthoritativeDnsResolver, createChallengeFn } from "@certd/acme-client";
|
||||||
import { CnameProviderService } from "./cname-provider-service.js";
|
import { CnameProviderService } from "./cname-provider-service.js";
|
||||||
import { CnameProviderEntity } from "../entity/cname-provider.js";
|
import { CnameProviderEntity } from "../entity/cname-provider.js";
|
||||||
import { CommonDnsProvider } from "./common-provider.js";
|
import { CommonDnsProvider } from "./common-provider.js";
|
||||||
@@ -241,6 +241,8 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
|
|||||||
* @param id
|
* @param id
|
||||||
*/
|
*/
|
||||||
async verify(id: number) {
|
async verify(id: number) {
|
||||||
|
|
||||||
|
const {walkTxtRecord} = createChallengeFn({logger});
|
||||||
const bean = await this.info(id);
|
const bean = await this.info(id);
|
||||||
if (!bean) {
|
if (!bean) {
|
||||||
throw new ValidateException(`CnameRecord:${id} 不存在`);
|
throw new ValidateException(`CnameRecord:${id} 不存在`);
|
||||||
@@ -416,6 +418,7 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
|
|||||||
|
|
||||||
async checkRepeatAcmeChallengeRecords(acmeRecordDomain: string, targetCnameDomain: string) {
|
async checkRepeatAcmeChallengeRecords(acmeRecordDomain: string, targetCnameDomain: string) {
|
||||||
|
|
||||||
|
|
||||||
let dnsResolver = null;
|
let dnsResolver = null;
|
||||||
try {
|
try {
|
||||||
dnsResolver = await getAuthoritativeDnsResolver(acmeRecordDomain);
|
dnsResolver = await getAuthoritativeDnsResolver(acmeRecordDomain);
|
||||||
@@ -460,6 +463,9 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
|
|||||||
//如果权威服务器中查不到txt,无需继续检查
|
//如果权威服务器中查不到txt,无需继续检查
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const {walkTxtRecord} = createChallengeFn({logger});
|
||||||
|
|
||||||
if (cnameRecords.length > 0) {
|
if (cnameRecords.length > 0) {
|
||||||
// 从cname记录中获取txt记录
|
// 从cname记录中获取txt记录
|
||||||
// 对比是否存在,如果不存在于cname中获取的txt中,说明本体有创建多余的txt记录
|
// 对比是否存在,如果不存在于cname中获取的txt中,说明本体有创建多余的txt记录
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
import './dnspod-dns-provider.js';
|
import './dnspod-dns-provider.js';
|
||||||
import './tencent-dns-provider.js';
|
import './tencent-dns-provider.js';
|
||||||
|
import './teo-dns-provider.js';
|
||||||
|
|||||||
@@ -0,0 +1,145 @@
|
|||||||
|
import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
|
||||||
|
import { TencentAccess } from '@certd/plugin-lib';
|
||||||
|
|
||||||
|
@IsDnsProvider({
|
||||||
|
name: 'tencent-eo',
|
||||||
|
title: '腾讯云EO DNS',
|
||||||
|
desc: '腾讯云EO DNS解析提供者',
|
||||||
|
accessType: 'tencent',
|
||||||
|
icon: 'svg:icon-tencentcloud',
|
||||||
|
})
|
||||||
|
export class TencentEoDnsProvider extends AbstractDnsProvider {
|
||||||
|
access!: TencentAccess;
|
||||||
|
|
||||||
|
client!: any;
|
||||||
|
|
||||||
|
|
||||||
|
async onInstance() {
|
||||||
|
this.access = this.ctx.access as TencentAccess
|
||||||
|
const clientConfig = {
|
||||||
|
credential: this.access,
|
||||||
|
region: '',
|
||||||
|
profile: {
|
||||||
|
httpProfile: {
|
||||||
|
endpoint: this.access.buildEndpoint("teo.tencentcloudapi.com"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const teosdk = await import('tencentcloud-sdk-nodejs/tencentcloud/services/teo/v20220901/index.js');
|
||||||
|
const TeoClient = teosdk.v20220901.Client;
|
||||||
|
// 实例化要请求产品的client对象,clientProfile是可选的
|
||||||
|
this.client = new TeoClient(clientConfig);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async getZoneId(domain: string) {
|
||||||
|
|
||||||
|
const params = {
|
||||||
|
"Filters": [
|
||||||
|
{
|
||||||
|
"Name": "zone-name",
|
||||||
|
"Values": [
|
||||||
|
domain
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
const res = await this.client.DescribeZones(params);
|
||||||
|
if (res.Zones && res.Zones.length > 0) {
|
||||||
|
return res.Zones[0].ZoneId;
|
||||||
|
}
|
||||||
|
throw new Error('未找到对应的ZoneId');
|
||||||
|
}
|
||||||
|
|
||||||
|
async createRecord(options: CreateRecordOptions): Promise<any> {
|
||||||
|
const { fullRecord, value, type, domain } = options;
|
||||||
|
this.logger.info('添加域名解析:', fullRecord, value);
|
||||||
|
|
||||||
|
const zoneId = await this.getZoneId(domain);
|
||||||
|
const params = {
|
||||||
|
"ZoneId": zoneId,
|
||||||
|
"Name": fullRecord,
|
||||||
|
"Type": type,
|
||||||
|
"Content": value,
|
||||||
|
"TTL": 60,
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const ret = await this.client.CreateDnsRecord(params);
|
||||||
|
this.logger.info('添加域名解析成功:', fullRecord, value, JSON.stringify(ret));
|
||||||
|
/*
|
||||||
|
{
|
||||||
|
"RecordId": 162,
|
||||||
|
"RequestId": "ab4f1426-ea15-42ea-8183-dc1b44151166"
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
return {
|
||||||
|
RecordId: ret.RecordId,
|
||||||
|
ZoneId: zoneId,
|
||||||
|
};
|
||||||
|
} catch (e: any) {
|
||||||
|
if (e?.code === 'ResourceInUse.DuplicateName') {
|
||||||
|
this.logger.info('域名解析已存在,无需重复添加:', fullRecord, value);
|
||||||
|
return await this.findRecord({
|
||||||
|
...options,
|
||||||
|
zoneId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async findRecord(options: CreateRecordOptions & { zoneId: string }): Promise<any> {
|
||||||
|
|
||||||
|
const { zoneId } = options;
|
||||||
|
const params = {
|
||||||
|
"ZoneId": zoneId,
|
||||||
|
"Filters": [
|
||||||
|
{
|
||||||
|
"Name": "name",
|
||||||
|
"Values": [
|
||||||
|
options.fullRecord
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Name": "content",
|
||||||
|
"Values": [
|
||||||
|
options.value
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Name": "type",
|
||||||
|
"Values": [
|
||||||
|
options.type
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
const ret = await this.client.DescribeRecordFilterList(params);
|
||||||
|
if (ret.DnsRecords && ret.DnsRecords.length > 0) {
|
||||||
|
this.logger.info('已存在解析记录:', ret.DnsRecords);
|
||||||
|
return ret.DnsRecords[0];
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
async removeRecord(options: RemoveRecordOptions<any>) {
|
||||||
|
const { fullRecord, value } = options.recordReq;
|
||||||
|
const record = options.recordRes;
|
||||||
|
if (!record) {
|
||||||
|
this.logger.info('解析记录recordId为空,不执行删除', fullRecord, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
const params = {
|
||||||
|
"ZoneId": record.ZoneId,
|
||||||
|
"RecordIds": [
|
||||||
|
record.RecordId
|
||||||
|
]
|
||||||
|
};
|
||||||
|
|
||||||
|
const ret = await this.client.DeleteDnsRecords(params);
|
||||||
|
this.logger.info('删除域名解析成功:', fullRecord, value);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
new TencentEoDnsProvider();
|
||||||
@@ -1 +1 @@
|
|||||||
01:32
|
01:16
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
01:52
|
01:31
|
||||||
|
|||||||
Reference in New Issue
Block a user