@push.rocks/smartacme 6.2.0 → 7.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/certmanagers/index.d.ts +2 -0
- package/dist_ts/certmanagers/index.js +3 -0
- package/dist_ts/certmanagers/memory.d.ts +18 -0
- package/dist_ts/certmanagers/memory.js +33 -0
- package/dist_ts/certmanagers/mongo.d.ts +23 -0
- package/dist_ts/certmanagers/mongo.js +40 -0
- package/dist_ts/certmanagers.d.ts +42 -0
- package/dist_ts/certmanagers.js +86 -0
- package/dist_ts/handlers/Dns01Handler.js +1 -3
- package/dist_ts/index.d.ts +2 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/interfaces/certmanager.d.ts +33 -0
- package/dist_ts/interfaces/certmanager.js +2 -0
- package/dist_ts/smartacme.classes.cert.d.ts +11 -4
- package/dist_ts/smartacme.classes.cert.js +23 -68
- package/dist_ts/smartacme.classes.certmanager.d.ts +18 -0
- package/dist_ts/smartacme.classes.certmanager.js +40 -1
- package/dist_ts/smartacme.classes.smartacme.d.ts +10 -3
- package/dist_ts/smartacme.classes.smartacme.js +65 -29
- package/package.json +2 -2
- package/readme.plan.md +13 -41
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/certmanagers/index.ts +2 -0
- package/ts/certmanagers/memory.ts +38 -0
- package/ts/certmanagers/mongo.ts +52 -0
- package/ts/handlers/Dns01Handler.ts +0 -8
- package/ts/index.ts +2 -0
- package/ts/interfaces/certmanager.ts +36 -0
- package/ts/smartacme.classes.cert.ts +22 -47
- package/ts/smartacme.classes.smartacme.ts +90 -33
- package/ts/smartacme.classes.certmanager.ts +0 -77
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import * as plugins from './smartacme.plugins.js';
|
|
2
|
-
import { SmartacmeCert } from './smartacme.classes.cert.js';
|
|
3
|
-
import { SmartacmeCertManager } from './smartacme.classes.certmanager.js';
|
|
4
2
|
import { SmartacmeCertMatcher } from './smartacme.classes.certmatcher.js';
|
|
5
3
|
import { commitinfo } from './00_commitinfo_data.js';
|
|
4
|
+
import { SmartacmeCert } from './smartacme.classes.cert.js';
|
|
6
5
|
/**
|
|
7
6
|
* class SmartAcme
|
|
8
7
|
* can be used for setting up communication with an ACME authority
|
|
@@ -24,10 +23,10 @@ export class SmartAcme {
|
|
|
24
23
|
this.logger.enableConsole();
|
|
25
24
|
// initialize retry/backoff options
|
|
26
25
|
this.retryOptions = {
|
|
27
|
-
retries: optionsArg.retryOptions?.retries ??
|
|
28
|
-
factor: optionsArg.retryOptions?.factor ??
|
|
26
|
+
retries: optionsArg.retryOptions?.retries ?? 10,
|
|
27
|
+
factor: optionsArg.retryOptions?.factor ?? 4,
|
|
29
28
|
minTimeoutMs: optionsArg.retryOptions?.minTimeoutMs ?? 1000,
|
|
30
|
-
maxTimeoutMs: optionsArg.retryOptions?.maxTimeoutMs ??
|
|
29
|
+
maxTimeoutMs: optionsArg.retryOptions?.maxTimeoutMs ?? 60000,
|
|
31
30
|
};
|
|
32
31
|
// initialize challenge handlers (must provide at least one)
|
|
33
32
|
if (!optionsArg.challengeHandlers || optionsArg.challengeHandlers.length === 0) {
|
|
@@ -39,6 +38,8 @@ export class SmartAcme {
|
|
|
39
38
|
optionsArg.challengePriority && optionsArg.challengePriority.length > 0
|
|
40
39
|
? optionsArg.challengePriority
|
|
41
40
|
: this.challengeHandlers.map((h) => h.getSupportedTypes()[0]);
|
|
41
|
+
// initialize interest coordination
|
|
42
|
+
this.interestMap = new plugins.lik.InterestMap((domain) => domain);
|
|
42
43
|
}
|
|
43
44
|
/**
|
|
44
45
|
* starts the instance
|
|
@@ -49,10 +50,11 @@ export class SmartAcme {
|
|
|
49
50
|
async start() {
|
|
50
51
|
this.privateKey =
|
|
51
52
|
this.options.accountPrivateKey || (await plugins.acme.forge.createPrivateKey()).toString();
|
|
52
|
-
//
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
53
|
+
// Initialize certificate manager
|
|
54
|
+
if (!this.options.certManager) {
|
|
55
|
+
throw new Error('You must provide a certManager via options.certManager');
|
|
56
|
+
}
|
|
57
|
+
this.certmanager = this.options.certManager;
|
|
56
58
|
await this.certmanager.init();
|
|
57
59
|
// CertMatcher
|
|
58
60
|
this.certmatcher = new SmartacmeCertMatcher();
|
|
@@ -77,8 +79,13 @@ export class SmartAcme {
|
|
|
77
79
|
process.on('SIGINT', () => this.handleSignal('SIGINT'));
|
|
78
80
|
process.on('SIGTERM', () => this.handleSignal('SIGTERM'));
|
|
79
81
|
}
|
|
82
|
+
/**
|
|
83
|
+
* Stops the SmartAcme instance and closes certificate store connections.
|
|
84
|
+
*/
|
|
80
85
|
async stop() {
|
|
81
|
-
|
|
86
|
+
if (this.certmanager && typeof this.certmanager.close === 'function') {
|
|
87
|
+
await this.certmanager.close();
|
|
88
|
+
}
|
|
82
89
|
}
|
|
83
90
|
/** Retry helper with exponential backoff */
|
|
84
91
|
async retry(operation, operationName = 'operation') {
|
|
@@ -147,9 +154,27 @@ export class SmartAcme {
|
|
|
147
154
|
async getCertificateForDomain(domainArg) {
|
|
148
155
|
const certDomainName = this.certmatcher.getCertificateDomainNameByDomainName(domainArg);
|
|
149
156
|
const retrievedCertificate = await this.certmanager.retrieveCertificate(certDomainName);
|
|
157
|
+
// integration test stub: bypass ACME and return a dummy certificate
|
|
158
|
+
if (this.options.environment === 'integration') {
|
|
159
|
+
if (retrievedCertificate) {
|
|
160
|
+
return retrievedCertificate;
|
|
161
|
+
}
|
|
162
|
+
const dummy = plugins.smartunique.shortId();
|
|
163
|
+
const certRecord = new SmartacmeCert({
|
|
164
|
+
id: dummy,
|
|
165
|
+
domainName: certDomainName,
|
|
166
|
+
privateKey: dummy,
|
|
167
|
+
publicKey: dummy,
|
|
168
|
+
csr: dummy,
|
|
169
|
+
created: Date.now(),
|
|
170
|
+
validUntil: Date.now() + plugins.smarttime.getMilliSecondsFromUnits({ days: 90 }),
|
|
171
|
+
});
|
|
172
|
+
await this.certmanager.storeCertificate(certRecord);
|
|
173
|
+
return certRecord;
|
|
174
|
+
}
|
|
150
175
|
if (!retrievedCertificate &&
|
|
151
|
-
(await this.
|
|
152
|
-
const existingCertificateInterest = this.
|
|
176
|
+
(await this.interestMap.checkInterest(certDomainName))) {
|
|
177
|
+
const existingCertificateInterest = this.interestMap.findInterest(certDomainName);
|
|
153
178
|
const certificate = existingCertificateInterest.interestFullfilled;
|
|
154
179
|
return certificate;
|
|
155
180
|
}
|
|
@@ -157,10 +182,11 @@ export class SmartAcme {
|
|
|
157
182
|
return retrievedCertificate;
|
|
158
183
|
}
|
|
159
184
|
else if (retrievedCertificate && retrievedCertificate.shouldBeRenewed()) {
|
|
160
|
-
|
|
185
|
+
// Remove old certificate via certManager
|
|
186
|
+
await this.certmanager.deleteCertificate(certDomainName);
|
|
161
187
|
}
|
|
162
188
|
// lets make sure others get the same interest
|
|
163
|
-
const currentDomainInterst = await this.
|
|
189
|
+
const currentDomainInterst = await this.interestMap.addInterest(certDomainName);
|
|
164
190
|
/* Place new order with retry */
|
|
165
191
|
const order = await this.retry(() => this.client.createOrder({
|
|
166
192
|
identifiers: [
|
|
@@ -212,17 +238,31 @@ export class SmartAcme {
|
|
|
212
238
|
}
|
|
213
239
|
this.pendingChallenges.push(input);
|
|
214
240
|
try {
|
|
241
|
+
// Prepare the challenge (set DNS record, write file, etc.)
|
|
215
242
|
await this.retry(() => handler.prepare(input), `${type}.prepare`);
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
await this.retry(() => this.
|
|
243
|
+
// For DNS-01, wait for propagation before verification
|
|
244
|
+
if (type === 'dns-01') {
|
|
245
|
+
const dnsInput = input;
|
|
246
|
+
// Wait for authoritative DNS propagation before ACME verify
|
|
247
|
+
await this.retry(() => this.smartdns.checkUntilAvailable(dnsInput.hostName, 'TXT', dnsInput.challenge, 100, 5000), `${type}.propagation`);
|
|
248
|
+
// Extra cool-down to ensure ACME server sees the new TXT record
|
|
249
|
+
this.logger.log('info', 'Cooling down for 1 minute before ACME verification');
|
|
250
|
+
await plugins.smartdelay.delayFor(60000);
|
|
221
251
|
}
|
|
252
|
+
// Official ACME verification (ensures challenge is publicly reachable)
|
|
253
|
+
await this.retry(() => this.client.verifyChallenge(authz, selectedChallengeArg), `${type}.verifyChallenge`);
|
|
254
|
+
// Notify ACME server to complete the challenge
|
|
222
255
|
await this.retry(() => this.client.completeChallenge(selectedChallengeArg), `${type}.completeChallenge`);
|
|
223
|
-
|
|
256
|
+
// Wait for valid status (warnings on staging timeouts)
|
|
257
|
+
try {
|
|
258
|
+
await this.retry(() => this.client.waitForValidStatus(selectedChallengeArg), `${type}.waitForValidStatus`);
|
|
259
|
+
}
|
|
260
|
+
catch (err) {
|
|
261
|
+
await this.logger.log('warn', `Challenge ${type} did not reach valid status in time, proceeding to finalize`, err);
|
|
262
|
+
}
|
|
224
263
|
}
|
|
225
264
|
finally {
|
|
265
|
+
// Always cleanup resource
|
|
226
266
|
try {
|
|
227
267
|
await this.retry(() => handler.cleanup(input), `${type}.cleanup`);
|
|
228
268
|
}
|
|
@@ -242,25 +282,21 @@ export class SmartAcme {
|
|
|
242
282
|
await this.retry(() => this.client.finalizeOrder(order, csr), 'finalizeOrder');
|
|
243
283
|
const cert = await this.retry(() => this.client.getCertificate(order), 'getCertificate');
|
|
244
284
|
/* Done */
|
|
245
|
-
|
|
285
|
+
// Store the new certificate record
|
|
286
|
+
const certRecord = new SmartacmeCert({
|
|
246
287
|
id: plugins.smartunique.shortId(),
|
|
247
288
|
domainName: certDomainName,
|
|
248
289
|
privateKey: key.toString(),
|
|
249
290
|
publicKey: cert.toString(),
|
|
250
291
|
csr: csr.toString(),
|
|
251
292
|
created: Date.now(),
|
|
252
|
-
validUntil: Date.now() +
|
|
253
|
-
plugins.smarttime.getMilliSecondsFromUnits({
|
|
254
|
-
days: 90,
|
|
255
|
-
}),
|
|
293
|
+
validUntil: Date.now() + plugins.smarttime.getMilliSecondsFromUnits({ days: 90 }),
|
|
256
294
|
});
|
|
295
|
+
await this.certmanager.storeCertificate(certRecord);
|
|
257
296
|
const newCertificate = await this.certmanager.retrieveCertificate(certDomainName);
|
|
258
297
|
currentDomainInterst.fullfillInterest(newCertificate);
|
|
259
298
|
currentDomainInterst.destroy();
|
|
260
299
|
return newCertificate;
|
|
261
300
|
}
|
|
262
|
-
async getAllCertificates() {
|
|
263
|
-
return SmartacmeCert.getInstances({});
|
|
264
|
-
}
|
|
265
301
|
}
|
|
266
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.smartacme.js","sourceRoot":"","sources":["../ts/smartacme.classes.smartacme.ts"],"names":[],"mappings":"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"}
|
|
302
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.smartacme.js","sourceRoot":"","sources":["../ts/smartacme.classes.smartacme.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartacme",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "7.2.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A TypeScript-based ACME client for LetsEncrypt certificate management with a focus on simplicity and power.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"@git.zone/tsrun": "^1.3.3",
|
|
55
55
|
"@git.zone/tstest": "^1.0.96",
|
|
56
56
|
"@push.rocks/qenv": "^6.1.0",
|
|
57
|
-
"@push.rocks/tapbundle": "^6.0.
|
|
57
|
+
"@push.rocks/tapbundle": "^6.0.3",
|
|
58
58
|
"@types/node": "^22.15.3"
|
|
59
59
|
},
|
|
60
60
|
"files": [
|
package/readme.plan.md
CHANGED
|
@@ -1,44 +1,16 @@
|
|
|
1
|
-
# Plan:
|
|
1
|
+
# Plan: Move interestMap from certmanager to smartacme core
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
(e.g., Express).
|
|
3
|
+
## Goal
|
|
4
|
+
- Pull the interest coordination mechanism out of the ICertManager implementations and into the SmartAcme class.
|
|
6
5
|
|
|
7
|
-
##
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
6
|
+
## Steps
|
|
7
|
+
1. Remove `interestMap` from `ICertManager` interface (`ts/interfaces/certmanager.ts`) and its import of `InterestMap`.
|
|
8
|
+
2. Strip out `interestMap` property, initialization, and usage from `MemoryCertManager` and `MongoCertManager` (`ts/certmanagers/*.ts`).
|
|
9
|
+
3. In `Smartacme` class (`ts/smartacme.classes.smartacme.ts`):
|
|
10
|
+
- Add a private `interestMap: plugins.lik.InterestMap<string, SmartacmeCert>` property.
|
|
11
|
+
- Initialize it in the constructor: `this.interestMap = new plugins.lik.InterestMap((domain) => domain);`.
|
|
12
|
+
- Update `getCertificateForDomain()` and any other consumers to reference `this.interestMap` instead of `this.certmanager.interestMap`.
|
|
13
|
+
4. Remove any tests or code that reference the old `interestMap` on `ICertManager` (if any).
|
|
14
|
+
5. Run CI (`pnpm build` and `pnpm test`) and fix any regressions.
|
|
16
15
|
|
|
17
|
-
|
|
18
|
-
- Create `ts/handlers/Http01MemoryHandler.ts`:
|
|
19
|
-
- Implement `IChallengeHandler<{ token: string; keyAuthorization: string; webPath: string }>`, storing challenges in a private `Map<string, string>`.
|
|
20
|
-
- `prepare()`: add token→keyAuthorization mapping.
|
|
21
|
-
- `verify()`: no-op.
|
|
22
|
-
- `cleanup()`: remove mapping.
|
|
23
|
-
- Add `handleRequest(req, res, next?)` method:
|
|
24
|
-
- Parse `/.well-known/acme-challenge/:token` from `req.url`.
|
|
25
|
-
- If token exists, respond with the key authorization and status 200.
|
|
26
|
-
- If missing and `next` provided, call `next()`, otherwise respond 404.
|
|
27
|
-
- Export `Http01MemoryHandler` in `ts/handlers/index.ts`.
|
|
28
|
-
|
|
29
|
-
## 3. Write tests for Http01MemoryHandler
|
|
30
|
-
- Create `test/test.handlers-http01-memory.ts`:
|
|
31
|
-
- Use `tap` and `expect` to:
|
|
32
|
-
1. `prepare()` a challenge.
|
|
33
|
-
2. Invoke `handleRequest()` with a fake `req`/`res` to confirm 200 and correct body.
|
|
34
|
-
3. `cleanup()` the challenge.
|
|
35
|
-
4. Confirm `handleRequest()` now yields 404.
|
|
36
|
-
|
|
37
|
-
## 4. Update documentation
|
|
38
|
-
- Add examples in `readme.md` showing how to use both `Http01Webroot` and the new `Http01MemoryHandler`:
|
|
39
|
-
- Sample code for Express integration using `handleRequest`.
|
|
40
|
-
|
|
41
|
-
## 5. Build and test
|
|
42
|
-
- Run `pnpm build` and `pnpm test`, ensuring existing tests are updated for `Http01Webroot` and new tests pass.
|
|
43
|
-
|
|
44
|
-
Please review and let me know if this plan makes sense before proceeding with implementation.
|
|
16
|
+
Please review and confirm before we begin the refactor.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import * as plugins from '../smartacme.plugins.js';
|
|
2
|
+
import type { ICertManager } from '../interfaces/certmanager.js';
|
|
3
|
+
import { SmartacmeCert } from '../smartacme.classes.cert.js';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* In-memory certificate manager for mongoless mode.
|
|
7
|
+
* Stores certificates in memory only and does not connect to MongoDB.
|
|
8
|
+
*/
|
|
9
|
+
export class MemoryCertManager implements ICertManager {
|
|
10
|
+
private certs: Map<string, SmartacmeCert> = new Map();
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
public async init(): Promise<void> {
|
|
14
|
+
// no-op for in-memory store
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
public async retrieveCertificate(domainName: string): Promise<SmartacmeCert | null> {
|
|
18
|
+
return this.certs.get(domainName) ?? null;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
public async storeCertificate(cert: SmartacmeCert): Promise<void> {
|
|
22
|
+
this.certs.set(cert.domainName, cert);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
public async deleteCertificate(domainName: string): Promise<void> {
|
|
26
|
+
this.certs.delete(domainName);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
public async close(): Promise<void> {
|
|
30
|
+
// no-op
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Wipe all certificates from the in-memory store (for testing)
|
|
34
|
+
*/
|
|
35
|
+
public async wipe(): Promise<void> {
|
|
36
|
+
this.certs.clear();
|
|
37
|
+
}
|
|
38
|
+
}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import * as plugins from '../smartacme.plugins.js';
|
|
2
|
+
import type { ICertManager } from '../interfaces/certmanager.js';
|
|
3
|
+
import { SmartacmeCert } from '../smartacme.classes.cert.js';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* MongoDB-backed certificate manager using EasyStore from smartdata.
|
|
7
|
+
*/
|
|
8
|
+
export class MongoCertManager implements ICertManager {
|
|
9
|
+
private db: plugins.smartdata.SmartdataDb;
|
|
10
|
+
private store: plugins.smartdata.EasyStore<Record<string, any>>;
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* @param mongoDescriptor MongoDB connection settings
|
|
14
|
+
*/
|
|
15
|
+
constructor(mongoDescriptor: plugins.smartdata.IMongoDescriptor) {
|
|
16
|
+
this.db = new plugins.smartdata.SmartdataDb(mongoDescriptor);
|
|
17
|
+
// Use a single EasyStore document to hold all certs keyed by domainName
|
|
18
|
+
this.store = new plugins.smartdata.EasyStore<Record<string, any>>(
|
|
19
|
+
'smartacme-certs',
|
|
20
|
+
this.db,
|
|
21
|
+
);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
public async init(): Promise<void> {
|
|
25
|
+
await this.db.init();
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
public async retrieveCertificate(domainName: string): Promise<SmartacmeCert | null> {
|
|
29
|
+
const data = await this.store.readKey(domainName);
|
|
30
|
+
return data ? new SmartacmeCert(data) : null;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
public async storeCertificate(cert: SmartacmeCert): Promise<void> {
|
|
34
|
+
// write plain object for persistence
|
|
35
|
+
await this.store.writeKey(cert.domainName, { ...cert });
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
public async deleteCertificate(domainName: string): Promise<void> {
|
|
39
|
+
await this.store.deleteKey(domainName);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
public async close(): Promise<void> {
|
|
43
|
+
await this.db.close();
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Wipe all certificates from the persistent store (for integration testing)
|
|
47
|
+
*/
|
|
48
|
+
public async wipe(): Promise<void> {
|
|
49
|
+
// clear all keys in the easy store
|
|
50
|
+
await this.store.wipe();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
@@ -23,14 +23,6 @@ export class Dns01Handler implements IChallengeHandler<plugins.tsclass.network.I
|
|
|
23
23
|
public async prepare(ch: plugins.tsclass.network.IDnsChallenge): Promise<void> {
|
|
24
24
|
// set DNS TXT record
|
|
25
25
|
await this.cf.convenience.acmeSetDnsChallenge(ch);
|
|
26
|
-
// wait for DNS propagation
|
|
27
|
-
await this.smartdns.checkUntilAvailable(
|
|
28
|
-
ch.hostName,
|
|
29
|
-
'TXT',
|
|
30
|
-
ch.challenge,
|
|
31
|
-
100,
|
|
32
|
-
5000,
|
|
33
|
-
);
|
|
34
26
|
}
|
|
35
27
|
|
|
36
28
|
public async cleanup(ch: plugins.tsclass.network.IDnsChallenge): Promise<void> {
|
package/ts/index.ts
CHANGED
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import type { SmartacmeCert } from '../smartacme.classes.cert.js';
|
|
2
|
+
|
|
3
|
+
// (ICertRecord removed; use SmartacmeCert directly)
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Interface for certificate storage managers.
|
|
7
|
+
* Users can implement this to provide custom persistence (in-memory,
|
|
8
|
+
* file-based, Redis, etc.).
|
|
9
|
+
*/
|
|
10
|
+
export interface ICertManager {
|
|
11
|
+
/**
|
|
12
|
+
* Initialize the store (e.g., connect to database).
|
|
13
|
+
*/
|
|
14
|
+
init(): Promise<void>;
|
|
15
|
+
/**
|
|
16
|
+
* Retrieve a certificate record by domain name.
|
|
17
|
+
* Returns null if none found.
|
|
18
|
+
*/
|
|
19
|
+
retrieveCertificate(domainName: string): Promise<SmartacmeCert | null>;
|
|
20
|
+
/**
|
|
21
|
+
* Store a certificate record. Fulfills any pending interests.
|
|
22
|
+
*/
|
|
23
|
+
storeCertificate(cert: SmartacmeCert): Promise<void>;
|
|
24
|
+
/**
|
|
25
|
+
* Delete a certificate record by domain name.
|
|
26
|
+
*/
|
|
27
|
+
deleteCertificate(domainName: string): Promise<void>;
|
|
28
|
+
/**
|
|
29
|
+
* Close the store (e.g., disconnect database).
|
|
30
|
+
*/
|
|
31
|
+
close(): Promise<void>;
|
|
32
|
+
/**
|
|
33
|
+
* Optional: wipe all stored certificates (e.g., for integration testing)
|
|
34
|
+
*/
|
|
35
|
+
wipe(): Promise<void>;
|
|
36
|
+
}
|
|
@@ -1,64 +1,39 @@
|
|
|
1
1
|
import * as plugins from './smartacme.plugins.js';
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
import { Collection, svDb, unI } from '@push.rocks/smartdata';
|
|
8
|
-
|
|
9
|
-
@plugins.smartdata.Collection(() => {
|
|
10
|
-
return SmartacmeCertManager.activeDB;
|
|
11
|
-
})
|
|
12
|
-
export class SmartacmeCert
|
|
13
|
-
extends plugins.smartdata.SmartDataDbDoc<SmartacmeCert, plugins.tsclass.network.ICert>
|
|
14
|
-
implements plugins.tsclass.network.ICert
|
|
15
|
-
{
|
|
16
|
-
@unI()
|
|
3
|
+
/**
|
|
4
|
+
* Plain certificate record.
|
|
5
|
+
*/
|
|
6
|
+
export class SmartacmeCert {
|
|
17
7
|
public id: string;
|
|
18
|
-
|
|
19
|
-
@svDb()
|
|
20
8
|
public domainName: string;
|
|
21
|
-
|
|
22
|
-
@svDb()
|
|
23
9
|
public created: number;
|
|
24
|
-
|
|
25
|
-
@svDb()
|
|
26
10
|
public privateKey: string;
|
|
27
|
-
|
|
28
|
-
@svDb()
|
|
29
11
|
public publicKey: string;
|
|
30
|
-
|
|
31
|
-
@svDb()
|
|
32
12
|
public csr: string;
|
|
33
|
-
|
|
34
|
-
@svDb()
|
|
35
13
|
public validUntil: number;
|
|
36
14
|
|
|
15
|
+
constructor(data: Partial<SmartacmeCert> = {}) {
|
|
16
|
+
this.id = data.id || '';
|
|
17
|
+
this.domainName = data.domainName || '';
|
|
18
|
+
this.created = data.created || Date.now();
|
|
19
|
+
this.privateKey = data.privateKey || '';
|
|
20
|
+
this.publicKey = data.publicKey || '';
|
|
21
|
+
this.csr = data.csr || '';
|
|
22
|
+
this.validUntil = data.validUntil || 0;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Check if certificate is still valid.
|
|
27
|
+
*/
|
|
37
28
|
public isStillValid(): boolean {
|
|
38
29
|
return this.validUntil >= Date.now();
|
|
39
30
|
}
|
|
40
31
|
|
|
32
|
+
/**
|
|
33
|
+
* Check if certificate needs renewal (e.g., expires in <10 days).
|
|
34
|
+
*/
|
|
41
35
|
public shouldBeRenewed(): boolean {
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
plugins.smarttime.getMilliSecondsFromUnits({
|
|
45
|
-
days: 10,
|
|
46
|
-
});
|
|
47
|
-
return !(this.validUntil >= shouldBeValidAtLeastUntil);
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
public update(certDataArg: plugins.tsclass.network.ICert) {
|
|
51
|
-
Object.keys(certDataArg).forEach((key) => {
|
|
52
|
-
this[key] = certDataArg[key];
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
constructor(optionsArg: plugins.tsclass.network.ICert) {
|
|
57
|
-
super();
|
|
58
|
-
if (optionsArg) {
|
|
59
|
-
Object.keys(optionsArg).forEach((key) => {
|
|
60
|
-
this[key] = optionsArg[key];
|
|
61
|
-
});
|
|
62
|
-
}
|
|
36
|
+
const threshold = Date.now() + plugins.smarttime.getMilliSecondsFromUnits({ days: 10 });
|
|
37
|
+
return this.validUntil < threshold;
|
|
63
38
|
}
|
|
64
39
|
}
|