@certd/plugin-cert 1.24.0 → 1.24.2
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 +15 -0
- package/dist/access/eab-access.js +48 -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 +65 -62
- package/dist/plugin/cert-plugin/acme.js +31 -3
- package/dist/plugin/cert-plugin/base.d.ts +46 -46
- package/dist/plugin/cert-plugin/base.js +46 -18
- package/dist/plugin/cert-plugin/cert-reader.d.ts +31 -15
- package/dist/plugin/cert-plugin/cert-reader.js +89 -44
- package/dist/plugin/cert-plugin/convert.d.ts +21 -0
- package/dist/plugin/cert-plugin/convert.js +71 -0
- package/dist/plugin/cert-plugin/index.d.ts +18 -18
- package/dist/plugin/cert-plugin/index.js +219 -211
- package/dist/plugin/cert-plugin/lego/dns.js +1 -1
- package/dist/plugin/cert-plugin/lego/index.js +171 -171
- package/dist/plugin/index.js +2 -2
- package/package.json +4 -4
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -11,14 +11,16 @@ import { AbstractTaskPlugin, TaskInput, TaskOutput } from "@certd/pipeline";
|
|
|
11
11
|
import dayjs from "dayjs";
|
|
12
12
|
import { CertReader } from "./cert-reader.js";
|
|
13
13
|
import JSZip from "jszip";
|
|
14
|
+
import { CertConverter } from "./convert.js";
|
|
15
|
+
import fs from "fs";
|
|
14
16
|
export { CertReader };
|
|
15
17
|
export class CertApplyBasePlugin extends AbstractTaskPlugin {
|
|
16
18
|
domains;
|
|
17
19
|
email;
|
|
20
|
+
pfxPassword;
|
|
18
21
|
renewDays;
|
|
19
22
|
forceUpdate;
|
|
20
23
|
successNotify = true;
|
|
21
|
-
intro;
|
|
22
24
|
// @TaskInput({
|
|
23
25
|
// title: "CsrInfo",
|
|
24
26
|
// helper: "暂时没有用",
|
|
@@ -56,22 +58,42 @@ export class CertApplyBasePlugin extends AbstractTaskPlugin {
|
|
|
56
58
|
const cert = certReader.toCertInfo();
|
|
57
59
|
this.cert = cert;
|
|
58
60
|
this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.notAfter).valueOf();
|
|
61
|
+
if (cert.pfx == null || cert.der == null) {
|
|
62
|
+
try {
|
|
63
|
+
const converter = new CertConverter({ logger: this.logger });
|
|
64
|
+
const res = await converter.convert({
|
|
65
|
+
cert,
|
|
66
|
+
pfxPassword: this.pfxPassword,
|
|
67
|
+
});
|
|
68
|
+
const pfxBuffer = fs.readFileSync(res.pfxPath);
|
|
69
|
+
cert.pfx = pfxBuffer.toString("base64");
|
|
70
|
+
const derBuffer = fs.readFileSync(res.derPath);
|
|
71
|
+
cert.der = derBuffer.toString("base64");
|
|
72
|
+
this.logger.info("转换证书格式成功");
|
|
73
|
+
isNew = true;
|
|
74
|
+
}
|
|
75
|
+
catch (e) {
|
|
76
|
+
this.logger.error("转换证书格式失败", e);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
59
79
|
if (isNew) {
|
|
60
|
-
const
|
|
61
|
-
await this.zipCert(cert,
|
|
80
|
+
const zipFileName = certReader.buildCertFileName("zip", certReader.detail.notBefore);
|
|
81
|
+
await this.zipCert(cert, zipFileName);
|
|
62
82
|
}
|
|
63
83
|
else {
|
|
64
84
|
this.extendsFiles();
|
|
65
85
|
}
|
|
66
|
-
// thi
|
|
67
|
-
// s.logger.info(JSON.stringify(certReader.detail));
|
|
68
86
|
}
|
|
69
|
-
async zipCert(cert,
|
|
87
|
+
async zipCert(cert, filename) {
|
|
70
88
|
const zip = new JSZip();
|
|
71
89
|
zip.file("cert.crt", cert.crt);
|
|
72
90
|
zip.file("cert.key", cert.key);
|
|
73
|
-
|
|
74
|
-
|
|
91
|
+
if (cert.pfx) {
|
|
92
|
+
zip.file("cert.pfx", Buffer.from(cert.pfx, "base64"));
|
|
93
|
+
}
|
|
94
|
+
if (cert.der) {
|
|
95
|
+
zip.file("cert.der", Buffer.from(cert.der, "base64"));
|
|
96
|
+
}
|
|
75
97
|
const content = await zip.generateAsync({ type: "nodebuffer" });
|
|
76
98
|
this.saveFile(filename, content);
|
|
77
99
|
this.logger.info(`已保存文件:${filename}`);
|
|
@@ -174,6 +196,7 @@ __decorate([
|
|
|
174
196
|
vModel: "value",
|
|
175
197
|
mode: "tags",
|
|
176
198
|
open: false,
|
|
199
|
+
tokenSeparators: [",", " ", ",", "、", "|"],
|
|
177
200
|
},
|
|
178
201
|
required: true,
|
|
179
202
|
col: {
|
|
@@ -183,7 +206,7 @@ __decorate([
|
|
|
183
206
|
helper: "1、支持通配符域名,例如: *.foo.com、foo.com、*.test.handsfree.work\n" +
|
|
184
207
|
"2、支持多个域名、多个子域名、多个通配符域名打到一个证书上(域名必须是在同一个DNS提供商解析)\n" +
|
|
185
208
|
"3、多级子域名要分成多个域名输入(*.foo.com的证书不能用于xxx.yyy.foo.com、foo.com)\n" +
|
|
186
|
-
"4
|
|
209
|
+
"4、输入一个空格之后,再输入下一个",
|
|
187
210
|
}),
|
|
188
211
|
__metadata("design:type", Array)
|
|
189
212
|
], CertApplyBasePlugin.prototype, "domains", void 0);
|
|
@@ -200,6 +223,19 @@ __decorate([
|
|
|
200
223
|
}),
|
|
201
224
|
__metadata("design:type", String)
|
|
202
225
|
], CertApplyBasePlugin.prototype, "email", void 0);
|
|
226
|
+
__decorate([
|
|
227
|
+
TaskInput({
|
|
228
|
+
title: "PFX密码",
|
|
229
|
+
component: {
|
|
230
|
+
name: "a-input-password",
|
|
231
|
+
vModel: "value",
|
|
232
|
+
},
|
|
233
|
+
required: false,
|
|
234
|
+
order: 100,
|
|
235
|
+
helper: "PFX格式证书是否需要加密",
|
|
236
|
+
}),
|
|
237
|
+
__metadata("design:type", String)
|
|
238
|
+
], CertApplyBasePlugin.prototype, "pfxPassword", void 0);
|
|
203
239
|
__decorate([
|
|
204
240
|
TaskInput({
|
|
205
241
|
title: "更新天数",
|
|
@@ -239,18 +275,10 @@ __decorate([
|
|
|
239
275
|
}),
|
|
240
276
|
__metadata("design:type", Object)
|
|
241
277
|
], 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
278
|
__decorate([
|
|
251
279
|
TaskOutput({
|
|
252
280
|
title: "域名证书",
|
|
253
281
|
}),
|
|
254
282
|
__metadata("design:type", Object)
|
|
255
283
|
], CertApplyBasePlugin.prototype, "cert", void 0);
|
|
256
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
284
|
+
//# 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,15 +1,31 @@
|
|
|
1
|
-
import { CertInfo } from "./acme.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
1
|
+
import { CertInfo } from "./acme.js";
|
|
2
|
+
import { ILogger } from "@certd/pipeline";
|
|
3
|
+
export type CertReaderHandleContext = {
|
|
4
|
+
reader: CertReader;
|
|
5
|
+
tmpCrtPath: string;
|
|
6
|
+
tmpKeyPath: string;
|
|
7
|
+
tmpPfxPath?: string;
|
|
8
|
+
tmpDerPath?: string;
|
|
9
|
+
};
|
|
10
|
+
export type CertReaderHandle = (ctx: CertReaderHandleContext) => Promise<void>;
|
|
11
|
+
export type HandleOpts = {
|
|
12
|
+
logger: ILogger;
|
|
13
|
+
handle: CertReaderHandle;
|
|
14
|
+
};
|
|
15
|
+
export declare class CertReader {
|
|
16
|
+
cert: CertInfo;
|
|
17
|
+
crt: string;
|
|
18
|
+
key: string;
|
|
19
|
+
csr: string;
|
|
20
|
+
detail: any;
|
|
21
|
+
expires: number;
|
|
22
|
+
constructor(certInfo: CertInfo);
|
|
23
|
+
toCertInfo(): CertInfo;
|
|
24
|
+
getCrtDetail(crt?: string): {
|
|
25
|
+
detail: import("@certd/acme-client").CertificateInfo;
|
|
26
|
+
expires: Date;
|
|
27
|
+
};
|
|
28
|
+
saveToFile(type: "crt" | "key" | "pfx" | "der", filepath?: string): string;
|
|
29
|
+
readCertFile(opts: HandleOpts): Promise<void>;
|
|
30
|
+
buildCertFileName(suffix: string, applyTime: number, prefix?: string): string;
|
|
31
|
+
}
|
|
@@ -1,44 +1,89 @@
|
|
|
1
|
-
import fs from "fs";
|
|
2
|
-
import os from "os";
|
|
3
|
-
import path from "path";
|
|
4
|
-
import { crypto } from "@certd/acme-client";
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
this.
|
|
15
|
-
|
|
16
|
-
this.
|
|
17
|
-
this.
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
1
|
+
import fs from "fs";
|
|
2
|
+
import os from "os";
|
|
3
|
+
import path from "path";
|
|
4
|
+
import { crypto } from "@certd/acme-client";
|
|
5
|
+
import dayjs from "dayjs";
|
|
6
|
+
export class CertReader {
|
|
7
|
+
cert;
|
|
8
|
+
crt;
|
|
9
|
+
key;
|
|
10
|
+
csr;
|
|
11
|
+
detail;
|
|
12
|
+
expires;
|
|
13
|
+
constructor(certInfo) {
|
|
14
|
+
this.cert = certInfo;
|
|
15
|
+
this.crt = certInfo.crt;
|
|
16
|
+
this.key = certInfo.key;
|
|
17
|
+
this.csr = certInfo.csr;
|
|
18
|
+
const { detail, expires } = this.getCrtDetail(this.cert.crt);
|
|
19
|
+
this.detail = detail;
|
|
20
|
+
this.expires = expires.getTime();
|
|
21
|
+
}
|
|
22
|
+
toCertInfo() {
|
|
23
|
+
return this.cert;
|
|
24
|
+
}
|
|
25
|
+
getCrtDetail(crt = this.cert.crt) {
|
|
26
|
+
const detail = crypto.readCertificateInfo(crt.toString());
|
|
27
|
+
const expires = detail.notAfter;
|
|
28
|
+
return { detail, expires };
|
|
29
|
+
}
|
|
30
|
+
saveToFile(type, filepath) {
|
|
31
|
+
if (!this.cert[type]) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
if (filepath == null) {
|
|
35
|
+
//写入临时目录
|
|
36
|
+
filepath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", `cert.${type}`);
|
|
37
|
+
}
|
|
38
|
+
const dir = path.dirname(filepath);
|
|
39
|
+
if (!fs.existsSync(dir)) {
|
|
40
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
41
|
+
}
|
|
42
|
+
if (type === "crt" || type === "key") {
|
|
43
|
+
fs.writeFileSync(filepath, this.cert[type]);
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
fs.writeFileSync(filepath, Buffer.from(this.cert[type], "base64"));
|
|
47
|
+
}
|
|
48
|
+
return filepath;
|
|
49
|
+
}
|
|
50
|
+
async readCertFile(opts) {
|
|
51
|
+
const logger = opts.logger;
|
|
52
|
+
logger.info("将证书写入本地缓存文件");
|
|
53
|
+
const tmpCrtPath = this.saveToFile("crt");
|
|
54
|
+
const tmpKeyPath = this.saveToFile("key");
|
|
55
|
+
const tmpPfxPath = this.saveToFile("pfx");
|
|
56
|
+
const tmpDerPath = this.saveToFile("der");
|
|
57
|
+
logger.info("本地文件写入成功");
|
|
58
|
+
try {
|
|
59
|
+
await opts.handle({
|
|
60
|
+
reader: this,
|
|
61
|
+
tmpCrtPath: tmpCrtPath,
|
|
62
|
+
tmpKeyPath: tmpKeyPath,
|
|
63
|
+
tmpPfxPath: tmpPfxPath,
|
|
64
|
+
tmpDerPath: tmpDerPath,
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
finally {
|
|
68
|
+
//删除临时文件
|
|
69
|
+
logger.info("删除临时文件");
|
|
70
|
+
function removeFile(filepath) {
|
|
71
|
+
if (filepath) {
|
|
72
|
+
fs.unlinkSync(filepath);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
removeFile(tmpCrtPath);
|
|
76
|
+
removeFile(tmpKeyPath);
|
|
77
|
+
removeFile(tmpPfxPath);
|
|
78
|
+
removeFile(tmpDerPath);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
buildCertFileName(suffix, applyTime, prefix = "cert") {
|
|
82
|
+
const detail = this.getCrtDetail();
|
|
83
|
+
let domain = detail.detail.domains.commonName;
|
|
84
|
+
domain = domain.replace(".", "_").replace("*", "_");
|
|
85
|
+
const timeStr = dayjs(applyTime).format("YYYYMMDDHHmmss");
|
|
86
|
+
return `${prefix}_${domain}_${timeStr}.${suffix}`;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC1yZWFkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGx1Z2luL2NlcnQtcGx1Z2luL2NlcnQtcmVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDcEIsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QyxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFLMUIsTUFBTSxPQUFPLFVBQVU7SUFDckIsSUFBSSxDQUFXO0lBQ2YsR0FBRyxDQUFTO0lBQ1osR0FBRyxDQUFTO0lBQ1osR0FBRyxDQUFTO0lBRVosTUFBTSxDQUFNO0lBQ1osT0FBTyxDQUFTO0lBQ2hCLFlBQVksUUFBa0I7UUFDNUIsSUFBSSxDQUFDLElBQUksR0FBRyxRQUFRLENBQUM7UUFDckIsSUFBSSxDQUFDLEdBQUcsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxHQUFHLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQztRQUN4QixJQUFJLENBQUMsR0FBRyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUM7UUFFeEIsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDN0QsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkMsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUM7SUFDbkIsQ0FBQztJQUVELFlBQVksQ0FBQyxNQUFjLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRztRQUN0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
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { ILogger } from "@certd/pipeline";
|
|
2
|
+
import type { CertInfo } from "../cert-plugin/acme.js";
|
|
3
|
+
import { CertReader } from "../cert-plugin/cert-reader.js";
|
|
4
|
+
export { CertReader };
|
|
5
|
+
export type { CertInfo };
|
|
6
|
+
export declare class CertConverter {
|
|
7
|
+
logger: ILogger;
|
|
8
|
+
constructor(opts: {
|
|
9
|
+
logger: ILogger;
|
|
10
|
+
});
|
|
11
|
+
convert(opts: {
|
|
12
|
+
cert: CertInfo;
|
|
13
|
+
pfxPassword: string;
|
|
14
|
+
}): Promise<{
|
|
15
|
+
pfxPath: string;
|
|
16
|
+
derPath: string;
|
|
17
|
+
}>;
|
|
18
|
+
exec(cmd: string): Promise<void>;
|
|
19
|
+
private convertPfx;
|
|
20
|
+
private convertDer;
|
|
21
|
+
}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { sp } from "@certd/pipeline";
|
|
2
|
+
import { CertReader } from "../cert-plugin/cert-reader.js";
|
|
3
|
+
import path from "path";
|
|
4
|
+
import os from "os";
|
|
5
|
+
import fs from "fs";
|
|
6
|
+
export { CertReader };
|
|
7
|
+
export class CertConverter {
|
|
8
|
+
logger;
|
|
9
|
+
constructor(opts) {
|
|
10
|
+
this.logger = opts.logger;
|
|
11
|
+
}
|
|
12
|
+
async convert(opts) {
|
|
13
|
+
const certReader = new CertReader(opts.cert);
|
|
14
|
+
let pfxPath;
|
|
15
|
+
let derPath;
|
|
16
|
+
const handle = async (opts) => {
|
|
17
|
+
// 调用openssl 转pfx
|
|
18
|
+
pfxPath = await this.convertPfx(opts);
|
|
19
|
+
// 转der
|
|
20
|
+
derPath = await this.convertDer(opts);
|
|
21
|
+
};
|
|
22
|
+
await certReader.readCertFile({ logger: this.logger, handle });
|
|
23
|
+
return {
|
|
24
|
+
pfxPath,
|
|
25
|
+
derPath,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
async exec(cmd) {
|
|
29
|
+
await sp.spawn({
|
|
30
|
+
cmd: cmd,
|
|
31
|
+
logger: this.logger,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
async convertPfx(opts, pfxPassword) {
|
|
35
|
+
const { tmpCrtPath, tmpKeyPath } = opts;
|
|
36
|
+
const pfxPath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", "cert.pfx");
|
|
37
|
+
const dir = path.dirname(pfxPath);
|
|
38
|
+
if (!fs.existsSync(dir)) {
|
|
39
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
40
|
+
}
|
|
41
|
+
let passwordArg = "-passout pass:";
|
|
42
|
+
if (pfxPassword) {
|
|
43
|
+
passwordArg = `-password pass:${pfxPassword}`;
|
|
44
|
+
}
|
|
45
|
+
await this.exec(`openssl pkcs12 -export -out ${pfxPath} -inkey ${tmpKeyPath} -in ${tmpCrtPath} ${passwordArg}`);
|
|
46
|
+
return pfxPath;
|
|
47
|
+
// const fileBuffer = fs.readFileSync(pfxPath);
|
|
48
|
+
// this.pfxCert = fileBuffer.toString("base64");
|
|
49
|
+
//
|
|
50
|
+
// const applyTime = new Date().getTime();
|
|
51
|
+
// const filename = reader.buildCertFileName("pfx", applyTime);
|
|
52
|
+
// this.saveFile(filename, fileBuffer);
|
|
53
|
+
}
|
|
54
|
+
async convertDer(opts) {
|
|
55
|
+
const { tmpCrtPath } = opts;
|
|
56
|
+
const derPath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", `cert.der`);
|
|
57
|
+
const dir = path.dirname(derPath);
|
|
58
|
+
if (!fs.existsSync(dir)) {
|
|
59
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
60
|
+
}
|
|
61
|
+
await this.exec(`openssl x509 -outform der -in ${tmpCrtPath} -out ${derPath}`);
|
|
62
|
+
return derPath;
|
|
63
|
+
// const fileBuffer = fs.readFileSync(derPath);
|
|
64
|
+
// this.derCert = fileBuffer.toString("base64");
|
|
65
|
+
//
|
|
66
|
+
// const applyTime = new Date().getTime();
|
|
67
|
+
// const filename = reader.buildCertFileName("der", applyTime);
|
|
68
|
+
// this.saveFile(filename, fileBuffer);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wbHVnaW4vY2VydC1wbHVnaW4vY29udmVydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQVcsRUFBRSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFOUMsT0FBTyxFQUFFLFVBQVUsRUFBMkIsTUFBTSwrQkFBK0IsQ0FBQztBQUNwRixPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFDeEIsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3BCLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUVwQixPQUFPLEVBQUUsVUFBVSxFQUFFLENBQUM7QUFHdEIsTUFBTSxPQUFPLGFBQWE7SUFDeEIsTUFBTSxDQUFVO0lBRWhCLFlBQVksSUFBeUI7UUFDbkMsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQzVCLENBQUM7SUFDRCxLQUFLLENBQUMsT0FBTyxDQUFDLElBQTZDO1FBSXpELE1BQU0sVUFBVSxHQUFHLElBQUksVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxJQUFJLE9BQWUsQ0FBQztRQUNwQixJQUFJLE9BQWUsQ0FBQztRQUNwQixNQUFNLE1BQU0sR0FBRyxLQUFLLEVBQUUsSUFBNkIsRUFBRSxFQUFFO1lBQ3JELGlCQUFpQjtZQUNqQixPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBRXRDLE9BQU87WUFDUCxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hDLENBQUMsQ0FBQztRQUVGLE1BQU0sVUFBVSxDQUFDLFlBQVksQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFFL0QsT0FBTztZQUNMLE9BQU87WUFDUCxPQUFPO1NBQ1IsQ0FBQztJQUNKLENBQUM7SUFFRCxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQVc7UUFDcEIsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1lBQ2IsR0FBRyxFQUFFLEdBQUc7WUFDUixNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07U0FDcEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVPLEtBQUssQ0FBQyxVQUFVLENBQUMsSUFBNkIsRUFBRSxXQUFvQjtRQUMxRSxNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FBQztRQUV4QyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxhQUFhLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRTVHLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDdkIsRUFBRSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztTQUN4QztRQUVELElBQUksV0FBVyxHQUFHLGdCQUFnQixDQUFDO1FBQ25DLElBQUksV0FBVyxFQUFFO1lBQ2YsV0FBVyxHQUFHLGtCQUFrQixXQUFXLEVBQUUsQ0FBQztTQUMvQztRQUNELE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQywrQkFBK0IsT0FBTyxXQUFXLFVBQVUsUUFBUSxVQUFVLElBQUksV0FBVyxFQUFFLENBQUMsQ0FBQztRQUNoSCxPQUFPLE9BQU8sQ0FBQztRQUNmLCtDQUErQztRQUMvQyxnREFBZ0Q7UUFDaEQsRUFBRTtRQUNGLDBDQUEwQztRQUMxQywrREFBK0Q7UUFDL0QsdUNBQXVDO0lBQ3pDLENBQUM7SUFFTyxLQUFLLENBQUMsVUFBVSxDQUFDLElBQTZCO1FBQ3BELE1BQU0sRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFJLENBQUM7UUFDNUIsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxVQUFVLENBQUMsQ0FBQztRQUU1RyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ3ZCLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7U0FDeEM7UUFFRCxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsaUNBQWlDLFVBQVUsU0FBUyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBRS9FLE9BQU8sT0FBTyxDQUFDO1FBRWYsK0NBQStDO1FBQy9DLGdEQUFnRDtRQUNoRCxFQUFFO1FBQ0YsMENBQTBDO1FBQzFDLCtEQUErRDtRQUMvRCx1Q0FBdUM7SUFDekMsQ0FBQztDQUNGIn0=
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import type { CertInfo, PrivateKeyType, SSLProvider } from "./acme.js";
|
|
2
|
-
import { AcmeService } from "./acme.js";
|
|
3
|
-
import { CertReader } from "./cert-reader.js";
|
|
4
|
-
import { CertApplyBasePlugin } from "./base.js";
|
|
5
|
-
export {
|
|
6
|
-
export
|
|
7
|
-
export declare class CertApplyPlugin extends CertApplyBasePlugin {
|
|
8
|
-
sslProvider: SSLProvider;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
dnsProviderType: string;
|
|
12
|
-
dnsProviderAccess: string;
|
|
13
|
-
useProxy: boolean;
|
|
14
|
-
skipLocalVerify: boolean;
|
|
15
|
-
acme: AcmeService;
|
|
16
|
-
onInit(): Promise<void>;
|
|
17
|
-
doCertApply(): Promise<CertReader>;
|
|
18
|
-
}
|
|
1
|
+
import type { CertInfo, PrivateKeyType, SSLProvider } from "./acme.js";
|
|
2
|
+
import { AcmeService } from "./acme.js";
|
|
3
|
+
import { CertReader } from "./cert-reader.js";
|
|
4
|
+
import { CertApplyBasePlugin } from "./base.js";
|
|
5
|
+
export type { CertInfo };
|
|
6
|
+
export * from "./cert-reader.js";
|
|
7
|
+
export declare class CertApplyPlugin extends CertApplyBasePlugin {
|
|
8
|
+
sslProvider: SSLProvider;
|
|
9
|
+
eabAccessId: number;
|
|
10
|
+
privateKeyType: PrivateKeyType;
|
|
11
|
+
dnsProviderType: string;
|
|
12
|
+
dnsProviderAccess: string;
|
|
13
|
+
useProxy: boolean;
|
|
14
|
+
skipLocalVerify: boolean;
|
|
15
|
+
acme: AcmeService;
|
|
16
|
+
onInit(): Promise<void>;
|
|
17
|
+
doCertApply(): Promise<CertReader>;
|
|
18
|
+
}
|