@certd/plugin-cert 1.24.2 → 1.24.4
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 +10 -0
- package/dist/access/eab-access.d.ts +4 -4
- package/dist/access/eab-access.js +48 -48
- 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 +2 -0
- package/dist/d/plugin/cert-plugin/index.d.ts +1 -0
- 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 +25 -25
- 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/index.js +3 -3
- package/dist/plugin/cert-plugin/acme.d.ts +65 -65
- package/dist/plugin/cert-plugin/acme.js +2 -2
- package/dist/plugin/cert-plugin/base.d.ts +46 -46
- package/dist/plugin/cert-plugin/base.js +7 -11
- package/dist/plugin/cert-plugin/cert-reader.d.ts +31 -31
- package/dist/plugin/cert-plugin/cert-reader.js +92 -89
- package/dist/plugin/cert-plugin/convert.d.ts +21 -21
- package/dist/plugin/cert-plugin/convert.js +70 -70
- package/dist/plugin/cert-plugin/index.d.ts +18 -18
- package/dist/plugin/cert-plugin/index.js +206 -206
- package/dist/plugin/cert-plugin/lego/dns.d.ts +1 -1
- package/dist/plugin/cert-plugin/lego/dns.js +1 -1
- package/dist/plugin/cert-plugin/lego/index.d.ts +17 -17
- package/dist/plugin/cert-plugin/lego/index.js +171 -171
- package/dist/plugin/cert-plugin/lego.d.ts +16 -16
- package/dist/plugin/cert-plugin/lego.js +145 -153
- package/dist/plugin/index.d.ts +2 -2
- package/dist/plugin/index.js +2 -2
- package/package.json +4 -4
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/plugin-cert.mjs +0 -11786
- package/dist/plugin-cert.umd.js +0 -28
- package/stats.html +0 -6177
- package/test/user.secret.js +0 -7
- package/test/user.secret.ts +0 -4
|
@@ -13,12 +13,14 @@ export declare class AcmeService {
|
|
|
13
13
|
userContext: IContext;
|
|
14
14
|
logger: Logger;
|
|
15
15
|
sslProvider: SSLProvider;
|
|
16
|
+
skipLocalVerify: boolean;
|
|
16
17
|
eab?: ClientExternalAccountBindingOptions;
|
|
17
18
|
constructor(options: {
|
|
18
19
|
userContext: IContext;
|
|
19
20
|
logger: Logger;
|
|
20
21
|
sslProvider: SSLProvider;
|
|
21
22
|
eab?: ClientExternalAccountBindingOptions;
|
|
23
|
+
skipLocalVerify?: boolean;
|
|
22
24
|
});
|
|
23
25
|
getAccountConfig(email: string): Promise<any>;
|
|
24
26
|
buildAccountKey(email: string): string;
|
|
@@ -1,27 +1,27 @@
|
|
|
1
|
-
import { HttpClient, IAccess, ILogger, Registrable } from "@certd/pipeline";
|
|
2
|
-
export type DnsProviderDefine = Registrable & {
|
|
3
|
-
accessType: string;
|
|
4
|
-
autowire?: {
|
|
5
|
-
[key: string]: any;
|
|
6
|
-
};
|
|
7
|
-
};
|
|
8
|
-
export type CreateRecordOptions = {
|
|
9
|
-
fullRecord: string;
|
|
10
|
-
type: string;
|
|
11
|
-
value: any;
|
|
12
|
-
domain: string;
|
|
13
|
-
};
|
|
14
|
-
export type RemoveRecordOptions<T> = CreateRecordOptions & {
|
|
15
|
-
record: T;
|
|
16
|
-
};
|
|
17
|
-
export type DnsProviderContext = {
|
|
18
|
-
access: IAccess;
|
|
19
|
-
logger: ILogger;
|
|
20
|
-
http: HttpClient;
|
|
21
|
-
};
|
|
22
|
-
export interface IDnsProvider<T = any> {
|
|
23
|
-
onInstance(): Promise<void>;
|
|
24
|
-
createRecord(options: CreateRecordOptions): Promise<T>;
|
|
25
|
-
removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
|
|
26
|
-
setCtx(ctx: DnsProviderContext): void;
|
|
27
|
-
}
|
|
1
|
+
import { HttpClient, IAccess, ILogger, Registrable } from "@certd/pipeline";
|
|
2
|
+
export type DnsProviderDefine = Registrable & {
|
|
3
|
+
accessType: string;
|
|
4
|
+
autowire?: {
|
|
5
|
+
[key: string]: any;
|
|
6
|
+
};
|
|
7
|
+
};
|
|
8
|
+
export type CreateRecordOptions = {
|
|
9
|
+
fullRecord: string;
|
|
10
|
+
type: string;
|
|
11
|
+
value: any;
|
|
12
|
+
domain: string;
|
|
13
|
+
};
|
|
14
|
+
export type RemoveRecordOptions<T> = CreateRecordOptions & {
|
|
15
|
+
record: T;
|
|
16
|
+
};
|
|
17
|
+
export type DnsProviderContext = {
|
|
18
|
+
access: IAccess;
|
|
19
|
+
logger: ILogger;
|
|
20
|
+
http: HttpClient;
|
|
21
|
+
};
|
|
22
|
+
export interface IDnsProvider<T = any> {
|
|
23
|
+
onInstance(): Promise<void>;
|
|
24
|
+
createRecord(options: CreateRecordOptions): Promise<T>;
|
|
25
|
+
removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
|
|
26
|
+
setCtx(ctx: DnsProviderContext): void;
|
|
27
|
+
}
|
package/dist/dns-provider/api.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {};
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Rucy1wcm92aWRlci9hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { CreateRecordOptions, DnsProviderContext, IDnsProvider, RemoveRecordOptions } from "./api.js";
|
|
2
|
-
export declare abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
|
|
3
|
-
ctx: DnsProviderContext;
|
|
4
|
-
setCtx(ctx: DnsProviderContext): void;
|
|
5
|
-
abstract createRecord(options: CreateRecordOptions): Promise<T>;
|
|
6
|
-
abstract onInstance(): Promise<void>;
|
|
7
|
-
abstract removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
|
|
8
|
-
}
|
|
1
|
+
import { CreateRecordOptions, DnsProviderContext, IDnsProvider, RemoveRecordOptions } from "./api.js";
|
|
2
|
+
export declare abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
|
|
3
|
+
ctx: DnsProviderContext;
|
|
4
|
+
setCtx(ctx: DnsProviderContext): void;
|
|
5
|
+
abstract createRecord(options: CreateRecordOptions): Promise<T>;
|
|
6
|
+
abstract onInstance(): Promise<void>;
|
|
7
|
+
abstract removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
|
|
8
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export class AbstractDnsProvider {
|
|
2
|
-
ctx;
|
|
3
|
-
setCtx(ctx) {
|
|
4
|
-
this.ctx = ctx;
|
|
5
|
-
}
|
|
6
|
-
}
|
|
1
|
+
export class AbstractDnsProvider {
|
|
2
|
+
ctx;
|
|
3
|
+
setCtx(ctx) {
|
|
4
|
+
this.ctx = ctx;
|
|
5
|
+
}
|
|
6
|
+
}
|
|
7
7
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kbnMtcHJvdmlkZXIvYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQWdCLG1CQUFtQjtJQUN2QyxHQUFHLENBQXNCO0lBRXpCLE1BQU0sQ0FBQyxHQUF1QjtRQUM1QixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNqQixDQUFDO0NBT0YifQ==
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { DnsProviderDefine } from "./api.js";
|
|
2
|
-
export declare const DNS_PROVIDER_CLASS_KEY = "pipeline:dns-provider";
|
|
3
|
-
export declare function IsDnsProvider(define: DnsProviderDefine): ClassDecorator;
|
|
1
|
+
import { DnsProviderDefine } from "./api.js";
|
|
2
|
+
export declare const DNS_PROVIDER_CLASS_KEY = "pipeline:dns-provider";
|
|
3
|
+
export declare function IsDnsProvider(define: DnsProviderDefine): ClassDecorator;
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
import { dnsProviderRegistry } from "./registry.js";
|
|
2
|
-
import { Decorator, AUTOWIRE_KEY } from "@certd/pipeline";
|
|
3
|
-
import _ from "lodash-es";
|
|
4
|
-
// 提供一个唯一 key
|
|
5
|
-
export const DNS_PROVIDER_CLASS_KEY = "pipeline:dns-provider";
|
|
6
|
-
export function IsDnsProvider(define) {
|
|
7
|
-
return (target) => {
|
|
8
|
-
target = Decorator.target(target);
|
|
9
|
-
const autowires = {};
|
|
10
|
-
const properties = Decorator.getClassProperties(target);
|
|
11
|
-
for (const property in properties) {
|
|
12
|
-
const autowire = Reflect.getMetadata(AUTOWIRE_KEY, target, property);
|
|
13
|
-
if (autowire) {
|
|
14
|
-
autowires[property] = autowire;
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
_.merge(define, { autowire: autowires });
|
|
18
|
-
Reflect.defineMetadata(DNS_PROVIDER_CLASS_KEY, define, target);
|
|
19
|
-
target.define = define;
|
|
20
|
-
dnsProviderRegistry.register(define.name, {
|
|
21
|
-
define,
|
|
22
|
-
target,
|
|
23
|
-
});
|
|
24
|
-
};
|
|
25
|
-
}
|
|
1
|
+
import { dnsProviderRegistry } from "./registry.js";
|
|
2
|
+
import { Decorator, AUTOWIRE_KEY } from "@certd/pipeline";
|
|
3
|
+
import _ from "lodash-es";
|
|
4
|
+
// 提供一个唯一 key
|
|
5
|
+
export const DNS_PROVIDER_CLASS_KEY = "pipeline:dns-provider";
|
|
6
|
+
export function IsDnsProvider(define) {
|
|
7
|
+
return (target) => {
|
|
8
|
+
target = Decorator.target(target);
|
|
9
|
+
const autowires = {};
|
|
10
|
+
const properties = Decorator.getClassProperties(target);
|
|
11
|
+
for (const property in properties) {
|
|
12
|
+
const autowire = Reflect.getMetadata(AUTOWIRE_KEY, target, property);
|
|
13
|
+
if (autowire) {
|
|
14
|
+
autowires[property] = autowire;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
_.merge(define, { autowire: autowires });
|
|
18
|
+
Reflect.defineMetadata(DNS_PROVIDER_CLASS_KEY, define, target);
|
|
19
|
+
target.define = define;
|
|
20
|
+
dnsProviderRegistry.register(define.name, {
|
|
21
|
+
define,
|
|
22
|
+
target,
|
|
23
|
+
});
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
26
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjb3JhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Rucy1wcm92aWRlci9kZWNvcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXBELE9BQU8sRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDMUQsT0FBTyxDQUFDLE1BQU0sV0FBVyxDQUFDO0FBRTFCLGFBQWE7QUFDYixNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyx1QkFBdUIsQ0FBQztBQUU5RCxNQUFNLFVBQVUsYUFBYSxDQUFDLE1BQXlCO0lBQ3JELE9BQU8sQ0FBQyxNQUFXLEVBQUUsRUFBRTtRQUNyQixNQUFNLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNsQyxNQUFNLFNBQVMsR0FBUSxFQUFFLENBQUM7UUFDMUIsTUFBTSxVQUFVLEdBQUcsU0FBUyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3hELEtBQUssTUFBTSxRQUFRLElBQUksVUFBVSxFQUFFO1lBQ2pDLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztZQUNyRSxJQUFJLFFBQVEsRUFBRTtnQkFDWixTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsUUFBUSxDQUFDO2FBQ2hDO1NBQ0Y7UUFDRCxDQUFDLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO1FBRXpDLE9BQU8sQ0FBQyxjQUFjLENBQUMsc0JBQXNCLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRS9ELE1BQU0sQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3ZCLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO1lBQ3hDLE1BQU07WUFDTixNQUFNO1NBQ1AsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDO0FBQ0osQ0FBQyJ9
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from "./api.js";
|
|
2
|
-
export * from "./registry.js";
|
|
3
|
-
export * from "./decorator.js";
|
|
4
|
-
export * from "./base.js";
|
|
1
|
+
export * from "./api.js";
|
|
2
|
+
export * from "./registry.js";
|
|
3
|
+
export * from "./decorator.js";
|
|
4
|
+
export * from "./base.js";
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export * from "./api.js";
|
|
2
|
-
export * from "./registry.js";
|
|
3
|
-
export * from "./decorator.js";
|
|
4
|
-
export * from "./base.js";
|
|
1
|
+
export * from "./api.js";
|
|
2
|
+
export * from "./registry.js";
|
|
3
|
+
export * from "./decorator.js";
|
|
4
|
+
export * from "./base.js";
|
|
5
5
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZG5zLXByb3ZpZGVyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxXQUFXLENBQUMifQ==
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { Registry } from "@certd/pipeline";
|
|
2
|
-
export declare const dnsProviderRegistry: Registry<unknown>;
|
|
1
|
+
import { Registry } from "@certd/pipeline";
|
|
2
|
+
export declare const dnsProviderRegistry: Registry<unknown>;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { Registry } from "@certd/pipeline";
|
|
2
|
-
export const dnsProviderRegistry = new Registry("dnsProvider");
|
|
1
|
+
import { Registry } from "@certd/pipeline";
|
|
2
|
+
export const dnsProviderRegistry = new Registry("dnsProvider");
|
|
3
3
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaXN0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZG5zLXByb3ZpZGVyL3JlZ2lzdHJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUzQyxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLFFBQVEsQ0FBQyxhQUFhLENBQUMsQ0FBQyJ9
|
package/dist/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from "./plugin/index.js";
|
|
2
|
-
export * from "./dns-provider/index.js";
|
|
3
|
-
export * from "./access/index.js";
|
|
1
|
+
export * from "./plugin/index.js";
|
|
2
|
+
export * from "./dns-provider/index.js";
|
|
3
|
+
export * from "./access/index.js";
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from "./plugin/index.js";
|
|
2
|
-
export * from "./dns-provider/index.js";
|
|
3
|
-
export * from "./access/index.js";
|
|
1
|
+
export * from "./plugin/index.js";
|
|
2
|
+
export * from "./dns-provider/index.js";
|
|
3
|
+
export * from "./access/index.js";
|
|
4
4
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsbUJBQW1CLENBQUMifQ==
|
|
@@ -1,65 +1,65 @@
|
|
|
1
|
-
import * as acme from "@certd/acme-client";
|
|
2
|
-
import { Logger } from "log4js";
|
|
3
|
-
import { IContext } from "@certd/pipeline";
|
|
4
|
-
import { IDnsProvider } from "../../dns-provider/index.js";
|
|
5
|
-
import { ClientExternalAccountBindingOptions, UrlMapping } from "@certd/acme-client";
|
|
6
|
-
export type CertInfo = {
|
|
7
|
-
crt: string;
|
|
8
|
-
key: string;
|
|
9
|
-
csr: string;
|
|
10
|
-
pfx?: string;
|
|
11
|
-
der?: string;
|
|
12
|
-
};
|
|
13
|
-
export type SSLProvider = "letsencrypt" | "google" | "zerossl";
|
|
14
|
-
export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
|
|
15
|
-
type AcmeServiceOptions = {
|
|
16
|
-
userContext: IContext;
|
|
17
|
-
logger: Logger;
|
|
18
|
-
sslProvider: SSLProvider;
|
|
19
|
-
eab?: ClientExternalAccountBindingOptions;
|
|
20
|
-
skipLocalVerify?: boolean;
|
|
21
|
-
useMappingProxy?: boolean;
|
|
22
|
-
privateKeyType?: PrivateKeyType;
|
|
23
|
-
signal?: AbortSignal;
|
|
24
|
-
};
|
|
25
|
-
export declare class AcmeService {
|
|
26
|
-
options: AcmeServiceOptions;
|
|
27
|
-
userContext: IContext;
|
|
28
|
-
logger: Logger;
|
|
29
|
-
sslProvider: SSLProvider;
|
|
30
|
-
skipLocalVerify: boolean;
|
|
31
|
-
eab?: ClientExternalAccountBindingOptions;
|
|
32
|
-
constructor(options: AcmeServiceOptions);
|
|
33
|
-
getAccountConfig(email: string, urlMapping: UrlMapping): Promise<any>;
|
|
34
|
-
buildAccountKey(email: string): string;
|
|
35
|
-
saveAccountConfig(email: string, conf: any): Promise<void>;
|
|
36
|
-
getAcmeClient(email: string, isTest?: boolean): Promise<acme.Client>;
|
|
37
|
-
createNewKey(): Promise<string>;
|
|
38
|
-
parseDomain(fullDomain: string): string;
|
|
39
|
-
challengeCreateFn(authz: any, challenge: any, keyAuthorization: string, dnsProvider: IDnsProvider): Promise<any>;
|
|
40
|
-
/**
|
|
41
|
-
* Function used to remove an ACME challenge response
|
|
42
|
-
*
|
|
43
|
-
* @param {object} authz Authorization object
|
|
44
|
-
* @param {object} challenge Selected challenge
|
|
45
|
-
* @param {string} keyAuthorization Authorization key
|
|
46
|
-
* @param recordItem challengeCreateFn create record item
|
|
47
|
-
* @param dnsProvider dnsProvider
|
|
48
|
-
* @returns {Promise}
|
|
49
|
-
*/
|
|
50
|
-
challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordItem: any, dnsProvider: IDnsProvider): Promise<void>;
|
|
51
|
-
order(options: {
|
|
52
|
-
email: string;
|
|
53
|
-
domains: string | string[];
|
|
54
|
-
dnsProvider: any;
|
|
55
|
-
csrInfo: any;
|
|
56
|
-
isTest?: boolean;
|
|
57
|
-
privateKeyType?: string;
|
|
58
|
-
}): Promise<CertInfo>;
|
|
59
|
-
buildCommonNameByDomains(domains: string | string[]): {
|
|
60
|
-
commonName: string;
|
|
61
|
-
altNames: string[] | undefined;
|
|
62
|
-
};
|
|
63
|
-
private testDirectory;
|
|
64
|
-
}
|
|
65
|
-
export {};
|
|
1
|
+
import * as acme from "@certd/acme-client";
|
|
2
|
+
import { Logger } from "log4js";
|
|
3
|
+
import { IContext } from "@certd/pipeline";
|
|
4
|
+
import { IDnsProvider } from "../../dns-provider/index.js";
|
|
5
|
+
import { ClientExternalAccountBindingOptions, UrlMapping } from "@certd/acme-client";
|
|
6
|
+
export type CertInfo = {
|
|
7
|
+
crt: string;
|
|
8
|
+
key: string;
|
|
9
|
+
csr: string;
|
|
10
|
+
pfx?: string;
|
|
11
|
+
der?: string;
|
|
12
|
+
};
|
|
13
|
+
export type SSLProvider = "letsencrypt" | "google" | "zerossl";
|
|
14
|
+
export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
|
|
15
|
+
type AcmeServiceOptions = {
|
|
16
|
+
userContext: IContext;
|
|
17
|
+
logger: Logger;
|
|
18
|
+
sslProvider: SSLProvider;
|
|
19
|
+
eab?: ClientExternalAccountBindingOptions;
|
|
20
|
+
skipLocalVerify?: boolean;
|
|
21
|
+
useMappingProxy?: boolean;
|
|
22
|
+
privateKeyType?: PrivateKeyType;
|
|
23
|
+
signal?: AbortSignal;
|
|
24
|
+
};
|
|
25
|
+
export declare class AcmeService {
|
|
26
|
+
options: AcmeServiceOptions;
|
|
27
|
+
userContext: IContext;
|
|
28
|
+
logger: Logger;
|
|
29
|
+
sslProvider: SSLProvider;
|
|
30
|
+
skipLocalVerify: boolean;
|
|
31
|
+
eab?: ClientExternalAccountBindingOptions;
|
|
32
|
+
constructor(options: AcmeServiceOptions);
|
|
33
|
+
getAccountConfig(email: string, urlMapping: UrlMapping): Promise<any>;
|
|
34
|
+
buildAccountKey(email: string): string;
|
|
35
|
+
saveAccountConfig(email: string, conf: any): Promise<void>;
|
|
36
|
+
getAcmeClient(email: string, isTest?: boolean): Promise<acme.Client>;
|
|
37
|
+
createNewKey(): Promise<string>;
|
|
38
|
+
parseDomain(fullDomain: string): string;
|
|
39
|
+
challengeCreateFn(authz: any, challenge: any, keyAuthorization: string, dnsProvider: IDnsProvider): Promise<any>;
|
|
40
|
+
/**
|
|
41
|
+
* Function used to remove an ACME challenge response
|
|
42
|
+
*
|
|
43
|
+
* @param {object} authz Authorization object
|
|
44
|
+
* @param {object} challenge Selected challenge
|
|
45
|
+
* @param {string} keyAuthorization Authorization key
|
|
46
|
+
* @param recordItem challengeCreateFn create record item
|
|
47
|
+
* @param dnsProvider dnsProvider
|
|
48
|
+
* @returns {Promise}
|
|
49
|
+
*/
|
|
50
|
+
challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordItem: any, dnsProvider: IDnsProvider): Promise<void>;
|
|
51
|
+
order(options: {
|
|
52
|
+
email: string;
|
|
53
|
+
domains: string | string[];
|
|
54
|
+
dnsProvider: any;
|
|
55
|
+
csrInfo: any;
|
|
56
|
+
isTest?: boolean;
|
|
57
|
+
privateKeyType?: string;
|
|
58
|
+
}): Promise<CertInfo>;
|
|
59
|
+
buildCommonNameByDomains(domains: string | string[]): {
|
|
60
|
+
commonName: string;
|
|
61
|
+
altNames: string[] | undefined;
|
|
62
|
+
};
|
|
63
|
+
private testDirectory;
|
|
64
|
+
}
|
|
65
|
+
export {};
|
|
@@ -253,7 +253,7 @@ export class AcmeService {
|
|
|
253
253
|
}
|
|
254
254
|
async testDirectory(directoryUrl) {
|
|
255
255
|
try {
|
|
256
|
-
await utils.http({
|
|
256
|
+
await utils.http.request({
|
|
257
257
|
url: directoryUrl,
|
|
258
258
|
method: "GET",
|
|
259
259
|
timeout: 10000,
|
|
@@ -267,4 +267,4 @@ export class AcmeService {
|
|
|
267
267
|
return true;
|
|
268
268
|
}
|
|
269
269
|
}
|
|
270
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"acme.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/acme.ts"],"names":[],"mappings":"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"}
|
|
270
|
+
//# 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,46 +1,46 @@
|
|
|
1
|
-
import { AbstractTaskPlugin, HttpClient, IContext, Step } from "@certd/pipeline";
|
|
2
|
-
import type { CertInfo } from "./acme.js";
|
|
3
|
-
import { CertReader } from "./cert-reader.js";
|
|
4
|
-
export { CertReader };
|
|
5
|
-
export type { CertInfo };
|
|
6
|
-
export declare abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
|
|
7
|
-
domains: string[];
|
|
8
|
-
email: string;
|
|
9
|
-
pfxPassword: string;
|
|
10
|
-
renewDays: number;
|
|
11
|
-
forceUpdate: string;
|
|
12
|
-
successNotify: boolean;
|
|
13
|
-
csrInfo: string;
|
|
14
|
-
userContext: IContext;
|
|
15
|
-
http: HttpClient;
|
|
16
|
-
lastStatus: Step;
|
|
17
|
-
cert?: CertInfo;
|
|
18
|
-
onInstance(): Promise<void>;
|
|
19
|
-
abstract onInit(): Promise<void>;
|
|
20
|
-
abstract doCertApply(): Promise<any>;
|
|
21
|
-
execute(): Promise<void>;
|
|
22
|
-
output(certReader: CertReader, isNew: boolean): Promise<void>;
|
|
23
|
-
zipCert(cert: CertInfo, filename: string): Promise<void>;
|
|
24
|
-
/**
|
|
25
|
-
* 是否更新证书
|
|
26
|
-
*/
|
|
27
|
-
condition(): Promise<CertReader>;
|
|
28
|
-
formatCert(pem: string): string;
|
|
29
|
-
formatCerts(cert: {
|
|
30
|
-
crt: string;
|
|
31
|
-
key: string;
|
|
32
|
-
csr: string;
|
|
33
|
-
}): CertInfo;
|
|
34
|
-
readLastCert(): Promise<CertReader | undefined>;
|
|
35
|
-
/**
|
|
36
|
-
* 检查是否过期,默认提前20天
|
|
37
|
-
* @param expires
|
|
38
|
-
* @param maxDays
|
|
39
|
-
* @returns {boolean}
|
|
40
|
-
*/
|
|
41
|
-
isWillExpire(expires: number, maxDays?: number): {
|
|
42
|
-
isWillExpire: boolean;
|
|
43
|
-
leftDays: number;
|
|
44
|
-
};
|
|
45
|
-
private sendSuccessEmail;
|
|
46
|
-
}
|
|
1
|
+
import { AbstractTaskPlugin, HttpClient, IContext, Step } from "@certd/pipeline";
|
|
2
|
+
import type { CertInfo } from "./acme.js";
|
|
3
|
+
import { CertReader } from "./cert-reader.js";
|
|
4
|
+
export { CertReader };
|
|
5
|
+
export type { CertInfo };
|
|
6
|
+
export declare abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
|
|
7
|
+
domains: string[];
|
|
8
|
+
email: string;
|
|
9
|
+
pfxPassword: string;
|
|
10
|
+
renewDays: number;
|
|
11
|
+
forceUpdate: string;
|
|
12
|
+
successNotify: boolean;
|
|
13
|
+
csrInfo: string;
|
|
14
|
+
userContext: IContext;
|
|
15
|
+
http: HttpClient;
|
|
16
|
+
lastStatus: Step;
|
|
17
|
+
cert?: CertInfo;
|
|
18
|
+
onInstance(): Promise<void>;
|
|
19
|
+
abstract onInit(): Promise<void>;
|
|
20
|
+
abstract doCertApply(): Promise<any>;
|
|
21
|
+
execute(): Promise<void>;
|
|
22
|
+
output(certReader: CertReader, isNew: boolean): Promise<void>;
|
|
23
|
+
zipCert(cert: CertInfo, filename: string): Promise<void>;
|
|
24
|
+
/**
|
|
25
|
+
* 是否更新证书
|
|
26
|
+
*/
|
|
27
|
+
condition(): Promise<CertReader>;
|
|
28
|
+
formatCert(pem: string): string;
|
|
29
|
+
formatCerts(cert: {
|
|
30
|
+
crt: string;
|
|
31
|
+
key: string;
|
|
32
|
+
csr: string;
|
|
33
|
+
}): CertInfo;
|
|
34
|
+
readLastCert(): Promise<CertReader | undefined>;
|
|
35
|
+
/**
|
|
36
|
+
* 检查是否过期,默认提前20天
|
|
37
|
+
* @param expires
|
|
38
|
+
* @param maxDays
|
|
39
|
+
* @returns {boolean}
|
|
40
|
+
*/
|
|
41
|
+
isWillExpire(expires: number, maxDays?: number): {
|
|
42
|
+
isWillExpire: boolean;
|
|
43
|
+
leftDays: number;
|
|
44
|
+
};
|
|
45
|
+
private sendSuccessEmail;
|
|
46
|
+
}
|
|
@@ -103,13 +103,13 @@ export class CertApplyBasePlugin extends AbstractTaskPlugin {
|
|
|
103
103
|
*/
|
|
104
104
|
async condition() {
|
|
105
105
|
if (this.forceUpdate) {
|
|
106
|
+
this.logger.info("强制更新证书选项已勾选,准备申请新证书");
|
|
106
107
|
return null;
|
|
107
108
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
inputChanged = true;
|
|
109
|
+
const inputChanged = this.ctx.inputChanged;
|
|
110
|
+
if (inputChanged) {
|
|
111
|
+
this.logger.info("输入参数变更,准备申请新证书");
|
|
112
|
+
return null;
|
|
113
113
|
}
|
|
114
114
|
let oldCert = undefined;
|
|
115
115
|
try {
|
|
@@ -122,10 +122,6 @@ export class CertApplyBasePlugin extends AbstractTaskPlugin {
|
|
|
122
122
|
this.logger.info("还未申请过,准备申请新证书");
|
|
123
123
|
return null;
|
|
124
124
|
}
|
|
125
|
-
if (inputChanged) {
|
|
126
|
-
this.logger.info("输入参数变更,申请新证书");
|
|
127
|
-
return null;
|
|
128
|
-
}
|
|
129
125
|
const ret = this.isWillExpire(oldCert.expires, this.renewDays);
|
|
130
126
|
if (!ret.isWillExpire) {
|
|
131
127
|
this.logger.info(`证书还未过期:过期时间${dayjs(oldCert.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${ret.leftDays}天`);
|
|
@@ -225,7 +221,7 @@ __decorate([
|
|
|
225
221
|
], CertApplyBasePlugin.prototype, "email", void 0);
|
|
226
222
|
__decorate([
|
|
227
223
|
TaskInput({
|
|
228
|
-
title: "PFX
|
|
224
|
+
title: "PFX证书密码",
|
|
229
225
|
component: {
|
|
230
226
|
name: "a-input-password",
|
|
231
227
|
vModel: "value",
|
|
@@ -281,4 +277,4 @@ __decorate([
|
|
|
281
277
|
}),
|
|
282
278
|
__metadata("design:type", Object)
|
|
283
279
|
], CertApplyBasePlugin.prototype, "cert", void 0);
|
|
284
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
280
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/base.ts"],"names":[],"mappings":"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"}
|