@certd/plugin-cert 1.24.0 → 1.24.1
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 +6 -0
- package/dist/access/eab-access.js +47 -46
- package/dist/access/index.js +1 -1
- package/dist/dns-provider/api.js +1 -1
- package/dist/dns-provider/base.js +6 -6
- package/dist/dns-provider/decorator.js +25 -25
- package/dist/dns-provider/index.js +4 -4
- package/dist/dns-provider/registry.js +2 -2
- package/dist/index.js +3 -3
- package/dist/plugin/cert-plugin/acme.d.ts +63 -62
- package/dist/plugin/cert-plugin/acme.js +266 -242
- package/dist/plugin/cert-plugin/base.d.ts +46 -46
- package/dist/plugin/cert-plugin/base.js +256 -256
- package/dist/plugin/cert-plugin/cert-reader.d.ts +15 -15
- package/dist/plugin/cert-plugin/cert-reader.js +43 -43
- package/dist/plugin/cert-plugin/index.d.ts +18 -18
- package/dist/plugin/cert-plugin/index.js +209 -211
- package/dist/plugin/cert-plugin/lego/dns.js +1 -1
- package/dist/plugin/cert-plugin/lego/index.js +170 -171
- package/dist/plugin/index.js +2 -2
- package/package.json +4 -4
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1,242 +1,266 @@
|
|
|
1
|
-
// @ts-ignore
|
|
2
|
-
import * as acme from "@certd/acme-client";
|
|
3
|
-
import _ from "lodash-es";
|
|
4
|
-
import psl from "psl";
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
this.
|
|
15
|
-
this.
|
|
16
|
-
this.
|
|
17
|
-
this.
|
|
18
|
-
this.
|
|
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
|
-
await this.
|
|
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
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
const
|
|
105
|
-
if (
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
const
|
|
116
|
-
const
|
|
117
|
-
this.logger.info(`Creating
|
|
118
|
-
/* Replace this */
|
|
119
|
-
this.logger.info(`Would
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
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
|
-
|
|
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
|
-
const
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
const
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
//# 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
|
+
// @ts-ignore
|
|
2
|
+
import * as acme from "@certd/acme-client";
|
|
3
|
+
import _ from "lodash-es";
|
|
4
|
+
import psl from "psl";
|
|
5
|
+
import { utils } from "@certd/pipeline";
|
|
6
|
+
export class AcmeService {
|
|
7
|
+
options;
|
|
8
|
+
userContext;
|
|
9
|
+
logger;
|
|
10
|
+
sslProvider;
|
|
11
|
+
skipLocalVerify = true;
|
|
12
|
+
eab;
|
|
13
|
+
constructor(options) {
|
|
14
|
+
this.options = options;
|
|
15
|
+
this.userContext = options.userContext;
|
|
16
|
+
this.logger = options.logger;
|
|
17
|
+
this.sslProvider = options.sslProvider || "letsencrypt";
|
|
18
|
+
this.eab = options.eab;
|
|
19
|
+
this.skipLocalVerify = options.skipLocalVerify ?? false;
|
|
20
|
+
acme.setLogger((text) => {
|
|
21
|
+
this.logger.info(text);
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
async getAccountConfig(email, urlMapping) {
|
|
25
|
+
const conf = (await this.userContext.getObj(this.buildAccountKey(email))) || {};
|
|
26
|
+
if (urlMapping && urlMapping.mappings) {
|
|
27
|
+
for (const key in urlMapping.mappings) {
|
|
28
|
+
if (Object.prototype.hasOwnProperty.call(urlMapping.mappings, key)) {
|
|
29
|
+
const element = urlMapping.mappings[key];
|
|
30
|
+
if (conf.accountUrl?.indexOf(element) > -1) {
|
|
31
|
+
//如果用了代理url,要替换回去
|
|
32
|
+
conf.accountUrl = conf.accountUrl.replace(element, key);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return conf;
|
|
38
|
+
}
|
|
39
|
+
buildAccountKey(email) {
|
|
40
|
+
return `acme.config.${this.sslProvider}.${email}`;
|
|
41
|
+
}
|
|
42
|
+
async saveAccountConfig(email, conf) {
|
|
43
|
+
await this.userContext.setObj(this.buildAccountKey(email), conf);
|
|
44
|
+
}
|
|
45
|
+
async getAcmeClient(email, isTest = false) {
|
|
46
|
+
const urlMapping = {
|
|
47
|
+
enabled: false,
|
|
48
|
+
mappings: {
|
|
49
|
+
"acme-v02.api.letsencrypt.org": "letsencrypt.proxy.handsfree.work",
|
|
50
|
+
"dv.acme-v02.api.pki.goog": "google.proxy.handsfree.work",
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
const conf = await this.getAccountConfig(email, urlMapping);
|
|
54
|
+
if (conf.key == null) {
|
|
55
|
+
conf.key = await this.createNewKey();
|
|
56
|
+
await this.saveAccountConfig(email, conf);
|
|
57
|
+
}
|
|
58
|
+
let directoryUrl = "";
|
|
59
|
+
if (isTest) {
|
|
60
|
+
directoryUrl = acme.directory[this.sslProvider].staging;
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
directoryUrl = acme.directory[this.sslProvider].production;
|
|
64
|
+
}
|
|
65
|
+
if (this.options.useMappingProxy) {
|
|
66
|
+
urlMapping.enabled = true;
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
//测试directory是否可以访问
|
|
70
|
+
const isOk = await this.testDirectory(directoryUrl);
|
|
71
|
+
if (!isOk) {
|
|
72
|
+
this.logger.info("测试访问失败,自动使用代理");
|
|
73
|
+
urlMapping.enabled = true;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
const client = new acme.Client({
|
|
77
|
+
directoryUrl: directoryUrl,
|
|
78
|
+
accountKey: conf.key,
|
|
79
|
+
accountUrl: conf.accountUrl,
|
|
80
|
+
externalAccountBinding: this.eab,
|
|
81
|
+
backoffAttempts: 15,
|
|
82
|
+
backoffMin: 5000,
|
|
83
|
+
backoffMax: 10000,
|
|
84
|
+
urlMapping,
|
|
85
|
+
signal: this.options.signal,
|
|
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.forge.createPrivateKey();
|
|
101
|
+
return key.toString();
|
|
102
|
+
}
|
|
103
|
+
parseDomain(fullDomain) {
|
|
104
|
+
const parsed = psl.parse(fullDomain);
|
|
105
|
+
if (parsed.error) {
|
|
106
|
+
throw new Error(`解析${fullDomain}域名失败:` + JSON.stringify(parsed.error));
|
|
107
|
+
}
|
|
108
|
+
return parsed.domain;
|
|
109
|
+
}
|
|
110
|
+
async challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider) {
|
|
111
|
+
this.logger.info("Triggered challengeCreateFn()");
|
|
112
|
+
/* http-01 */
|
|
113
|
+
const fullDomain = authz.identifier.value;
|
|
114
|
+
if (challenge.type === "http-01") {
|
|
115
|
+
const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
|
|
116
|
+
const fileContents = keyAuthorization;
|
|
117
|
+
this.logger.info(`Creating challenge response for ${fullDomain} at path: ${filePath}`);
|
|
118
|
+
/* Replace this */
|
|
119
|
+
this.logger.info(`Would write "${fileContents}" to path "${filePath}"`);
|
|
120
|
+
// await fs.writeFileAsync(filePath, fileContents);
|
|
121
|
+
}
|
|
122
|
+
else if (challenge.type === "dns-01") {
|
|
123
|
+
/* dns-01 */
|
|
124
|
+
const dnsRecord = `_acme-challenge.${fullDomain}`;
|
|
125
|
+
const recordValue = keyAuthorization;
|
|
126
|
+
this.logger.info(`Creating TXT record for ${fullDomain}: ${dnsRecord}`);
|
|
127
|
+
/* Replace this */
|
|
128
|
+
this.logger.info(`Would create TXT record "${dnsRecord}" with value "${recordValue}"`);
|
|
129
|
+
const domain = this.parseDomain(fullDomain);
|
|
130
|
+
this.logger.info("解析到域名domain=", domain);
|
|
131
|
+
return await dnsProvider.createRecord({
|
|
132
|
+
fullRecord: dnsRecord,
|
|
133
|
+
type: "TXT",
|
|
134
|
+
value: recordValue,
|
|
135
|
+
domain,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* Function used to remove an ACME challenge response
|
|
141
|
+
*
|
|
142
|
+
* @param {object} authz Authorization object
|
|
143
|
+
* @param {object} challenge Selected challenge
|
|
144
|
+
* @param {string} keyAuthorization Authorization key
|
|
145
|
+
* @param recordItem challengeCreateFn create record item
|
|
146
|
+
* @param dnsProvider dnsProvider
|
|
147
|
+
* @returns {Promise}
|
|
148
|
+
*/
|
|
149
|
+
async challengeRemoveFn(authz, challenge, keyAuthorization, recordItem, dnsProvider) {
|
|
150
|
+
this.logger.info("Triggered challengeRemoveFn()");
|
|
151
|
+
/* http-01 */
|
|
152
|
+
const fullDomain = authz.identifier.value;
|
|
153
|
+
if (challenge.type === "http-01") {
|
|
154
|
+
const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
|
|
155
|
+
this.logger.info(`Removing challenge response for ${fullDomain} at path: ${filePath}`);
|
|
156
|
+
/* Replace this */
|
|
157
|
+
this.logger.info(`Would remove file on path "${filePath}"`);
|
|
158
|
+
// await fs.unlinkAsync(filePath);
|
|
159
|
+
}
|
|
160
|
+
else if (challenge.type === "dns-01") {
|
|
161
|
+
const dnsRecord = `_acme-challenge.${fullDomain}`;
|
|
162
|
+
const recordValue = keyAuthorization;
|
|
163
|
+
this.logger.info(`Removing TXT record for ${fullDomain}: ${dnsRecord}`);
|
|
164
|
+
/* Replace this */
|
|
165
|
+
this.logger.info(`Would remove TXT record "${dnsRecord}" with value "${recordValue}"`);
|
|
166
|
+
const domain = this.parseDomain(fullDomain);
|
|
167
|
+
try {
|
|
168
|
+
await dnsProvider.removeRecord({
|
|
169
|
+
fullRecord: dnsRecord,
|
|
170
|
+
type: "TXT",
|
|
171
|
+
value: keyAuthorization,
|
|
172
|
+
record: recordItem,
|
|
173
|
+
domain,
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
catch (e) {
|
|
177
|
+
this.logger.error("删除解析记录出错:", e);
|
|
178
|
+
throw e;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
async order(options) {
|
|
183
|
+
const { email, isTest, domains, csrInfo, dnsProvider } = options;
|
|
184
|
+
const client = await this.getAcmeClient(email, isTest);
|
|
185
|
+
/* Create CSR */
|
|
186
|
+
const { commonName, altNames } = this.buildCommonNameByDomains(domains);
|
|
187
|
+
let privateKey = null;
|
|
188
|
+
const privateKeyType = options.privateKeyType || "rsa_2048";
|
|
189
|
+
const privateKeyArr = privateKeyType.split("_");
|
|
190
|
+
const type = privateKeyArr[0];
|
|
191
|
+
const size = parseInt(privateKeyArr[1]);
|
|
192
|
+
if (type == "ec") {
|
|
193
|
+
const name = "P-" + size;
|
|
194
|
+
privateKey = await acme.crypto.createPrivateEcdsaKey(name);
|
|
195
|
+
}
|
|
196
|
+
else {
|
|
197
|
+
privateKey = await acme.crypto.createPrivateRsaKey(size);
|
|
198
|
+
}
|
|
199
|
+
const [key, csr] = await acme.crypto.createCsr({
|
|
200
|
+
commonName,
|
|
201
|
+
...csrInfo,
|
|
202
|
+
altNames,
|
|
203
|
+
}, privateKey);
|
|
204
|
+
if (dnsProvider == null) {
|
|
205
|
+
throw new Error("dnsProvider 不能为空");
|
|
206
|
+
}
|
|
207
|
+
/* 自动申请证书 */
|
|
208
|
+
const crt = await client.auto({
|
|
209
|
+
csr,
|
|
210
|
+
email: email,
|
|
211
|
+
termsOfServiceAgreed: true,
|
|
212
|
+
skipChallengeVerification: this.skipLocalVerify,
|
|
213
|
+
challengePriority: ["dns-01"],
|
|
214
|
+
challengeCreateFn: async (authz, challenge, keyAuthorization) => {
|
|
215
|
+
return await this.challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider);
|
|
216
|
+
},
|
|
217
|
+
challengeRemoveFn: async (authz, challenge, keyAuthorization, recordItem) => {
|
|
218
|
+
return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordItem, dnsProvider);
|
|
219
|
+
},
|
|
220
|
+
signal: this.options.signal,
|
|
221
|
+
});
|
|
222
|
+
const cert = {
|
|
223
|
+
crt: crt.toString(),
|
|
224
|
+
key: key.toString(),
|
|
225
|
+
csr: csr.toString(),
|
|
226
|
+
};
|
|
227
|
+
/* Done */
|
|
228
|
+
this.logger.debug(`CSR:\n${cert.csr}`);
|
|
229
|
+
this.logger.debug(`Certificate:\n${cert.crt}`);
|
|
230
|
+
this.logger.info("证书申请成功");
|
|
231
|
+
return cert;
|
|
232
|
+
}
|
|
233
|
+
buildCommonNameByDomains(domains) {
|
|
234
|
+
if (typeof domains === "string") {
|
|
235
|
+
domains = domains.split(",");
|
|
236
|
+
}
|
|
237
|
+
if (domains.length === 0) {
|
|
238
|
+
throw new Error("domain can not be empty");
|
|
239
|
+
}
|
|
240
|
+
const commonName = domains[0];
|
|
241
|
+
let altNames = undefined;
|
|
242
|
+
if (domains.length > 1) {
|
|
243
|
+
altNames = _.slice(domains, 1);
|
|
244
|
+
}
|
|
245
|
+
return {
|
|
246
|
+
commonName,
|
|
247
|
+
altNames,
|
|
248
|
+
};
|
|
249
|
+
}
|
|
250
|
+
async testDirectory(directoryUrl) {
|
|
251
|
+
try {
|
|
252
|
+
await utils.http({
|
|
253
|
+
url: directoryUrl,
|
|
254
|
+
method: "GET",
|
|
255
|
+
timeout: 5000,
|
|
256
|
+
});
|
|
257
|
+
}
|
|
258
|
+
catch (e) {
|
|
259
|
+
this.logger.error(`${directoryUrl},测试访问失败`, e);
|
|
260
|
+
return false;
|
|
261
|
+
}
|
|
262
|
+
this.logger.info(`${directoryUrl},测试访问成功`);
|
|
263
|
+
return true;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"acme.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/acme.ts"],"names":[],"mappings":"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"}
|