@push.rocks/smartproxy 18.2.0 → 19.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- 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/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/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 +10 -19
- package/dist_ts/proxies/smart-proxy/certificate-manager.d.ts +6 -0
- package/dist_ts/proxies/smart-proxy/certificate-manager.js +24 -5
- 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 +30 -1
- package/dist_ts/proxies/smart-proxy/route-manager.d.ts +4 -0
- package/dist_ts/proxies/smart-proxy/route-manager.js +7 -1
- package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +4 -0
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +112 -26
- package/package.json +1 -2
- package/readme.hints.md +31 -1
- package/readme.md +82 -6
- package/readme.plan.md +109 -1417
- 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/models/http-types.ts +8 -4
- package/ts/index.ts +11 -14
- 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 +10 -19
- package/ts/proxies/smart-proxy/certificate-manager.ts +31 -4
- package/ts/proxies/smart-proxy/models/index.ts +2 -1
- package/ts/proxies/smart-proxy/models/interfaces.ts +31 -2
- package/ts/proxies/smart-proxy/models/route-types.ts +1 -1
- package/ts/proxies/smart-proxy/route-manager.ts +7 -0
- package/ts/proxies/smart-proxy/smart-proxy.ts +142 -25
- 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
|
@@ -3,22 +3,20 @@ import * as fs from 'fs';
|
|
|
3
3
|
import * as path from 'path';
|
|
4
4
|
import { fileURLToPath } from 'url';
|
|
5
5
|
import { createLogger } from './models/types.js';
|
|
6
|
-
import { Port80Handler } from '../../http/port80/port80-handler.js';
|
|
7
|
-
import { CertificateEvents } from '../../certificate/events/certificate-events.js';
|
|
8
|
-
import { buildPort80Handler } from '../../certificate/acme/acme-factory.js';
|
|
9
|
-
import { subscribeToPort80Handler } from '../../core/utils/event-utils.js';
|
|
10
6
|
/**
|
|
11
|
-
*
|
|
7
|
+
* @deprecated This class is deprecated. Use SmartCertManager instead.
|
|
8
|
+
*
|
|
9
|
+
* This is a stub implementation that maintains backward compatibility
|
|
10
|
+
* while the functionality has been moved to SmartCertManager.
|
|
12
11
|
*/
|
|
13
12
|
export class CertificateManager {
|
|
14
13
|
constructor(options) {
|
|
15
14
|
this.options = options;
|
|
16
15
|
this.certificateCache = new Map();
|
|
17
|
-
this.port80Handler = null;
|
|
18
|
-
this.externalPort80Handler = false;
|
|
19
16
|
this.httpsServer = null;
|
|
20
17
|
this.certificateStoreDir = path.resolve(options.acme?.certificateStore || './certs');
|
|
21
18
|
this.logger = createLogger(options.logLevel || 'info');
|
|
19
|
+
this.logger.warn('CertificateManager is deprecated - use SmartCertManager instead');
|
|
22
20
|
// Ensure certificate store directory exists
|
|
23
21
|
try {
|
|
24
22
|
if (!fs.existsSync(this.certificateStoreDir)) {
|
|
@@ -36,429 +34,134 @@ export class CertificateManager {
|
|
|
36
34
|
*/
|
|
37
35
|
loadDefaultCertificates() {
|
|
38
36
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
39
|
-
// Fix the path to look for certificates at the project root instead of inside ts directory
|
|
40
37
|
const certPath = path.join(__dirname, '..', '..', '..', 'assets', 'certs');
|
|
41
38
|
try {
|
|
42
39
|
this.defaultCertificates = {
|
|
43
40
|
key: fs.readFileSync(path.join(certPath, 'key.pem'), 'utf8'),
|
|
44
41
|
cert: fs.readFileSync(path.join(certPath, 'cert.pem'), 'utf8')
|
|
45
42
|
};
|
|
46
|
-
this.logger.info('
|
|
43
|
+
this.logger.info('Loaded default certificates from filesystem');
|
|
47
44
|
}
|
|
48
45
|
catch (error) {
|
|
49
|
-
this.logger.error(
|
|
50
|
-
|
|
51
|
-
try {
|
|
52
|
-
// This is a placeholder for actual certificate generation code
|
|
53
|
-
// In a real implementation, you would use a library like selfsigned to generate certs
|
|
54
|
-
this.defaultCertificates = {
|
|
55
|
-
key: "FALLBACK_KEY_CONTENT",
|
|
56
|
-
cert: "FALLBACK_CERT_CONTENT"
|
|
57
|
-
};
|
|
58
|
-
this.logger.warn('Using fallback self-signed certificates');
|
|
59
|
-
}
|
|
60
|
-
catch (fallbackError) {
|
|
61
|
-
this.logger.error('Failed to generate fallback certificates', fallbackError);
|
|
62
|
-
throw new Error('Could not load or generate SSL certificates');
|
|
63
|
-
}
|
|
46
|
+
this.logger.error(`Failed to load default certificates: ${error}`);
|
|
47
|
+
this.generateSelfSignedCertificate();
|
|
64
48
|
}
|
|
65
49
|
}
|
|
66
50
|
/**
|
|
67
|
-
*
|
|
51
|
+
* Generates self-signed certificates as fallback
|
|
68
52
|
*/
|
|
69
|
-
|
|
70
|
-
|
|
53
|
+
generateSelfSignedCertificate() {
|
|
54
|
+
// Generate a self-signed certificate using forge or similar
|
|
55
|
+
// For now, just use a placeholder
|
|
56
|
+
const selfSignedCert = `-----BEGIN CERTIFICATE-----
|
|
57
|
+
MIIBkTCB+wIJAKHHIgIIA0/cMA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNVBAYTAlVT
|
|
58
|
+
MB4XDTE0MDEwMTAwMDAwMFoXDTI0MDEwMTAwMDAwMFowDTELMAkGA1UEBhMCVVMw
|
|
59
|
+
gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRiH0VwnOH3jCV7c6JFZWYrvuqy
|
|
60
|
+
-----END CERTIFICATE-----`;
|
|
61
|
+
const selfSignedKey = `-----BEGIN PRIVATE KEY-----
|
|
62
|
+
MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMRiH0VwnOH3jCV7
|
|
63
|
+
c6JFZWYrvuqyALCLXj0pcr1iqNdHjegNXnkl5zjdaUjq4edNOKl7M1AlFiYjG2xk
|
|
64
|
+
-----END PRIVATE KEY-----`;
|
|
65
|
+
this.defaultCertificates = {
|
|
66
|
+
key: selfSignedKey,
|
|
67
|
+
cert: selfSignedCert
|
|
68
|
+
};
|
|
69
|
+
this.logger.warn('Using self-signed certificate as fallback');
|
|
71
70
|
}
|
|
72
71
|
/**
|
|
73
|
-
*
|
|
72
|
+
* Gets the default certificates
|
|
74
73
|
*/
|
|
75
74
|
getDefaultCertificates() {
|
|
76
|
-
return
|
|
75
|
+
return this.defaultCertificates;
|
|
77
76
|
}
|
|
78
77
|
/**
|
|
79
|
-
*
|
|
78
|
+
* @deprecated Use SmartCertManager instead
|
|
80
79
|
*/
|
|
81
80
|
setExternalPort80Handler(handler) {
|
|
82
|
-
|
|
83
|
-
this.logger.warn('Replacing existing internal Port80Handler with external handler');
|
|
84
|
-
// Clean up existing handler if needed
|
|
85
|
-
if (this.port80Handler !== handler) {
|
|
86
|
-
// Unregister event handlers to avoid memory leaks
|
|
87
|
-
this.port80Handler.removeAllListeners(CertificateEvents.CERTIFICATE_ISSUED);
|
|
88
|
-
this.port80Handler.removeAllListeners(CertificateEvents.CERTIFICATE_RENEWED);
|
|
89
|
-
this.port80Handler.removeAllListeners(CertificateEvents.CERTIFICATE_FAILED);
|
|
90
|
-
this.port80Handler.removeAllListeners(CertificateEvents.CERTIFICATE_EXPIRING);
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
// Set the external handler
|
|
94
|
-
this.port80Handler = handler;
|
|
95
|
-
this.externalPort80Handler = true;
|
|
96
|
-
// Subscribe to Port80Handler events
|
|
97
|
-
subscribeToPort80Handler(this.port80Handler, {
|
|
98
|
-
onCertificateIssued: this.handleCertificateIssued.bind(this),
|
|
99
|
-
onCertificateRenewed: this.handleCertificateIssued.bind(this),
|
|
100
|
-
onCertificateFailed: this.handleCertificateFailed.bind(this),
|
|
101
|
-
onCertificateExpiring: (data) => {
|
|
102
|
-
this.logger.info(`Certificate for ${data.domain} expires in ${data.daysRemaining} days`);
|
|
103
|
-
}
|
|
104
|
-
});
|
|
105
|
-
this.logger.info('External Port80Handler connected to CertificateManager');
|
|
106
|
-
// Register domains with Port80Handler if we have any certificates cached
|
|
107
|
-
if (this.certificateCache.size > 0) {
|
|
108
|
-
const domains = Array.from(this.certificateCache.keys())
|
|
109
|
-
.filter(domain => !domain.includes('*')); // Skip wildcard domains
|
|
110
|
-
this.registerDomainsWithPort80Handler(domains);
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
/**
|
|
114
|
-
* Update route configurations managed by this certificate manager
|
|
115
|
-
* This method is called when route configurations change
|
|
116
|
-
*
|
|
117
|
-
* @param routes Array of route configurations
|
|
118
|
-
*/
|
|
119
|
-
updateRouteConfigs(routes) {
|
|
120
|
-
if (!this.port80Handler) {
|
|
121
|
-
this.logger.warn('Cannot update routes - Port80Handler is not initialized');
|
|
122
|
-
return;
|
|
123
|
-
}
|
|
124
|
-
// Register domains from routes with Port80Handler
|
|
125
|
-
this.registerRoutesWithPort80Handler(routes);
|
|
126
|
-
// Process individual routes for certificate requirements
|
|
127
|
-
for (const route of routes) {
|
|
128
|
-
this.processRouteForCertificates(route);
|
|
129
|
-
}
|
|
130
|
-
this.logger.info(`Updated certificate management for ${routes.length} routes`);
|
|
131
|
-
}
|
|
132
|
-
/**
|
|
133
|
-
* Handle newly issued or renewed certificates from Port80Handler
|
|
134
|
-
*/
|
|
135
|
-
handleCertificateIssued(data) {
|
|
136
|
-
const { domain, certificate, privateKey, expiryDate } = data;
|
|
137
|
-
this.logger.info(`Certificate ${this.certificateCache.has(domain) ? 'renewed' : 'issued'} for ${domain}, valid until ${expiryDate.toISOString()}`);
|
|
138
|
-
// Update certificate in HTTPS server
|
|
139
|
-
this.updateCertificateCache(domain, certificate, privateKey, expiryDate);
|
|
140
|
-
// Save the certificate to the filesystem if not using external handler
|
|
141
|
-
if (!this.externalPort80Handler && this.options.acme?.certificateStore) {
|
|
142
|
-
this.saveCertificateToStore(domain, certificate, privateKey);
|
|
143
|
-
}
|
|
81
|
+
this.logger.warn('setExternalPort80Handler is deprecated - use SmartCertManager instead');
|
|
144
82
|
}
|
|
145
83
|
/**
|
|
146
|
-
*
|
|
84
|
+
* @deprecated Use SmartCertManager instead
|
|
147
85
|
*/
|
|
148
|
-
|
|
149
|
-
this.logger.
|
|
86
|
+
async updateRoutes(routes) {
|
|
87
|
+
this.logger.warn('updateRoutes is deprecated - use SmartCertManager instead');
|
|
150
88
|
}
|
|
151
89
|
/**
|
|
152
|
-
*
|
|
153
|
-
*/
|
|
154
|
-
saveCertificateToStore(domain, certificate, privateKey) {
|
|
155
|
-
try {
|
|
156
|
-
const certPath = path.join(this.certificateStoreDir, `${domain}.cert.pem`);
|
|
157
|
-
const keyPath = path.join(this.certificateStoreDir, `${domain}.key.pem`);
|
|
158
|
-
fs.writeFileSync(certPath, certificate);
|
|
159
|
-
fs.writeFileSync(keyPath, privateKey);
|
|
160
|
-
// Ensure private key has restricted permissions
|
|
161
|
-
try {
|
|
162
|
-
fs.chmodSync(keyPath, 0o600);
|
|
163
|
-
}
|
|
164
|
-
catch (error) {
|
|
165
|
-
this.logger.warn(`Failed to set permissions on private key for ${domain}: ${error}`);
|
|
166
|
-
}
|
|
167
|
-
this.logger.info(`Saved certificate for ${domain} to ${certPath}`);
|
|
168
|
-
}
|
|
169
|
-
catch (error) {
|
|
170
|
-
this.logger.error(`Failed to save certificate for ${domain}: ${error}`);
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
/**
|
|
174
|
-
* Handles SNI (Server Name Indication) for TLS connections
|
|
175
|
-
* Used by the HTTPS server to select the correct certificate for each domain
|
|
90
|
+
* Handles SNI callback to provide appropriate certificate
|
|
176
91
|
*/
|
|
177
92
|
handleSNI(domain, cb) {
|
|
178
|
-
this.
|
|
179
|
-
|
|
180
|
-
const certs = this.certificateCache.get(domain);
|
|
181
|
-
if (certs) {
|
|
182
|
-
try {
|
|
183
|
-
// Create TLS context with the cached certificate
|
|
184
|
-
const context = plugins.tls.createSecureContext({
|
|
185
|
-
key: certs.key,
|
|
186
|
-
cert: certs.cert
|
|
187
|
-
});
|
|
188
|
-
this.logger.debug(`Using cached certificate for ${domain}`);
|
|
189
|
-
cb(null, context);
|
|
190
|
-
return;
|
|
191
|
-
}
|
|
192
|
-
catch (err) {
|
|
193
|
-
this.logger.error(`Error creating secure context for ${domain}:`, err);
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
|
-
// No existing certificate: trigger dynamic provisioning via Port80Handler
|
|
197
|
-
if (this.port80Handler) {
|
|
198
|
-
try {
|
|
199
|
-
this.logger.info(`Triggering on-demand certificate retrieval for ${domain}`);
|
|
200
|
-
this.port80Handler.addDomain({
|
|
201
|
-
domainName: domain,
|
|
202
|
-
sslRedirect: false,
|
|
203
|
-
acmeMaintenance: true
|
|
204
|
-
});
|
|
205
|
-
}
|
|
206
|
-
catch (err) {
|
|
207
|
-
this.logger.error(`Error registering domain for on-demand certificate: ${domain}`, err);
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
// Check if we should trigger certificate issuance
|
|
211
|
-
if (this.options.acme?.enabled && this.port80Handler && !domain.includes('*')) {
|
|
212
|
-
// Check if this domain is already registered
|
|
213
|
-
const certData = this.port80Handler.getCertificate(domain);
|
|
214
|
-
if (!certData) {
|
|
215
|
-
this.logger.info(`No certificate found for ${domain}, registering for issuance`);
|
|
216
|
-
// Register with new domain options format
|
|
217
|
-
const domainOptions = {
|
|
218
|
-
domainName: domain,
|
|
219
|
-
sslRedirect: true,
|
|
220
|
-
acmeMaintenance: true
|
|
221
|
-
};
|
|
222
|
-
this.port80Handler.addDomain(domainOptions);
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
// Fall back to default certificate
|
|
226
|
-
try {
|
|
93
|
+
const certificate = this.getCachedCertificate(domain);
|
|
94
|
+
if (certificate) {
|
|
227
95
|
const context = plugins.tls.createSecureContext({
|
|
228
|
-
key:
|
|
229
|
-
cert:
|
|
96
|
+
key: certificate.key,
|
|
97
|
+
cert: certificate.cert
|
|
230
98
|
});
|
|
231
|
-
this.logger.debug(`Using default certificate for ${domain}`);
|
|
232
99
|
cb(null, context);
|
|
100
|
+
return;
|
|
233
101
|
}
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
102
|
+
// Use default certificate if no domain-specific certificate found
|
|
103
|
+
const defaultContext = plugins.tls.createSecureContext({
|
|
104
|
+
key: this.defaultCertificates.key,
|
|
105
|
+
cert: this.defaultCertificates.cert
|
|
106
|
+
});
|
|
107
|
+
cb(null, defaultContext);
|
|
238
108
|
}
|
|
239
109
|
/**
|
|
240
|
-
* Updates certificate in cache
|
|
110
|
+
* Updates a certificate in the cache
|
|
241
111
|
*/
|
|
242
|
-
|
|
243
|
-
// Update certificate context in HTTPS server if it's running
|
|
244
|
-
if (this.httpsServer) {
|
|
245
|
-
try {
|
|
246
|
-
this.httpsServer.addContext(domain, {
|
|
247
|
-
key: privateKey,
|
|
248
|
-
cert: certificate
|
|
249
|
-
});
|
|
250
|
-
this.logger.debug(`Updated SSL context for domain: ${domain}`);
|
|
251
|
-
}
|
|
252
|
-
catch (error) {
|
|
253
|
-
this.logger.error(`Error updating SSL context for domain ${domain}:`, error);
|
|
254
|
-
}
|
|
255
|
-
}
|
|
256
|
-
// Update certificate in cache
|
|
112
|
+
updateCertificate(domain, cert, key) {
|
|
257
113
|
this.certificateCache.set(domain, {
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
expires:
|
|
114
|
+
cert,
|
|
115
|
+
key,
|
|
116
|
+
expires: new Date(Date.now() + 90 * 24 * 60 * 60 * 1000) // 90 days
|
|
261
117
|
});
|
|
118
|
+
this.logger.info(`Certificate updated for ${domain}`);
|
|
262
119
|
}
|
|
263
120
|
/**
|
|
264
|
-
* Gets a certificate
|
|
121
|
+
* Gets a cached certificate
|
|
265
122
|
*/
|
|
266
|
-
|
|
267
|
-
return this.certificateCache.get(domain);
|
|
123
|
+
getCachedCertificate(domain) {
|
|
124
|
+
return this.certificateCache.get(domain) || null;
|
|
268
125
|
}
|
|
269
126
|
/**
|
|
270
|
-
*
|
|
127
|
+
* @deprecated Use SmartCertManager instead
|
|
271
128
|
*/
|
|
272
|
-
async
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
return false;
|
|
276
|
-
}
|
|
277
|
-
if (!this.port80Handler) {
|
|
278
|
-
this.logger.error('Port80Handler is not initialized');
|
|
279
|
-
return false;
|
|
280
|
-
}
|
|
281
|
-
// Skip wildcard domains - can't get certs for these with HTTP-01 validation
|
|
282
|
-
if (domain.includes('*')) {
|
|
283
|
-
this.logger.error(`Cannot request certificate for wildcard domain: ${domain}`);
|
|
284
|
-
return false;
|
|
285
|
-
}
|
|
286
|
-
try {
|
|
287
|
-
// Use the new domain options format
|
|
288
|
-
const domainOptions = {
|
|
289
|
-
domainName: domain,
|
|
290
|
-
sslRedirect: true,
|
|
291
|
-
acmeMaintenance: true
|
|
292
|
-
};
|
|
293
|
-
this.port80Handler.addDomain(domainOptions);
|
|
294
|
-
this.logger.info(`Certificate request submitted for domain: ${domain}`);
|
|
295
|
-
return true;
|
|
296
|
-
}
|
|
297
|
-
catch (error) {
|
|
298
|
-
this.logger.error(`Error requesting certificate for domain ${domain}:`, error);
|
|
299
|
-
return false;
|
|
300
|
-
}
|
|
129
|
+
async initializePort80Handler() {
|
|
130
|
+
this.logger.warn('initializePort80Handler is deprecated - use SmartCertManager instead');
|
|
131
|
+
return null;
|
|
301
132
|
}
|
|
302
133
|
/**
|
|
303
|
-
*
|
|
304
|
-
* @param domains String array of domains to register
|
|
134
|
+
* @deprecated Use SmartCertManager instead
|
|
305
135
|
*/
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
this.logger.warn('Port80Handler is not initialized');
|
|
309
|
-
return;
|
|
310
|
-
}
|
|
311
|
-
for (const domain of domains) {
|
|
312
|
-
// Skip wildcard domains - can't get certs for these with HTTP-01 validation
|
|
313
|
-
if (domain.includes('*')) {
|
|
314
|
-
this.logger.info(`Skipping wildcard domain for ACME: ${domain}`);
|
|
315
|
-
continue;
|
|
316
|
-
}
|
|
317
|
-
// Skip domains already with certificates if configured to do so
|
|
318
|
-
if (this.options.acme?.skipConfiguredCerts) {
|
|
319
|
-
const cachedCert = this.certificateCache.get(domain);
|
|
320
|
-
if (cachedCert) {
|
|
321
|
-
this.logger.info(`Skipping domain with existing certificate: ${domain}`);
|
|
322
|
-
continue;
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
// Register the domain for certificate issuance with new domain options format
|
|
326
|
-
const domainOptions = {
|
|
327
|
-
domainName: domain,
|
|
328
|
-
sslRedirect: true,
|
|
329
|
-
acmeMaintenance: true
|
|
330
|
-
};
|
|
331
|
-
this.port80Handler.addDomain(domainOptions);
|
|
332
|
-
this.logger.info(`Registered domain for ACME certificate issuance: ${domain}`);
|
|
333
|
-
}
|
|
136
|
+
async stopPort80Handler() {
|
|
137
|
+
this.logger.warn('stopPort80Handler is deprecated - use SmartCertManager instead');
|
|
334
138
|
}
|
|
335
139
|
/**
|
|
336
|
-
*
|
|
337
|
-
* This method enables direct integration with route-based configuration
|
|
338
|
-
*
|
|
339
|
-
* @param routes Array of route configurations
|
|
140
|
+
* @deprecated Use SmartCertManager instead
|
|
340
141
|
*/
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
this.logger.warn('Port80Handler is not initialized');
|
|
344
|
-
return;
|
|
345
|
-
}
|
|
346
|
-
// Extract domains from route configurations
|
|
347
|
-
const domains = new Set();
|
|
348
|
-
for (const route of routes) {
|
|
349
|
-
// Skip disabled routes
|
|
350
|
-
if (route.enabled === false) {
|
|
351
|
-
continue;
|
|
352
|
-
}
|
|
353
|
-
// Skip routes without HTTPS termination
|
|
354
|
-
if (route.action.type !== 'forward' || route.action.tls?.mode !== 'terminate') {
|
|
355
|
-
continue;
|
|
356
|
-
}
|
|
357
|
-
// Extract domains from match criteria
|
|
358
|
-
if (route.match.domains) {
|
|
359
|
-
if (typeof route.match.domains === 'string') {
|
|
360
|
-
domains.add(route.match.domains);
|
|
361
|
-
}
|
|
362
|
-
else if (Array.isArray(route.match.domains)) {
|
|
363
|
-
for (const domain of route.match.domains) {
|
|
364
|
-
domains.add(domain);
|
|
365
|
-
}
|
|
366
|
-
}
|
|
367
|
-
}
|
|
368
|
-
}
|
|
369
|
-
// Register extracted domains
|
|
370
|
-
this.registerDomainsWithPort80Handler(Array.from(domains));
|
|
142
|
+
registerDomainsWithPort80Handler(domains) {
|
|
143
|
+
this.logger.warn('registerDomainsWithPort80Handler is deprecated - use SmartCertManager instead');
|
|
371
144
|
}
|
|
372
145
|
/**
|
|
373
|
-
*
|
|
374
|
-
* @param route Route configuration to process
|
|
146
|
+
* @deprecated Use SmartCertManager instead
|
|
375
147
|
*/
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
if (route.enabled === false) {
|
|
379
|
-
return;
|
|
380
|
-
}
|
|
381
|
-
// Skip routes without HTTPS termination or auto certificate
|
|
382
|
-
if (route.action.type !== 'forward' ||
|
|
383
|
-
route.action.tls?.mode !== 'terminate' ||
|
|
384
|
-
route.action.tls?.certificate !== 'auto') {
|
|
385
|
-
return;
|
|
386
|
-
}
|
|
387
|
-
// Extract domains from match criteria
|
|
388
|
-
const domains = [];
|
|
389
|
-
if (route.match.domains) {
|
|
390
|
-
if (typeof route.match.domains === 'string') {
|
|
391
|
-
domains.push(route.match.domains);
|
|
392
|
-
}
|
|
393
|
-
else if (Array.isArray(route.match.domains)) {
|
|
394
|
-
domains.push(...route.match.domains);
|
|
395
|
-
}
|
|
396
|
-
}
|
|
397
|
-
// Request certificates for the domains
|
|
398
|
-
for (const domain of domains) {
|
|
399
|
-
if (!domain.includes('*')) { // Skip wildcard domains
|
|
400
|
-
this.requestCertificate(domain).catch(err => {
|
|
401
|
-
this.logger.error(`Error requesting certificate for domain ${domain}:`, err);
|
|
402
|
-
});
|
|
403
|
-
}
|
|
404
|
-
}
|
|
148
|
+
registerRoutesWithPort80Handler(routes) {
|
|
149
|
+
this.logger.warn('registerRoutesWithPort80Handler is deprecated - use SmartCertManager instead');
|
|
405
150
|
}
|
|
406
151
|
/**
|
|
407
|
-
*
|
|
152
|
+
* Sets the HTTPS server for certificate updates
|
|
408
153
|
*/
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
if (this.externalPort80Handler) {
|
|
412
|
-
this.logger.info('Using external Port80Handler, skipping initialization');
|
|
413
|
-
return this.port80Handler;
|
|
414
|
-
}
|
|
415
|
-
if (!this.options.acme?.enabled) {
|
|
416
|
-
return null;
|
|
417
|
-
}
|
|
418
|
-
// Build and configure Port80Handler
|
|
419
|
-
this.port80Handler = buildPort80Handler({
|
|
420
|
-
port: this.options.acme.port,
|
|
421
|
-
accountEmail: this.options.acme.accountEmail,
|
|
422
|
-
useProduction: this.options.acme.useProduction,
|
|
423
|
-
httpsRedirectPort: this.options.port, // Redirect to our HTTPS port
|
|
424
|
-
enabled: this.options.acme.enabled,
|
|
425
|
-
certificateStore: this.options.acme.certificateStore,
|
|
426
|
-
skipConfiguredCerts: this.options.acme.skipConfiguredCerts
|
|
427
|
-
});
|
|
428
|
-
// Subscribe to Port80Handler events
|
|
429
|
-
subscribeToPort80Handler(this.port80Handler, {
|
|
430
|
-
onCertificateIssued: this.handleCertificateIssued.bind(this),
|
|
431
|
-
onCertificateRenewed: this.handleCertificateIssued.bind(this),
|
|
432
|
-
onCertificateFailed: this.handleCertificateFailed.bind(this),
|
|
433
|
-
onCertificateExpiring: (data) => {
|
|
434
|
-
this.logger.info(`Certificate for ${data.domain} expires in ${data.daysRemaining} days`);
|
|
435
|
-
}
|
|
436
|
-
});
|
|
437
|
-
// Start the handler
|
|
438
|
-
try {
|
|
439
|
-
await this.port80Handler.start();
|
|
440
|
-
this.logger.info(`Port80Handler started on port ${this.options.acme.port}`);
|
|
441
|
-
return this.port80Handler;
|
|
442
|
-
}
|
|
443
|
-
catch (error) {
|
|
444
|
-
this.logger.error(`Failed to start Port80Handler: ${error}`);
|
|
445
|
-
this.port80Handler = null;
|
|
446
|
-
return null;
|
|
447
|
-
}
|
|
154
|
+
setHttpsServer(server) {
|
|
155
|
+
this.httpsServer = server;
|
|
448
156
|
}
|
|
449
157
|
/**
|
|
450
|
-
*
|
|
158
|
+
* Gets statistics for metrics
|
|
451
159
|
*/
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
}
|
|
458
|
-
catch (error) {
|
|
459
|
-
this.logger.error('Error stopping Port80Handler', error);
|
|
460
|
-
}
|
|
461
|
-
}
|
|
160
|
+
getStats() {
|
|
161
|
+
return {
|
|
162
|
+
cachedCertificates: this.certificateCache.size,
|
|
163
|
+
defaultCertEnabled: true
|
|
164
|
+
};
|
|
462
165
|
}
|
|
463
166
|
}
|
|
464
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certificate-manager.js","sourceRoot":"","sources":["../../../ts/proxies/network-proxy/certificate-manager.ts"],"names":[],"mappings":"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"}
|
|
167
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydGlmaWNhdGUtbWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL3Byb3hpZXMvbmV0d29yay1wcm94eS9jZXJ0aWZpY2F0ZS1tYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDekIsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUM7QUFDN0IsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUNwQyxPQUFPLEVBQW1FLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBR2xIOzs7OztHQUtHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQU83QixZQUFvQixPQUE2QjtRQUE3QixZQUFPLEdBQVAsT0FBTyxDQUFzQjtRQUx6QyxxQkFBZ0IsR0FBbUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUc3RCxnQkFBVyxHQUFnQyxJQUFJLENBQUM7UUFHdEQsSUFBSSxDQUFDLG1CQUFtQixHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxnQkFBZ0IsSUFBSSxTQUFTLENBQUMsQ0FBQztRQUNyRixJQUFJLENBQUMsTUFBTSxHQUFHLFlBQVksQ0FBQyxPQUFPLENBQUMsUUFBUSxJQUFJLE1BQU0sQ0FBQyxDQUFDO1FBRXZELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGlFQUFpRSxDQUFDLENBQUM7UUFFcEYsNENBQTRDO1FBQzVDLElBQUksQ0FBQztZQUNILElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLENBQUM7Z0JBQzdDLEVBQUUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLG1CQUFtQixFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7Z0JB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
|
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
import * as plugins from '../../../plugins.js';
|
|
2
|
-
|
|
2
|
+
export interface IAcmeOptions {
|
|
3
|
+
enabled: boolean;
|
|
4
|
+
email?: string;
|
|
5
|
+
accountEmail?: string;
|
|
6
|
+
port?: number;
|
|
7
|
+
certificateStore?: string;
|
|
8
|
+
environment?: 'production' | 'staging';
|
|
9
|
+
useProduction?: boolean;
|
|
10
|
+
renewThresholdDays?: number;
|
|
11
|
+
autoRenew?: boolean;
|
|
12
|
+
skipConfiguredCerts?: boolean;
|
|
13
|
+
}
|
|
3
14
|
import type { IRouteConfig } from '../../smart-proxy/models/route-types.js';
|
|
4
15
|
import type { IRouteContext } from '../../../core/models/route-context.js';
|
|
5
16
|
/**
|
|
@@ -273,4 +273,4 @@ export function createLogger(logLevel = 'info') {
|
|
|
273
273
|
}
|
|
274
274
|
};
|
|
275
275
|
}
|
|
276
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
276
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../ts/proxies/network-proxy/models/types.ts"],"names":[],"mappings":"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"}
|