@push.rocks/smartproxy 4.2.6 → 4.3.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.
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '4.
|
|
6
|
+
version: '4.3.0',
|
|
7
7
|
description: 'A powerful proxy package that effectively handles high traffic, with features such as SSL/TLS support, port proxying, WebSocket handling, dynamic routing with authentication options, and automatic ACME certificate management.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLG1PQUFtTztDQUNqUCxDQUFBIn0=
|
|
@@ -81,6 +81,7 @@ export interface ICertificateExpiring {
|
|
|
81
81
|
}
|
|
82
82
|
/**
|
|
83
83
|
* Port80Handler with ACME certificate management and request forwarding capabilities
|
|
84
|
+
* Now with glob pattern support for domain matching
|
|
84
85
|
*/
|
|
85
86
|
export declare class Port80Handler extends plugins.EventEmitter {
|
|
86
87
|
private domainCertificates;
|
|
@@ -126,6 +127,25 @@ export declare class Port80Handler extends plugins.EventEmitter {
|
|
|
126
127
|
* @param domain The domain to get the certificate for
|
|
127
128
|
*/
|
|
128
129
|
getCertificate(domain: string): ICertificateData | null;
|
|
130
|
+
/**
|
|
131
|
+
* Check if a domain is a glob pattern
|
|
132
|
+
* @param domain Domain to check
|
|
133
|
+
* @returns True if the domain is a glob pattern
|
|
134
|
+
*/
|
|
135
|
+
private isGlobPattern;
|
|
136
|
+
/**
|
|
137
|
+
* Get domain info for a specific domain, using glob pattern matching if needed
|
|
138
|
+
* @param requestDomain The actual domain from the request
|
|
139
|
+
* @returns The domain info or null if not found
|
|
140
|
+
*/
|
|
141
|
+
private getDomainInfoForRequest;
|
|
142
|
+
/**
|
|
143
|
+
* Check if a domain matches a glob pattern
|
|
144
|
+
* @param domain The domain to check
|
|
145
|
+
* @param pattern The pattern to match against
|
|
146
|
+
* @returns True if the domain matches the pattern
|
|
147
|
+
*/
|
|
148
|
+
private domainMatchesPattern;
|
|
129
149
|
/**
|
|
130
150
|
* Lazy initialization of the ACME client
|
|
131
151
|
* @returns An ACME client instance
|
|
@@ -39,6 +39,7 @@ export var Port80HandlerEvents;
|
|
|
39
39
|
})(Port80HandlerEvents || (Port80HandlerEvents = {}));
|
|
40
40
|
/**
|
|
41
41
|
* Port80Handler with ACME certificate management and request forwarding capabilities
|
|
42
|
+
* Now with glob pattern support for domain matching
|
|
42
43
|
*/
|
|
43
44
|
export class Port80Handler extends plugins.EventEmitter {
|
|
44
45
|
/**
|
|
@@ -93,6 +94,11 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
93
94
|
this.emit(Port80HandlerEvents.MANAGER_STARTED, this.options.port);
|
|
94
95
|
// Start certificate process for domains with acmeMaintenance enabled
|
|
95
96
|
for (const [domain, domainInfo] of this.domainCertificates.entries()) {
|
|
97
|
+
// Skip glob patterns for certificate issuance
|
|
98
|
+
if (this.isGlobPattern(domain)) {
|
|
99
|
+
console.log(`Skipping initial certificate for glob pattern: ${domain}`);
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
96
102
|
if (domainInfo.options.acmeMaintenance && !domainInfo.certObtained && !domainInfo.obtainingInProgress) {
|
|
97
103
|
this.obtainCertificate(domain).catch(err => {
|
|
98
104
|
console.error(`Error obtaining initial certificate for ${domain}:`, err);
|
|
@@ -157,8 +163,8 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
157
163
|
hasForward: !!options.forward,
|
|
158
164
|
hasAcmeForward: !!options.acmeForward
|
|
159
165
|
});
|
|
160
|
-
// If acmeMaintenance is enabled, start certificate process immediately
|
|
161
|
-
if (options.acmeMaintenance && this.server) {
|
|
166
|
+
// If acmeMaintenance is enabled and not a glob pattern, start certificate process immediately
|
|
167
|
+
if (options.acmeMaintenance && this.server && !this.isGlobPattern(domainName)) {
|
|
162
168
|
this.obtainCertificate(domainName).catch(err => {
|
|
163
169
|
console.error(`Error obtaining initial certificate for ${domainName}:`, err);
|
|
164
170
|
});
|
|
@@ -191,6 +197,10 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
191
197
|
if (!domain || !certificate || !privateKey) {
|
|
192
198
|
throw new Port80HandlerError('Domain, certificate and privateKey are required');
|
|
193
199
|
}
|
|
200
|
+
// Don't allow setting certificates for glob patterns
|
|
201
|
+
if (this.isGlobPattern(domain)) {
|
|
202
|
+
throw new Port80HandlerError('Cannot set certificate for glob pattern domains');
|
|
203
|
+
}
|
|
194
204
|
let domainInfo = this.domainCertificates.get(domain);
|
|
195
205
|
if (!domainInfo) {
|
|
196
206
|
// Create default domain options if not already configured
|
|
@@ -231,6 +241,10 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
231
241
|
* @param domain The domain to get the certificate for
|
|
232
242
|
*/
|
|
233
243
|
getCertificate(domain) {
|
|
244
|
+
// Can't get certificates for glob patterns
|
|
245
|
+
if (this.isGlobPattern(domain)) {
|
|
246
|
+
return null;
|
|
247
|
+
}
|
|
234
248
|
const domainInfo = this.domainCertificates.get(domain);
|
|
235
249
|
if (!domainInfo || !domainInfo.certObtained || !domainInfo.certificate || !domainInfo.privateKey) {
|
|
236
250
|
return null;
|
|
@@ -242,6 +256,63 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
242
256
|
expiryDate: domainInfo.expiryDate || this.getDefaultExpiryDate()
|
|
243
257
|
};
|
|
244
258
|
}
|
|
259
|
+
/**
|
|
260
|
+
* Check if a domain is a glob pattern
|
|
261
|
+
* @param domain Domain to check
|
|
262
|
+
* @returns True if the domain is a glob pattern
|
|
263
|
+
*/
|
|
264
|
+
isGlobPattern(domain) {
|
|
265
|
+
return domain.includes('*');
|
|
266
|
+
}
|
|
267
|
+
/**
|
|
268
|
+
* Get domain info for a specific domain, using glob pattern matching if needed
|
|
269
|
+
* @param requestDomain The actual domain from the request
|
|
270
|
+
* @returns The domain info or null if not found
|
|
271
|
+
*/
|
|
272
|
+
getDomainInfoForRequest(requestDomain) {
|
|
273
|
+
// Try direct match first
|
|
274
|
+
if (this.domainCertificates.has(requestDomain)) {
|
|
275
|
+
return {
|
|
276
|
+
domainInfo: this.domainCertificates.get(requestDomain),
|
|
277
|
+
pattern: requestDomain
|
|
278
|
+
};
|
|
279
|
+
}
|
|
280
|
+
// Then try glob patterns
|
|
281
|
+
for (const [pattern, domainInfo] of this.domainCertificates.entries()) {
|
|
282
|
+
if (this.isGlobPattern(pattern) && this.domainMatchesPattern(requestDomain, pattern)) {
|
|
283
|
+
return { domainInfo, pattern };
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
return null;
|
|
287
|
+
}
|
|
288
|
+
/**
|
|
289
|
+
* Check if a domain matches a glob pattern
|
|
290
|
+
* @param domain The domain to check
|
|
291
|
+
* @param pattern The pattern to match against
|
|
292
|
+
* @returns True if the domain matches the pattern
|
|
293
|
+
*/
|
|
294
|
+
domainMatchesPattern(domain, pattern) {
|
|
295
|
+
// Handle different glob pattern styles
|
|
296
|
+
if (pattern.startsWith('*.')) {
|
|
297
|
+
// *.example.com matches any subdomain
|
|
298
|
+
const suffix = pattern.substring(2);
|
|
299
|
+
return domain.endsWith(suffix) && domain.includes('.') && domain !== suffix;
|
|
300
|
+
}
|
|
301
|
+
else if (pattern.endsWith('.*')) {
|
|
302
|
+
// example.* matches any TLD
|
|
303
|
+
const prefix = pattern.substring(0, pattern.length - 2);
|
|
304
|
+
const domainParts = domain.split('.');
|
|
305
|
+
return domain.startsWith(prefix + '.') && domainParts.length >= 2;
|
|
306
|
+
}
|
|
307
|
+
else if (pattern === '*') {
|
|
308
|
+
// Wildcard matches everything
|
|
309
|
+
return true;
|
|
310
|
+
}
|
|
311
|
+
else {
|
|
312
|
+
// Exact match (shouldn't reach here as we check exact matches first)
|
|
313
|
+
return domain === pattern;
|
|
314
|
+
}
|
|
315
|
+
}
|
|
245
316
|
/**
|
|
246
317
|
* Lazy initialization of the ACME client
|
|
247
318
|
* @returns An ACME client instance
|
|
@@ -285,13 +356,14 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
285
356
|
}
|
|
286
357
|
// Extract domain (ignoring any port in the Host header)
|
|
287
358
|
const domain = hostHeader.split(':')[0];
|
|
288
|
-
//
|
|
289
|
-
|
|
359
|
+
// Get domain config, using glob pattern matching if needed
|
|
360
|
+
const domainMatch = this.getDomainInfoForRequest(domain);
|
|
361
|
+
if (!domainMatch) {
|
|
290
362
|
res.statusCode = 404;
|
|
291
363
|
res.end('Domain not configured');
|
|
292
364
|
return;
|
|
293
365
|
}
|
|
294
|
-
const domainInfo =
|
|
366
|
+
const { domainInfo, pattern } = domainMatch;
|
|
295
367
|
const options = domainInfo.options;
|
|
296
368
|
// If the request is for an ACME HTTP-01 challenge, handle it
|
|
297
369
|
if (req.url && req.url.startsWith('/.well-known/acme-challenge/') && (options.acmeMaintenance || options.acmeForward)) {
|
|
@@ -300,8 +372,11 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
300
372
|
this.forwardRequest(req, res, options.acmeForward, 'ACME challenge');
|
|
301
373
|
return;
|
|
302
374
|
}
|
|
303
|
-
|
|
304
|
-
|
|
375
|
+
// Only handle ACME challenges for non-glob patterns
|
|
376
|
+
if (!this.isGlobPattern(pattern)) {
|
|
377
|
+
this.handleAcmeChallenge(req, res, domain);
|
|
378
|
+
return;
|
|
379
|
+
}
|
|
305
380
|
}
|
|
306
381
|
// Check if we should forward non-ACME requests
|
|
307
382
|
if (options.forward) {
|
|
@@ -309,7 +384,8 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
309
384
|
return;
|
|
310
385
|
}
|
|
311
386
|
// If certificate exists and sslRedirect is enabled, redirect to HTTPS
|
|
312
|
-
|
|
387
|
+
// (Skip for glob patterns as they won't have certificates)
|
|
388
|
+
if (!this.isGlobPattern(pattern) && domainInfo.certObtained && options.sslRedirect) {
|
|
313
389
|
const httpsPort = this.options.httpsRedirectPort;
|
|
314
390
|
const portSuffix = httpsPort === 443 ? '' : `:${httpsPort}`;
|
|
315
391
|
const redirectUrl = `https://${domain}${portSuffix}${req.url || '/'}`;
|
|
@@ -319,7 +395,8 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
319
395
|
return;
|
|
320
396
|
}
|
|
321
397
|
// Handle case where certificate maintenance is enabled but not yet obtained
|
|
322
|
-
|
|
398
|
+
// (Skip for glob patterns as they can't have certificates)
|
|
399
|
+
if (!this.isGlobPattern(pattern) && options.acmeMaintenance && !domainInfo.certObtained) {
|
|
323
400
|
// Trigger certificate issuance if not already running
|
|
324
401
|
if (!domainInfo.obtainingInProgress) {
|
|
325
402
|
this.obtainCertificate(domain).catch(err => {
|
|
@@ -425,6 +502,10 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
425
502
|
* @param isRenewal Whether this is a renewal attempt
|
|
426
503
|
*/
|
|
427
504
|
async obtainCertificate(domain, isRenewal = false) {
|
|
505
|
+
// Don't allow certificate issuance for glob patterns
|
|
506
|
+
if (this.isGlobPattern(domain)) {
|
|
507
|
+
throw new CertificateError('Cannot obtain certificates for glob pattern domains', domain, isRenewal);
|
|
508
|
+
}
|
|
428
509
|
// Get the domain info
|
|
429
510
|
const domainInfo = this.domainCertificates.get(domain);
|
|
430
511
|
if (!domainInfo) {
|
|
@@ -575,6 +656,10 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
575
656
|
const now = new Date();
|
|
576
657
|
const renewThresholdMs = this.options.renewThresholdDays * 24 * 60 * 60 * 1000;
|
|
577
658
|
for (const [domain, domainInfo] of this.domainCertificates.entries()) {
|
|
659
|
+
// Skip glob patterns
|
|
660
|
+
if (this.isGlobPattern(domain)) {
|
|
661
|
+
continue;
|
|
662
|
+
}
|
|
578
663
|
// Skip domains with acmeMaintenance disabled
|
|
579
664
|
if (!domainInfo.options.acmeMaintenance) {
|
|
580
665
|
continue;
|
|
@@ -648,4 +733,4 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
648
733
|
this.emit(eventType, data);
|
|
649
734
|
}
|
|
650
735
|
}
|
|
651
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.port80handler.js","sourceRoot":"","sources":["../ts/classes.port80handler.ts"],"names":[],"mappings":"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"}
|
|
736
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.port80handler.js","sourceRoot":"","sources":["../ts/classes.port80handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartproxy",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.3.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A powerful proxy package that effectively handles high traffic, with features such as SSL/TLS support, port proxying, WebSocket handling, dynamic routing with authentication options, and automatic ACME certificate management.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '4.
|
|
6
|
+
version: '4.3.0',
|
|
7
7
|
description: 'A powerful proxy package that effectively handles high traffic, with features such as SSL/TLS support, port proxying, WebSocket handling, dynamic routing with authentication options, and automatic ACME certificate management.'
|
|
8
8
|
}
|
|
@@ -118,6 +118,7 @@ export interface ICertificateExpiring {
|
|
|
118
118
|
|
|
119
119
|
/**
|
|
120
120
|
* Port80Handler with ACME certificate management and request forwarding capabilities
|
|
121
|
+
* Now with glob pattern support for domain matching
|
|
121
122
|
*/
|
|
122
123
|
export class Port80Handler extends plugins.EventEmitter {
|
|
123
124
|
private domainCertificates: Map<string, IDomainCertificate>;
|
|
@@ -180,6 +181,12 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
180
181
|
|
|
181
182
|
// Start certificate process for domains with acmeMaintenance enabled
|
|
182
183
|
for (const [domain, domainInfo] of this.domainCertificates.entries()) {
|
|
184
|
+
// Skip glob patterns for certificate issuance
|
|
185
|
+
if (this.isGlobPattern(domain)) {
|
|
186
|
+
console.log(`Skipping initial certificate for glob pattern: ${domain}`);
|
|
187
|
+
continue;
|
|
188
|
+
}
|
|
189
|
+
|
|
183
190
|
if (domainInfo.options.acmeMaintenance && !domainInfo.certObtained && !domainInfo.obtainingInProgress) {
|
|
184
191
|
this.obtainCertificate(domain).catch(err => {
|
|
185
192
|
console.error(`Error obtaining initial certificate for ${domain}:`, err);
|
|
@@ -252,8 +259,8 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
252
259
|
hasAcmeForward: !!options.acmeForward
|
|
253
260
|
});
|
|
254
261
|
|
|
255
|
-
// If acmeMaintenance is enabled, start certificate process immediately
|
|
256
|
-
if (options.acmeMaintenance && this.server) {
|
|
262
|
+
// If acmeMaintenance is enabled and not a glob pattern, start certificate process immediately
|
|
263
|
+
if (options.acmeMaintenance && this.server && !this.isGlobPattern(domainName)) {
|
|
257
264
|
this.obtainCertificate(domainName).catch(err => {
|
|
258
265
|
console.error(`Error obtaining initial certificate for ${domainName}:`, err);
|
|
259
266
|
});
|
|
@@ -288,6 +295,11 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
288
295
|
throw new Port80HandlerError('Domain, certificate and privateKey are required');
|
|
289
296
|
}
|
|
290
297
|
|
|
298
|
+
// Don't allow setting certificates for glob patterns
|
|
299
|
+
if (this.isGlobPattern(domain)) {
|
|
300
|
+
throw new Port80HandlerError('Cannot set certificate for glob pattern domains');
|
|
301
|
+
}
|
|
302
|
+
|
|
291
303
|
let domainInfo = this.domainCertificates.get(domain);
|
|
292
304
|
|
|
293
305
|
if (!domainInfo) {
|
|
@@ -334,6 +346,11 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
334
346
|
* @param domain The domain to get the certificate for
|
|
335
347
|
*/
|
|
336
348
|
public getCertificate(domain: string): ICertificateData | null {
|
|
349
|
+
// Can't get certificates for glob patterns
|
|
350
|
+
if (this.isGlobPattern(domain)) {
|
|
351
|
+
return null;
|
|
352
|
+
}
|
|
353
|
+
|
|
337
354
|
const domainInfo = this.domainCertificates.get(domain);
|
|
338
355
|
|
|
339
356
|
if (!domainInfo || !domainInfo.certObtained || !domainInfo.certificate || !domainInfo.privateKey) {
|
|
@@ -348,6 +365,65 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
348
365
|
};
|
|
349
366
|
}
|
|
350
367
|
|
|
368
|
+
/**
|
|
369
|
+
* Check if a domain is a glob pattern
|
|
370
|
+
* @param domain Domain to check
|
|
371
|
+
* @returns True if the domain is a glob pattern
|
|
372
|
+
*/
|
|
373
|
+
private isGlobPattern(domain: string): boolean {
|
|
374
|
+
return domain.includes('*');
|
|
375
|
+
}
|
|
376
|
+
|
|
377
|
+
/**
|
|
378
|
+
* Get domain info for a specific domain, using glob pattern matching if needed
|
|
379
|
+
* @param requestDomain The actual domain from the request
|
|
380
|
+
* @returns The domain info or null if not found
|
|
381
|
+
*/
|
|
382
|
+
private getDomainInfoForRequest(requestDomain: string): { domainInfo: IDomainCertificate, pattern: string } | null {
|
|
383
|
+
// Try direct match first
|
|
384
|
+
if (this.domainCertificates.has(requestDomain)) {
|
|
385
|
+
return {
|
|
386
|
+
domainInfo: this.domainCertificates.get(requestDomain)!,
|
|
387
|
+
pattern: requestDomain
|
|
388
|
+
};
|
|
389
|
+
}
|
|
390
|
+
|
|
391
|
+
// Then try glob patterns
|
|
392
|
+
for (const [pattern, domainInfo] of this.domainCertificates.entries()) {
|
|
393
|
+
if (this.isGlobPattern(pattern) && this.domainMatchesPattern(requestDomain, pattern)) {
|
|
394
|
+
return { domainInfo, pattern };
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
|
|
398
|
+
return null;
|
|
399
|
+
}
|
|
400
|
+
|
|
401
|
+
/**
|
|
402
|
+
* Check if a domain matches a glob pattern
|
|
403
|
+
* @param domain The domain to check
|
|
404
|
+
* @param pattern The pattern to match against
|
|
405
|
+
* @returns True if the domain matches the pattern
|
|
406
|
+
*/
|
|
407
|
+
private domainMatchesPattern(domain: string, pattern: string): boolean {
|
|
408
|
+
// Handle different glob pattern styles
|
|
409
|
+
if (pattern.startsWith('*.')) {
|
|
410
|
+
// *.example.com matches any subdomain
|
|
411
|
+
const suffix = pattern.substring(2);
|
|
412
|
+
return domain.endsWith(suffix) && domain.includes('.') && domain !== suffix;
|
|
413
|
+
} else if (pattern.endsWith('.*')) {
|
|
414
|
+
// example.* matches any TLD
|
|
415
|
+
const prefix = pattern.substring(0, pattern.length - 2);
|
|
416
|
+
const domainParts = domain.split('.');
|
|
417
|
+
return domain.startsWith(prefix + '.') && domainParts.length >= 2;
|
|
418
|
+
} else if (pattern === '*') {
|
|
419
|
+
// Wildcard matches everything
|
|
420
|
+
return true;
|
|
421
|
+
} else {
|
|
422
|
+
// Exact match (shouldn't reach here as we check exact matches first)
|
|
423
|
+
return domain === pattern;
|
|
424
|
+
}
|
|
425
|
+
}
|
|
426
|
+
|
|
351
427
|
/**
|
|
352
428
|
* Lazy initialization of the ACME client
|
|
353
429
|
* @returns An ACME client instance
|
|
@@ -397,14 +473,16 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
397
473
|
// Extract domain (ignoring any port in the Host header)
|
|
398
474
|
const domain = hostHeader.split(':')[0];
|
|
399
475
|
|
|
400
|
-
//
|
|
401
|
-
|
|
476
|
+
// Get domain config, using glob pattern matching if needed
|
|
477
|
+
const domainMatch = this.getDomainInfoForRequest(domain);
|
|
478
|
+
|
|
479
|
+
if (!domainMatch) {
|
|
402
480
|
res.statusCode = 404;
|
|
403
481
|
res.end('Domain not configured');
|
|
404
482
|
return;
|
|
405
483
|
}
|
|
406
484
|
|
|
407
|
-
const domainInfo =
|
|
485
|
+
const { domainInfo, pattern } = domainMatch;
|
|
408
486
|
const options = domainInfo.options;
|
|
409
487
|
|
|
410
488
|
// If the request is for an ACME HTTP-01 challenge, handle it
|
|
@@ -415,8 +493,11 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
415
493
|
return;
|
|
416
494
|
}
|
|
417
495
|
|
|
418
|
-
|
|
419
|
-
|
|
496
|
+
// Only handle ACME challenges for non-glob patterns
|
|
497
|
+
if (!this.isGlobPattern(pattern)) {
|
|
498
|
+
this.handleAcmeChallenge(req, res, domain);
|
|
499
|
+
return;
|
|
500
|
+
}
|
|
420
501
|
}
|
|
421
502
|
|
|
422
503
|
// Check if we should forward non-ACME requests
|
|
@@ -426,7 +507,8 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
426
507
|
}
|
|
427
508
|
|
|
428
509
|
// If certificate exists and sslRedirect is enabled, redirect to HTTPS
|
|
429
|
-
|
|
510
|
+
// (Skip for glob patterns as they won't have certificates)
|
|
511
|
+
if (!this.isGlobPattern(pattern) && domainInfo.certObtained && options.sslRedirect) {
|
|
430
512
|
const httpsPort = this.options.httpsRedirectPort;
|
|
431
513
|
const portSuffix = httpsPort === 443 ? '' : `:${httpsPort}`;
|
|
432
514
|
const redirectUrl = `https://${domain}${portSuffix}${req.url || '/'}`;
|
|
@@ -438,7 +520,8 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
438
520
|
}
|
|
439
521
|
|
|
440
522
|
// Handle case where certificate maintenance is enabled but not yet obtained
|
|
441
|
-
|
|
523
|
+
// (Skip for glob patterns as they can't have certificates)
|
|
524
|
+
if (!this.isGlobPattern(pattern) && options.acmeMaintenance && !domainInfo.certObtained) {
|
|
442
525
|
// Trigger certificate issuance if not already running
|
|
443
526
|
if (!domainInfo.obtainingInProgress) {
|
|
444
527
|
this.obtainCertificate(domain).catch(err => {
|
|
@@ -559,6 +642,11 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
559
642
|
* @param isRenewal Whether this is a renewal attempt
|
|
560
643
|
*/
|
|
561
644
|
private async obtainCertificate(domain: string, isRenewal: boolean = false): Promise<void> {
|
|
645
|
+
// Don't allow certificate issuance for glob patterns
|
|
646
|
+
if (this.isGlobPattern(domain)) {
|
|
647
|
+
throw new CertificateError('Cannot obtain certificates for glob pattern domains', domain, isRenewal);
|
|
648
|
+
}
|
|
649
|
+
|
|
562
650
|
// Get the domain info
|
|
563
651
|
const domainInfo = this.domainCertificates.get(domain);
|
|
564
652
|
if (!domainInfo) {
|
|
@@ -752,6 +840,11 @@ export class Port80Handler extends plugins.EventEmitter {
|
|
|
752
840
|
const renewThresholdMs = this.options.renewThresholdDays * 24 * 60 * 60 * 1000;
|
|
753
841
|
|
|
754
842
|
for (const [domain, domainInfo] of this.domainCertificates.entries()) {
|
|
843
|
+
// Skip glob patterns
|
|
844
|
+
if (this.isGlobPattern(domain)) {
|
|
845
|
+
continue;
|
|
846
|
+
}
|
|
847
|
+
|
|
755
848
|
// Skip domains with acmeMaintenance disabled
|
|
756
849
|
if (!domainInfo.options.acmeMaintenance) {
|
|
757
850
|
continue;
|