@certd/plugin-cert 1.41.3 → 1.41.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/package.json +6 -6
  3. package/dist/access/eab-access.d.ts +0 -6
  4. package/dist/access/eab-access.js +0 -62
  5. package/dist/access/google-access.d.ts +0 -8
  6. package/dist/access/google-access.js +0 -119
  7. package/dist/access/index.d.ts +0 -2
  8. package/dist/access/index.js +0 -3
  9. package/dist/dns-provider/api.d.ts +0 -76
  10. package/dist/dns-provider/api.js +0 -2
  11. package/dist/dns-provider/base.d.ts +0 -27
  12. package/dist/dns-provider/base.js +0 -49
  13. package/dist/dns-provider/decorator.d.ts +0 -3
  14. package/dist/dns-provider/decorator.js +0 -18
  15. package/dist/dns-provider/domain-parser.d.ts +0 -9
  16. package/dist/dns-provider/domain-parser.js +0 -64
  17. package/dist/dns-provider/index.d.ts +0 -5
  18. package/dist/dns-provider/index.js +0 -6
  19. package/dist/dns-provider/registry.d.ts +0 -1
  20. package/dist/dns-provider/registry.js +0 -3
  21. package/dist/libs/google.d.ts +0 -11
  22. package/dist/libs/google.js +0 -59
  23. package/dist/plugin/cert-plugin/acme.d.ts +0 -123
  24. package/dist/plugin/cert-plugin/acme.js +0 -362
  25. package/dist/plugin/cert-plugin/base-convert.d.ts +0 -25
  26. package/dist/plugin/cert-plugin/base-convert.js +0 -210
  27. package/dist/plugin/cert-plugin/base.d.ts +0 -27
  28. package/dist/plugin/cert-plugin/base.js +0 -175
  29. package/dist/plugin/cert-plugin/cert-reader.d.ts +0 -51
  30. package/dist/plugin/cert-plugin/cert-reader.js +0 -206
  31. package/dist/plugin/cert-plugin/convert.d.ts +0 -26
  32. package/dist/plugin/cert-plugin/convert.js +0 -124
  33. package/dist/plugin/cert-plugin/custom/index.d.ts +0 -24
  34. package/dist/plugin/cert-plugin/custom/index.js +0 -202
  35. package/dist/plugin/cert-plugin/getter/aliyun.d.ts +0 -19
  36. package/dist/plugin/cert-plugin/getter/aliyun.js +0 -165
  37. package/dist/plugin/cert-plugin/index.d.ts +0 -62
  38. package/dist/plugin/cert-plugin/index.js +0 -672
  39. package/dist/plugin/cert-plugin/lego/dns.d.ts +0 -1
  40. package/dist/plugin/cert-plugin/lego/dns.js +0 -2
  41. package/dist/plugin/cert-plugin/lego/index.d.ts +0 -21
  42. package/dist/plugin/cert-plugin/lego/index.js +0 -256
  43. package/dist/plugin/index.d.ts +0 -6
  44. package/dist/plugin/index.js +0 -7
  45. package/stats.html +0 -6177
  46. package/test/dist/cert-plugin.test.js +0 -14
  47. package/test/dist/test/cert-plugin.test.js +0 -15
