@certd/plugin-cert 1.22.2 → 1.22.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.
- package/CHANGELOG.md +10 -0
- package/LICENSE +661 -0
- package/dist/plugin/cert-plugin/acme.d.ts +58 -54
- package/dist/plugin/cert-plugin/acme.js +213 -203
- package/dist/plugin/cert-plugin/base.js +259 -259
- package/dist/plugin/cert-plugin/cert-reader.js +45 -45
- package/dist/plugin/cert-plugin/index.d.ts +17 -16
- package/dist/plugin/cert-plugin/index.js +15 -1
- package/package.json +4 -4
- package/test/user.secret.js +7 -0
- package/tsconfig.tsbuildinfo +1 -0
|
@@ -1,54 +1,58 @@
|
|
|
1
|
-
import * as acme from "@certd/acme-client";
|
|
2
|
-
import { Logger } from "log4js";
|
|
3
|
-
import { IContext } from "@certd/pipeline";
|
|
4
|
-
import { IDnsProvider } from "../../dns-provider/index.js";
|
|
5
|
-
import { ClientExternalAccountBindingOptions } from "@certd/acme-client";
|
|
6
|
-
export type CertInfo = {
|
|
7
|
-
crt: string;
|
|
8
|
-
key: string;
|
|
9
|
-
csr: string;
|
|
10
|
-
};
|
|
11
|
-
export type SSLProvider = "letsencrypt" | "buypass" | "zerossl";
|
|
12
|
-
|
|
13
|
-
userContext: IContext;
|
|
14
|
-
logger: Logger;
|
|
15
|
-
sslProvider: SSLProvider;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
* @param
|
|
39
|
-
* @param
|
|
40
|
-
* @
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
1
|
+
import * as acme from "@certd/acme-client";
|
|
2
|
+
import { Logger } from "log4js";
|
|
3
|
+
import { IContext } from "@certd/pipeline";
|
|
4
|
+
import { IDnsProvider } from "../../dns-provider/index.js";
|
|
5
|
+
import { ClientExternalAccountBindingOptions } from "@certd/acme-client";
|
|
6
|
+
export type CertInfo = {
|
|
7
|
+
crt: string;
|
|
8
|
+
key: string;
|
|
9
|
+
csr: string;
|
|
10
|
+
};
|
|
11
|
+
export type SSLProvider = "letsencrypt" | "buypass" | "zerossl";
|
|
12
|
+
type AcmeServiceOptions = {
|
|
13
|
+
userContext: IContext;
|
|
14
|
+
logger: Logger;
|
|
15
|
+
sslProvider: SSLProvider;
|
|
16
|
+
eab?: ClientExternalAccountBindingOptions;
|
|
17
|
+
skipLocalVerify?: boolean;
|
|
18
|
+
useMappingProxy?: boolean;
|
|
19
|
+
};
|
|
20
|
+
export declare class AcmeService {
|
|
21
|
+
options: AcmeServiceOptions;
|
|
22
|
+
userContext: IContext;
|
|
23
|
+
logger: Logger;
|
|
24
|
+
sslProvider: SSLProvider;
|
|
25
|
+
skipLocalVerify: boolean;
|
|
26
|
+
eab?: ClientExternalAccountBindingOptions;
|
|
27
|
+
constructor(options: AcmeServiceOptions);
|
|
28
|
+
getAccountConfig(email: string): Promise<any>;
|
|
29
|
+
buildAccountKey(email: string): string;
|
|
30
|
+
saveAccountConfig(email: string, conf: any): Promise<void>;
|
|
31
|
+
getAcmeClient(email: string, isTest?: boolean): Promise<acme.Client>;
|
|
32
|
+
createNewKey(): Promise<string>;
|
|
33
|
+
parseDomain(fullDomain: string): string;
|
|
34
|
+
challengeCreateFn(authz: any, challenge: any, keyAuthorization: string, dnsProvider: IDnsProvider): Promise<any>;
|
|
35
|
+
/**
|
|
36
|
+
* Function used to remove an ACME challenge response
|
|
37
|
+
*
|
|
38
|
+
* @param {object} authz Authorization object
|
|
39
|
+
* @param {object} challenge Selected challenge
|
|
40
|
+
* @param {string} keyAuthorization Authorization key
|
|
41
|
+
* @param recordItem challengeCreateFn create record item
|
|
42
|
+
* @param dnsProvider dnsProvider
|
|
43
|
+
* @returns {Promise}
|
|
44
|
+
*/
|
|
45
|
+
challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordItem: any, dnsProvider: IDnsProvider): Promise<void>;
|
|
46
|
+
order(options: {
|
|
47
|
+
email: string;
|
|
48
|
+
domains: string | string[];
|
|
49
|
+
dnsProvider: any;
|
|
50
|
+
csrInfo: any;
|
|
51
|
+
isTest?: boolean;
|
|
52
|
+
}): Promise<CertInfo>;
|
|
53
|
+
buildCommonNameByDomains(domains: string | string[]): {
|
|
54
|
+
commonName: string;
|
|
55
|
+
altNames: string[] | undefined;
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
export {};
|
|
@@ -1,203 +1,213 @@
|
|
|
1
|
-
// @ts-ignore
|
|
2
|
-
import * as acme from "@certd/acme-client";
|
|
3
|
-
import _ from "lodash-es";
|
|
4
|
-
import psl from "psl";
|
|
5
|
-
export class AcmeService {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
this.
|
|
14
|
-
this.
|
|
15
|
-
this.
|
|
16
|
-
this.
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
});
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
this.logger.info(`
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
/*
|
|
161
|
-
const
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
1
|
+
// @ts-ignore
|
|
2
|
+
import * as acme from "@certd/acme-client";
|
|
3
|
+
import _ from "lodash-es";
|
|
4
|
+
import psl from "psl";
|
|
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((text) => {
|
|
20
|
+
this.logger.info(text);
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
async getAccountConfig(email) {
|
|
24
|
+
return (await this.userContext.getObj(this.buildAccountKey(email))) || {};
|
|
25
|
+
}
|
|
26
|
+
buildAccountKey(email) {
|
|
27
|
+
return `acme.config.${this.sslProvider}.${email}`;
|
|
28
|
+
}
|
|
29
|
+
async saveAccountConfig(email, conf) {
|
|
30
|
+
await this.userContext.setObj(this.buildAccountKey(email), conf);
|
|
31
|
+
}
|
|
32
|
+
async getAcmeClient(email, isTest = false) {
|
|
33
|
+
const conf = await this.getAccountConfig(email);
|
|
34
|
+
if (conf.key == null) {
|
|
35
|
+
conf.key = await this.createNewKey();
|
|
36
|
+
await this.saveAccountConfig(email, conf);
|
|
37
|
+
}
|
|
38
|
+
let directoryUrl = "";
|
|
39
|
+
if (isTest) {
|
|
40
|
+
directoryUrl = acme.directory[this.sslProvider].staging;
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
directoryUrl = acme.directory[this.sslProvider].production;
|
|
44
|
+
}
|
|
45
|
+
const urlMapping = { enabled: false, mappings: {} };
|
|
46
|
+
if (this.options.useMappingProxy) {
|
|
47
|
+
urlMapping.enabled = true;
|
|
48
|
+
urlMapping.mappings = {
|
|
49
|
+
"acme-v02.api.letsencrypt.org": "letsencrypt.proxy.handsfree.work",
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
const client = new acme.Client({
|
|
53
|
+
directoryUrl: directoryUrl,
|
|
54
|
+
accountKey: conf.key,
|
|
55
|
+
accountUrl: conf.accountUrl,
|
|
56
|
+
externalAccountBinding: this.eab,
|
|
57
|
+
backoffAttempts: 30,
|
|
58
|
+
backoffMin: 5000,
|
|
59
|
+
backoffMax: 10000,
|
|
60
|
+
urlMapping,
|
|
61
|
+
});
|
|
62
|
+
if (conf.accountUrl == null) {
|
|
63
|
+
const accountPayload = {
|
|
64
|
+
termsOfServiceAgreed: true,
|
|
65
|
+
contact: [`mailto:${email}`],
|
|
66
|
+
externalAccountBinding: this.eab,
|
|
67
|
+
};
|
|
68
|
+
await client.createAccount(accountPayload);
|
|
69
|
+
conf.accountUrl = client.getAccountUrl();
|
|
70
|
+
await this.saveAccountConfig(email, conf);
|
|
71
|
+
}
|
|
72
|
+
return client;
|
|
73
|
+
}
|
|
74
|
+
async createNewKey() {
|
|
75
|
+
const key = await acme.forge.createPrivateKey();
|
|
76
|
+
return key.toString();
|
|
77
|
+
}
|
|
78
|
+
parseDomain(fullDomain) {
|
|
79
|
+
const parsed = psl.parse(fullDomain);
|
|
80
|
+
if (parsed.error) {
|
|
81
|
+
throw new Error(`解析${fullDomain}域名失败:` + JSON.stringify(parsed.error));
|
|
82
|
+
}
|
|
83
|
+
return parsed.domain;
|
|
84
|
+
}
|
|
85
|
+
async challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider) {
|
|
86
|
+
this.logger.info("Triggered challengeCreateFn()");
|
|
87
|
+
/* http-01 */
|
|
88
|
+
const fullDomain = authz.identifier.value;
|
|
89
|
+
if (challenge.type === "http-01") {
|
|
90
|
+
const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
|
|
91
|
+
const fileContents = keyAuthorization;
|
|
92
|
+
this.logger.info(`Creating challenge response for ${fullDomain} at path: ${filePath}`);
|
|
93
|
+
/* Replace this */
|
|
94
|
+
this.logger.info(`Would write "${fileContents}" to path "${filePath}"`);
|
|
95
|
+
// await fs.writeFileAsync(filePath, fileContents);
|
|
96
|
+
}
|
|
97
|
+
else if (challenge.type === "dns-01") {
|
|
98
|
+
/* dns-01 */
|
|
99
|
+
const dnsRecord = `_acme-challenge.${fullDomain}`;
|
|
100
|
+
const recordValue = keyAuthorization;
|
|
101
|
+
this.logger.info(`Creating TXT record for ${fullDomain}: ${dnsRecord}`);
|
|
102
|
+
/* Replace this */
|
|
103
|
+
this.logger.info(`Would create TXT record "${dnsRecord}" with value "${recordValue}"`);
|
|
104
|
+
const domain = this.parseDomain(fullDomain);
|
|
105
|
+
this.logger.info("解析到域名domain=", domain);
|
|
106
|
+
return await dnsProvider.createRecord({
|
|
107
|
+
fullRecord: dnsRecord,
|
|
108
|
+
type: "TXT",
|
|
109
|
+
value: recordValue,
|
|
110
|
+
domain,
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Function used to remove an ACME challenge response
|
|
116
|
+
*
|
|
117
|
+
* @param {object} authz Authorization object
|
|
118
|
+
* @param {object} challenge Selected challenge
|
|
119
|
+
* @param {string} keyAuthorization Authorization key
|
|
120
|
+
* @param recordItem challengeCreateFn create record item
|
|
121
|
+
* @param dnsProvider dnsProvider
|
|
122
|
+
* @returns {Promise}
|
|
123
|
+
*/
|
|
124
|
+
async challengeRemoveFn(authz, challenge, keyAuthorization, recordItem, dnsProvider) {
|
|
125
|
+
this.logger.info("Triggered challengeRemoveFn()");
|
|
126
|
+
/* http-01 */
|
|
127
|
+
const fullDomain = authz.identifier.value;
|
|
128
|
+
if (challenge.type === "http-01") {
|
|
129
|
+
const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
|
|
130
|
+
this.logger.info(`Removing challenge response for ${fullDomain} at path: ${filePath}`);
|
|
131
|
+
/* Replace this */
|
|
132
|
+
this.logger.info(`Would remove file on path "${filePath}"`);
|
|
133
|
+
// await fs.unlinkAsync(filePath);
|
|
134
|
+
}
|
|
135
|
+
else if (challenge.type === "dns-01") {
|
|
136
|
+
const dnsRecord = `_acme-challenge.${fullDomain}`;
|
|
137
|
+
const recordValue = keyAuthorization;
|
|
138
|
+
this.logger.info(`Removing TXT record for ${fullDomain}: ${dnsRecord}`);
|
|
139
|
+
/* Replace this */
|
|
140
|
+
this.logger.info(`Would remove TXT record "${dnsRecord}" with value "${recordValue}"`);
|
|
141
|
+
const domain = this.parseDomain(fullDomain);
|
|
142
|
+
try {
|
|
143
|
+
await dnsProvider.removeRecord({
|
|
144
|
+
fullRecord: dnsRecord,
|
|
145
|
+
type: "TXT",
|
|
146
|
+
value: keyAuthorization,
|
|
147
|
+
record: recordItem,
|
|
148
|
+
domain,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
catch (e) {
|
|
152
|
+
this.logger.error("删除解析记录出错:", e);
|
|
153
|
+
throw e;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
async order(options) {
|
|
158
|
+
const { email, isTest, domains, csrInfo, dnsProvider } = options;
|
|
159
|
+
const client = await this.getAcmeClient(email, isTest);
|
|
160
|
+
/* Create CSR */
|
|
161
|
+
const { commonName, altNames } = this.buildCommonNameByDomains(domains);
|
|
162
|
+
const [key, csr] = await acme.forge.createCsr({
|
|
163
|
+
commonName,
|
|
164
|
+
...csrInfo,
|
|
165
|
+
altNames,
|
|
166
|
+
});
|
|
167
|
+
if (dnsProvider == null) {
|
|
168
|
+
throw new Error("dnsProvider 不能为空");
|
|
169
|
+
}
|
|
170
|
+
/* 自动申请证书 */
|
|
171
|
+
const crt = await client.auto({
|
|
172
|
+
csr,
|
|
173
|
+
email: email,
|
|
174
|
+
termsOfServiceAgreed: true,
|
|
175
|
+
skipChallengeVerification: this.skipLocalVerify,
|
|
176
|
+
challengePriority: ["dns-01"],
|
|
177
|
+
challengeCreateFn: async (authz, challenge, keyAuthorization) => {
|
|
178
|
+
return await this.challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider);
|
|
179
|
+
},
|
|
180
|
+
challengeRemoveFn: async (authz, challenge, keyAuthorization, recordItem) => {
|
|
181
|
+
return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordItem, dnsProvider);
|
|
182
|
+
},
|
|
183
|
+
});
|
|
184
|
+
const cert = {
|
|
185
|
+
crt: crt.toString(),
|
|
186
|
+
key: key.toString(),
|
|
187
|
+
csr: csr.toString(),
|
|
188
|
+
};
|
|
189
|
+
/* Done */
|
|
190
|
+
this.logger.debug(`CSR:\n${cert.csr}`);
|
|
191
|
+
this.logger.debug(`Certificate:\n${cert.crt}`);
|
|
192
|
+
this.logger.info("证书申请成功");
|
|
193
|
+
return cert;
|
|
194
|
+
}
|
|
195
|
+
buildCommonNameByDomains(domains) {
|
|
196
|
+
if (typeof domains === "string") {
|
|
197
|
+
domains = domains.split(",");
|
|
198
|
+
}
|
|
199
|
+
if (domains.length === 0) {
|
|
200
|
+
throw new Error("domain can not be empty");
|
|
201
|
+
}
|
|
202
|
+
const commonName = domains[0];
|
|
203
|
+
let altNames = undefined;
|
|
204
|
+
if (domains.length > 1) {
|
|
205
|
+
altNames = _.slice(domains, 1);
|
|
206
|
+
}
|
|
207
|
+
return {
|
|
208
|
+
commonName,
|
|
209
|
+
altNames,
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"acme.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/acme.ts"],"names":[],"mappings":"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"}
|