@certd/plugin-cert 1.23.1 → 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.
Files changed (43) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/dist/access/eab-access.d.ts +4 -4
  3. package/dist/access/eab-access.js +47 -46
  4. package/dist/access/index.d.ts +1 -1
  5. package/dist/access/index.js +1 -1
  6. package/dist/bundle.js +1 -1
  7. package/dist/d/plugin/cert-plugin/acme.d.ts +0 -2
  8. package/dist/d/plugin/cert-plugin/index.d.ts +0 -1
  9. package/dist/dns-provider/api.d.ts +27 -27
  10. package/dist/dns-provider/api.js +1 -1
  11. package/dist/dns-provider/base.d.ts +8 -8
  12. package/dist/dns-provider/base.js +6 -6
  13. package/dist/dns-provider/decorator.d.ts +3 -3
  14. package/dist/dns-provider/decorator.js +25 -25
  15. package/dist/dns-provider/index.d.ts +4 -4
  16. package/dist/dns-provider/index.js +4 -4
  17. package/dist/dns-provider/registry.d.ts +2 -2
  18. package/dist/dns-provider/registry.js +2 -2
  19. package/dist/index.d.ts +3 -3
  20. package/dist/index.js +3 -3
  21. package/dist/plugin/cert-plugin/acme.d.ts +63 -58
  22. package/dist/plugin/cert-plugin/acme.js +266 -213
  23. package/dist/plugin/cert-plugin/base.d.ts +46 -49
  24. package/dist/plugin/cert-plugin/base.js +256 -260
  25. package/dist/plugin/cert-plugin/cert-reader.d.ts +15 -16
  26. package/dist/plugin/cert-plugin/cert-reader.js +44 -45
  27. package/dist/plugin/cert-plugin/index.d.ts +18 -17
  28. package/dist/plugin/cert-plugin/index.js +209 -186
  29. package/dist/plugin/cert-plugin/lego/dns.d.ts +1 -1
  30. package/dist/plugin/cert-plugin/lego/dns.js +1 -1
  31. package/dist/plugin/cert-plugin/lego/index.d.ts +17 -17
  32. package/dist/plugin/cert-plugin/lego/index.js +170 -171
  33. package/dist/plugin/cert-plugin/lego.d.ts +16 -16
  34. package/dist/plugin/cert-plugin/lego.js +153 -145
  35. package/dist/plugin/index.d.ts +2 -2
  36. package/dist/plugin/index.js +2 -2
  37. package/dist/plugin-cert.mjs +11786 -0
  38. package/dist/plugin-cert.umd.js +28 -0
  39. package/package.json +4 -4
  40. package/stats.html +6177 -0
  41. package/test/user.secret.js +7 -0
  42. package/test/user.secret.ts +4 -0
  43. package/tsconfig.tsbuildinfo +1 -1