@@ -1,123 +0,0 @@
1
- import * as acme from "@certd/acme-client";
2
- import { ClientExternalAccountBindingOptions, UrlMapping } from "@certd/acme-client";
3
- import { Challenge } from "@certd/acme-client/types/rfc8555";
4
- import { IContext } from "@certd/pipeline";
5
- import { ILogger } from "@certd/basic";
6
- import { IDnsProvider, IDomainParser } from "../../dns-provider/index.js";
7
- import { IOssClient } from "@certd/plugin-lib";
8
- export type CnameVerifyPlan = {
9
- type?: string;
10
- domain: string;
11
- fullRecord: string;
12
- dnsProvider: IDnsProvider;
13
- };
14
- export type HttpVerifyPlan = {
15
- type: string;
16
- domain: string;
17
- httpUploader: IOssClient;
18
- };
19
- export type DomainVerifyPlan = {
20
- domain: string;
21
- mainDomain: string;
22
- type: "cname" | "dns" | "http";
23
- dnsProvider?: IDnsProvider;
24
- cnameVerifyPlan?: CnameVerifyPlan;
25
- httpVerifyPlan?: HttpVerifyPlan;
26
- };
27
- export type DomainsVerifyPlan = {
28
- [key: string]: DomainVerifyPlan;
29
- };
30
- export type Providers = {
31
- dnsProvider?: IDnsProvider;
32
- domainsVerifyPlan?: DomainsVerifyPlan;
33
- };
34
- export type CertInfo = {
35
- crt: string;
36
- key: string;
37
- csr: string;
38
- oc?: string;
39
- ic?: string;
40
- pfx?: string;
41
- der?: string;
42
- jks?: string;
43
- one?: string;
44
- p7b?: string;
45
- };
46
- export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom" | "letsencrypt_staging";
47
- export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
48
- type AcmeServiceOptions = {
49
- userContext: IContext;
50
- logger: ILogger;
51
- sslProvider: SSLProvider;
52
- eab?: ClientExternalAccountBindingOptions;
53
- skipLocalVerify?: boolean;
54
- useMappingProxy?: boolean;
55
- reverseProxy?: string;
56
- privateKeyType?: PrivateKeyType;
57
- signal?: AbortSignal;
58
- maxCheckRetryCount?: number;
59
- userId: number;
60
- domainParser: IDomainParser;
61
- waitDnsDiffuseTime?: number;
62
- };
63
- export declare class AcmeService {
64
- options: AcmeServiceOptions;
65
- userContext: IContext;
66
- logger: ILogger;
67
- sslProvider: SSLProvider;
68
- skipLocalVerify: boolean;
69
- eab?: ClientExternalAccountBindingOptions;
70
- constructor(options: AcmeServiceOptions);
71
- getAccountConfig(email: string, urlMapping: UrlMapping): Promise<any>;
72
- buildAccountKey(email: string): string;
73
- saveAccountConfig(email: string, conf: any): Promise<void>;
74
- getAcmeClient(email: string): Promise<acme.Client>;
75
- createNewKey(): Promise<string>;
76
- challengeCreateFn(authz: any, keyAuthorizationGetter: (challenge: Challenge) => Promise<string>, providers: Providers): Promise<{
77
- challenge: any;
78
- keyAuthorization: string;
79
- httpUploader: IOssClient;
80
- } | {
81
- recordReq: {
82
- domain: any;
83
- fullRecord: string;
84
- hostRecord: string;
85
- type: string;
86
- value: string;
87
- };
88
- recordRes: any;
89
- dnsProvider: IDnsProvider<any>;
90
- challenge: any;
91
- keyAuthorization: string;
92
- }>;
93
- /**
94
- * Function used to remove an ACME challenge response
95
- *
96
- * @param {object} authz Authorization object
97
- * @param {object} challenge Selected challenge
98
- * @param {string} keyAuthorization Authorization key
99
- * @param recordReq
100
- * @param recordRes
101
- * @param dnsProvider dnsProvider
102
- * @param httpUploader
103
- * @returns {Promise}
104
- */
105
- challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordReq: any, recordRes: any, dnsProvider?: IDnsProvider, httpUploader?: IOssClient): Promise<void>;
106
- order(options: {
107
- email: string;
108
- domains: string | string[];
109
- dnsProvider?: any;
110
- domainsVerifyPlan?: DomainsVerifyPlan;
111
- httpUploader?: any;
112
- csrInfo: any;
113
- privateKeyType?: string;
114
- profile?: string;
115
- preferredChain?: string;
116
- }): Promise<CertInfo>;
117
- buildCommonNameByDomains(domains: string | string[]): {
118
- commonName?: string;
119
- altNames: string[] | undefined;
120
- };
121
- private testDirectory;
122
- }
123
- export {};
@@ -1,362 +0,0 @@
1
- // @ts-ignore
2
- import * as acme from "@certd/acme-client";
3
- import { utils } from "@certd/basic";
4
- import punycode from "punycode.js";
5
- export class AcmeService {
6
- options;
7
- userContext;
8
- logger;
9
- sslProvider;
10
- skipLocalVerify = true;
11
- eab;
12
- constructor(options) {
13
- this.options = options;
14
- this.userContext = options.userContext;
15
- this.logger = options.logger;
16
- this.sslProvider = options.sslProvider || "letsencrypt";
17
- this.eab = options.eab;
18
- this.skipLocalVerify = options.skipLocalVerify ?? false;
19
- // acme.setLogger((message: any, ...args: any[]) => {
20
- // this.logger.info(message, ...args);
21
- // });
22
- }
23
- async getAccountConfig(email, urlMapping) {
24
- const conf = (await this.userContext.getObj(this.buildAccountKey(email))) || {};
25
- if (urlMapping && urlMapping.mappings) {
26
- for (const key in urlMapping.mappings) {
27
- if (Object.prototype.hasOwnProperty.call(urlMapping.mappings, key)) {
28
- const element = urlMapping.mappings[key];
29
- if (conf.accountUrl?.indexOf(element) > -1) {
30
- //如果用了代理url,要替换回去
31
- conf.accountUrl = conf.accountUrl.replace(element, key);
32
- }
33
- }
34
- }
35
- }
36
- return conf;
37
- }
38
- buildAccountKey(email) {
39
- return `acme.config.${this.sslProvider}.${email}`;
40
- }
41
- async saveAccountConfig(email, conf) {
42
- await this.userContext.setObj(this.buildAccountKey(email), conf);
43
- }
44
- async getAcmeClient(email) {
45
- const mappings = {};
46
- if (this.sslProvider === "letsencrypt") {
47
- mappings["acme-v02.api.letsencrypt.org"] = this.options.reverseProxy || "le.px.certd.handfree.work";
48
- }
49
- else if (this.sslProvider === "google") {
50
- mappings["dv.acme-v02.api.pki.goog"] = this.options.reverseProxy || "gg.px.certd.handfree.work";
51
- }
52
- const urlMapping = {
53
- enabled: false,
54
- mappings,
55
- };
56
- const conf = await this.getAccountConfig(email, urlMapping);
57
- if (conf.key == null) {
58
- conf.key = await this.createNewKey();
59
- await this.saveAccountConfig(email, conf);
60
- this.logger.info(`创建新的Accountkey:${email}`);
61
- }
62
- const directoryUrl = acme.getDirectoryUrl({ sslProvider: this.sslProvider, pkType: this.options.privateKeyType });
63
- if (this.options.useMappingProxy) {
64
- urlMapping.enabled = true;
65
- }
66
- else {
67
- //测试directory是否可以访问
68
- const isOk = await this.testDirectory(directoryUrl);
69
- if (!isOk) {
70
- this.logger.info("测试访问失败,自动使用代理");
71
- urlMapping.enabled = true;
72
- }
73
- }
74
- const client = new acme.Client({
75
- sslProvider: this.sslProvider,
76
- directoryUrl: directoryUrl,
77
- accountKey: conf.key,
78
- accountUrl: conf.accountUrl,
79
- externalAccountBinding: this.eab,
80
- backoffAttempts: this.options.maxCheckRetryCount || 20,
81
- backoffMin: 5000,
82
- backoffMax: 10000,
83
- urlMapping,
84
- signal: this.options.signal,
85
- logger: this.logger,
86
- });
87
- if (conf.accountUrl == null) {
88
- const accountPayload = {
89
- termsOfServiceAgreed: true,
90
- contact: [`mailto:${email}`],
91
- externalAccountBinding: this.eab,
92
- };
93
- await client.createAccount(accountPayload);
94
- conf.accountUrl = client.getAccountUrl();
95
- await this.saveAccountConfig(email, conf);
96
- }
97
- return client;
98
- }
99
- async createNewKey() {
100
- const key = await acme.crypto.createPrivateKey(2048);
101
- return key.toString();
102
- }
103
- async challengeCreateFn(authz, keyAuthorizationGetter, providers) {
104
- this.logger.info("Triggered challengeCreateFn()");
105
- const fullDomain = authz.identifier.value;
106
- let domain = await this.options.domainParser.parse(fullDomain);
107
- this.logger.info("主域名为:" + domain);
108
- const getChallenge = (type) => {
109
- return authz.challenges.find((c) => c.type === type);
110
- };
111
- const doHttpVerify = async (challenge, httpUploader) => {
112
- const keyAuthorization = await keyAuthorizationGetter(challenge);
113
- this.logger.info("http校验");
114
- const filePath = `.well-known/acme-challenge/${challenge.token}`;
115
- const fileContents = keyAuthorization;
116
- this.logger.info(`校验 ${fullDomain} ,准备上传文件:${filePath}`);
117
- await httpUploader.upload(filePath, Buffer.from(fileContents));
118
- this.logger.info(`上传文件【${filePath}】成功`);
119
- return {
120
- challenge,
121
- keyAuthorization,
122
- httpUploader,
123
- };
124
- };
125
- const doDnsVerify = async (challenge, fullRecord, dnsProvider) => {
126
- this.logger.info("dns校验");
127
- const keyAuthorization = await keyAuthorizationGetter(challenge);
128
- const mainDomain = dnsProvider.usePunyCode() ? domain : punycode.toUnicode(domain);
129
- fullRecord = dnsProvider.usePunyCode() ? fullRecord : punycode.toUnicode(fullRecord);
130
- const recordValue = keyAuthorization;
131
- let hostRecord = fullRecord.replace(`${mainDomain}`, "");
132
- if (hostRecord.endsWith(".")) {
133
- hostRecord = hostRecord.substring(0, hostRecord.length - 1);
134
- }
135
- const recordReq = {
136
- domain: mainDomain,
137
- fullRecord,
138
- hostRecord,
139
- type: "TXT",
140
- value: recordValue,
141
- };
142
- this.logger.info("添加 TXT 解析记录", JSON.stringify(recordReq));
143
- const recordRes = await dnsProvider.createRecord(recordReq);
144
- this.logger.info("添加 TXT 解析记录成功", JSON.stringify(recordRes));
145
- return {
146
- recordReq,
147
- recordRes,
148
- dnsProvider,
149
- challenge,
150
- keyAuthorization,
151
- };
152
- };
153
- let dnsProvider = providers.dnsProvider;
154
- let fullRecord = `_acme-challenge.${fullDomain}`;
155
- // const origDomain = punycode.toUnicode(domain);
156
- const origFullDomain = punycode.toUnicode(fullDomain);
157
- const isIp = utils.domain.isIp(origFullDomain);
158
- function checkIpChallenge(type) {
159
- if (isIp) {
160
- throw new Error(`IP证书不支持${type}校验方式,请选择HTTP方式校验`);
161
- }
162
- }
163
- if (providers.domainsVerifyPlan) {
164
- //按照计划执行
165
- const domainVerifyPlan = providers.domainsVerifyPlan[origFullDomain];
166
- if (domainVerifyPlan) {
167
- if (domainVerifyPlan.type === "dns") {
168
- checkIpChallenge("dns");
169
- dnsProvider = domainVerifyPlan.dnsProvider;
170
- }
171
- else if (domainVerifyPlan.type === "cname") {
172
- checkIpChallenge("cname");
173
- const cname = domainVerifyPlan.cnameVerifyPlan;
174
- if (cname) {
175
- dnsProvider = cname.dnsProvider;
176
- domain = await this.options.domainParser.parse(cname.domain);
177
- fullRecord = cname.fullRecord;
178
- }
179
- else {
180
- this.logger.error(`未找到域名${fullDomain}的CNAME校验计划,请修改证书申请配置`);
181
- }
182
- if (dnsProvider == null) {
183
- throw new Error(`未找到域名${fullDomain}CNAME校验计划的DnsProvider,请修改证书申请配置`);
184
- }
185
- }
186
- else if (domainVerifyPlan.type === "http") {
187
- const plan = domainVerifyPlan.httpVerifyPlan;
188
- if (plan) {
189
- const httpChallenge = getChallenge("http-01");
190
- if (httpChallenge == null) {
191
- throw new Error("该域名不支持http-01方式校验");
192
- }
193
- return await doHttpVerify(httpChallenge, plan.httpUploader);
194
- }
195
- else {
196
- throw new Error("未找到域名【" + fullDomain + "】的http校验配置");
197
- }
198
- }
199
- else {
200
- throw new Error("不支持的校验类型", domainVerifyPlan.type);
201
- }
202
- }
203
- else {
204
- this.logger.warn(`未找到域名${fullDomain}的校验计划,使用默认的dnsProvider`);
205
- }
206
- }
207
- if (!dnsProvider) {
208
- throw new Error(`域名${fullDomain}没有匹配到任何校验方式,证书申请失败`);
209
- }
210
- const dnsChallenge = getChallenge("dns-01");
211
- checkIpChallenge("dns");
212
- return await doDnsVerify(dnsChallenge, fullRecord, dnsProvider);
213
- }
214
- /**
215
- * Function used to remove an ACME challenge response
216
- *
217
- * @param {object} authz Authorization object
218
- * @param {object} challenge Selected challenge
219
- * @param {string} keyAuthorization Authorization key
220
- * @param recordReq
221
- * @param recordRes
222
- * @param dnsProvider dnsProvider
223
- * @param httpUploader
224
- * @returns {Promise}
225
- */
226
- async challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider, httpUploader) {
227
- this.logger.info("执行清理");
228
- /* http-01 */
229
- const fullDomain = authz.identifier.value;
230
- if (challenge.type === "http-01") {
231
- const filePath = `.well-known/acme-challenge/${challenge.token}`;
232
- this.logger.info(`Removing challenge response for ${fullDomain} at file: ${filePath}`);
233
- await httpUploader.remove(filePath);
234
- this.logger.info(`删除文件【${filePath}】成功`);
235
- }
236
- else if (challenge.type === "dns-01") {
237
- this.logger.info(`删除 TXT 解析记录:${JSON.stringify(recordReq)} ,recordRes = ${JSON.stringify(recordRes)}`);
238
- try {
239
- await dnsProvider.removeRecord({
240
- recordReq,
241
- recordRes,
242
- });
243
- this.logger.info("删除解析记录成功");
244
- }
245
- catch (e) {
246
- this.logger.error("删除解析记录出错:", e);
247
- throw e;
248
- }
249
- }
250
- }
251
- async order(options) {
252
- const { email, csrInfo, dnsProvider, domainsVerifyPlan, profile, preferredChain } = options;
253
- const client = await this.getAcmeClient(email);
254
- let domains = options.domains;
255
- const encodingDomains = [];
256
- for (const domain of domains) {
257
- encodingDomains.push(punycode.toASCII(domain));
258
- }
259
- domains = encodingDomains;
260
- /* Create CSR */
261
- const { altNames } = this.buildCommonNameByDomains(domains);
262
- let privateKey = null;
263
- const privateKeyType = options.privateKeyType || "rsa_2048";
264
- const privateKeyArr = privateKeyType.split("_");
265
- const type = privateKeyArr[0];
266
- let size = 2048;
267
- if (privateKeyArr.length > 1) {
268
- size = parseInt(privateKeyArr[1]);
269
- }
270
- let encodingType = "pkcs8";
271
- if (privateKeyArr.length > 2) {
272
- encodingType = privateKeyArr[2];
273
- }
274
- if (type == "ec") {
275
- const name = "P-" + size;
276
- privateKey = await acme.crypto.createPrivateEcdsaKey(name, encodingType);
277
- }
278
- else {
279
- privateKey = await acme.crypto.createPrivateRsaKey(size, encodingType);
280
- }
281
- let createCsr = acme.crypto.createCsr;
282
- if (encodingType === "pkcs1") {
283
- //兼容老版本
284
- createCsr = acme.forge.createCsr;
285
- }
286
- const csrData = {
287
- // commonName,
288
- ...csrInfo,
289
- altNames,
290
- // emailAddress: email,
291
- };
292
- const [key, csr] = await createCsr(csrData, privateKey);
293
- if (dnsProvider == null && domainsVerifyPlan == null) {
294
- throw new Error("dnsProvider 、 domainsVerifyPlan不能都为空");
295
- }
296
- const providers = {
297
- dnsProvider,
298
- domainsVerifyPlan,
299
- };
300
- /* 自动申请证书 */
301
- const crt = await client.auto({
302
- csr,
303
- email: email,
304
- termsOfServiceAgreed: true,
305
- skipChallengeVerification: this.skipLocalVerify,
306
- challengePriority: ["dns-01", "http-01"],
307
- challengeCreateFn: async (authz, keyAuthorizationGetter) => {
308
- return await this.challengeCreateFn(authz, keyAuthorizationGetter, providers);
309
- },
310
- challengeRemoveFn: async (authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider, httpUploader) => {
311
- return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider, httpUploader);
312
- },
313
- signal: this.options.signal,
314
- profile,
315
- preferredChain,
316
- });
317
- const crtString = crt.toString();
318
- const cert = {
319
- crt: crtString,
320
- key: key.toString(),
321
- csr: csr.toString(),
322
- };
323
- /* Done */
324
- this.logger.debug(`CSR:\n${cert.csr}`);
325
- this.logger.debug(`Certificate:\n${cert.crt}`);
326
- this.logger.info("证书申请成功");
327
- return cert;
328
- }
329
- buildCommonNameByDomains(domains) {
330
- if (typeof domains === "string") {
331
- domains = domains.split(",");
332
- }
333
- if (domains.length === 0) {
334
- throw new Error("domain can not be empty");
335
- }
336
- // const commonName = domains[0];
337
- // let altNames: undefined | string[] = undefined;
338
- // if (domains.length > 1) {
339
- // altNames = _.slice(domains, 1);
340
- // }
341
- return {
342
- // commonName,
343
- altNames: domains,
344
- };
345
- }
346
- async testDirectory(directoryUrl) {
347
- try {
348
- await utils.http.request({
349
- url: directoryUrl,
350
- method: "GET",
351
- timeout: 10000,
352
- });
353
- }
354
- catch (e) {
355
- this.logger.error(`${directoryUrl},测试访问失败`, e.message);
356
- return false;
357
- }
358
- this.logger.info(`${directoryUrl},测试访问成功`);
359
- return true;
360
- }
361
- }
362
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"acme.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/acme.ts"],"names":[],"mappings":"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"}
@@ -1,25 +0,0 @@
1
- import { AbstractTaskPlugin, FileItem, IContext, Step } from "@certd/pipeline";
2
- import type { CertInfo } from "./acme.js";
3
- import { CertReader } from "./cert-reader.js";
4
- export declare const EVENT_CERT_APPLY_SUCCESS = "CertApply.success";
5
- export declare abstract class CertApplyBaseConvertPlugin extends AbstractTaskPlugin {
6
- domains: string[];
7
- pfxPassword: string;
8
- pfxArgs: string;
9
- userContext: IContext;
10
- lastStatus: Step;
11
- cert?: CertInfo;
12
- certZip?: FileItem;
13
- onInstance(): Promise<void>;
14
- abstract onInit(): Promise<void>;
15
- emitCertApplySuccess(): Promise<void>;
16
- output(certReader: CertReader, isNew: boolean): Promise<void>;
17
- zipCert(cert: CertInfo, filename: string): Promise<void>;
18
- formatCert(pem: string): string;
19
- formatCerts(cert: {
20
- crt: string;
21
- key: string;
22
- csr: string;
23
- }): CertInfo;
24
- readLastCert(): Promise<CertReader | undefined>;
25
- }