@certd/plugin-cert 1.36.17 → 1.36.19
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 +14 -0
- package/dist/access/eab-access.js +2 -2
- package/dist/plugin/cert-plugin/acme.d.ts +2 -1
- package/dist/plugin/cert-plugin/acme.js +2 -1
- package/dist/plugin/cert-plugin/base-convert.js +6 -2
- package/dist/plugin/cert-plugin/cert-reader.d.ts +4 -3
- package/dist/plugin/cert-plugin/cert-reader.js +32 -13
- package/dist/plugin/cert-plugin/convert.d.ts +2 -0
- package/dist/plugin/cert-plugin/convert.js +21 -1
- package/dist/plugin/cert-plugin/index.d.ts +1 -0
- package/dist/plugin/cert-plugin/index.js +42 -35
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,20 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
|
|
7
|
+
|
|
8
|
+
### Performance Improvements
|
|
9
|
+
|
|
10
|
+
* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/certd/certd/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
|
|
11
|
+
* 子域名托管说明 ([39a0223](https://github.com/certd/certd/commit/39a02235cf4416bb5bd1acd3831241efeaa2f602))
|
|
12
|
+
|
|
13
|
+
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
|
|
14
|
+
|
|
15
|
+
### Performance Improvements
|
|
16
|
+
|
|
17
|
+
* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165))
|
|
18
|
+
* openapi返回证书时挑选匹配范围最小的那一个；增加format参数，增加返回值p7b格式，增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5))
|
|
19
|
+
|
|
6
20
|
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
|
|
7
21
|
|
|
8
22
|
### Performance Improvements
|
|
@@ -19,7 +19,7 @@ __decorate([
|
|
|
19
19
|
component: {
|
|
20
20
|
placeholder: "kid / keyId",
|
|
21
21
|
},
|
|
22
|
-
helper: "EAB KID， google的叫 keyId",
|
|
22
|
+
helper: "EAB KID， google的叫 keyId，ssl.com的叫Account/ACME Key",
|
|
23
23
|
required: true,
|
|
24
24
|
encrypt: true,
|
|
25
25
|
}),
|
|
@@ -59,4 +59,4 @@ EabAccess = __decorate([
|
|
|
59
59
|
], EabAccess);
|
|
60
60
|
export { EabAccess };
|
|
61
61
|
new EabAccess();
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWFiLWFjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY2Nlc3MvZWFiLWFjY2Vzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQVE3RCxJQUFNLFNBQVMsR0FBZixNQUFNLFNBQVUsU0FBUSxVQUFVO0lBVXZDLEdBQUcsR0FBRyxFQUFFLENBQUM7SUFVVCxPQUFPLEdBQUcsRUFBRSxDQUFDO0lBV2IsS0FBSyxHQUFHLEVBQUUsQ0FBQztDQUNaLENBQUE7QUF0QkM7SUFUQyxXQUFXLENBQUM7UUFDWCxLQUFLLEVBQUUsS0FBSztRQUNaLFNBQVMsRUFBRTtZQUNULFdBQVcsRUFBRSxhQUFhO1NBQzNCO1FBQ0QsTUFBTSxFQUFFLG1EQUFtRDtRQUMzRCxRQUFRLEVBQUUsSUFBSTtRQUNkLE9BQU8sRUFBRSxJQUFJO0tBQ2QsQ0FBQzs7c0NBQ087QUFVVDtJQVRDLFdBQVcsQ0FBQztRQUNYLEtBQUssRUFBRSxTQUFTO1FBQ2hCLFNBQVMsRUFBRTtZQUNULFdBQVcsRUFBRSxzQkFBc0I7U0FDcEM7UUFDRCxNQUFNLEVBQUUsaUNBQWlDO1FBQ3pDLFFBQVEsRUFBRSxJQUFJO1FBQ2QsT0FBTyxFQUFFLElBQUk7S0FDZCxDQUFDOzswQ0FDVztBQVdiO0lBVEMsV0FBVyxDQUFDO1FBQ1gsS0FBSyxFQUFFLE9BQU87UUFDZCxTQUFTLEVBQUU7WUFDVCxXQUFXLEVBQUUsUUFBUTtTQUN0QjtRQUNELEtBQUssRUFBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLENBQUM7UUFDL0MsTUFBTSxFQUFFLDhDQUE4QztRQUN0RCxRQUFRLEVBQUUsSUFBSTtLQUNmLENBQUM7O3dDQUNTO0FBL0JBLFNBQVM7SUFOckIsUUFBUSxDQUFDO1FBQ1IsSUFBSSxFQUFFLEtBQUs7UUFDWCxLQUFLLEVBQUUsT0FBTztRQUNkLElBQUksRUFBRSxvQkFBb0I7UUFDMUIsSUFBSSxFQUFFLGlCQUFpQjtLQUN4QixDQUFDO0dBQ1csU0FBUyxDQWdDckI7O0FBRUQsSUFBSSxTQUFTLEVBQUUsQ0FBQyJ9
|
|
@@ -41,8 +41,9 @@ export type CertInfo = {
|
|
|
41
41
|
der?: string;
|
|
42
42
|
jks?: string;
|
|
43
43
|
one?: string;
|
|
44
|
+
p7b?: string;
|
|
44
45
|
};
|
|
45
|
-
export type SSLProvider = "letsencrypt" | "google" | "zerossl";
|
|
46
|
+
export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom";
|
|
46
47
|
export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
|
|
47
48
|
type AcmeServiceOptions = {
|
|
48
49
|
userContext: IContext;
|
|
@@ -284,6 +284,7 @@ export class AcmeService {
|
|
|
284
284
|
commonName,
|
|
285
285
|
...csrInfo,
|
|
286
286
|
altNames,
|
|
287
|
+
emailAddress: email,
|
|
287
288
|
}, privateKey);
|
|
288
289
|
if (dnsProvider == null && domainsVerifyPlan == null) {
|
|
289
290
|
throw new Error("dnsProvider 、 domainsVerifyPlan不能都为空");
|
|
@@ -353,4 +354,4 @@ export class AcmeService {
|
|
|
353
354
|
return true;
|
|
354
355
|
}
|
|
355
356
|
}
|
|
356
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"acme.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/acme.ts"],"names":[],"mappings":"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"}
|
|
357
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"acme.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/acme.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,6 +60,9 @@ export class CertApplyBaseConvertPlugin extends AbstractTaskPlugin {
|
|
|
60
60
|
if (cert.jks == null && res.jks) {
|
|
61
61
|
cert.jks = res.jks;
|
|
62
62
|
}
|
|
63
|
+
if (cert.p7b == null && res.p7b) {
|
|
64
|
+
cert.p7b = res.p7b;
|
|
65
|
+
}
|
|
63
66
|
this.logger.info("转换证书格式成功");
|
|
64
67
|
}
|
|
65
68
|
catch (e) {
|
|
@@ -85,6 +88,7 @@ export class CertApplyBaseConvertPlugin extends AbstractTaskPlugin {
|
|
|
85
88
|
zip.file("intermediate.crt", cert.ic);
|
|
86
89
|
zip.file("origin.crt", cert.oc);
|
|
87
90
|
zip.file("one.pem", cert.one);
|
|
91
|
+
zip.file("cert.p7b", cert.p7b);
|
|
88
92
|
if (cert.pfx) {
|
|
89
93
|
zip.file("cert.pfx", Buffer.from(cert.pfx, "base64"));
|
|
90
94
|
}
|
|
@@ -152,7 +156,7 @@ __decorate([
|
|
|
152
156
|
"2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com\n" +
|
|
153
157
|
"3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）\n" +
|
|
154
158
|
"4、输入一个，空格之后，再输入下一个 \n" +
|
|
155
|
-
"5
|
|
159
|
+
"5、如果设置了子域托管解析（比如免费的二级域名托管在CF或者阿里云），请先[设置托管子域名](#/certd/pipeline/subDomain)",
|
|
156
160
|
}),
|
|
157
161
|
__metadata("design:type", Array)
|
|
158
162
|
], CertApplyBaseConvertPlugin.prototype, "domains", void 0);
|
|
@@ -202,4 +206,4 @@ __decorate([
|
|
|
202
206
|
}),
|
|
203
207
|
__metadata("design:type", Object)
|
|
204
208
|
], CertApplyBaseConvertPlugin.prototype, "certZip", void 0);
|
|
205
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
209
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS1jb252ZXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3BsdWdpbi9jZXJ0LXBsdWdpbi9iYXNlLWNvbnZlcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLGtCQUFrQixFQUE0QixTQUFTLEVBQUUsVUFBVSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdEcsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBRTFCLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUM3QyxNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FBRyxtQkFBbUIsQ0FBQztBQUU1RCxNQUFNLE9BQWdCLDBCQUEyQixTQUFRLGtCQUFrQjtJQXdCekUsT0FBTyxDQUFZO0lBWW5CLFdBQVcsQ0FBVTtJQWtCckIsT0FBTyxHQUFHLDJEQUEyRCxDQUFDO0lBRXRFLFdBQVcsQ0FBWTtJQUN2QixVQUFVLENBQVE7SUFNbEIsSUFBSSxDQUFZO0lBTWhCLE9BQU8sQ0FBWTtJQUVuQixLQUFLLENBQUMsVUFBVTtRQUNkLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUM7UUFDeEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQWtCLENBQUM7UUFDOUMsTUFBTSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUlELGNBQWM7SUFDZCxLQUFLLENBQUMsb0JBQW9CO1FBQ3hCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDO1FBQ2pDLE1BQU0sS0FBSyxHQUFHO1lBQ1osSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ2YsSUFBSSxFQUFFLElBQUks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
|
|
@@ -11,6 +11,7 @@ export type CertReaderHandleContext = {
|
|
|
11
11
|
tmpIcPath?: string;
|
|
12
12
|
tmpJksPath?: string;
|
|
13
13
|
tmpOnePath?: string;
|
|
14
|
+
tmpP7bPath?: string;
|
|
14
15
|
};
|
|
15
16
|
export type CertReaderHandle = (ctx: CertReaderHandleContext) => Promise<void>;
|
|
16
17
|
export type HandleOpts = {
|
|
@@ -24,7 +25,7 @@ export declare class CertReader {
|
|
|
24
25
|
constructor(certInfo: CertInfo);
|
|
25
26
|
getIc(): string;
|
|
26
27
|
getOc(): string;
|
|
27
|
-
toCertInfo(): CertInfo;
|
|
28
|
+
toCertInfo(format?: string): CertInfo;
|
|
28
29
|
getCrtDetail(crt?: string): {
|
|
29
30
|
detail: CertificateInfo;
|
|
30
31
|
expires: Date;
|
|
@@ -38,10 +39,10 @@ export declare class CertReader {
|
|
|
38
39
|
static getMainDomain(crt: string): string;
|
|
39
40
|
getMainDomain(): string;
|
|
40
41
|
static getMainDomainFromDetail(detail: CertificateInfo): string;
|
|
41
|
-
saveToFile(type: "crt" | "key" | "pfx" | "der" | "oc" | "one" | "ic" | "jks", filepath?: string): string;
|
|
42
|
+
saveToFile(type: "crt" | "key" | "pfx" | "der" | "oc" | "one" | "ic" | "jks" | "p7b", filepath?: string): string;
|
|
42
43
|
readCertFile(opts: HandleOpts): Promise<void>;
|
|
43
44
|
buildCertFileName(suffix: string, applyTime: any, prefix?: string): string;
|
|
44
|
-
buildCertName(): string;
|
|
45
|
+
buildCertName(prefix?: string): string;
|
|
45
46
|
static appendTimeSuffix(name?: string): string;
|
|
46
47
|
static buildCertName(cert: any): string;
|
|
47
48
|
}
|
|
@@ -4,6 +4,14 @@ import path from "path";
|
|
|
4
4
|
import { crypto } from "@certd/acme-client";
|
|
5
5
|
import dayjs from "dayjs";
|
|
6
6
|
import { uniq } from "lodash-es";
|
|
7
|
+
const formats = {
|
|
8
|
+
pem: ["crt", "key", "ic"],
|
|
9
|
+
one: ["one"],
|
|
10
|
+
pfx: ["pfx"],
|
|
11
|
+
der: ["der"],
|
|
12
|
+
jks: ["jks"],
|
|
13
|
+
p7b: ["p7b", "key"],
|
|
14
|
+
};
|
|
7
15
|
export class CertReader {
|
|
8
16
|
cert;
|
|
9
17
|
detail;
|
|
@@ -49,8 +57,16 @@ export class CertReader {
|
|
|
49
57
|
const arr = this.cert.crt.split(endStr);
|
|
50
58
|
return arr[0] + endStr;
|
|
51
59
|
}
|
|
52
|
-
toCertInfo() {
|
|
53
|
-
|
|
60
|
+
toCertInfo(format) {
|
|
61
|
+
if (!format) {
|
|
62
|
+
return this.cert;
|
|
63
|
+
}
|
|
64
|
+
const formatArr = formats[format];
|
|
65
|
+
const res = {};
|
|
66
|
+
formatArr.forEach((key) => {
|
|
67
|
+
res[key] = this.cert[key];
|
|
68
|
+
});
|
|
69
|
+
return res;
|
|
54
70
|
}
|
|
55
71
|
getCrtDetail(crt = this.cert.crt) {
|
|
56
72
|
return CertReader.readCertDetail(crt);
|
|
@@ -104,7 +120,7 @@ export class CertReader {
|
|
|
104
120
|
if (!fs.existsSync(dir)) {
|
|
105
121
|
fs.mkdirSync(dir, { recursive: true });
|
|
106
122
|
}
|
|
107
|
-
if (type === "crt" || type === "key" || type === "ic" || type === "oc" || type === "one") {
|
|
123
|
+
if (type === "crt" || type === "key" || type === "ic" || type === "oc" || type === "one" || type === "p7b") {
|
|
108
124
|
fs.writeFileSync(filepath, this.cert[type]);
|
|
109
125
|
}
|
|
110
126
|
else {
|
|
@@ -123,17 +139,19 @@ export class CertReader {
|
|
|
123
139
|
const tmpDerPath = this.saveToFile("der");
|
|
124
140
|
const tmpJksPath = this.saveToFile("jks");
|
|
125
141
|
const tmpOnePath = this.saveToFile("one");
|
|
142
|
+
const tmpP7bPath = this.saveToFile("p7b");
|
|
126
143
|
logger.info("本地文件写入成功");
|
|
127
144
|
try {
|
|
128
145
|
return await opts.handle({
|
|
129
146
|
reader: this,
|
|
130
|
-
tmpCrtPath
|
|
131
|
-
tmpKeyPath
|
|
132
|
-
tmpPfxPath
|
|
133
|
-
tmpDerPath
|
|
134
|
-
tmpIcPath
|
|
135
|
-
tmpJksPath
|
|
136
|
-
tmpOcPath
|
|
147
|
+
tmpCrtPath,
|
|
148
|
+
tmpKeyPath,
|
|
149
|
+
tmpPfxPath,
|
|
150
|
+
tmpDerPath,
|
|
151
|
+
tmpIcPath,
|
|
152
|
+
tmpJksPath,
|
|
153
|
+
tmpOcPath,
|
|
154
|
+
tmpP7bPath,
|
|
137
155
|
tmpOnePath,
|
|
138
156
|
});
|
|
139
157
|
}
|
|
@@ -157,6 +175,7 @@ export class CertReader {
|
|
|
157
175
|
removeFile(tmpIcPath);
|
|
158
176
|
removeFile(tmpJksPath);
|
|
159
177
|
removeFile(tmpOnePath);
|
|
178
|
+
removeFile(tmpP7bPath);
|
|
160
179
|
}
|
|
161
180
|
}
|
|
162
181
|
buildCertFileName(suffix, applyTime, prefix = "cert") {
|
|
@@ -165,10 +184,10 @@ export class CertReader {
|
|
|
165
184
|
const timeStr = dayjs(applyTime).format("YYYYMMDDHHmmss");
|
|
166
185
|
return `${prefix}_${domain}_${timeStr}.${suffix}`;
|
|
167
186
|
}
|
|
168
|
-
buildCertName() {
|
|
187
|
+
buildCertName(prefix = "") {
|
|
169
188
|
let domain = this.getMainDomain();
|
|
170
189
|
domain = domain.replaceAll(".", "_").replaceAll("*", "_");
|
|
171
|
-
return `${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`;
|
|
190
|
+
return `${prefix}_${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`;
|
|
172
191
|
}
|
|
173
192
|
static appendTimeSuffix(name) {
|
|
174
193
|
if (name == null) {
|
|
@@ -180,4 +199,4 @@ export class CertReader {
|
|
|
180
199
|
return new CertReader(cert).buildCertName();
|
|
181
200
|
}
|
|
182
201
|
}
|
|
183
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
202
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cert-reader.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/cert-reader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAmB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAiBjC,MAAM,OAAO,GAAG;IACd,GAAG,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;IACzB,GAAG,EAAE,CAAC,KAAK,CAAC;IACZ,GAAG,EAAE,CAAC,KAAK,CAAC;IACZ,GAAG,EAAE,CAAC,KAAK,CAAC;IACZ,GAAG,EAAE,CAAC,KAAK,CAAC;IACZ,GAAG,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;CACpB,CAAC;AACF,MAAM,OAAO,UAAU;IACrB,IAAI,CAAW;IAEf,MAAM,CAAkB;IACxB,OAAO;IACP,OAAO,CAAS;IAChB,YAAY,QAAkB;QAC5B,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;QAErB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACvD,CAAC;QAED,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACnC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,KAAK;QACH,mDAAmD;QACnD,MAAM,MAAM,GAAG,2BAA2B,CAAC;QAC3C,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAEzD,MAAM,KAAK,GAAG,kBAAkB,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QACrD,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;YAClC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YACf,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,KAAK;QACH,gDAAgD;QAChD,MAAM,MAAM,GAAG,2BAA2B,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxC,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,UAAU,CAAC,MAAe;QACxB,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,GAAG,GAAQ,EAAE,CAAC;QACpB,SAAS,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YAChC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACb,CAAC;IAED,YAAY,CAAC,MAAc,IAAI,CAAC,IAAI,CAAC,GAAG;QACtC,OAAO,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,GAAW;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,aAAa;QACX,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,IAAI,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,WAAW;QACT,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAW;QAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAClD,OAAO,UAAU,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,aAAa;QACX,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACvC,OAAO,UAAU,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAC,uBAAuB,CAAC,MAAuB;QACpD,IAAI,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC;QACzC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,MAAM,GAAG,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,IAAyE,EAAE,QAAiB;QACrG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,QAAQ;YACR,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,SAAS,IAAI,EAAE,CAAC,CAAC;QAC1G,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YAC3G,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAgB;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC;gBACvB,MAAM,EAAE,IAAI;gBACZ,UAAU;gBACV,UAAU;gBACV,UAAU;gBACV,UAAU;gBACV,SAAS;gBACT,UAAU;gBACV,SAAS;gBACT,UAAU;gBACV,UAAU;aACX,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC1B,MAAM,GAAG,CAAC;QACZ,CAAC;gBAAS,CAAC;YACT,QAAQ;YACR,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtB,SAAS,UAAU,CAAC,QAAiB;gBACnC,IAAI,QAAQ,EAAE,CAAC;oBACb,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAC1B,CAAC;YACH,CAAC;YACD,UAAU,CAAC,UAAU,CAAC,CAAC;YACvB,UAAU,CAAC,UAAU,CAAC,CAAC;YACvB,UAAU,CAAC,UAAU,CAAC,CAAC;YACvB,UAAU,CAAC,SAAS,CAAC,CAAC;YACtB,UAAU,CAAC,UAAU,CAAC,CAAC;YACvB,UAAU,CAAC,SAAS,CAAC,CAAC;YACtB,UAAU,CAAC,UAAU,CAAC,CAAC;YACvB,UAAU,CAAC,UAAU,CAAC,CAAC;YACvB,UAAU,CAAC,UAAU,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,iBAAiB,CAAC,MAAc,EAAE,SAAc,EAAE,MAAM,GAAG,MAAM;QAC/D,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAClC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1D,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC1D,OAAO,GAAG,MAAM,IAAI,MAAM,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;IACpD,CAAC;IAED,aAAa,CAAC,SAAiB,EAAE;QAC/B,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAClC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1D,OAAO,GAAG,MAAM,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;IACtE,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,IAAa;QACnC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,IAAI,GAAG,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,GAAG,GAAG,GAAG,KAAK,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAS;QAC5B,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;IAC9C,CAAC;CACF"}
|
|
@@ -16,9 +16,11 @@ export declare class CertConverter {
|
|
|
16
16
|
pfx: string;
|
|
17
17
|
der: string;
|
|
18
18
|
jks: string;
|
|
19
|
+
p7b: string;
|
|
19
20
|
}>;
|
|
20
21
|
exec(cmd: string): Promise<void>;
|
|
21
22
|
private convertPfx;
|
|
22
23
|
private convertDer;
|
|
24
|
+
convertP7b(opts: CertReaderHandleContext): Promise<string>;
|
|
23
25
|
convertJks(opts: CertReaderHandleContext, pfxPassword?: string): Promise<string>;
|
|
24
26
|
}
|
|
@@ -14,18 +14,21 @@ export class CertConverter {
|
|
|
14
14
|
let pfx;
|
|
15
15
|
let der;
|
|
16
16
|
let jks;
|
|
17
|
+
let p7b;
|
|
17
18
|
const handle = async (ctx) => {
|
|
18
19
|
// 调用openssl 转pfx
|
|
19
20
|
pfx = await this.convertPfx(ctx, opts.pfxPassword, opts.pfxArgs);
|
|
20
21
|
// 转der
|
|
21
22
|
der = await this.convertDer(ctx);
|
|
22
23
|
jks = await this.convertJks(ctx, opts.pfxPassword);
|
|
24
|
+
p7b = await this.convertP7b(ctx);
|
|
23
25
|
};
|
|
24
26
|
await certReader.readCertFile({ logger: this.logger, handle });
|
|
25
27
|
return {
|
|
26
28
|
pfx,
|
|
27
29
|
der,
|
|
28
30
|
jks,
|
|
31
|
+
p7b,
|
|
29
32
|
};
|
|
30
33
|
}
|
|
31
34
|
async exec(cmd) {
|
|
@@ -72,6 +75,23 @@ export class CertConverter {
|
|
|
72
75
|
fs.unlinkSync(derPath);
|
|
73
76
|
return derCert;
|
|
74
77
|
}
|
|
78
|
+
async convertP7b(opts) {
|
|
79
|
+
const { tmpCrtPath } = opts;
|
|
80
|
+
const p7bPath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + `_cert.p7b`);
|
|
81
|
+
const dir = path.dirname(p7bPath);
|
|
82
|
+
if (!fs.existsSync(dir)) {
|
|
83
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
84
|
+
}
|
|
85
|
+
//openssl crl2pkcs7 -nocrl \
|
|
86
|
+
// -certfile your_domain.crt \
|
|
87
|
+
// -certfile intermediate.crt \
|
|
88
|
+
// -out chain.p7b
|
|
89
|
+
await this.exec(`openssl crl2pkcs7 -nocrl -certfile ${tmpCrtPath} -out ${p7bPath}`);
|
|
90
|
+
const fileBuffer = fs.readFileSync(p7bPath);
|
|
91
|
+
const p7bCert = fileBuffer.toString();
|
|
92
|
+
fs.unlinkSync(p7bPath);
|
|
93
|
+
return p7bCert;
|
|
94
|
+
}
|
|
75
95
|
async convertJks(opts, pfxPassword = "") {
|
|
76
96
|
const jksPassword = pfxPassword || "123456";
|
|
77
97
|
try {
|
|
@@ -101,4 +121,4 @@ export class CertConverter {
|
|
|
101
121
|
}
|
|
102
122
|
}
|
|
103
123
|
}
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wbHVnaW4vY2VydC1wbHVnaW4vY29udmVydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQVcsRUFBRSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRTNDLE9BQU8sRUFBRSxVQUFVLEVBQTJCLE1BQU0sK0JBQStCLENBQUM7QUFDcEYsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFFcEIsT0FBTyxFQUFFLFVBQVUsRUFBRSxDQUFDO0FBR3RCLE1BQU0sT0FBTyxhQUFhO0lBQ3hCLE1BQU0sQ0FBVTtJQUVoQixZQUFZLElBQXlCO1FBQ25DLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUM1QixDQUFDO0lBQ0QsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUE4RDtRQU0xRSxNQUFNLFVBQVUsR0FBRyxJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDN0MsSUFBSSxHQUFXLENBQUM7UUFDaEIsSUFBSSxHQUFXLENBQUM7UUFDaEIsSUFBSSxHQUFXLENBQUM7UUFDaEIsSUFBSSxHQUFXLENBQUM7UUFDaEIsTUFBTSxNQUFNLEdBQUcsS0FBSyxFQUFFLEdBQTRCLEVBQUUsRUFBRTtZQUNwRCxpQkFBaUI7WUFDakIsR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7WUFFakUsT0FBTztZQUNQLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7WUFFakMsR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsSUFB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
|
|
@@ -37,6 +37,7 @@ export declare class CertApplyPlugin extends CertApplyBasePlugin {
|
|
|
37
37
|
domainsVerifyPlan: DomainsVerifyPlanInput;
|
|
38
38
|
googleCommonEabAccessId: number;
|
|
39
39
|
zerosslCommonEabAccessId: number;
|
|
40
|
+
sslcomCommonEabAccessId: number;
|
|
40
41
|
eabAccessId: number;
|
|
41
42
|
googleAccessId: number;
|
|
42
43
|
privateKeyType: PrivateKeyType;
|
|
@@ -29,6 +29,7 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
|
|
|
29
29
|
domainsVerifyPlan;
|
|
30
30
|
googleCommonEabAccessId;
|
|
31
31
|
zerosslCommonEabAccessId;
|
|
32
|
+
sslcomCommonEabAccessId;
|
|
32
33
|
eabAccessId;
|
|
33
34
|
googleAccessId;
|
|
34
35
|
privateKeyType;
|
|
@@ -42,8 +43,8 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
|
|
|
42
43
|
eab;
|
|
43
44
|
async onInit() {
|
|
44
45
|
let eab = null;
|
|
45
|
-
if (this.sslProvider
|
|
46
|
-
if (this.googleAccessId) {
|
|
46
|
+
if (this.sslProvider !== "letsencrypt") {
|
|
47
|
+
if (this.sslProvider === "google" && this.googleAccessId) {
|
|
47
48
|
this.logger.info("当前正在使用 google服务账号授权获取EAB");
|
|
48
49
|
const googleAccess = await this.getAccess(this.googleAccessId);
|
|
49
50
|
const googleClient = new GoogleClient({
|
|
@@ -52,29 +53,21 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
|
|
|
52
53
|
});
|
|
53
54
|
eab = await googleClient.getEab();
|
|
54
55
|
}
|
|
55
|
-
else if (this.eabAccessId) {
|
|
56
|
-
this.logger.info("当前正在使用 google EAB授权");
|
|
57
|
-
eab = await this.getAccess(this.eabAccessId);
|
|
58
|
-
}
|
|
59
|
-
else if (this.googleCommonEabAccessId) {
|
|
60
|
-
this.logger.info("当前正在使用 google 公共EAB授权");
|
|
61
|
-
eab = await this.getAccess(this.googleCommonEabAccessId, true);
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
throw new Error("google需要配置EAB授权或服务账号授权");
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
else if (this.sslProvider === "zerossl") {
|
|
68
|
-
if (this.eabAccessId) {
|
|
69
|
-
this.logger.info("当前正在使用 zerossl EAB授权");
|
|
70
|
-
eab = await this.getAccess(this.eabAccessId);
|
|
71
|
-
}
|
|
72
|
-
else if (this.zerosslCommonEabAccessId) {
|
|
73
|
-
this.logger.info("当前正在使用 zerossl 公共EAB授权");
|
|
74
|
-
eab = await this.getAccess(this.zerosslCommonEabAccessId, true);
|
|
75
|
-
}
|
|
76
56
|
else {
|
|
77
|
-
|
|
57
|
+
const getEab = async (type) => {
|
|
58
|
+
if (this.eabAccessId) {
|
|
59
|
+
this.logger.info(`当前正在使用 ${type} EAB授权`);
|
|
60
|
+
eab = await this.getAccess(this.eabAccessId);
|
|
61
|
+
}
|
|
62
|
+
else if (this[`${type}CommonEabAccessId`]) {
|
|
63
|
+
this.logger.info(`当前正在使用 ${type} 公共EAB授权`);
|
|
64
|
+
eab = await this.getAccess(this[`${type}CommonEabAccessId`], true);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
throw new Error(`${type}需要配置EAB授权`);
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
await getEab(this.sslProvider);
|
|
78
71
|
}
|
|
79
72
|
}
|
|
80
73
|
this.eab = eab;
|
|
@@ -103,12 +96,12 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
|
|
|
103
96
|
}
|
|
104
97
|
const domains = this["domains"];
|
|
105
98
|
const csrInfo = _.merge({
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
99
|
+
// country: "CN",
|
|
100
|
+
// state: "GuangDong",
|
|
101
|
+
// locality: "ShengZhen",
|
|
102
|
+
// organization: "CertD Org.",
|
|
103
|
+
// organizationUnit: "IT Department",
|
|
104
|
+
// emailAddress: email,
|
|
112
105
|
}, this.csrInfo ? JSON.parse(this.csrInfo) : {});
|
|
113
106
|
this.logger.info("开始申请证书,", email, domains);
|
|
114
107
|
let dnsProvider = null;
|
|
@@ -309,6 +302,7 @@ __decorate([
|
|
|
309
302
|
{ value: "letsencrypt", label: "Let's Encrypt", icon: "simple-icons:letsencrypt" },
|
|
310
303
|
{ value: "google", label: "Google", icon: "flat-color-icons:google" },
|
|
311
304
|
{ value: "zerossl", label: "ZeroSSL", icon: "emojione:digit-zero" },
|
|
305
|
+
{ value: "sslcom", label: "SSL.com（仅主域名和www免费）", icon: "la:expeditedssl" },
|
|
312
306
|
],
|
|
313
307
|
},
|
|
314
308
|
helper: "Let's Encrypt：申请最简单\nGoogle：大厂光环，兼容性好，仅首次需要翻墙获取EAB授权\nZeroSSL：需要EAB授权，无需翻墙",
|
|
@@ -325,7 +319,7 @@ __decorate([
|
|
|
325
319
|
mergeScript: `
|
|
326
320
|
return {
|
|
327
321
|
show: ctx.compute(({form})=>{
|
|
328
|
-
return form.challengeType === 'dns'
|
|
322
|
+
return form.challengeType === 'dns'
|
|
329
323
|
}),
|
|
330
324
|
component:{
|
|
331
325
|
onSelectedChange: ctx.compute(({form})=>{
|
|
@@ -356,7 +350,7 @@ __decorate([
|
|
|
356
350
|
})
|
|
357
351
|
},
|
|
358
352
|
show: ctx.compute(({form})=>{
|
|
359
|
-
return form.challengeType === 'dns'
|
|
353
|
+
return form.challengeType === 'dns'
|
|
360
354
|
})
|
|
361
355
|
}
|
|
362
356
|
`,
|
|
@@ -416,6 +410,14 @@ __decorate([
|
|
|
416
410
|
}),
|
|
417
411
|
__metadata("design:type", Number)
|
|
418
412
|
], CertApplyPlugin.prototype, "zerosslCommonEabAccessId", void 0);
|
|
413
|
+
__decorate([
|
|
414
|
+
TaskInput({
|
|
415
|
+
title: "SSL.com公共EAB授权",
|
|
416
|
+
isSys: true,
|
|
417
|
+
show: false,
|
|
418
|
+
}),
|
|
419
|
+
__metadata("design:type", Number)
|
|
420
|
+
], CertApplyPlugin.prototype, "sslcomCommonEabAccessId", void 0);
|
|
419
421
|
__decorate([
|
|
420
422
|
TaskInput({
|
|
421
423
|
title: "EAB授权",
|
|
@@ -425,11 +427,16 @@ __decorate([
|
|
|
425
427
|
},
|
|
426
428
|
maybeNeed: true,
|
|
427
429
|
required: false,
|
|
428
|
-
helper: "需要提供EAB
|
|
430
|
+
helper: "需要提供EAB授权" +
|
|
431
|
+
"\nZeroSSL：请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'" +
|
|
432
|
+
"\nGoogle:请查看[google获取eab帮助文档](https://certd.docmirror.cn/guide/use/google/)，用过一次后会绑定邮箱，后续复用EAB要用同一个邮箱" +
|
|
433
|
+
"\nSSL.com:[SSL.com账号页面](https://secure.ssl.com/account),然后点击api credentials链接，然后点击编辑按钮，查看Secret key和HMAC key",
|
|
429
434
|
mergeScript: `
|
|
430
435
|
return {
|
|
431
436
|
show: ctx.compute(({form})=>{
|
|
432
|
-
return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId)
|
|
437
|
+
return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId)
|
|
438
|
+
|| (form.sslProvider === 'google' && !form.googleCommonEabAccessId)
|
|
439
|
+
|| (form.sslProvider === 'sslcom' && !form.sslcomCommonEabAccessId)
|
|
433
440
|
})
|
|
434
441
|
}
|
|
435
442
|
`,
|
|
@@ -582,4 +589,4 @@ CertApplyPlugin = __decorate([
|
|
|
582
589
|
], CertApplyPlugin);
|
|
583
590
|
export { CertApplyPlugin };
|
|
584
591
|
new CertApplyPlugin();
|
|
585
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/index.ts"],"names":[],"mappings":"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"}
|
|
592
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@certd/plugin-cert",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "1.36.
|
|
4
|
+
"version": "1.36.19",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
7
7
|
"types": "./dist/index.d.ts",
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
"pub": "npm publish"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@certd/acme-client": "^1.36.
|
|
20
|
-
"@certd/basic": "^1.36.
|
|
21
|
-
"@certd/pipeline": "^1.36.
|
|
22
|
-
"@certd/plugin-lib": "^1.36.
|
|
19
|
+
"@certd/acme-client": "^1.36.19",
|
|
20
|
+
"@certd/basic": "^1.36.19",
|
|
21
|
+
"@certd/pipeline": "^1.36.19",
|
|
22
|
+
"@certd/plugin-lib": "^1.36.19",
|
|
23
23
|
"@google-cloud/publicca": "^1.3.0",
|
|
24
24
|
"dayjs": "^1.11.7",
|
|
25
25
|
"jszip": "^3.10.1",
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"tslib": "^2.8.1",
|
|
44
44
|
"typescript": "^5.4.2"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "6d8981479517b5de9634e242c1ebf22e70527ec4"
|
|
47
47
|
}
|