@@ -1,260 +1,256 @@
1
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
2
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
3
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
4
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
5
- return c > 3 && r && Object.defineProperty(target, key, r), r;
6
- };
7
- var __metadata = (this && this.__metadata) || function (k, v) {
8
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
- };
10
- import { AbstractTaskPlugin, TaskInput, TaskOutput } from "@certd/pipeline";
11
- import dayjs from "dayjs";
12
- import { CertReader } from "./cert-reader.js";
13
- import JSZip from "jszip";
14
- export { CertReader };
15
- export class CertApplyBasePlugin extends AbstractTaskPlugin {
16
- domains;
17
- email;
18
- renewDays;
19
- forceUpdate;
20
- successNotify = true;
21
- intro;
22
- // @TaskInput({
23
- // title: "CsrInfo",
24
- // helper: "暂时没有用",
25
- // })
26
- csrInfo;
27
- logger;
28
- userContext;
29
- accessService;
30
- http;
31
- lastStatus;
32
- cert;
33
- async onInstance() {
34
- this.accessService = this.ctx.accessService;
35
- this.logger = this.ctx.logger;
36
- this.userContext = this.ctx.userContext;
37
- this.http = this.ctx.http;
38
- this.lastStatus = this.ctx.lastStatus;
39
- await this.onInit();
40
- }
41
- async execute() {
42
- const oldCert = await this.condition();
43
- if (oldCert != null) {
44
- return await this.output(oldCert, false);
45
- }
46
- const cert = await this.doCertApply();
47
- if (cert != null) {
48
- await this.output(cert, true);
49
- //清空后续任务的状态,让后续任务能够重新执行
50
- this.clearLastStatus();
51
- if (this.successNotify) {
52
- await this.sendSuccessEmail();
53
- }
54
- }
55
- else {
56
- throw new Error("申请证书失败");
57
- }
58
- }
59
- async output(certReader, isNew) {
60
- const cert = certReader.toCertInfo();
61
- this.cert = cert;
62
- this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.validity.notAfter).valueOf();
63
- if (isNew) {
64
- const applyTime = dayjs(certReader.detail.validity.notBefore).format("YYYYMMDD_HHmmss");
65
- await this.zipCert(cert, applyTime);
66
- }
67
- else {
68
- this.extendsFiles();
69
- }
70
- // thi
71
- // s.logger.info(JSON.stringify(certReader.detail));
72
- }
73
- async zipCert(cert, applyTime) {
74
- const zip = new JSZip();
75
- zip.file("cert.crt", cert.crt);
76
- zip.file("cert.key", cert.key);
77
- const domain_name = this.domains[0].replace(".", "_").replace("*", "_");
78
- const filename = `cert_${domain_name}_${applyTime}.zip`;
79
- const content = await zip.generateAsync({ type: "nodebuffer" });
80
- this.saveFile(filename, content);
81
- this.logger.info(`已保存文件:${filename}`);
82
- }
83
- /**
84
- * 是否更新证书
85
- */
86
- async condition() {
87
- if (this.forceUpdate) {
88
- return null;
89
- }
90
- let inputChanged = false;
91
- const oldInput = JSON.stringify(this.lastStatus?.input?.domains);
92
- const thisInput = JSON.stringify(this.domains);
93
- if (oldInput !== thisInput) {
94
- inputChanged = true;
95
- }
96
- let oldCert = undefined;
97
- try {
98
- oldCert = await this.readLastCert();
99
- }
100
- catch (e) {
101
- this.logger.warn("读取cert失败:", e);
102
- }
103
- if (oldCert == null) {
104
- this.logger.info("还未申请过,准备申请新证书");
105
- return null;
106
- }
107
- if (inputChanged) {
108
- this.logger.info("输入参数变更,申请新证书");
109
- return null;
110
- }
111
- const ret = this.isWillExpire(oldCert.expires, this.renewDays);
112
- if (!ret.isWillExpire) {
113
- this.logger.info(`证书还未过期:过期时间${dayjs(oldCert.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${ret.leftDays}天`);
114
- return oldCert;
115
- }
116
- this.logger.info("即将过期,开始更新证书");
117
- return null;
118
- }
119
- formatCert(pem) {
120
- pem = pem.replace(/\r/g, "");
121
- pem = pem.replace(/\n\n/g, "\n");
122
- pem = pem.replace(/\n$/g, "");
123
- return pem;
124
- }
125
- formatCerts(cert) {
126
- const newCert = {
127
- crt: this.formatCert(cert.crt),
128
- key: this.formatCert(cert.key),
129
- csr: this.formatCert(cert.csr),
130
- };
131
- return newCert;
132
- }
133
- async readLastCert() {
134
- const cert = this.lastStatus?.status?.output?.cert;
135
- if (cert == null) {
136
- return undefined;
137
- }
138
- return new CertReader(cert);
139
- }
140
- /**
141
- * 检查是否过期,默认提前20天
142
- * @param expires
143
- * @param maxDays
144
- * @returns {boolean}
145
- */
146
- isWillExpire(expires, maxDays = 20) {
147
- if (expires == null) {
148
- throw new Error("过期时间不能为空");
149
- }
150
- // 检查有效期
151
- const leftDays = dayjs(expires).diff(dayjs(), "day");
152
- return {
153
- isWillExpire: leftDays < maxDays,
154
- leftDays,
155
- };
156
- }
157
- async sendSuccessEmail() {
158
- try {
159
- this.logger.info("发送成功邮件通知:" + this.email);
160
- const subject = `【CertD】证书申请成功【${this.domains[0]}】`;
161
- await this.ctx.emailService.send({
162
- userId: this.ctx.pipeline.userId,
163
- receivers: [this.email],
164
- subject: subject,
165
- content: `证书申请成功,域名:${this.domains.join(",")}`,
166
- });
167
- }
168
- catch (e) {
169
- this.logger.error("send email error", e);
170
- }
171
- }
172
- }
173
- __decorate([
174
- TaskInput({
175
- title: "域名",
176
- component: {
177
- name: "a-select",
178
- vModel: "value",
179
- mode: "tags",
180
- open: false,
181
- },
182
- required: true,
183
- col: {
184
- span: 24,
185
- },
186
- order: -1,
187
- helper: "1、支持通配符域名,例如: *.foo.com、foo.com、*.test.handsfree.work\n" +
188
- "2、支持多个域名、多个子域名、多个通配符域名打到一个证书上(域名必须是在同一个DNS提供商解析)\n" +
189
- "3、多级子域名要分成多个域名输入(*.foo.com的证书不能用于xxx.yyy.foo.com、foo.com)\n" +
190
- "4、输入一个回车之后,再输入下一个",
191
- }),
192
- __metadata("design:type", Array)
193
- ], CertApplyBasePlugin.prototype, "domains", void 0);
194
- __decorate([
195
- TaskInput({
196
- title: "邮箱",
197
- component: {
198
- name: "a-input",
199
- vModel: "value",
200
- },
201
- required: true,
202
- order: -1,
203
- helper: "请输入邮箱",
204
- }),
205
- __metadata("design:type", String)
206
- ], CertApplyBasePlugin.prototype, "email", void 0);
207
- __decorate([
208
- TaskInput({
209
- title: "更新天数",
210
- value: 20,
211
- component: {
212
- name: "a-input-number",
213
- vModel: "value",
214
- },
215
- required: true,
216
- order: 100,
217
- helper: "到期前多少天后更新证书,注意:流水线默认不会自动运行,请设置定时器,每天定时运行本流水线",
218
- }),
219
- __metadata("design:type", Number)
220
- ], CertApplyBasePlugin.prototype, "renewDays", void 0);
221
- __decorate([
222
- TaskInput({
223
- title: "强制更新",
224
- component: {
225
- name: "a-switch",
226
- vModel: "checked",
227
- },
228
- order: 100,
229
- helper: "是否强制重新申请证书",
230
- }),
231
- __metadata("design:type", String)
232
- ], CertApplyBasePlugin.prototype, "forceUpdate", void 0);
233
- __decorate([
234
- TaskInput({
235
- title: "成功后邮件通知",
236
- value: true,
237
- component: {
238
- name: "a-switch",
239
- vModel: "checked",
240
- },
241
- order: 100,
242
- helper: "申请成功后是否发送邮件通知",
243
- }),
244
- __metadata("design:type", Object)
245
- ], CertApplyBasePlugin.prototype, "successNotify", void 0);
246
- __decorate([
247
- TaskInput({
248
- title: "配置说明",
249
- order: 9999,
250
- helper: "运行策略请选择总是运行,其他证书部署任务请选择成功后跳过;当证书快到期前将会自动重新申请证书,然后会清空后续任务的成功状态,部署任务将会重新运行",
251
- }),
252
- __metadata("design:type", String)
253
- ], CertApplyBasePlugin.prototype, "intro", void 0);
254
- __decorate([
255
- TaskOutput({
256
- title: "域名证书",
257
- }),
258
- __metadata("design:type", Object)
259
- ], CertApplyBasePlugin.prototype, "cert", void 0);
260
- //# 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
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
2
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
3
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
4
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
5
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
6
+ };
7
+ var __metadata = (this && this.__metadata) || function (k, v) {
8
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
+ };
10
+ import { AbstractTaskPlugin, TaskInput, TaskOutput } from "@certd/pipeline";
11
+ import dayjs from "dayjs";
12
+ import { CertReader } from "./cert-reader.js";
13
+ import JSZip from "jszip";
14
+ export { CertReader };
15
+ export class CertApplyBasePlugin extends AbstractTaskPlugin {
16
+ domains;
17
+ email;
18
+ renewDays;
19
+ forceUpdate;
20
+ successNotify = true;
21
+ intro;
22
+ // @TaskInput({
23
+ // title: "CsrInfo",
24
+ // helper: "暂时没有用",
25
+ // })
26
+ csrInfo;
27
+ userContext;
28
+ http;
29
+ lastStatus;
30
+ cert;
31
+ async onInstance() {
32
+ this.userContext = this.ctx.userContext;
33
+ this.http = this.ctx.http;
34
+ this.lastStatus = this.ctx.lastStatus;
35
+ await this.onInit();
36
+ }
37
+ async execute() {
38
+ const oldCert = await this.condition();
39
+ if (oldCert != null) {
40
+ return await this.output(oldCert, false);
41
+ }
42
+ const cert = await this.doCertApply();
43
+ if (cert != null) {
44
+ await this.output(cert, true);
45
+ //清空后续任务的状态,让后续任务能够重新执行
46
+ this.clearLastStatus();
47
+ if (this.successNotify) {
48
+ await this.sendSuccessEmail();
49
+ }
50
+ }
51
+ else {
52
+ throw new Error("申请证书失败");
53
+ }
54
+ }
55
+ async output(certReader, isNew) {
56
+ const cert = certReader.toCertInfo();
57
+ this.cert = cert;
58
+ this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.notAfter).valueOf();
59
+ if (isNew) {
60
+ const applyTime = dayjs(certReader.detail.notBefore).format("YYYYMMDD_HHmmss");
61
+ await this.zipCert(cert, applyTime);
62
+ }
63
+ else {
64
+ this.extendsFiles();
65
+ }
66
+ // thi
67
+ // s.logger.info(JSON.stringify(certReader.detail));
68
+ }
69
+ async zipCert(cert, applyTime) {
70
+ const zip = new JSZip();
71
+ zip.file("cert.crt", cert.crt);
72
+ zip.file("cert.key", cert.key);
73
+ const domain_name = this.domains[0].replace(".", "_").replace("*", "_");
74
+ const filename = `cert_${domain_name}_${applyTime}.zip`;
75
+ const content = await zip.generateAsync({ type: "nodebuffer" });
76
+ this.saveFile(filename, content);
77
+ this.logger.info(`已保存文件:${filename}`);
78
+ }
79
+ /**
80
+ * 是否更新证书
81
+ */
82
+ async condition() {
83
+ if (this.forceUpdate) {
84
+ return null;
85
+ }
86
+ let inputChanged = false;
87
+ const oldInput = JSON.stringify(this.lastStatus?.input?.domains);
88
+ const thisInput = JSON.stringify(this.domains);
89
+ if (oldInput !== thisInput) {
90
+ inputChanged = true;
91
+ }
92
+ let oldCert = undefined;
93
+ try {
94
+ oldCert = await this.readLastCert();
95
+ }
96
+ catch (e) {
97
+ this.logger.warn("读取cert失败:", e);
98
+ }
99
+ if (oldCert == null) {
100
+ this.logger.info("还未申请过,准备申请新证书");
101
+ return null;
102
+ }
103
+ if (inputChanged) {
104
+ this.logger.info("输入参数变更,申请新证书");
105
+ return null;
106
+ }
107
+ const ret = this.isWillExpire(oldCert.expires, this.renewDays);
108
+ if (!ret.isWillExpire) {
109
+ this.logger.info(`证书还未过期:过期时间${dayjs(oldCert.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${ret.leftDays}天`);
110
+ return oldCert;
111
+ }
112
+ this.logger.info("即将过期,开始更新证书");
113
+ return null;
114
+ }
115
+ formatCert(pem) {
116
+ pem = pem.replace(/\r/g, "");
117
+ pem = pem.replace(/\n\n/g, "\n");
118
+ pem = pem.replace(/\n$/g, "");
119
+ return pem;
120
+ }
121
+ formatCerts(cert) {
122
+ const newCert = {
123
+ crt: this.formatCert(cert.crt),
124
+ key: this.formatCert(cert.key),
125
+ csr: this.formatCert(cert.csr),
126
+ };
127
+ return newCert;
128
+ }
129
+ async readLastCert() {
130
+ const cert = this.lastStatus?.status?.output?.cert;
131
+ if (cert == null) {
132
+ return undefined;
133
+ }
134
+ return new CertReader(cert);
135
+ }
136
+ /**
137
+ * 检查是否过期,默认提前20天
138
+ * @param expires
139
+ * @param maxDays
140
+ * @returns {boolean}
141
+ */
142
+ isWillExpire(expires, maxDays = 20) {
143
+ if (expires == null) {
144
+ throw new Error("过期时间不能为空");
145
+ }
146
+ // 检查有效期
147
+ const leftDays = dayjs(expires).diff(dayjs(), "day");
148
+ return {
149
+ isWillExpire: leftDays < maxDays,
150
+ leftDays,
151
+ };
152
+ }
153
+ async sendSuccessEmail() {
154
+ try {
155
+ this.logger.info("发送成功邮件通知:" + this.email);
156
+ const subject = `【CertD】证书申请成功【${this.domains[0]}】`;
157
+ await this.ctx.emailService.send({
158
+ userId: this.ctx.pipeline.userId,
159
+ receivers: [this.email],
160
+ subject: subject,
161
+ content: `证书申请成功,域名:${this.domains.join(",")}`,
162
+ });
163
+ }
164
+ catch (e) {
165
+ this.logger.error("send email error", e);
166
+ }
167
+ }
168
+ }
169
+ __decorate([
170
+ TaskInput({
171
+ title: "域名",
172
+ component: {
173
+ name: "a-select",
174
+ vModel: "value",
175
+ mode: "tags",
176
+ open: false,
177
+ },
178
+ required: true,
179
+ col: {
180
+ span: 24,
181
+ },
182
+ order: -1,
183
+ helper: "1、支持通配符域名,例如: *.foo.com、foo.com、*.test.handsfree.work\n" +
184
+ "2、支持多个域名、多个子域名、多个通配符域名打到一个证书上(域名必须是在同一个DNS提供商解析)\n" +
185
+ "3、多级子域名要分成多个域名输入(*.foo.com的证书不能用于xxx.yyy.foo.com、foo.com)\n" +
186
+ "4、输入一个回车之后,再输入下一个",
187
+ }),
188
+ __metadata("design:type", Array)
189
+ ], CertApplyBasePlugin.prototype, "domains", void 0);
190
+ __decorate([
191
+ TaskInput({
192
+ title: "邮箱",
193
+ component: {
194
+ name: "a-input",
195
+ vModel: "value",
196
+ },
197
+ required: true,
198
+ order: -1,
199
+ helper: "请输入邮箱",
200
+ }),
201
+ __metadata("design:type", String)
202
+ ], CertApplyBasePlugin.prototype, "email", void 0);
203
+ __decorate([
204
+ TaskInput({
205
+ title: "更新天数",
206
+ value: 20,
207
+ component: {
208
+ name: "a-input-number",
209
+ vModel: "value",
210
+ },
211
+ required: true,
212
+ order: 100,
213
+ helper: "到期前多少天后更新证书,注意:流水线默认不会自动运行,请设置定时器,每天定时运行本流水线",
214
+ }),
215
+ __metadata("design:type", Number)
216
+ ], CertApplyBasePlugin.prototype, "renewDays", void 0);
217
+ __decorate([
218
+ TaskInput({
219
+ title: "强制更新",
220
+ component: {
221
+ name: "a-switch",
222
+ vModel: "checked",
223
+ },
224
+ order: 100,
225
+ helper: "是否强制重新申请证书",
226
+ }),
227
+ __metadata("design:type", String)
228
+ ], CertApplyBasePlugin.prototype, "forceUpdate", void 0);
229
+ __decorate([
230
+ TaskInput({
231
+ title: "成功后邮件通知",
232
+ value: true,
233
+ component: {
234
+ name: "a-switch",
235
+ vModel: "checked",
236
+ },
237
+ order: 100,
238
+ helper: "申请成功后是否发送邮件通知",
239
+ }),
240
+ __metadata("design:type", Object)
241
+ ], CertApplyBasePlugin.prototype, "successNotify", void 0);
242
+ __decorate([
243
+ TaskInput({
244
+ title: "配置说明",
245
+ order: 9999,
246
+ helper: "运行策略请选择总是运行,其他证书部署任务请选择成功后跳过;当证书快到期前将会自动重新申请证书,然后会清空后续任务的成功状态,部署任务将会重新运行",
247
+ }),
248
+ __metadata("design:type", String)
249
+ ], CertApplyBasePlugin.prototype, "intro", void 0);
250
+ __decorate([
251
+ TaskOutput({
252
+ title: "域名证书",
253
+ }),
254
+ __metadata("design:type", Object)
255
+ ], CertApplyBasePlugin.prototype, "cert", void 0);
256
+ //# 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,15 @@
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
+ export declare class CertReader implements CertInfo {
3
+ crt: string;
4
+ key: string;
5
+ csr: string;
6
+ detail: any;
7
+ expires: number;
8
+ constructor(certInfo: CertInfo);
9
+ toCertInfo(): CertInfo;
10
+ getCrtDetail(crt: string): {
11
+ detail: import("@certd/acme-client").CertificateInfo;
12
+ expires: Date;
13
+ };
14
+ saveToFile(type: "crt" | "key", filepath?: string): string;
15
+ }