@push.rocks/smartproxy 19.6.13 → 19.6.15
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/core/utils/log-deduplicator.d.ts +39 -0
- package/dist_ts/core/utils/log-deduplicator.js +297 -0
- package/dist_ts/core/utils/shared-security-manager.d.ts +2 -1
- package/dist_ts/core/utils/shared-security-manager.js +22 -2
- package/dist_ts/proxies/http-proxy/http-proxy.d.ts +1 -0
- package/dist_ts/proxies/http-proxy/http-proxy.js +94 -9
- package/dist_ts/proxies/http-proxy/models/types.d.ts +2 -0
- package/dist_ts/proxies/http-proxy/models/types.js +1 -1
- package/dist_ts/proxies/http-proxy/security-manager.d.ts +42 -1
- package/dist_ts/proxies/http-proxy/security-manager.js +121 -2
- package/dist_ts/proxies/smart-proxy/connection-manager.d.ts +14 -0
- package/dist_ts/proxies/smart-proxy/connection-manager.js +86 -32
- package/dist_ts/proxies/smart-proxy/http-proxy-bridge.js +5 -1
- package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +1 -0
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +25 -9
- package/dist_ts/proxies/smart-proxy/security-manager.d.ts +9 -0
- package/dist_ts/proxies/smart-proxy/security-manager.js +63 -1
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +4 -1
- package/package.json +1 -1
- package/readme.hints.md +113 -1
- package/readme.plan.md +34 -353
- package/ts/core/utils/log-deduplicator.ts +361 -0
- package/ts/core/utils/shared-security-manager.ts +24 -1
- package/ts/proxies/http-proxy/http-proxy.ts +129 -9
- package/ts/proxies/http-proxy/models/types.ts +4 -0
- package/ts/proxies/http-proxy/security-manager.ts +136 -1
- package/ts/proxies/smart-proxy/connection-manager.ts +113 -36
- package/ts/proxies/smart-proxy/http-proxy-bridge.ts +5 -0
- package/ts/proxies/smart-proxy/models/interfaces.ts +1 -0
- package/ts/proxies/smart-proxy/route-connection-handler.ts +52 -15
- package/ts/proxies/smart-proxy/security-manager.ts +76 -1
- package/ts/proxies/smart-proxy/smart-proxy.ts +4 -0
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Log deduplication utility to reduce log spam for repetitive events
|
|
3
|
+
*/
|
|
4
|
+
export declare class LogDeduplicator {
|
|
5
|
+
private globalFlushTimer?;
|
|
6
|
+
private aggregatedEvents;
|
|
7
|
+
private flushInterval;
|
|
8
|
+
private maxBatchSize;
|
|
9
|
+
private rapidEventThreshold;
|
|
10
|
+
private lastRapidCheck;
|
|
11
|
+
constructor(flushInterval?: number);
|
|
12
|
+
/**
|
|
13
|
+
* Log a deduplicated event
|
|
14
|
+
* @param key - Aggregation key (e.g., 'connection-rejected', 'cleanup-batch')
|
|
15
|
+
* @param level - Log level
|
|
16
|
+
* @param message - Log message template
|
|
17
|
+
* @param data - Additional data
|
|
18
|
+
* @param dedupeKey - Deduplication key within the aggregation (e.g., IP address, reason)
|
|
19
|
+
*/
|
|
20
|
+
log(key: string, level: 'info' | 'warn' | 'error' | 'debug', message: string, data?: any, dedupeKey?: string): void;
|
|
21
|
+
/**
|
|
22
|
+
* Flush aggregated events for a specific key
|
|
23
|
+
*/
|
|
24
|
+
flush(key: string): void;
|
|
25
|
+
/**
|
|
26
|
+
* Flush all pending events
|
|
27
|
+
*/
|
|
28
|
+
flushAll(): void;
|
|
29
|
+
private flushConnectionRejections;
|
|
30
|
+
private flushConnectionCleanups;
|
|
31
|
+
private flushConnectionTerminations;
|
|
32
|
+
private flushIPRejections;
|
|
33
|
+
private flushGeneric;
|
|
34
|
+
/**
|
|
35
|
+
* Cleanup and stop deduplication
|
|
36
|
+
*/
|
|
37
|
+
cleanup(): void;
|
|
38
|
+
}
|
|
39
|
+
export declare const connectionLogDeduplicator: LogDeduplicator;
|
|
@@ -0,0 +1,297 @@
|
|
|
1
|
+
import { logger } from './logger.js';
|
|
2
|
+
/**
|
|
3
|
+
* Log deduplication utility to reduce log spam for repetitive events
|
|
4
|
+
*/
|
|
5
|
+
export class LogDeduplicator {
|
|
6
|
+
constructor(flushInterval) {
|
|
7
|
+
this.aggregatedEvents = new Map();
|
|
8
|
+
this.flushInterval = 5000; // 5 seconds
|
|
9
|
+
this.maxBatchSize = 100;
|
|
10
|
+
this.rapidEventThreshold = 50; // Flush early if this many events in 1 second
|
|
11
|
+
this.lastRapidCheck = Date.now();
|
|
12
|
+
if (flushInterval) {
|
|
13
|
+
this.flushInterval = flushInterval;
|
|
14
|
+
}
|
|
15
|
+
// Set up global periodic flush to ensure logs are emitted regularly
|
|
16
|
+
this.globalFlushTimer = setInterval(() => {
|
|
17
|
+
this.flushAll();
|
|
18
|
+
}, this.flushInterval * 2); // Flush everything every 2x the normal interval
|
|
19
|
+
if (this.globalFlushTimer.unref) {
|
|
20
|
+
this.globalFlushTimer.unref();
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Log a deduplicated event
|
|
25
|
+
* @param key - Aggregation key (e.g., 'connection-rejected', 'cleanup-batch')
|
|
26
|
+
* @param level - Log level
|
|
27
|
+
* @param message - Log message template
|
|
28
|
+
* @param data - Additional data
|
|
29
|
+
* @param dedupeKey - Deduplication key within the aggregation (e.g., IP address, reason)
|
|
30
|
+
*/
|
|
31
|
+
log(key, level, message, data, dedupeKey) {
|
|
32
|
+
const eventKey = dedupeKey || message;
|
|
33
|
+
const now = Date.now();
|
|
34
|
+
if (!this.aggregatedEvents.has(key)) {
|
|
35
|
+
this.aggregatedEvents.set(key, {
|
|
36
|
+
key,
|
|
37
|
+
events: new Map(),
|
|
38
|
+
flushTimer: undefined
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
const aggregated = this.aggregatedEvents.get(key);
|
|
42
|
+
if (aggregated.events.has(eventKey)) {
|
|
43
|
+
const event = aggregated.events.get(eventKey);
|
|
44
|
+
event.count++;
|
|
45
|
+
event.lastSeen = now;
|
|
46
|
+
if (data) {
|
|
47
|
+
event.data = { ...event.data, ...data };
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
aggregated.events.set(eventKey, {
|
|
52
|
+
level,
|
|
53
|
+
message,
|
|
54
|
+
data,
|
|
55
|
+
count: 1,
|
|
56
|
+
firstSeen: now,
|
|
57
|
+
lastSeen: now
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
// Check for rapid events (many events in short time)
|
|
61
|
+
const totalEvents = Array.from(aggregated.events.values()).reduce((sum, e) => sum + e.count, 0);
|
|
62
|
+
// If we're getting flooded with events, flush more frequently
|
|
63
|
+
if (now - this.lastRapidCheck < 1000 && totalEvents >= this.rapidEventThreshold) {
|
|
64
|
+
this.flush(key);
|
|
65
|
+
this.lastRapidCheck = now;
|
|
66
|
+
}
|
|
67
|
+
else if (aggregated.events.size >= this.maxBatchSize) {
|
|
68
|
+
// Check if we should flush due to size
|
|
69
|
+
this.flush(key);
|
|
70
|
+
}
|
|
71
|
+
else if (!aggregated.flushTimer) {
|
|
72
|
+
// Schedule flush
|
|
73
|
+
aggregated.flushTimer = setTimeout(() => {
|
|
74
|
+
this.flush(key);
|
|
75
|
+
}, this.flushInterval);
|
|
76
|
+
if (aggregated.flushTimer.unref) {
|
|
77
|
+
aggregated.flushTimer.unref();
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
// Update rapid check time
|
|
81
|
+
if (now - this.lastRapidCheck >= 1000) {
|
|
82
|
+
this.lastRapidCheck = now;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* Flush aggregated events for a specific key
|
|
87
|
+
*/
|
|
88
|
+
flush(key) {
|
|
89
|
+
const aggregated = this.aggregatedEvents.get(key);
|
|
90
|
+
if (!aggregated || aggregated.events.size === 0) {
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
if (aggregated.flushTimer) {
|
|
94
|
+
clearTimeout(aggregated.flushTimer);
|
|
95
|
+
aggregated.flushTimer = undefined;
|
|
96
|
+
}
|
|
97
|
+
// Emit aggregated log based on the key
|
|
98
|
+
switch (key) {
|
|
99
|
+
case 'connection-rejected':
|
|
100
|
+
this.flushConnectionRejections(aggregated);
|
|
101
|
+
break;
|
|
102
|
+
case 'connection-cleanup':
|
|
103
|
+
this.flushConnectionCleanups(aggregated);
|
|
104
|
+
break;
|
|
105
|
+
case 'connection-terminated':
|
|
106
|
+
this.flushConnectionTerminations(aggregated);
|
|
107
|
+
break;
|
|
108
|
+
case 'ip-rejected':
|
|
109
|
+
this.flushIPRejections(aggregated);
|
|
110
|
+
break;
|
|
111
|
+
default:
|
|
112
|
+
this.flushGeneric(aggregated);
|
|
113
|
+
}
|
|
114
|
+
// Clear events
|
|
115
|
+
aggregated.events.clear();
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Flush all pending events
|
|
119
|
+
*/
|
|
120
|
+
flushAll() {
|
|
121
|
+
for (const key of this.aggregatedEvents.keys()) {
|
|
122
|
+
this.flush(key);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
flushConnectionRejections(aggregated) {
|
|
126
|
+
const totalCount = Array.from(aggregated.events.values()).reduce((sum, e) => sum + e.count, 0);
|
|
127
|
+
const byReason = new Map();
|
|
128
|
+
for (const [, event] of aggregated.events) {
|
|
129
|
+
const reason = event.data?.reason || 'unknown';
|
|
130
|
+
byReason.set(reason, (byReason.get(reason) || 0) + event.count);
|
|
131
|
+
}
|
|
132
|
+
const reasonSummary = Array.from(byReason.entries())
|
|
133
|
+
.sort((a, b) => b[1] - a[1])
|
|
134
|
+
.map(([reason, count]) => `${reason}: ${count}`)
|
|
135
|
+
.join(', ');
|
|
136
|
+
const duration = Date.now() - Math.min(...Array.from(aggregated.events.values()).map(e => e.firstSeen));
|
|
137
|
+
logger.log('warn', `[SUMMARY] Rejected ${totalCount} connections in ${Math.round(duration / 1000)}s`, {
|
|
138
|
+
reasons: reasonSummary,
|
|
139
|
+
uniqueIPs: aggregated.events.size,
|
|
140
|
+
component: 'connection-dedup'
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
flushConnectionCleanups(aggregated) {
|
|
144
|
+
const totalCount = Array.from(aggregated.events.values()).reduce((sum, e) => sum + e.count, 0);
|
|
145
|
+
const byReason = new Map();
|
|
146
|
+
for (const [, event] of aggregated.events) {
|
|
147
|
+
const reason = event.data?.reason || 'normal';
|
|
148
|
+
byReason.set(reason, (byReason.get(reason) || 0) + event.count);
|
|
149
|
+
}
|
|
150
|
+
const reasonSummary = Array.from(byReason.entries())
|
|
151
|
+
.sort((a, b) => b[1] - a[1])
|
|
152
|
+
.slice(0, 5) // Top 5 reasons
|
|
153
|
+
.map(([reason, count]) => `${reason}: ${count}`)
|
|
154
|
+
.join(', ');
|
|
155
|
+
logger.log('info', `Cleaned up ${totalCount} connections`, {
|
|
156
|
+
reasons: reasonSummary,
|
|
157
|
+
duration: Date.now() - Math.min(...Array.from(aggregated.events.values()).map(e => e.firstSeen)),
|
|
158
|
+
component: 'connection-dedup'
|
|
159
|
+
});
|
|
160
|
+
}
|
|
161
|
+
flushConnectionTerminations(aggregated) {
|
|
162
|
+
const totalCount = Array.from(aggregated.events.values()).reduce((sum, e) => sum + e.count, 0);
|
|
163
|
+
const byReason = new Map();
|
|
164
|
+
const byIP = new Map();
|
|
165
|
+
let lastActiveCount = 0;
|
|
166
|
+
for (const [, event] of aggregated.events) {
|
|
167
|
+
const reason = event.data?.reason || 'unknown';
|
|
168
|
+
const ip = event.data?.remoteIP || 'unknown';
|
|
169
|
+
byReason.set(reason, (byReason.get(reason) || 0) + event.count);
|
|
170
|
+
// Track by IP
|
|
171
|
+
if (ip !== 'unknown') {
|
|
172
|
+
byIP.set(ip, (byIP.get(ip) || 0) + event.count);
|
|
173
|
+
}
|
|
174
|
+
// Track the last active connection count
|
|
175
|
+
if (event.data?.activeConnections !== undefined) {
|
|
176
|
+
lastActiveCount = event.data.activeConnections;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
const reasonSummary = Array.from(byReason.entries())
|
|
180
|
+
.sort((a, b) => b[1] - a[1])
|
|
181
|
+
.slice(0, 5) // Top 5 reasons
|
|
182
|
+
.map(([reason, count]) => `${reason}: ${count}`)
|
|
183
|
+
.join(', ');
|
|
184
|
+
// Show top IPs if there are many different ones
|
|
185
|
+
let ipInfo = '';
|
|
186
|
+
if (byIP.size > 3) {
|
|
187
|
+
const topIPs = Array.from(byIP.entries())
|
|
188
|
+
.sort((a, b) => b[1] - a[1])
|
|
189
|
+
.slice(0, 3)
|
|
190
|
+
.map(([ip, count]) => `${ip} (${count})`)
|
|
191
|
+
.join(', ');
|
|
192
|
+
ipInfo = `, from ${byIP.size} IPs (top: ${topIPs})`;
|
|
193
|
+
}
|
|
194
|
+
else if (byIP.size > 0) {
|
|
195
|
+
ipInfo = `, IPs: ${Array.from(byIP.keys()).join(', ')}`;
|
|
196
|
+
}
|
|
197
|
+
const duration = Date.now() - Math.min(...Array.from(aggregated.events.values()).map(e => e.firstSeen));
|
|
198
|
+
// Special handling for localhost connections (HttpProxy)
|
|
199
|
+
const localhostCount = byIP.get('::ffff:127.0.0.1') || 0;
|
|
200
|
+
if (localhostCount > 0 && byIP.size === 1) {
|
|
201
|
+
// All connections are from localhost (HttpProxy)
|
|
202
|
+
logger.log('info', `[SUMMARY] ${totalCount} HttpProxy connections terminated in ${Math.round(duration / 1000)}s`, {
|
|
203
|
+
reasons: reasonSummary,
|
|
204
|
+
activeConnections: lastActiveCount,
|
|
205
|
+
component: 'connection-dedup'
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
else {
|
|
209
|
+
logger.log('info', `[SUMMARY] ${totalCount} connections terminated in ${Math.round(duration / 1000)}s`, {
|
|
210
|
+
reasons: reasonSummary,
|
|
211
|
+
activeConnections: lastActiveCount,
|
|
212
|
+
uniqueReasons: byReason.size,
|
|
213
|
+
...(ipInfo ? { ips: ipInfo } : {}),
|
|
214
|
+
component: 'connection-dedup'
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
flushIPRejections(aggregated) {
|
|
219
|
+
const byIP = new Map();
|
|
220
|
+
for (const [ip, event] of aggregated.events) {
|
|
221
|
+
if (!byIP.has(ip)) {
|
|
222
|
+
byIP.set(ip, { count: 0, reasons: new Set() });
|
|
223
|
+
}
|
|
224
|
+
const ipData = byIP.get(ip);
|
|
225
|
+
ipData.count += event.count;
|
|
226
|
+
if (event.data?.reason) {
|
|
227
|
+
ipData.reasons.add(event.data.reason);
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
// Log top offenders
|
|
231
|
+
const topOffenders = Array.from(byIP.entries())
|
|
232
|
+
.sort((a, b) => b[1].count - a[1].count)
|
|
233
|
+
.slice(0, 10)
|
|
234
|
+
.map(([ip, data]) => `${ip} (${data.count}x, ${Array.from(data.reasons).join('/')})`)
|
|
235
|
+
.join(', ');
|
|
236
|
+
const totalRejections = Array.from(byIP.values()).reduce((sum, data) => sum + data.count, 0);
|
|
237
|
+
const duration = Date.now() - Math.min(...Array.from(aggregated.events.values()).map(e => e.firstSeen));
|
|
238
|
+
logger.log('warn', `[SUMMARY] Rejected ${totalRejections} connections from ${byIP.size} IPs in ${Math.round(duration / 1000)}s`, {
|
|
239
|
+
topOffenders,
|
|
240
|
+
component: 'ip-dedup'
|
|
241
|
+
});
|
|
242
|
+
}
|
|
243
|
+
flushGeneric(aggregated) {
|
|
244
|
+
const totalCount = Array.from(aggregated.events.values()).reduce((sum, e) => sum + e.count, 0);
|
|
245
|
+
const level = aggregated.events.values().next().value?.level || 'info';
|
|
246
|
+
// Special handling for IP cleanup events
|
|
247
|
+
if (aggregated.key === 'ip-cleanup') {
|
|
248
|
+
const totalCleaned = Array.from(aggregated.events.values()).reduce((sum, e) => {
|
|
249
|
+
return sum + (e.data?.cleanedIPs || 0) + (e.data?.cleanedRateLimits || 0);
|
|
250
|
+
}, 0);
|
|
251
|
+
if (totalCleaned > 0) {
|
|
252
|
+
logger.log(level, `IP tracking cleanup: removed ${totalCleaned} entries across ${totalCount} cleanup cycles`, {
|
|
253
|
+
duration: Date.now() - Math.min(...Array.from(aggregated.events.values()).map(e => e.firstSeen)),
|
|
254
|
+
component: 'log-dedup'
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
else {
|
|
259
|
+
logger.log(level, `${aggregated.key}: ${totalCount} events`, {
|
|
260
|
+
uniqueEvents: aggregated.events.size,
|
|
261
|
+
duration: Date.now() - Math.min(...Array.from(aggregated.events.values()).map(e => e.firstSeen)),
|
|
262
|
+
component: 'log-dedup'
|
|
263
|
+
});
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
/**
|
|
267
|
+
* Cleanup and stop deduplication
|
|
268
|
+
*/
|
|
269
|
+
cleanup() {
|
|
270
|
+
this.flushAll();
|
|
271
|
+
if (this.globalFlushTimer) {
|
|
272
|
+
clearInterval(this.globalFlushTimer);
|
|
273
|
+
this.globalFlushTimer = undefined;
|
|
274
|
+
}
|
|
275
|
+
for (const aggregated of this.aggregatedEvents.values()) {
|
|
276
|
+
if (aggregated.flushTimer) {
|
|
277
|
+
clearTimeout(aggregated.flushTimer);
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
this.aggregatedEvents.clear();
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
// Global instance for connection-related log deduplication
|
|
284
|
+
export const connectionLogDeduplicator = new LogDeduplicator(5000); // 5 second batches
|
|
285
|
+
// Ensure logs are flushed on process exit
|
|
286
|
+
process.on('beforeExit', () => {
|
|
287
|
+
connectionLogDeduplicator.flushAll();
|
|
288
|
+
});
|
|
289
|
+
process.on('SIGINT', () => {
|
|
290
|
+
connectionLogDeduplicator.cleanup();
|
|
291
|
+
process.exit(0);
|
|
292
|
+
});
|
|
293
|
+
process.on('SIGTERM', () => {
|
|
294
|
+
connectionLogDeduplicator.cleanup();
|
|
295
|
+
process.exit(0);
|
|
296
|
+
});
|
|
297
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"log-deduplicator.js","sourceRoot":"","sources":["../../../ts/core/utils/log-deduplicator.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,9 +66,10 @@ export declare class SharedSecurityManager {
|
|
|
66
66
|
*
|
|
67
67
|
* @param route - The route to check
|
|
68
68
|
* @param context - The request context
|
|
69
|
+
* @param routeConnectionCount - Current connection count for this route (optional)
|
|
69
70
|
* @returns Whether access is allowed
|
|
70
71
|
*/
|
|
71
|
-
isAllowed(route: IRouteConfig, context: IRouteContext): boolean;
|
|
72
|
+
isAllowed(route: IRouteConfig, context: IRouteContext, routeConnectionCount?: number): boolean;
|
|
72
73
|
/**
|
|
73
74
|
* Check if a client IP is allowed for a route
|
|
74
75
|
*
|
|
@@ -101,9 +101,10 @@ export class SharedSecurityManager {
|
|
|
101
101
|
*
|
|
102
102
|
* @param route - The route to check
|
|
103
103
|
* @param context - The request context
|
|
104
|
+
* @param routeConnectionCount - Current connection count for this route (optional)
|
|
104
105
|
* @returns Whether access is allowed
|
|
105
106
|
*/
|
|
106
|
-
isAllowed(route, context) {
|
|
107
|
+
isAllowed(route, context, routeConnectionCount) {
|
|
107
108
|
if (!route.security) {
|
|
108
109
|
return true; // No security restrictions
|
|
109
110
|
}
|
|
@@ -112,6 +113,13 @@ export class SharedSecurityManager {
|
|
|
112
113
|
this.logger?.debug?.(`IP ${context.clientIp} is blocked for route ${route.name || 'unnamed'}`);
|
|
113
114
|
return false;
|
|
114
115
|
}
|
|
116
|
+
// --- Route-level connection limit ---
|
|
117
|
+
if (route.security.maxConnections !== undefined && routeConnectionCount !== undefined) {
|
|
118
|
+
if (routeConnectionCount >= route.security.maxConnections) {
|
|
119
|
+
this.logger?.debug?.(`Route connection limit (${route.security.maxConnections}) exceeded for route ${route.name || 'unnamed'}`);
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
115
123
|
// --- Rate limiting ---
|
|
116
124
|
if (route.security.rateLimit?.enabled && !this.isWithinRateLimit(route, context)) {
|
|
117
125
|
this.logger?.debug?.(`Rate limit exceeded for route ${route.name || 'unnamed'}`);
|
|
@@ -225,6 +233,18 @@ export class SharedSecurityManager {
|
|
|
225
233
|
cleanupCaches() {
|
|
226
234
|
// Clean up rate limits
|
|
227
235
|
cleanupExpiredRateLimits(this.rateLimits, this.logger);
|
|
236
|
+
// Clean up IP connection tracking
|
|
237
|
+
let cleanedIPs = 0;
|
|
238
|
+
for (const [ip, info] of this.connectionsByIP.entries()) {
|
|
239
|
+
// Remove IPs with no active connections and no recent timestamps
|
|
240
|
+
if (info.connections.size === 0 && info.timestamps.length === 0) {
|
|
241
|
+
this.connectionsByIP.delete(ip);
|
|
242
|
+
cleanedIPs++;
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
if (cleanedIPs > 0 && this.logger?.debug) {
|
|
246
|
+
this.logger.debug(`Cleaned up ${cleanedIPs} IPs with no active connections`);
|
|
247
|
+
}
|
|
228
248
|
// IP filter cache doesn't need cleanup (tied to routes)
|
|
229
249
|
}
|
|
230
250
|
/**
|
|
@@ -249,4 +269,4 @@ export class SharedSecurityManager {
|
|
|
249
269
|
this.ipFilterCache.clear();
|
|
250
270
|
}
|
|
251
271
|
}
|
|
252
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
272
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"shared-security-manager.js","sourceRoot":"","sources":["../../../ts/core/utils/shared-security-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export declare class HttpProxy implements IMetricsTracker {
|
|
|
19
19
|
private router;
|
|
20
20
|
private routeManager;
|
|
21
21
|
private functionCache;
|
|
22
|
+
private securityManager;
|
|
22
23
|
socketMap: plugins.lik.ObjectMap<plugins.net.Socket>;
|
|
23
24
|
activeContexts: Set<string>;
|
|
24
25
|
connectedClients: number;
|