@certd/plugin-cert 1.22.0 → 1.22.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/LICENSE +661 -0
- package/dist/access/eab-access.d.ts +4 -4
- package/dist/access/eab-access.js +46 -46
- package/dist/access/index.d.ts +1 -1
- package/dist/access/index.js +1 -1
- package/dist/bundle.js +1 -1
- package/dist/d/plugin/cert-plugin/acme.d.ts +0 -2
- package/dist/d/plugin/cert-plugin/index.d.ts +0 -1
- package/dist/dns-provider/api.d.ts +27 -27
- package/dist/dns-provider/api.js +1 -1
- package/dist/dns-provider/base.d.ts +8 -8
- package/dist/dns-provider/base.js +6 -6
- package/dist/dns-provider/decorator.d.ts +3 -3
- package/dist/dns-provider/decorator.js +26 -26
- package/dist/dns-provider/index.d.ts +4 -4
- package/dist/dns-provider/index.js +4 -4
- package/dist/dns-provider/registry.d.ts +2 -2
- package/dist/dns-provider/registry.js +2 -2
- package/dist/index.d.ts +3 -3
- package/dist/plugin/cert-plugin/acme.d.ts +54 -54
- package/dist/plugin/cert-plugin/acme.js +203 -203
- package/dist/plugin/cert-plugin/base.d.ts +49 -49
- package/dist/plugin/cert-plugin/base.js +4 -1
- package/dist/plugin/cert-plugin/cert-reader.d.ts +16 -16
- package/dist/plugin/cert-plugin/cert-reader.js +45 -45
- package/dist/plugin/cert-plugin/index.d.ts +16 -16
- package/dist/plugin/cert-plugin/index.js +5 -3
- package/dist/plugin/cert-plugin/lego.d.ts +1 -1
- package/dist/plugin/cert-plugin/lego.js +17 -9
- package/dist/plugin-cert.mjs +11786 -0
- package/dist/plugin-cert.umd.js +28 -0
- package/package.json +4 -4
- package/stats.html +6177 -0
- package/test/user.secret.js +7 -0
- package/test/user.secret.ts +4 -0
- package/tsconfig.tsbuildinfo +1 -0
|
@@ -1,203 +1,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
|
-
userContext;
|
|
7
|
-
logger;
|
|
8
|
-
sslProvider;
|
|
9
|
-
skipLocalVerify = true;
|
|
10
|
-
eab;
|
|
11
|
-
constructor(options) {
|
|
12
|
-
this.userContext = options.userContext;
|
|
13
|
-
this.logger = options.logger;
|
|
14
|
-
this.sslProvider = options.sslProvider || "letsencrypt";
|
|
15
|
-
this.eab = options.eab;
|
|
16
|
-
this.skipLocalVerify = options.skipLocalVerify ?? false;
|
|
17
|
-
acme.setLogger((text) => {
|
|
18
|
-
this.logger.info(text);
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
async getAccountConfig(email) {
|
|
22
|
-
return (await this.userContext.getObj(this.buildAccountKey(email))) || {};
|
|
23
|
-
}
|
|
24
|
-
buildAccountKey(email) {
|
|
25
|
-
return `acme.config.${this.sslProvider}.${email}`;
|
|
26
|
-
}
|
|
27
|
-
async saveAccountConfig(email, conf) {
|
|
28
|
-
await this.userContext.setObj(this.buildAccountKey(email), conf);
|
|
29
|
-
}
|
|
30
|
-
async getAcmeClient(email, isTest = false) {
|
|
31
|
-
const conf = await this.getAccountConfig(email);
|
|
32
|
-
if (conf.key == null) {
|
|
33
|
-
conf.key = await this.createNewKey();
|
|
34
|
-
await this.saveAccountConfig(email, conf);
|
|
35
|
-
}
|
|
36
|
-
let directoryUrl = "";
|
|
37
|
-
if (isTest) {
|
|
38
|
-
directoryUrl = acme.directory[this.sslProvider].staging;
|
|
39
|
-
}
|
|
40
|
-
else {
|
|
41
|
-
directoryUrl = acme.directory[this.sslProvider].production;
|
|
42
|
-
}
|
|
43
|
-
const client = new acme.Client({
|
|
44
|
-
directoryUrl: directoryUrl,
|
|
45
|
-
accountKey: conf.key,
|
|
46
|
-
accountUrl: conf.accountUrl,
|
|
47
|
-
externalAccountBinding: this.eab,
|
|
48
|
-
backoffAttempts: 30,
|
|
49
|
-
backoffMin: 5000,
|
|
50
|
-
backoffMax: 10000,
|
|
51
|
-
});
|
|
52
|
-
if (conf.accountUrl == null) {
|
|
53
|
-
const accountPayload = {
|
|
54
|
-
termsOfServiceAgreed: true,
|
|
55
|
-
contact: [`mailto:${email}`],
|
|
56
|
-
externalAccountBinding: this.eab,
|
|
57
|
-
};
|
|
58
|
-
await client.createAccount(accountPayload);
|
|
59
|
-
conf.accountUrl = client.getAccountUrl();
|
|
60
|
-
await this.saveAccountConfig(email, conf);
|
|
61
|
-
}
|
|
62
|
-
return client;
|
|
63
|
-
}
|
|
64
|
-
async createNewKey() {
|
|
65
|
-
const key = await acme.forge.createPrivateKey();
|
|
66
|
-
return key.toString();
|
|
67
|
-
}
|
|
68
|
-
parseDomain(fullDomain) {
|
|
69
|
-
const parsed = psl.parse(fullDomain);
|
|
70
|
-
if (parsed.error) {
|
|
71
|
-
throw new Error(`解析${fullDomain}域名失败:` + JSON.stringify(parsed.error));
|
|
72
|
-
}
|
|
73
|
-
return parsed.domain;
|
|
74
|
-
}
|
|
75
|
-
async challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider) {
|
|
76
|
-
this.logger.info("Triggered challengeCreateFn()");
|
|
77
|
-
/* http-01 */
|
|
78
|
-
const fullDomain = authz.identifier.value;
|
|
79
|
-
if (challenge.type === "http-01") {
|
|
80
|
-
const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
|
|
81
|
-
const fileContents = keyAuthorization;
|
|
82
|
-
this.logger.info(`Creating challenge response for ${fullDomain} at path: ${filePath}`);
|
|
83
|
-
/* Replace this */
|
|
84
|
-
this.logger.info(`Would write "${fileContents}" to path "${filePath}"`);
|
|
85
|
-
// await fs.writeFileAsync(filePath, fileContents);
|
|
86
|
-
}
|
|
87
|
-
else if (challenge.type === "dns-01") {
|
|
88
|
-
/* dns-01 */
|
|
89
|
-
const dnsRecord = `_acme-challenge.${fullDomain}`;
|
|
90
|
-
const recordValue = keyAuthorization;
|
|
91
|
-
this.logger.info(`Creating TXT record for ${fullDomain}: ${dnsRecord}`);
|
|
92
|
-
/* Replace this */
|
|
93
|
-
this.logger.info(`Would create TXT record "${dnsRecord}" with value "${recordValue}"`);
|
|
94
|
-
const domain = this.parseDomain(fullDomain);
|
|
95
|
-
this.logger.info("解析到域名domain=", domain);
|
|
96
|
-
return await dnsProvider.createRecord({
|
|
97
|
-
fullRecord: dnsRecord,
|
|
98
|
-
type: "TXT",
|
|
99
|
-
value: recordValue,
|
|
100
|
-
domain,
|
|
101
|
-
});
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
/**
|
|
105
|
-
* Function used to remove an ACME challenge response
|
|
106
|
-
*
|
|
107
|
-
* @param {object} authz Authorization object
|
|
108
|
-
* @param {object} challenge Selected challenge
|
|
109
|
-
* @param {string} keyAuthorization Authorization key
|
|
110
|
-
* @param recordItem challengeCreateFn create record item
|
|
111
|
-
* @param dnsProvider dnsProvider
|
|
112
|
-
* @returns {Promise}
|
|
113
|
-
*/
|
|
114
|
-
async challengeRemoveFn(authz, challenge, keyAuthorization, recordItem, dnsProvider) {
|
|
115
|
-
this.logger.info("Triggered challengeRemoveFn()");
|
|
116
|
-
/* http-01 */
|
|
117
|
-
const fullDomain = authz.identifier.value;
|
|
118
|
-
if (challenge.type === "http-01") {
|
|
119
|
-
const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
|
|
120
|
-
this.logger.info(`Removing challenge response for ${fullDomain} at path: ${filePath}`);
|
|
121
|
-
/* Replace this */
|
|
122
|
-
this.logger.info(`Would remove file on path "${filePath}"`);
|
|
123
|
-
// await fs.unlinkAsync(filePath);
|
|
124
|
-
}
|
|
125
|
-
else if (challenge.type === "dns-01") {
|
|
126
|
-
const dnsRecord = `_acme-challenge.${fullDomain}`;
|
|
127
|
-
const recordValue = keyAuthorization;
|
|
128
|
-
this.logger.info(`Removing TXT record for ${fullDomain}: ${dnsRecord}`);
|
|
129
|
-
/* Replace this */
|
|
130
|
-
this.logger.info(`Would remove TXT record "${dnsRecord}" with value "${recordValue}"`);
|
|
131
|
-
const domain = this.parseDomain(fullDomain);
|
|
132
|
-
try {
|
|
133
|
-
await dnsProvider.removeRecord({
|
|
134
|
-
fullRecord: dnsRecord,
|
|
135
|
-
type: "TXT",
|
|
136
|
-
value: keyAuthorization,
|
|
137
|
-
record: recordItem,
|
|
138
|
-
domain,
|
|
139
|
-
});
|
|
140
|
-
}
|
|
141
|
-
catch (e) {
|
|
142
|
-
this.logger.error("删除解析记录出错:", e);
|
|
143
|
-
throw e;
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
async order(options) {
|
|
148
|
-
const { email, isTest, domains, csrInfo, dnsProvider } = options;
|
|
149
|
-
const client = await this.getAcmeClient(email, isTest);
|
|
150
|
-
/* Create CSR */
|
|
151
|
-
const { commonName, altNames } = this.buildCommonNameByDomains(domains);
|
|
152
|
-
const [key, csr] = await acme.forge.createCsr({
|
|
153
|
-
commonName,
|
|
154
|
-
...csrInfo,
|
|
155
|
-
altNames,
|
|
156
|
-
});
|
|
157
|
-
if (dnsProvider == null) {
|
|
158
|
-
throw new Error("dnsProvider 不能为空");
|
|
159
|
-
}
|
|
160
|
-
/* 自动申请证书 */
|
|
161
|
-
const crt = await client.auto({
|
|
162
|
-
csr,
|
|
163
|
-
email: email,
|
|
164
|
-
termsOfServiceAgreed: true,
|
|
165
|
-
skipChallengeVerification: this.skipLocalVerify,
|
|
166
|
-
challengePriority: ["dns-01"],
|
|
167
|
-
challengeCreateFn: async (authz, challenge, keyAuthorization) => {
|
|
168
|
-
return await this.challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider);
|
|
169
|
-
},
|
|
170
|
-
challengeRemoveFn: async (authz, challenge, keyAuthorization, recordItem) => {
|
|
171
|
-
return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordItem, dnsProvider);
|
|
172
|
-
},
|
|
173
|
-
});
|
|
174
|
-
const cert = {
|
|
175
|
-
crt: crt.toString(),
|
|
176
|
-
key: key.toString(),
|
|
177
|
-
csr: csr.toString(),
|
|
178
|
-
};
|
|
179
|
-
/* Done */
|
|
180
|
-
this.logger.debug(`CSR:\n${cert.csr}`);
|
|
181
|
-
this.logger.debug(`Certificate:\n${cert.crt}`);
|
|
182
|
-
this.logger.info("证书申请成功");
|
|
183
|
-
return cert;
|
|
184
|
-
}
|
|
185
|
-
buildCommonNameByDomains(domains) {
|
|
186
|
-
if (typeof domains === "string") {
|
|
187
|
-
domains = domains.split(",");
|
|
188
|
-
}
|
|
189
|
-
if (domains.length === 0) {
|
|
190
|
-
throw new Error("domain can not be empty");
|
|
191
|
-
}
|
|
192
|
-
const commonName = domains[0];
|
|
193
|
-
let altNames = undefined;
|
|
194
|
-
if (domains.length > 1) {
|
|
195
|
-
altNames = _.slice(domains, 1);
|
|
196
|
-
}
|
|
197
|
-
return {
|
|
198
|
-
commonName,
|
|
199
|
-
altNames,
|
|
200
|
-
};
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
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
|
+
userContext;
|
|
7
|
+
logger;
|
|
8
|
+
sslProvider;
|
|
9
|
+
skipLocalVerify = true;
|
|
10
|
+
eab;
|
|
11
|
+
constructor(options) {
|
|
12
|
+
this.userContext = options.userContext;
|
|
13
|
+
this.logger = options.logger;
|
|
14
|
+
this.sslProvider = options.sslProvider || "letsencrypt";
|
|
15
|
+
this.eab = options.eab;
|
|
16
|
+
this.skipLocalVerify = options.skipLocalVerify ?? false;
|
|
17
|
+
acme.setLogger((text) => {
|
|
18
|
+
this.logger.info(text);
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
async getAccountConfig(email) {
|
|
22
|
+
return (await this.userContext.getObj(this.buildAccountKey(email))) || {};
|
|
23
|
+
}
|
|
24
|
+
buildAccountKey(email) {
|
|
25
|
+
return `acme.config.${this.sslProvider}.${email}`;
|
|
26
|
+
}
|
|
27
|
+
async saveAccountConfig(email, conf) {
|
|
28
|
+
await this.userContext.setObj(this.buildAccountKey(email), conf);
|
|
29
|
+
}
|
|
30
|
+
async getAcmeClient(email, isTest = false) {
|
|
31
|
+
const conf = await this.getAccountConfig(email);
|
|
32
|
+
if (conf.key == null) {
|
|
33
|
+
conf.key = await this.createNewKey();
|
|
34
|
+
await this.saveAccountConfig(email, conf);
|
|
35
|
+
}
|
|
36
|
+
let directoryUrl = "";
|
|
37
|
+
if (isTest) {
|
|
38
|
+
directoryUrl = acme.directory[this.sslProvider].staging;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
directoryUrl = acme.directory[this.sslProvider].production;
|
|
42
|
+
}
|
|
43
|
+
const client = new acme.Client({
|
|
44
|
+
directoryUrl: directoryUrl,
|
|
45
|
+
accountKey: conf.key,
|
|
46
|
+
accountUrl: conf.accountUrl,
|
|
47
|
+
externalAccountBinding: this.eab,
|
|
48
|
+
backoffAttempts: 30,
|
|
49
|
+
backoffMin: 5000,
|
|
50
|
+
backoffMax: 10000,
|
|
51
|
+
});
|
|
52
|
+
if (conf.accountUrl == null) {
|
|
53
|
+
const accountPayload = {
|
|
54
|
+
termsOfServiceAgreed: true,
|
|
55
|
+
contact: [`mailto:${email}`],
|
|
56
|
+
externalAccountBinding: this.eab,
|
|
57
|
+
};
|
|
58
|
+
await client.createAccount(accountPayload);
|
|
59
|
+
conf.accountUrl = client.getAccountUrl();
|
|
60
|
+
await this.saveAccountConfig(email, conf);
|
|
61
|
+
}
|
|
62
|
+
return client;
|
|
63
|
+
}
|
|
64
|
+
async createNewKey() {
|
|
65
|
+
const key = await acme.forge.createPrivateKey();
|
|
66
|
+
return key.toString();
|
|
67
|
+
}
|
|
68
|
+
parseDomain(fullDomain) {
|
|
69
|
+
const parsed = psl.parse(fullDomain);
|
|
70
|
+
if (parsed.error) {
|
|
71
|
+
throw new Error(`解析${fullDomain}域名失败:` + JSON.stringify(parsed.error));
|
|
72
|
+
}
|
|
73
|
+
return parsed.domain;
|
|
74
|
+
}
|
|
75
|
+
async challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider) {
|
|
76
|
+
this.logger.info("Triggered challengeCreateFn()");
|
|
77
|
+
/* http-01 */
|
|
78
|
+
const fullDomain = authz.identifier.value;
|
|
79
|
+
if (challenge.type === "http-01") {
|
|
80
|
+
const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
|
|
81
|
+
const fileContents = keyAuthorization;
|
|
82
|
+
this.logger.info(`Creating challenge response for ${fullDomain} at path: ${filePath}`);
|
|
83
|
+
/* Replace this */
|
|
84
|
+
this.logger.info(`Would write "${fileContents}" to path "${filePath}"`);
|
|
85
|
+
// await fs.writeFileAsync(filePath, fileContents);
|
|
86
|
+
}
|
|
87
|
+
else if (challenge.type === "dns-01") {
|
|
88
|
+
/* dns-01 */
|
|
89
|
+
const dnsRecord = `_acme-challenge.${fullDomain}`;
|
|
90
|
+
const recordValue = keyAuthorization;
|
|
91
|
+
this.logger.info(`Creating TXT record for ${fullDomain}: ${dnsRecord}`);
|
|
92
|
+
/* Replace this */
|
|
93
|
+
this.logger.info(`Would create TXT record "${dnsRecord}" with value "${recordValue}"`);
|
|
94
|
+
const domain = this.parseDomain(fullDomain);
|
|
95
|
+
this.logger.info("解析到域名domain=", domain);
|
|
96
|
+
return await dnsProvider.createRecord({
|
|
97
|
+
fullRecord: dnsRecord,
|
|
98
|
+
type: "TXT",
|
|
99
|
+
value: recordValue,
|
|
100
|
+
domain,
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* Function used to remove an ACME challenge response
|
|
106
|
+
*
|
|
107
|
+
* @param {object} authz Authorization object
|
|
108
|
+
* @param {object} challenge Selected challenge
|
|
109
|
+
* @param {string} keyAuthorization Authorization key
|
|
110
|
+
* @param recordItem challengeCreateFn create record item
|
|
111
|
+
* @param dnsProvider dnsProvider
|
|
112
|
+
* @returns {Promise}
|
|
113
|
+
*/
|
|
114
|
+
async challengeRemoveFn(authz, challenge, keyAuthorization, recordItem, dnsProvider) {
|
|
115
|
+
this.logger.info("Triggered challengeRemoveFn()");
|
|
116
|
+
/* http-01 */
|
|
117
|
+
const fullDomain = authz.identifier.value;
|
|
118
|
+
if (challenge.type === "http-01") {
|
|
119
|
+
const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
|
|
120
|
+
this.logger.info(`Removing challenge response for ${fullDomain} at path: ${filePath}`);
|
|
121
|
+
/* Replace this */
|
|
122
|
+
this.logger.info(`Would remove file on path "${filePath}"`);
|
|
123
|
+
// await fs.unlinkAsync(filePath);
|
|
124
|
+
}
|
|
125
|
+
else if (challenge.type === "dns-01") {
|
|
126
|
+
const dnsRecord = `_acme-challenge.${fullDomain}`;
|
|
127
|
+
const recordValue = keyAuthorization;
|
|
128
|
+
this.logger.info(`Removing TXT record for ${fullDomain}: ${dnsRecord}`);
|
|
129
|
+
/* Replace this */
|
|
130
|
+
this.logger.info(`Would remove TXT record "${dnsRecord}" with value "${recordValue}"`);
|
|
131
|
+
const domain = this.parseDomain(fullDomain);
|
|
132
|
+
try {
|
|
133
|
+
await dnsProvider.removeRecord({
|
|
134
|
+
fullRecord: dnsRecord,
|
|
135
|
+
type: "TXT",
|
|
136
|
+
value: keyAuthorization,
|
|
137
|
+
record: recordItem,
|
|
138
|
+
domain,
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
catch (e) {
|
|
142
|
+
this.logger.error("删除解析记录出错:", e);
|
|
143
|
+
throw e;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
async order(options) {
|
|
148
|
+
const { email, isTest, domains, csrInfo, dnsProvider } = options;
|
|
149
|
+
const client = await this.getAcmeClient(email, isTest);
|
|
150
|
+
/* Create CSR */
|
|
151
|
+
const { commonName, altNames } = this.buildCommonNameByDomains(domains);
|
|
152
|
+
const [key, csr] = await acme.forge.createCsr({
|
|
153
|
+
commonName,
|
|
154
|
+
...csrInfo,
|
|
155
|
+
altNames,
|
|
156
|
+
});
|
|
157
|
+
if (dnsProvider == null) {
|
|
158
|
+
throw new Error("dnsProvider 不能为空");
|
|
159
|
+
}
|
|
160
|
+
/* 自动申请证书 */
|
|
161
|
+
const crt = await client.auto({
|
|
162
|
+
csr,
|
|
163
|
+
email: email,
|
|
164
|
+
termsOfServiceAgreed: true,
|
|
165
|
+
skipChallengeVerification: this.skipLocalVerify,
|
|
166
|
+
challengePriority: ["dns-01"],
|
|
167
|
+
challengeCreateFn: async (authz, challenge, keyAuthorization) => {
|
|
168
|
+
return await this.challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider);
|
|
169
|
+
},
|
|
170
|
+
challengeRemoveFn: async (authz, challenge, keyAuthorization, recordItem) => {
|
|
171
|
+
return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordItem, dnsProvider);
|
|
172
|
+
},
|
|
173
|
+
});
|
|
174
|
+
const cert = {
|
|
175
|
+
crt: crt.toString(),
|
|
176
|
+
key: key.toString(),
|
|
177
|
+
csr: csr.toString(),
|
|
178
|
+
};
|
|
179
|
+
/* Done */
|
|
180
|
+
this.logger.debug(`CSR:\n${cert.csr}`);
|
|
181
|
+
this.logger.debug(`Certificate:\n${cert.crt}`);
|
|
182
|
+
this.logger.info("证书申请成功");
|
|
183
|
+
return cert;
|
|
184
|
+
}
|
|
185
|
+
buildCommonNameByDomains(domains) {
|
|
186
|
+
if (typeof domains === "string") {
|
|
187
|
+
domains = domains.split(",");
|
|
188
|
+
}
|
|
189
|
+
if (domains.length === 0) {
|
|
190
|
+
throw new Error("domain can not be empty");
|
|
191
|
+
}
|
|
192
|
+
const commonName = domains[0];
|
|
193
|
+
let altNames = undefined;
|
|
194
|
+
if (domains.length > 1) {
|
|
195
|
+
altNames = _.slice(domains, 1);
|
|
196
|
+
}
|
|
197
|
+
return {
|
|
198
|
+
commonName,
|
|
199
|
+
altNames,
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
//# 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,49 +1,49 @@
|
|
|
1
|
-
import { AbstractTaskPlugin, HttpClient, IAccessService, IContext, Step } from "@certd/pipeline";
|
|
2
|
-
import type { CertInfo } from "./acme.js";
|
|
3
|
-
import { Logger } from "log4js";
|
|
4
|
-
import { CertReader } from "./cert-reader.js";
|
|
5
|
-
export { CertReader };
|
|
6
|
-
export type { CertInfo };
|
|
7
|
-
export declare abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
|
|
8
|
-
domains: string[];
|
|
9
|
-
email: string;
|
|
10
|
-
renewDays: number;
|
|
11
|
-
forceUpdate: string;
|
|
12
|
-
successNotify: boolean;
|
|
13
|
-
intro: string;
|
|
14
|
-
csrInfo: string;
|
|
15
|
-
logger: Logger;
|
|
16
|
-
userContext: IContext;
|
|
17
|
-
accessService: IAccessService;
|
|
18
|
-
http: HttpClient;
|
|
19
|
-
lastStatus: Step;
|
|
20
|
-
cert?: CertInfo;
|
|
21
|
-
onInstance(): Promise<void>;
|
|
22
|
-
abstract onInit(): Promise<void>;
|
|
23
|
-
abstract doCertApply(): Promise<any>;
|
|
24
|
-
execute(): Promise<void>;
|
|
25
|
-
output(certReader: CertReader, isNew: boolean): Promise<void>;
|
|
26
|
-
zipCert(cert: CertInfo, applyTime: string): Promise<void>;
|
|
27
|
-
/**
|
|
28
|
-
* 是否更新证书
|
|
29
|
-
*/
|
|
30
|
-
condition(): Promise<CertReader>;
|
|
31
|
-
formatCert(pem: string): string;
|
|
32
|
-
formatCerts(cert: {
|
|
33
|
-
crt: string;
|
|
34
|
-
key: string;
|
|
35
|
-
csr: string;
|
|
36
|
-
}): CertInfo;
|
|
37
|
-
readLastCert(): Promise<CertReader | undefined>;
|
|
38
|
-
/**
|
|
39
|
-
* 检查是否过期,默认提前20天
|
|
40
|
-
* @param expires
|
|
41
|
-
* @param maxDays
|
|
42
|
-
* @returns {boolean}
|
|
43
|
-
*/
|
|
44
|
-
isWillExpire(expires: number, maxDays?: number): {
|
|
45
|
-
isWillExpire: boolean;
|
|
46
|
-
leftDays: number;
|
|
47
|
-
};
|
|
48
|
-
private sendSuccessEmail;
|
|
49
|
-
}
|
|
1
|
+
import { AbstractTaskPlugin, HttpClient, IAccessService, IContext, Step } from "@certd/pipeline";
|
|
2
|
+
import type { CertInfo } from "./acme.js";
|
|
3
|
+
import { Logger } from "log4js";
|
|
4
|
+
import { CertReader } from "./cert-reader.js";
|
|
5
|
+
export { CertReader };
|
|
6
|
+
export type { CertInfo };
|
|
7
|
+
export declare abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
|
|
8
|
+
domains: string[];
|
|
9
|
+
email: string;
|
|
10
|
+
renewDays: number;
|
|
11
|
+
forceUpdate: string;
|
|
12
|
+
successNotify: boolean;
|
|
13
|
+
intro: string;
|
|
14
|
+
csrInfo: string;
|
|
15
|
+
logger: Logger;
|
|
16
|
+
userContext: IContext;
|
|
17
|
+
accessService: IAccessService;
|
|
18
|
+
http: HttpClient;
|
|
19
|
+
lastStatus: Step;
|
|
20
|
+
cert?: CertInfo;
|
|
21
|
+
onInstance(): Promise<void>;
|
|
22
|
+
abstract onInit(): Promise<void>;
|
|
23
|
+
abstract doCertApply(): Promise<any>;
|
|
24
|
+
execute(): Promise<void>;
|
|
25
|
+
output(certReader: CertReader, isNew: boolean): Promise<void>;
|
|
26
|
+
zipCert(cert: CertInfo, applyTime: string): Promise<void>;
|
|
27
|
+
/**
|
|
28
|
+
* 是否更新证书
|
|
29
|
+
*/
|
|
30
|
+
condition(): Promise<CertReader>;
|
|
31
|
+
formatCert(pem: string): string;
|
|
32
|
+
formatCerts(cert: {
|
|
33
|
+
crt: string;
|
|
34
|
+
key: string;
|
|
35
|
+
csr: string;
|
|
36
|
+
}): CertInfo;
|
|
37
|
+
readLastCert(): Promise<CertReader | undefined>;
|
|
38
|
+
/**
|
|
39
|
+
* 检查是否过期,默认提前20天
|
|
40
|
+
* @param expires
|
|
41
|
+
* @param maxDays
|
|
42
|
+
* @returns {boolean}
|
|
43
|
+
*/
|
|
44
|
+
isWillExpire(expires: number, maxDays?: number): {
|
|
45
|
+
isWillExpire: boolean;
|
|
46
|
+
leftDays: number;
|
|
47
|
+
};
|
|
48
|
+
private sendSuccessEmail;
|
|
49
|
+
}
|
|
@@ -182,6 +182,7 @@ __decorate([
|
|
|
182
182
|
col: {
|
|
183
183
|
span: 24,
|
|
184
184
|
},
|
|
185
|
+
order: -1,
|
|
185
186
|
helper: "1、支持通配符域名,例如: *.foo.com、foo.com、*.test.handsfree.work\n" +
|
|
186
187
|
"2、支持多个域名、多个子域名、多个通配符域名打到一个证书上(域名必须是在同一个DNS提供商解析)\n" +
|
|
187
188
|
"3、多级子域名要分成多个域名输入(*.foo.com的证书不能用于xxx.yyy.foo.com、foo.com)\n" +
|
|
@@ -197,6 +198,7 @@ __decorate([
|
|
|
197
198
|
vModel: "value",
|
|
198
199
|
},
|
|
199
200
|
required: true,
|
|
201
|
+
order: -1,
|
|
200
202
|
helper: "请输入邮箱",
|
|
201
203
|
}),
|
|
202
204
|
__metadata("design:type", String)
|
|
@@ -204,6 +206,7 @@ __decorate([
|
|
|
204
206
|
__decorate([
|
|
205
207
|
TaskInput({
|
|
206
208
|
title: "更新天数",
|
|
209
|
+
value: 20,
|
|
207
210
|
component: {
|
|
208
211
|
name: "a-input-number",
|
|
209
212
|
vModel: "value",
|
|
@@ -253,4 +256,4 @@ __decorate([
|
|
|
253
256
|
}),
|
|
254
257
|
__metadata("design:type", Object)
|
|
255
258
|
], CertApplyBasePlugin.prototype, "cert", void 0);
|
|
256
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
259
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import { CertInfo } from "./acme.js";
|
|
2
|
-
import forge from "node-forge";
|
|
3
|
-
export declare class CertReader implements CertInfo {
|
|
4
|
-
crt: string;
|
|
5
|
-
key: string;
|
|
6
|
-
csr: string;
|
|
7
|
-
detail: any;
|
|
8
|
-
expires: number;
|
|
9
|
-
constructor(certInfo: CertInfo);
|
|
10
|
-
toCertInfo(): CertInfo;
|
|
11
|
-
getCrtDetail(crt: string): {
|
|
12
|
-
detail: forge.pki.Certificate;
|
|
13
|
-
expires: Date;
|
|
14
|
-
};
|
|
15
|
-
saveToFile(type: "crt" | "key", filepath?: string): string;
|
|
16
|
-
}
|
|
1
|
+
import { CertInfo } from "./acme.js";
|
|
2
|
+
import forge from "node-forge";
|
|
3
|
+
export declare class CertReader implements CertInfo {
|
|
4
|
+
crt: string;
|
|
5
|
+
key: string;
|
|
6
|
+
csr: string;
|
|
7
|
+
detail: any;
|
|
8
|
+
expires: number;
|
|
9
|
+
constructor(certInfo: CertInfo);
|
|
10
|
+
toCertInfo(): CertInfo;
|
|
11
|
+
getCrtDetail(crt: string): {
|
|
12
|
+
detail: forge.pki.Certificate;
|
|
13
|
+
expires: Date;
|
|
14
|
+
};
|
|
15
|
+
saveToFile(type: "crt" | "key", filepath?: string): string;
|
|
16
|
+
}
|