@push.rocks/smartproxy 18.1.0 → 19.0.0
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/certificate/certificate-manager.d.ts +150 -0
- package/dist_ts/certificate/certificate-manager.js +505 -0
- package/dist_ts/certificate/events/simplified-events.d.ts +56 -0
- package/dist_ts/certificate/events/simplified-events.js +13 -0
- package/dist_ts/certificate/models/certificate-errors.d.ts +69 -0
- package/dist_ts/certificate/models/certificate-errors.js +141 -0
- package/dist_ts/certificate/models/certificate-strategy.d.ts +60 -0
- package/dist_ts/certificate/models/certificate-strategy.js +73 -0
- package/dist_ts/certificate/simplified-certificate-manager.d.ts +150 -0
- package/dist_ts/certificate/simplified-certificate-manager.js +501 -0
- package/dist_ts/common/eventUtils.d.ts +1 -2
- package/dist_ts/common/eventUtils.js +2 -1
- package/dist_ts/core/models/common-types.d.ts +1 -1
- package/dist_ts/core/models/common-types.js +1 -1
- package/dist_ts/core/utils/event-utils.d.ts +9 -9
- package/dist_ts/core/utils/event-utils.js +6 -14
- package/dist_ts/http/index.d.ts +1 -9
- package/dist_ts/http/index.js +5 -11
- package/dist_ts/http/models/http-types.d.ts +13 -1
- package/dist_ts/http/models/http-types.js +1 -1
- package/dist_ts/index.d.ts +4 -6
- package/dist_ts/index.js +4 -10
- package/dist_ts/plugins.d.ts +3 -1
- package/dist_ts/plugins.js +4 -2
- package/dist_ts/proxies/index.d.ts +3 -2
- package/dist_ts/proxies/index.js +4 -5
- package/dist_ts/proxies/network-proxy/certificate-manager.d.ts +31 -49
- package/dist_ts/proxies/network-proxy/certificate-manager.js +77 -374
- package/dist_ts/proxies/network-proxy/models/types.d.ts +12 -1
- package/dist_ts/proxies/network-proxy/models/types.js +1 -1
- package/dist_ts/proxies/network-proxy/network-proxy.d.ts +2 -7
- package/dist_ts/proxies/network-proxy/network-proxy.js +12 -19
- package/dist_ts/proxies/network-proxy/simplified-certificate-bridge.d.ts +48 -0
- package/dist_ts/proxies/network-proxy/simplified-certificate-bridge.js +76 -0
- package/dist_ts/proxies/network-proxy/websocket-handler.js +21 -7
- package/dist_ts/proxies/smart-proxy/cert-store.d.ts +10 -0
- package/dist_ts/proxies/smart-proxy/cert-store.js +70 -0
- package/dist_ts/proxies/smart-proxy/certificate-manager.d.ts +116 -0
- package/dist_ts/proxies/smart-proxy/certificate-manager.js +401 -0
- package/dist_ts/proxies/smart-proxy/legacy-smart-proxy.d.ts +168 -0
- package/dist_ts/proxies/smart-proxy/legacy-smart-proxy.js +642 -0
- package/dist_ts/proxies/smart-proxy/models/index.d.ts +1 -1
- package/dist_ts/proxies/smart-proxy/models/index.js +1 -5
- package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +13 -1
- package/dist_ts/proxies/smart-proxy/models/route-types.d.ts +26 -0
- package/dist_ts/proxies/smart-proxy/models/route-types.js +1 -1
- package/dist_ts/proxies/smart-proxy/models/simplified-smartproxy-config.d.ts +65 -0
- package/dist_ts/proxies/smart-proxy/models/simplified-smartproxy-config.js +31 -0
- package/dist_ts/proxies/smart-proxy/models/smartproxy-options.d.ts +102 -0
- package/dist_ts/proxies/smart-proxy/models/smartproxy-options.js +73 -0
- package/dist_ts/proxies/smart-proxy/network-proxy-bridge.d.ts +10 -44
- package/dist_ts/proxies/smart-proxy/network-proxy-bridge.js +66 -202
- package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +4 -0
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +62 -2
- package/dist_ts/proxies/smart-proxy/simplified-smart-proxy.d.ts +41 -0
- package/dist_ts/proxies/smart-proxy/simplified-smart-proxy.js +132 -0
- package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +18 -13
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +80 -198
- package/package.json +5 -3
- package/readme.md +13 -5
- package/readme.plan.md +1422 -617
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/common/eventUtils.ts +2 -2
- package/ts/core/models/common-types.ts +1 -1
- package/ts/core/utils/event-utils.ts +12 -21
- package/ts/http/index.ts +5 -12
- package/ts/http/models/http-types.ts +8 -4
- package/ts/index.ts +11 -14
- package/ts/plugins.ts +4 -1
- package/ts/proxies/index.ts +7 -4
- package/ts/proxies/network-proxy/certificate-manager.ts +92 -417
- package/ts/proxies/network-proxy/models/types.ts +14 -2
- package/ts/proxies/network-proxy/network-proxy.ts +13 -19
- package/ts/proxies/network-proxy/websocket-handler.ts +18 -6
- package/ts/proxies/smart-proxy/cert-store.ts +86 -0
- package/ts/proxies/smart-proxy/certificate-manager.ts +506 -0
- package/ts/proxies/smart-proxy/models/index.ts +2 -1
- package/ts/proxies/smart-proxy/models/interfaces.ts +14 -1
- package/ts/proxies/smart-proxy/models/route-types.ts +34 -4
- package/ts/proxies/smart-proxy/network-proxy-bridge.ts +86 -239
- package/ts/proxies/smart-proxy/route-connection-handler.ts +74 -1
- package/ts/proxies/smart-proxy/smart-proxy.ts +106 -224
- package/ts/certificate/acme/acme-factory.ts +0 -48
- package/ts/certificate/acme/challenge-handler.ts +0 -110
- package/ts/certificate/acme/index.ts +0 -3
- package/ts/certificate/events/certificate-events.ts +0 -36
- package/ts/certificate/index.ts +0 -75
- package/ts/certificate/models/certificate-types.ts +0 -109
- package/ts/certificate/providers/cert-provisioner.ts +0 -519
- package/ts/certificate/providers/index.ts +0 -3
- package/ts/certificate/storage/file-storage.ts +0 -234
- package/ts/certificate/storage/index.ts +0 -3
- package/ts/certificate/utils/certificate-helpers.ts +0 -50
- package/ts/http/port80/acme-interfaces.ts +0 -169
- package/ts/http/port80/challenge-responder.ts +0 -246
- package/ts/http/port80/index.ts +0 -13
- package/ts/http/port80/port80-handler.ts +0 -728
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
import { NetworkProxy } from '../network-proxy/index.js';
|
|
2
|
+
import type { IRouteConfig } from './models/route-types.js';
|
|
3
|
+
export interface ICertStatus {
|
|
4
|
+
domain: string;
|
|
5
|
+
status: 'valid' | 'pending' | 'expired' | 'error';
|
|
6
|
+
expiryDate?: Date;
|
|
7
|
+
issueDate?: Date;
|
|
8
|
+
source: 'static' | 'acme';
|
|
9
|
+
error?: string;
|
|
10
|
+
}
|
|
11
|
+
export interface ICertificateData {
|
|
12
|
+
cert: string;
|
|
13
|
+
key: string;
|
|
14
|
+
ca?: string;
|
|
15
|
+
expiryDate: Date;
|
|
16
|
+
issueDate: Date;
|
|
17
|
+
}
|
|
18
|
+
export declare class SmartCertManager {
|
|
19
|
+
private routes;
|
|
20
|
+
private certDir;
|
|
21
|
+
private acmeOptions?;
|
|
22
|
+
private certStore;
|
|
23
|
+
private smartAcme;
|
|
24
|
+
private networkProxy;
|
|
25
|
+
private renewalTimer;
|
|
26
|
+
private pendingChallenges;
|
|
27
|
+
private challengeRoute;
|
|
28
|
+
private certStatus;
|
|
29
|
+
private updateRoutesCallback?;
|
|
30
|
+
constructor(routes: IRouteConfig[], certDir?: string, acmeOptions?: {
|
|
31
|
+
email?: string;
|
|
32
|
+
useProduction?: boolean;
|
|
33
|
+
port?: number;
|
|
34
|
+
});
|
|
35
|
+
setNetworkProxy(networkProxy: NetworkProxy): void;
|
|
36
|
+
/**
|
|
37
|
+
* Set callback for updating routes (used for challenge routes)
|
|
38
|
+
*/
|
|
39
|
+
setUpdateRoutesCallback(callback: (routes: IRouteConfig[]) => Promise<void>): void;
|
|
40
|
+
/**
|
|
41
|
+
* Initialize certificate manager and provision certificates for all routes
|
|
42
|
+
*/
|
|
43
|
+
initialize(): Promise<void>;
|
|
44
|
+
/**
|
|
45
|
+
* Provision certificates for all routes that need them
|
|
46
|
+
*/
|
|
47
|
+
private provisionAllCertificates;
|
|
48
|
+
/**
|
|
49
|
+
* Provision certificate for a single route
|
|
50
|
+
*/
|
|
51
|
+
provisionCertificate(route: IRouteConfig): Promise<void>;
|
|
52
|
+
/**
|
|
53
|
+
* Provision ACME certificate
|
|
54
|
+
*/
|
|
55
|
+
private provisionAcmeCertificate;
|
|
56
|
+
/**
|
|
57
|
+
* Provision static certificate
|
|
58
|
+
*/
|
|
59
|
+
private provisionStaticCertificate;
|
|
60
|
+
/**
|
|
61
|
+
* Apply certificate to NetworkProxy
|
|
62
|
+
*/
|
|
63
|
+
private applyCertificate;
|
|
64
|
+
/**
|
|
65
|
+
* Extract domains from route configuration
|
|
66
|
+
*/
|
|
67
|
+
private extractDomainsFromRoute;
|
|
68
|
+
/**
|
|
69
|
+
* Check if certificate is valid
|
|
70
|
+
*/
|
|
71
|
+
private isCertificateValid;
|
|
72
|
+
/**
|
|
73
|
+
* Add challenge route to SmartProxy
|
|
74
|
+
*/
|
|
75
|
+
private addChallengeRoute;
|
|
76
|
+
/**
|
|
77
|
+
* Remove challenge route from SmartProxy
|
|
78
|
+
*/
|
|
79
|
+
private removeChallengeRoute;
|
|
80
|
+
/**
|
|
81
|
+
* Start renewal timer
|
|
82
|
+
*/
|
|
83
|
+
private startRenewalTimer;
|
|
84
|
+
/**
|
|
85
|
+
* Check and renew certificates that are expiring
|
|
86
|
+
*/
|
|
87
|
+
private checkAndRenewCertificates;
|
|
88
|
+
/**
|
|
89
|
+
* Update certificate status
|
|
90
|
+
*/
|
|
91
|
+
private updateCertStatus;
|
|
92
|
+
/**
|
|
93
|
+
* Get certificate status for a route
|
|
94
|
+
*/
|
|
95
|
+
getCertificateStatus(routeName: string): ICertStatus | undefined;
|
|
96
|
+
/**
|
|
97
|
+
* Force renewal of a certificate
|
|
98
|
+
*/
|
|
99
|
+
renewCertificate(routeName: string): Promise<void>;
|
|
100
|
+
/**
|
|
101
|
+
* Setup challenge handler integration with SmartProxy routing
|
|
102
|
+
*/
|
|
103
|
+
private setupChallengeHandler;
|
|
104
|
+
/**
|
|
105
|
+
* Stop certificate manager
|
|
106
|
+
*/
|
|
107
|
+
stop(): Promise<void>;
|
|
108
|
+
/**
|
|
109
|
+
* Get ACME options (for recreating after route updates)
|
|
110
|
+
*/
|
|
111
|
+
getAcmeOptions(): {
|
|
112
|
+
email?: string;
|
|
113
|
+
useProduction?: boolean;
|
|
114
|
+
port?: number;
|
|
115
|
+
} | undefined;
|
|
116
|
+
}
|
|
@@ -0,0 +1,401 @@
|
|
|
1
|
+
import * as plugins from '../../plugins.js';
|
|
2
|
+
import { NetworkProxy } from '../network-proxy/index.js';
|
|
3
|
+
import { CertStore } from './cert-store.js';
|
|
4
|
+
export class SmartCertManager {
|
|
5
|
+
constructor(routes, certDir = './certs', acmeOptions) {
|
|
6
|
+
this.routes = routes;
|
|
7
|
+
this.certDir = certDir;
|
|
8
|
+
this.acmeOptions = acmeOptions;
|
|
9
|
+
this.smartAcme = null;
|
|
10
|
+
this.networkProxy = null;
|
|
11
|
+
this.renewalTimer = null;
|
|
12
|
+
this.pendingChallenges = new Map();
|
|
13
|
+
this.challengeRoute = null;
|
|
14
|
+
// Track certificate status by route name
|
|
15
|
+
this.certStatus = new Map();
|
|
16
|
+
this.certStore = new CertStore(certDir);
|
|
17
|
+
}
|
|
18
|
+
setNetworkProxy(networkProxy) {
|
|
19
|
+
this.networkProxy = networkProxy;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Set callback for updating routes (used for challenge routes)
|
|
23
|
+
*/
|
|
24
|
+
setUpdateRoutesCallback(callback) {
|
|
25
|
+
this.updateRoutesCallback = callback;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Initialize certificate manager and provision certificates for all routes
|
|
29
|
+
*/
|
|
30
|
+
async initialize() {
|
|
31
|
+
// Create certificate directory if it doesn't exist
|
|
32
|
+
await this.certStore.initialize();
|
|
33
|
+
// Initialize SmartAcme if we have any ACME routes
|
|
34
|
+
const hasAcmeRoutes = this.routes.some(r => r.action.tls?.certificate === 'auto');
|
|
35
|
+
if (hasAcmeRoutes && this.acmeOptions?.email) {
|
|
36
|
+
// Create HTTP-01 challenge handler
|
|
37
|
+
const http01Handler = new plugins.smartacme.handlers.Http01MemoryHandler();
|
|
38
|
+
// Set up challenge handler integration with our routing
|
|
39
|
+
this.setupChallengeHandler(http01Handler);
|
|
40
|
+
// Create SmartAcme instance with built-in MemoryCertManager and HTTP-01 handler
|
|
41
|
+
this.smartAcme = new plugins.smartacme.SmartAcme({
|
|
42
|
+
accountEmail: this.acmeOptions.email,
|
|
43
|
+
environment: this.acmeOptions.useProduction ? 'production' : 'integration',
|
|
44
|
+
certManager: new plugins.smartacme.certmanagers.MemoryCertManager(),
|
|
45
|
+
challengeHandlers: [http01Handler]
|
|
46
|
+
});
|
|
47
|
+
await this.smartAcme.start();
|
|
48
|
+
}
|
|
49
|
+
// Provision certificates for all routes
|
|
50
|
+
await this.provisionAllCertificates();
|
|
51
|
+
// Start renewal timer
|
|
52
|
+
this.startRenewalTimer();
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Provision certificates for all routes that need them
|
|
56
|
+
*/
|
|
57
|
+
async provisionAllCertificates() {
|
|
58
|
+
const certRoutes = this.routes.filter(r => r.action.tls?.mode === 'terminate' ||
|
|
59
|
+
r.action.tls?.mode === 'terminate-and-reencrypt');
|
|
60
|
+
for (const route of certRoutes) {
|
|
61
|
+
try {
|
|
62
|
+
await this.provisionCertificate(route);
|
|
63
|
+
}
|
|
64
|
+
catch (error) {
|
|
65
|
+
console.error(`Failed to provision certificate for route ${route.name}: ${error}`);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Provision certificate for a single route
|
|
71
|
+
*/
|
|
72
|
+
async provisionCertificate(route) {
|
|
73
|
+
const tls = route.action.tls;
|
|
74
|
+
if (!tls || (tls.mode !== 'terminate' && tls.mode !== 'terminate-and-reencrypt')) {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
const domains = this.extractDomainsFromRoute(route);
|
|
78
|
+
if (domains.length === 0) {
|
|
79
|
+
console.warn(`Route ${route.name} has TLS termination but no domains`);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
const primaryDomain = domains[0];
|
|
83
|
+
if (tls.certificate === 'auto') {
|
|
84
|
+
// ACME certificate
|
|
85
|
+
await this.provisionAcmeCertificate(route, domains);
|
|
86
|
+
}
|
|
87
|
+
else if (typeof tls.certificate === 'object') {
|
|
88
|
+
// Static certificate
|
|
89
|
+
await this.provisionStaticCertificate(route, primaryDomain, tls.certificate);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Provision ACME certificate
|
|
94
|
+
*/
|
|
95
|
+
async provisionAcmeCertificate(route, domains) {
|
|
96
|
+
if (!this.smartAcme) {
|
|
97
|
+
throw new Error('SmartAcme not initialized');
|
|
98
|
+
}
|
|
99
|
+
const primaryDomain = domains[0];
|
|
100
|
+
const routeName = route.name || primaryDomain;
|
|
101
|
+
// Check if we already have a valid certificate
|
|
102
|
+
const existingCert = await this.certStore.getCertificate(routeName);
|
|
103
|
+
if (existingCert && this.isCertificateValid(existingCert)) {
|
|
104
|
+
console.log(`Using existing valid certificate for ${primaryDomain}`);
|
|
105
|
+
await this.applyCertificate(primaryDomain, existingCert);
|
|
106
|
+
this.updateCertStatus(routeName, 'valid', 'acme', existingCert);
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
console.log(`Requesting ACME certificate for ${domains.join(', ')}`);
|
|
110
|
+
this.updateCertStatus(routeName, 'pending', 'acme');
|
|
111
|
+
try {
|
|
112
|
+
// Add challenge route before requesting certificate
|
|
113
|
+
await this.addChallengeRoute();
|
|
114
|
+
try {
|
|
115
|
+
// Use smartacme to get certificate
|
|
116
|
+
const cert = await this.smartAcme.getCertificateForDomain(primaryDomain);
|
|
117
|
+
// SmartAcme's Cert object has these properties:
|
|
118
|
+
// - publicKey: The certificate PEM string
|
|
119
|
+
// - privateKey: The private key PEM string
|
|
120
|
+
// - csr: Certificate signing request
|
|
121
|
+
// - validUntil: Timestamp in milliseconds
|
|
122
|
+
// - domainName: The domain name
|
|
123
|
+
const certData = {
|
|
124
|
+
cert: cert.publicKey,
|
|
125
|
+
key: cert.privateKey,
|
|
126
|
+
ca: cert.publicKey, // Use same as cert for now
|
|
127
|
+
expiryDate: new Date(cert.validUntil),
|
|
128
|
+
issueDate: new Date(cert.created)
|
|
129
|
+
};
|
|
130
|
+
await this.certStore.saveCertificate(routeName, certData);
|
|
131
|
+
await this.applyCertificate(primaryDomain, certData);
|
|
132
|
+
this.updateCertStatus(routeName, 'valid', 'acme', certData);
|
|
133
|
+
console.log(`Successfully provisioned ACME certificate for ${primaryDomain}`);
|
|
134
|
+
}
|
|
135
|
+
catch (error) {
|
|
136
|
+
console.error(`Failed to provision ACME certificate for ${primaryDomain}: ${error}`);
|
|
137
|
+
this.updateCertStatus(routeName, 'error', 'acme', undefined, error.message);
|
|
138
|
+
throw error;
|
|
139
|
+
}
|
|
140
|
+
finally {
|
|
141
|
+
// Always remove challenge route after provisioning
|
|
142
|
+
await this.removeChallengeRoute();
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
catch (error) {
|
|
146
|
+
// Handle outer try-catch from adding challenge route
|
|
147
|
+
console.error(`Failed to setup ACME challenge for ${primaryDomain}: ${error}`);
|
|
148
|
+
this.updateCertStatus(routeName, 'error', 'acme', undefined, error.message);
|
|
149
|
+
throw error;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
/**
|
|
153
|
+
* Provision static certificate
|
|
154
|
+
*/
|
|
155
|
+
async provisionStaticCertificate(route, domain, certConfig) {
|
|
156
|
+
const routeName = route.name || domain;
|
|
157
|
+
try {
|
|
158
|
+
let key = certConfig.key;
|
|
159
|
+
let cert = certConfig.cert;
|
|
160
|
+
// Load from files if paths are provided
|
|
161
|
+
if (certConfig.keyFile) {
|
|
162
|
+
const keyFile = await plugins.smartfile.SmartFile.fromFilePath(certConfig.keyFile);
|
|
163
|
+
key = keyFile.contents.toString();
|
|
164
|
+
}
|
|
165
|
+
if (certConfig.certFile) {
|
|
166
|
+
const certFile = await plugins.smartfile.SmartFile.fromFilePath(certConfig.certFile);
|
|
167
|
+
cert = certFile.contents.toString();
|
|
168
|
+
}
|
|
169
|
+
// Parse certificate to get dates
|
|
170
|
+
// Parse certificate to get dates - for now just use defaults
|
|
171
|
+
// TODO: Implement actual certificate parsing if needed
|
|
172
|
+
const certInfo = { validTo: new Date(Date.now() + 90 * 24 * 60 * 60 * 1000), validFrom: new Date() };
|
|
173
|
+
const certData = {
|
|
174
|
+
cert,
|
|
175
|
+
key,
|
|
176
|
+
expiryDate: certInfo.validTo,
|
|
177
|
+
issueDate: certInfo.validFrom
|
|
178
|
+
};
|
|
179
|
+
// Save to store for consistency
|
|
180
|
+
await this.certStore.saveCertificate(routeName, certData);
|
|
181
|
+
await this.applyCertificate(domain, certData);
|
|
182
|
+
this.updateCertStatus(routeName, 'valid', 'static', certData);
|
|
183
|
+
console.log(`Successfully loaded static certificate for ${domain}`);
|
|
184
|
+
}
|
|
185
|
+
catch (error) {
|
|
186
|
+
console.error(`Failed to provision static certificate for ${domain}: ${error}`);
|
|
187
|
+
this.updateCertStatus(routeName, 'error', 'static', undefined, error.message);
|
|
188
|
+
throw error;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
/**
|
|
192
|
+
* Apply certificate to NetworkProxy
|
|
193
|
+
*/
|
|
194
|
+
async applyCertificate(domain, certData) {
|
|
195
|
+
if (!this.networkProxy) {
|
|
196
|
+
console.warn('NetworkProxy not set, cannot apply certificate');
|
|
197
|
+
return;
|
|
198
|
+
}
|
|
199
|
+
// Apply certificate to NetworkProxy
|
|
200
|
+
this.networkProxy.updateCertificate(domain, certData.cert, certData.key);
|
|
201
|
+
// Also apply for wildcard if it's a subdomain
|
|
202
|
+
if (domain.includes('.') && !domain.startsWith('*.')) {
|
|
203
|
+
const parts = domain.split('.');
|
|
204
|
+
if (parts.length >= 2) {
|
|
205
|
+
const wildcardDomain = `*.${parts.slice(-2).join('.')}`;
|
|
206
|
+
this.networkProxy.updateCertificate(wildcardDomain, certData.cert, certData.key);
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
/**
|
|
211
|
+
* Extract domains from route configuration
|
|
212
|
+
*/
|
|
213
|
+
extractDomainsFromRoute(route) {
|
|
214
|
+
if (!route.match.domains) {
|
|
215
|
+
return [];
|
|
216
|
+
}
|
|
217
|
+
const domains = Array.isArray(route.match.domains)
|
|
218
|
+
? route.match.domains
|
|
219
|
+
: [route.match.domains];
|
|
220
|
+
// Filter out wildcards and patterns
|
|
221
|
+
return domains.filter(d => !d.includes('*') &&
|
|
222
|
+
!d.includes('{') &&
|
|
223
|
+
d.includes('.'));
|
|
224
|
+
}
|
|
225
|
+
/**
|
|
226
|
+
* Check if certificate is valid
|
|
227
|
+
*/
|
|
228
|
+
isCertificateValid(cert) {
|
|
229
|
+
const now = new Date();
|
|
230
|
+
const expiryThreshold = new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000); // 30 days
|
|
231
|
+
return cert.expiryDate > expiryThreshold;
|
|
232
|
+
}
|
|
233
|
+
/**
|
|
234
|
+
* Add challenge route to SmartProxy
|
|
235
|
+
*/
|
|
236
|
+
async addChallengeRoute() {
|
|
237
|
+
if (!this.updateRoutesCallback) {
|
|
238
|
+
throw new Error('No route update callback set');
|
|
239
|
+
}
|
|
240
|
+
if (!this.challengeRoute) {
|
|
241
|
+
throw new Error('Challenge route not initialized');
|
|
242
|
+
}
|
|
243
|
+
const challengeRoute = this.challengeRoute;
|
|
244
|
+
const updatedRoutes = [...this.routes, challengeRoute];
|
|
245
|
+
await this.updateRoutesCallback(updatedRoutes);
|
|
246
|
+
}
|
|
247
|
+
/**
|
|
248
|
+
* Remove challenge route from SmartProxy
|
|
249
|
+
*/
|
|
250
|
+
async removeChallengeRoute() {
|
|
251
|
+
if (!this.updateRoutesCallback) {
|
|
252
|
+
return;
|
|
253
|
+
}
|
|
254
|
+
const filteredRoutes = this.routes.filter(r => r.name !== 'acme-challenge');
|
|
255
|
+
await this.updateRoutesCallback(filteredRoutes);
|
|
256
|
+
}
|
|
257
|
+
/**
|
|
258
|
+
* Start renewal timer
|
|
259
|
+
*/
|
|
260
|
+
startRenewalTimer() {
|
|
261
|
+
// Check for renewals every 12 hours
|
|
262
|
+
this.renewalTimer = setInterval(() => {
|
|
263
|
+
this.checkAndRenewCertificates();
|
|
264
|
+
}, 12 * 60 * 60 * 1000);
|
|
265
|
+
// Also do an immediate check
|
|
266
|
+
this.checkAndRenewCertificates();
|
|
267
|
+
}
|
|
268
|
+
/**
|
|
269
|
+
* Check and renew certificates that are expiring
|
|
270
|
+
*/
|
|
271
|
+
async checkAndRenewCertificates() {
|
|
272
|
+
for (const route of this.routes) {
|
|
273
|
+
if (route.action.tls?.certificate === 'auto') {
|
|
274
|
+
const routeName = route.name || this.extractDomainsFromRoute(route)[0];
|
|
275
|
+
const cert = await this.certStore.getCertificate(routeName);
|
|
276
|
+
if (cert && !this.isCertificateValid(cert)) {
|
|
277
|
+
console.log(`Certificate for ${routeName} needs renewal`);
|
|
278
|
+
try {
|
|
279
|
+
await this.provisionCertificate(route);
|
|
280
|
+
}
|
|
281
|
+
catch (error) {
|
|
282
|
+
console.error(`Failed to renew certificate for ${routeName}: ${error}`);
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
/**
|
|
289
|
+
* Update certificate status
|
|
290
|
+
*/
|
|
291
|
+
updateCertStatus(routeName, status, source, certData, error) {
|
|
292
|
+
this.certStatus.set(routeName, {
|
|
293
|
+
domain: routeName,
|
|
294
|
+
status,
|
|
295
|
+
source,
|
|
296
|
+
expiryDate: certData?.expiryDate,
|
|
297
|
+
issueDate: certData?.issueDate,
|
|
298
|
+
error
|
|
299
|
+
});
|
|
300
|
+
}
|
|
301
|
+
/**
|
|
302
|
+
* Get certificate status for a route
|
|
303
|
+
*/
|
|
304
|
+
getCertificateStatus(routeName) {
|
|
305
|
+
return this.certStatus.get(routeName);
|
|
306
|
+
}
|
|
307
|
+
/**
|
|
308
|
+
* Force renewal of a certificate
|
|
309
|
+
*/
|
|
310
|
+
async renewCertificate(routeName) {
|
|
311
|
+
const route = this.routes.find(r => r.name === routeName);
|
|
312
|
+
if (!route) {
|
|
313
|
+
throw new Error(`Route ${routeName} not found`);
|
|
314
|
+
}
|
|
315
|
+
// Remove existing certificate to force renewal
|
|
316
|
+
await this.certStore.deleteCertificate(routeName);
|
|
317
|
+
await this.provisionCertificate(route);
|
|
318
|
+
}
|
|
319
|
+
/**
|
|
320
|
+
* Setup challenge handler integration with SmartProxy routing
|
|
321
|
+
*/
|
|
322
|
+
setupChallengeHandler(http01Handler) {
|
|
323
|
+
// Create a challenge route that delegates to SmartAcme's HTTP-01 handler
|
|
324
|
+
const challengeRoute = {
|
|
325
|
+
name: 'acme-challenge',
|
|
326
|
+
priority: 1000, // High priority
|
|
327
|
+
match: {
|
|
328
|
+
ports: 80,
|
|
329
|
+
path: '/.well-known/acme-challenge/*'
|
|
330
|
+
},
|
|
331
|
+
action: {
|
|
332
|
+
type: 'static',
|
|
333
|
+
handler: async (context) => {
|
|
334
|
+
// Extract the token from the path
|
|
335
|
+
const token = context.path?.split('/').pop();
|
|
336
|
+
if (!token) {
|
|
337
|
+
return { status: 404, body: 'Not found' };
|
|
338
|
+
}
|
|
339
|
+
// Create mock request/response objects for SmartAcme
|
|
340
|
+
const mockReq = {
|
|
341
|
+
url: context.path,
|
|
342
|
+
method: 'GET',
|
|
343
|
+
headers: context.headers || {}
|
|
344
|
+
};
|
|
345
|
+
let responseData = null;
|
|
346
|
+
const mockRes = {
|
|
347
|
+
statusCode: 200,
|
|
348
|
+
setHeader: (name, value) => { },
|
|
349
|
+
end: (data) => {
|
|
350
|
+
responseData = data;
|
|
351
|
+
}
|
|
352
|
+
};
|
|
353
|
+
// Use SmartAcme's handler
|
|
354
|
+
const handled = await new Promise((resolve) => {
|
|
355
|
+
http01Handler.handleRequest(mockReq, mockRes, () => {
|
|
356
|
+
resolve(false);
|
|
357
|
+
});
|
|
358
|
+
// Give it a moment to process
|
|
359
|
+
setTimeout(() => resolve(true), 100);
|
|
360
|
+
});
|
|
361
|
+
if (handled && responseData) {
|
|
362
|
+
return {
|
|
363
|
+
status: mockRes.statusCode,
|
|
364
|
+
headers: { 'Content-Type': 'text/plain' },
|
|
365
|
+
body: responseData
|
|
366
|
+
};
|
|
367
|
+
}
|
|
368
|
+
else {
|
|
369
|
+
return { status: 404, body: 'Not found' };
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
}
|
|
373
|
+
};
|
|
374
|
+
// Store the challenge route to add it when needed
|
|
375
|
+
this.challengeRoute = challengeRoute;
|
|
376
|
+
}
|
|
377
|
+
/**
|
|
378
|
+
* Stop certificate manager
|
|
379
|
+
*/
|
|
380
|
+
async stop() {
|
|
381
|
+
if (this.renewalTimer) {
|
|
382
|
+
clearInterval(this.renewalTimer);
|
|
383
|
+
this.renewalTimer = null;
|
|
384
|
+
}
|
|
385
|
+
if (this.smartAcme) {
|
|
386
|
+
await this.smartAcme.stop();
|
|
387
|
+
}
|
|
388
|
+
// Remove any active challenge routes
|
|
389
|
+
if (this.pendingChallenges.size > 0) {
|
|
390
|
+
this.pendingChallenges.clear();
|
|
391
|
+
await this.removeChallengeRoute();
|
|
392
|
+
}
|
|
393
|
+
}
|
|
394
|
+
/**
|
|
395
|
+
* Get ACME options (for recreating after route updates)
|
|
396
|
+
*/
|
|
397
|
+
getAcmeOptions() {
|
|
398
|
+
return this.acmeOptions;
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certificate-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/certificate-manager.ts"],"names":[],"mappings":"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"}
|