@push.rocks/smartproxy 3.10.2 → 3.10.4
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: '3.10.
|
|
6
|
+
version: '3.10.4',
|
|
7
7
|
description: 'a proxy for handling high workloads of proxying'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGlEQUFpRDtDQUMvRCxDQUFBIn0=
|
|
@@ -16,9 +16,7 @@ export interface IProxySettings extends plugins.tls.TlsOptions {
|
|
|
16
16
|
export declare class PortProxy {
|
|
17
17
|
netServer: plugins.net.Server;
|
|
18
18
|
settings: IProxySettings;
|
|
19
|
-
private
|
|
20
|
-
private incomingConnectionTimes;
|
|
21
|
-
private outgoingConnectionTimes;
|
|
19
|
+
private connectionRecords;
|
|
22
20
|
private connectionLogger;
|
|
23
21
|
private terminationStats;
|
|
24
22
|
constructor(settings: IProxySettings);
|
|
@@ -1,77 +1,54 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
4
|
-
*
|
|
3
|
+
* Extracts the SNI (Server Name Indication) from a TLS ClientHello packet.
|
|
4
|
+
* @param buffer - Buffer containing the TLS ClientHello.
|
|
5
|
+
* @returns The server name if found, otherwise undefined.
|
|
5
6
|
*/
|
|
6
7
|
function extractSNI(buffer) {
|
|
7
8
|
let offset = 0;
|
|
8
|
-
|
|
9
|
-
if (buffer.length < 5) {
|
|
9
|
+
if (buffer.length < 5)
|
|
10
10
|
return undefined;
|
|
11
|
-
}
|
|
12
|
-
// TLS record header
|
|
13
11
|
const recordType = buffer.readUInt8(0);
|
|
14
|
-
if (recordType !== 22)
|
|
15
|
-
return undefined;
|
|
16
|
-
}
|
|
17
|
-
// Read record length
|
|
12
|
+
if (recordType !== 22)
|
|
13
|
+
return undefined; // 22 = handshake
|
|
18
14
|
const recordLength = buffer.readUInt16BE(3);
|
|
19
|
-
if (buffer.length < 5 + recordLength)
|
|
20
|
-
// Not all data arrived yet; in production you might need to accumulate more data.
|
|
15
|
+
if (buffer.length < 5 + recordLength)
|
|
21
16
|
return undefined;
|
|
22
|
-
}
|
|
23
17
|
offset = 5;
|
|
24
|
-
// Handshake message type should be 1 for ClientHello.
|
|
25
18
|
const handshakeType = buffer.readUInt8(offset);
|
|
26
|
-
if (handshakeType !== 1)
|
|
27
|
-
return undefined;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
offset += 4;
|
|
31
|
-
// Skip client version (2 bytes) and random (32 bytes)
|
|
32
|
-
offset += 2 + 32;
|
|
33
|
-
// Session ID
|
|
19
|
+
if (handshakeType !== 1)
|
|
20
|
+
return undefined; // 1 = ClientHello
|
|
21
|
+
offset += 4; // Skip handshake header (type + length)
|
|
22
|
+
offset += 2 + 32; // Skip client version and random
|
|
34
23
|
const sessionIDLength = buffer.readUInt8(offset);
|
|
35
|
-
offset += 1 + sessionIDLength;
|
|
36
|
-
// Cipher suites
|
|
24
|
+
offset += 1 + sessionIDLength; // Skip session ID
|
|
37
25
|
const cipherSuitesLength = buffer.readUInt16BE(offset);
|
|
38
|
-
offset += 2 + cipherSuitesLength;
|
|
39
|
-
// Compression methods
|
|
26
|
+
offset += 2 + cipherSuitesLength; // Skip cipher suites
|
|
40
27
|
const compressionMethodsLength = buffer.readUInt8(offset);
|
|
41
|
-
offset += 1 + compressionMethodsLength;
|
|
42
|
-
|
|
43
|
-
if (offset + 2 > buffer.length) {
|
|
28
|
+
offset += 1 + compressionMethodsLength; // Skip compression methods
|
|
29
|
+
if (offset + 2 > buffer.length)
|
|
44
30
|
return undefined;
|
|
45
|
-
}
|
|
46
31
|
const extensionsLength = buffer.readUInt16BE(offset);
|
|
47
32
|
offset += 2;
|
|
48
33
|
const extensionsEnd = offset + extensionsLength;
|
|
49
|
-
// Iterate over extensions
|
|
50
34
|
while (offset + 4 <= extensionsEnd) {
|
|
51
35
|
const extensionType = buffer.readUInt16BE(offset);
|
|
52
36
|
const extensionLength = buffer.readUInt16BE(offset + 2);
|
|
53
37
|
offset += 4;
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
// SNI extension: first 2 bytes are the SNI list length.
|
|
57
|
-
if (offset + 2 > buffer.length) {
|
|
38
|
+
if (extensionType === 0x0000) { // SNI extension
|
|
39
|
+
if (offset + 2 > buffer.length)
|
|
58
40
|
return undefined;
|
|
59
|
-
}
|
|
60
41
|
const sniListLength = buffer.readUInt16BE(offset);
|
|
61
42
|
offset += 2;
|
|
62
43
|
const sniListEnd = offset + sniListLength;
|
|
63
|
-
// Loop through the list; typically there is one entry.
|
|
64
44
|
while (offset + 3 < sniListEnd) {
|
|
65
|
-
const nameType = buffer.readUInt8(offset);
|
|
66
|
-
offset++;
|
|
45
|
+
const nameType = buffer.readUInt8(offset++);
|
|
67
46
|
const nameLen = buffer.readUInt16BE(offset);
|
|
68
47
|
offset += 2;
|
|
69
48
|
if (nameType === 0) { // host_name
|
|
70
|
-
if (offset + nameLen > buffer.length)
|
|
49
|
+
if (offset + nameLen > buffer.length)
|
|
71
50
|
return undefined;
|
|
72
|
-
|
|
73
|
-
const serverName = buffer.toString('utf8', offset, offset + nameLen);
|
|
74
|
-
return serverName;
|
|
51
|
+
return buffer.toString('utf8', offset, offset + nameLen);
|
|
75
52
|
}
|
|
76
53
|
offset += nameLen;
|
|
77
54
|
}
|
|
@@ -85,103 +62,86 @@ function extractSNI(buffer) {
|
|
|
85
62
|
}
|
|
86
63
|
export class PortProxy {
|
|
87
64
|
constructor(settings) {
|
|
88
|
-
//
|
|
89
|
-
this.
|
|
90
|
-
// Record start times for incoming connections
|
|
91
|
-
this.incomingConnectionTimes = new Map();
|
|
92
|
-
// Record start times for outgoing connections
|
|
93
|
-
this.outgoingConnectionTimes = new Map();
|
|
65
|
+
// Unified record tracking each connection pair.
|
|
66
|
+
this.connectionRecords = new Set();
|
|
94
67
|
this.connectionLogger = null;
|
|
95
|
-
// Overall termination statistics
|
|
96
68
|
this.terminationStats = {
|
|
97
69
|
incoming: {},
|
|
98
70
|
outgoing: {},
|
|
99
71
|
};
|
|
100
72
|
this.settings = {
|
|
101
73
|
...settings,
|
|
102
|
-
toHost: settings.toHost || 'localhost'
|
|
74
|
+
toHost: settings.toHost || 'localhost',
|
|
103
75
|
};
|
|
104
76
|
}
|
|
105
|
-
// Helper to update termination stats.
|
|
106
77
|
incrementTerminationStat(side, reason) {
|
|
107
|
-
|
|
108
|
-
this.terminationStats[side][reason] = 1;
|
|
109
|
-
}
|
|
110
|
-
else {
|
|
111
|
-
this.terminationStats[side][reason]++;
|
|
112
|
-
}
|
|
78
|
+
this.terminationStats[side][reason] = (this.terminationStats[side][reason] || 0) + 1;
|
|
113
79
|
}
|
|
114
80
|
async start() {
|
|
115
|
-
//
|
|
116
|
-
const cleanUpSockets = (
|
|
117
|
-
if (!
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
to.destroy();
|
|
122
|
-
}
|
|
81
|
+
// Helper to forcefully destroy sockets.
|
|
82
|
+
const cleanUpSockets = (socketA, socketB) => {
|
|
83
|
+
if (!socketA.destroyed)
|
|
84
|
+
socketA.destroy();
|
|
85
|
+
if (socketB && !socketB.destroyed)
|
|
86
|
+
socketB.destroy();
|
|
123
87
|
};
|
|
88
|
+
// Normalize an IP to include both IPv4 and IPv6 representations.
|
|
124
89
|
const normalizeIP = (ip) => {
|
|
125
|
-
// Handle IPv4-mapped IPv6 addresses
|
|
126
90
|
if (ip.startsWith('::ffff:')) {
|
|
127
|
-
const ipv4 = ip.slice(7);
|
|
91
|
+
const ipv4 = ip.slice(7);
|
|
128
92
|
return [ip, ipv4];
|
|
129
93
|
}
|
|
130
|
-
// Handle IPv4 addresses by adding IPv4-mapped IPv6 variant
|
|
131
94
|
if (/^\d{1,3}(\.\d{1,3}){3}$/.test(ip)) {
|
|
132
95
|
return [ip, `::ffff:${ip}`];
|
|
133
96
|
}
|
|
134
97
|
return [ip];
|
|
135
98
|
};
|
|
136
|
-
|
|
137
|
-
|
|
99
|
+
// Check if a given IP matches any of the glob patterns.
|
|
100
|
+
const isAllowed = (ip, patterns) => {
|
|
101
|
+
const normalizedIPVariants = normalizeIP(ip);
|
|
138
102
|
const expandedPatterns = patterns.flatMap(normalizeIP);
|
|
139
|
-
|
|
140
|
-
return normalizeIP(value).some(ip => expandedPatterns.some(pattern => plugins.minimatch(ip, pattern)));
|
|
141
|
-
};
|
|
142
|
-
const findMatchingDomain = (serverName) => {
|
|
143
|
-
return this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
|
|
103
|
+
return normalizedIPVariants.some(ipVariant => expandedPatterns.some(pattern => plugins.minimatch(ipVariant, pattern)));
|
|
144
104
|
};
|
|
145
|
-
//
|
|
105
|
+
// Find a matching domain config based on the SNI.
|
|
106
|
+
const findMatchingDomain = (serverName) => this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
|
|
146
107
|
this.netServer = plugins.net.createServer((socket) => {
|
|
147
108
|
const remoteIP = socket.remoteAddress || '';
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
109
|
+
const connectionRecord = {
|
|
110
|
+
incoming: socket,
|
|
111
|
+
outgoing: null,
|
|
112
|
+
incomingStartTime: Date.now(),
|
|
113
|
+
connectionClosed: false,
|
|
114
|
+
};
|
|
115
|
+
this.connectionRecords.add(connectionRecord);
|
|
116
|
+
console.log(`New connection from ${remoteIP}. Active connections: ${this.connectionRecords.size}`);
|
|
153
117
|
let initialDataReceived = false;
|
|
154
|
-
|
|
155
|
-
let
|
|
156
|
-
|
|
157
|
-
// Immediately attach an error handler to catch early errors.
|
|
158
|
-
socket.on('error', (err) => {
|
|
159
|
-
if (!initialDataReceived) {
|
|
160
|
-
console.log(`(Premature) Incoming socket error from ${remoteIP} before data received: ${err.message}`);
|
|
161
|
-
}
|
|
162
|
-
else {
|
|
163
|
-
console.log(`(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`);
|
|
164
|
-
}
|
|
165
|
-
});
|
|
166
|
-
// Ensure cleanup happens only once.
|
|
167
|
-
let connectionClosed = false;
|
|
118
|
+
let incomingTerminationReason = null;
|
|
119
|
+
let outgoingTerminationReason = null;
|
|
120
|
+
// Ensure cleanup happens only once for the entire connection record.
|
|
168
121
|
const cleanupOnce = () => {
|
|
169
|
-
if (!connectionClosed) {
|
|
170
|
-
connectionClosed = true;
|
|
171
|
-
cleanUpSockets(
|
|
172
|
-
this.
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
122
|
+
if (!connectionRecord.connectionClosed) {
|
|
123
|
+
connectionRecord.connectionClosed = true;
|
|
124
|
+
cleanUpSockets(connectionRecord.incoming, connectionRecord.outgoing || undefined);
|
|
125
|
+
this.connectionRecords.delete(connectionRecord);
|
|
126
|
+
console.log(`Connection from ${remoteIP} terminated. Active connections: ${this.connectionRecords.size}`);
|
|
127
|
+
}
|
|
128
|
+
};
|
|
129
|
+
// Helper to reject an incoming connection.
|
|
130
|
+
const rejectIncomingConnection = (reason, logMessage) => {
|
|
131
|
+
console.log(logMessage);
|
|
132
|
+
socket.end();
|
|
133
|
+
if (incomingTerminationReason === null) {
|
|
134
|
+
incomingTerminationReason = reason;
|
|
135
|
+
this.incrementTerminationStat('incoming', reason);
|
|
180
136
|
}
|
|
137
|
+
cleanupOnce();
|
|
181
138
|
};
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
139
|
+
socket.on('error', (err) => {
|
|
140
|
+
const errorMessage = initialDataReceived
|
|
141
|
+
? `(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`
|
|
142
|
+
: `(Premature) Incoming socket error from ${remoteIP} before data received: ${err.message}`;
|
|
143
|
+
console.log(errorMessage);
|
|
144
|
+
});
|
|
185
145
|
const handleError = (side) => (err) => {
|
|
186
146
|
const code = err.code;
|
|
187
147
|
let reason = 'error';
|
|
@@ -192,73 +152,47 @@ export class PortProxy {
|
|
|
192
152
|
else {
|
|
193
153
|
console.log(`Error on ${side} side from ${remoteIP}: ${err.message}`);
|
|
194
154
|
}
|
|
195
|
-
if (side === 'incoming' &&
|
|
196
|
-
|
|
155
|
+
if (side === 'incoming' && incomingTerminationReason === null) {
|
|
156
|
+
incomingTerminationReason = reason;
|
|
197
157
|
this.incrementTerminationStat('incoming', reason);
|
|
198
158
|
}
|
|
199
|
-
else if (side === 'outgoing' &&
|
|
200
|
-
|
|
159
|
+
else if (side === 'outgoing' && outgoingTerminationReason === null) {
|
|
160
|
+
outgoingTerminationReason = reason;
|
|
201
161
|
this.incrementTerminationStat('outgoing', reason);
|
|
202
162
|
}
|
|
203
163
|
cleanupOnce();
|
|
204
164
|
};
|
|
205
|
-
// Handle close events. If no termination reason was recorded, mark as "normal".
|
|
206
165
|
const handleClose = (side) => () => {
|
|
207
166
|
console.log(`Connection closed on ${side} side from ${remoteIP}`);
|
|
208
|
-
if (side === 'incoming' &&
|
|
209
|
-
|
|
167
|
+
if (side === 'incoming' && incomingTerminationReason === null) {
|
|
168
|
+
incomingTerminationReason = 'normal';
|
|
210
169
|
this.incrementTerminationStat('incoming', 'normal');
|
|
211
170
|
}
|
|
212
|
-
else if (side === 'outgoing' &&
|
|
213
|
-
|
|
171
|
+
else if (side === 'outgoing' && outgoingTerminationReason === null) {
|
|
172
|
+
outgoingTerminationReason = 'normal';
|
|
214
173
|
this.incrementTerminationStat('outgoing', 'normal');
|
|
215
174
|
}
|
|
216
175
|
cleanupOnce();
|
|
217
176
|
};
|
|
218
|
-
// Setup connection, optionally accepting the initial data chunk.
|
|
219
177
|
const setupConnection = (serverName, initialChunk) => {
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
if (!isDefaultAllowed && serverName) {
|
|
178
|
+
const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
|
|
179
|
+
if (!defaultAllowed && serverName) {
|
|
223
180
|
const domainConfig = findMatchingDomain(serverName);
|
|
224
181
|
if (!domainConfig) {
|
|
225
|
-
|
|
226
|
-
socket.end();
|
|
227
|
-
if (incomingTermReason === null) {
|
|
228
|
-
incomingTermReason = 'rejected';
|
|
229
|
-
this.incrementTerminationStat('incoming', 'rejected');
|
|
230
|
-
}
|
|
231
|
-
cleanupOnce();
|
|
232
|
-
return;
|
|
182
|
+
return rejectIncomingConnection('rejected', `Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
|
|
233
183
|
}
|
|
234
184
|
if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
|
|
235
|
-
|
|
236
|
-
socket.end();
|
|
237
|
-
if (incomingTermReason === null) {
|
|
238
|
-
incomingTermReason = 'rejected';
|
|
239
|
-
this.incrementTerminationStat('incoming', 'rejected');
|
|
240
|
-
}
|
|
241
|
-
cleanupOnce();
|
|
242
|
-
return;
|
|
185
|
+
return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
|
|
243
186
|
}
|
|
244
187
|
}
|
|
245
|
-
else if (!
|
|
246
|
-
|
|
247
|
-
socket.end();
|
|
248
|
-
if (incomingTermReason === null) {
|
|
249
|
-
incomingTermReason = 'rejected';
|
|
250
|
-
this.incrementTerminationStat('incoming', 'rejected');
|
|
251
|
-
}
|
|
252
|
-
cleanupOnce();
|
|
253
|
-
return;
|
|
188
|
+
else if (!defaultAllowed && !serverName) {
|
|
189
|
+
return rejectIncomingConnection('rejected', `Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
|
|
254
190
|
}
|
|
255
|
-
else {
|
|
191
|
+
else if (defaultAllowed && !serverName) {
|
|
256
192
|
console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
|
|
257
193
|
}
|
|
258
|
-
// Determine target host.
|
|
259
194
|
const domainConfig = serverName ? findMatchingDomain(serverName) : undefined;
|
|
260
195
|
const targetHost = domainConfig?.targetIP || this.settings.toHost;
|
|
261
|
-
// Create connection options.
|
|
262
196
|
const connectionOptions = {
|
|
263
197
|
host: targetHost,
|
|
264
198
|
port: this.settings.toPort,
|
|
@@ -266,53 +200,47 @@ export class PortProxy {
|
|
|
266
200
|
if (this.settings.preserveSourceIP) {
|
|
267
201
|
connectionOptions.localAddress = remoteIP.replace('::ffff:', '');
|
|
268
202
|
}
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
console.log(`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}${serverName ? ` (SNI: ${serverName})` : ''}`);
|
|
275
|
-
// Push back the initial chunk if provided.
|
|
203
|
+
const targetSocket = plugins.net.connect(connectionOptions);
|
|
204
|
+
connectionRecord.outgoing = targetSocket;
|
|
205
|
+
connectionRecord.outgoingStartTime = Date.now();
|
|
206
|
+
console.log(`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}` +
|
|
207
|
+
`${serverName ? ` (SNI: ${serverName})` : ''}`);
|
|
276
208
|
if (initialChunk) {
|
|
277
209
|
socket.unshift(initialChunk);
|
|
278
210
|
}
|
|
279
211
|
socket.setTimeout(120000);
|
|
280
|
-
socket.pipe(
|
|
281
|
-
|
|
282
|
-
// Attach event handlers for both sockets.
|
|
212
|
+
socket.pipe(targetSocket);
|
|
213
|
+
targetSocket.pipe(socket);
|
|
283
214
|
socket.on('error', handleError('incoming'));
|
|
284
|
-
|
|
215
|
+
targetSocket.on('error', handleError('outgoing'));
|
|
285
216
|
socket.on('close', handleClose('incoming'));
|
|
286
|
-
|
|
217
|
+
targetSocket.on('close', handleClose('outgoing'));
|
|
287
218
|
socket.on('timeout', () => {
|
|
288
219
|
console.log(`Timeout on incoming side from ${remoteIP}`);
|
|
289
|
-
if (
|
|
290
|
-
|
|
220
|
+
if (incomingTerminationReason === null) {
|
|
221
|
+
incomingTerminationReason = 'timeout';
|
|
291
222
|
this.incrementTerminationStat('incoming', 'timeout');
|
|
292
223
|
}
|
|
293
224
|
cleanupOnce();
|
|
294
225
|
});
|
|
295
|
-
|
|
226
|
+
targetSocket.on('timeout', () => {
|
|
296
227
|
console.log(`Timeout on outgoing side from ${remoteIP}`);
|
|
297
|
-
if (
|
|
298
|
-
|
|
228
|
+
if (outgoingTerminationReason === null) {
|
|
229
|
+
outgoingTerminationReason = 'timeout';
|
|
299
230
|
this.incrementTerminationStat('outgoing', 'timeout');
|
|
300
231
|
}
|
|
301
232
|
cleanupOnce();
|
|
302
233
|
});
|
|
303
234
|
socket.on('end', handleClose('incoming'));
|
|
304
|
-
|
|
235
|
+
targetSocket.on('end', handleClose('outgoing'));
|
|
305
236
|
};
|
|
306
|
-
// For SNI-enabled connections, set an initial data timeout before waiting for data.
|
|
307
237
|
if (this.settings.sniEnabled) {
|
|
308
|
-
// Set an initial timeout for receiving data (e.g., 5 seconds)
|
|
309
238
|
socket.setTimeout(5000, () => {
|
|
310
239
|
console.log(`Initial data timeout for ${remoteIP}`);
|
|
311
240
|
socket.end();
|
|
312
241
|
cleanupOnce();
|
|
313
242
|
});
|
|
314
243
|
socket.once('data', (chunk) => {
|
|
315
|
-
// Clear the initial timeout since data has been received
|
|
316
244
|
socket.setTimeout(0);
|
|
317
245
|
initialDataReceived = true;
|
|
318
246
|
const serverName = extractSNI(chunk) || '';
|
|
@@ -321,17 +249,9 @@ export class PortProxy {
|
|
|
321
249
|
});
|
|
322
250
|
}
|
|
323
251
|
else {
|
|
324
|
-
// For non-SNI connections, simply check defaultAllowedIPs.
|
|
325
252
|
initialDataReceived = true;
|
|
326
253
|
if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
|
|
327
|
-
|
|
328
|
-
socket.end();
|
|
329
|
-
if (incomingTermReason === null) {
|
|
330
|
-
incomingTermReason = 'rejected';
|
|
331
|
-
this.incrementTerminationStat('incoming', 'rejected');
|
|
332
|
-
}
|
|
333
|
-
cleanupOnce();
|
|
334
|
-
return;
|
|
254
|
+
return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
|
|
335
255
|
}
|
|
336
256
|
setupConnection('');
|
|
337
257
|
}
|
|
@@ -340,27 +260,24 @@ export class PortProxy {
|
|
|
340
260
|
console.log(`Server Error: ${err.message}`);
|
|
341
261
|
})
|
|
342
262
|
.listen(this.settings.fromPort, () => {
|
|
343
|
-
console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}
|
|
263
|
+
console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}` +
|
|
264
|
+
`${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
|
|
344
265
|
});
|
|
345
|
-
//
|
|
346
|
-
// and termination statistics every 10 seconds.
|
|
266
|
+
// Every 10 seconds log active connection count and longest running durations.
|
|
347
267
|
this.connectionLogger = setInterval(() => {
|
|
348
268
|
const now = Date.now();
|
|
349
269
|
let maxIncoming = 0;
|
|
350
|
-
for (const startTime of this.incomingConnectionTimes.values()) {
|
|
351
|
-
const duration = now - startTime;
|
|
352
|
-
if (duration > maxIncoming) {
|
|
353
|
-
maxIncoming = duration;
|
|
354
|
-
}
|
|
355
|
-
}
|
|
356
270
|
let maxOutgoing = 0;
|
|
357
|
-
for (const
|
|
358
|
-
|
|
359
|
-
if (
|
|
360
|
-
maxOutgoing =
|
|
271
|
+
for (const record of this.connectionRecords) {
|
|
272
|
+
maxIncoming = Math.max(maxIncoming, now - record.incomingStartTime);
|
|
273
|
+
if (record.outgoingStartTime) {
|
|
274
|
+
maxOutgoing = Math.max(maxOutgoing, now - record.outgoingStartTime);
|
|
361
275
|
}
|
|
362
276
|
}
|
|
363
|
-
console.log(`(Interval Log) Active connections: ${this.
|
|
277
|
+
console.log(`(Interval Log) Active connections: ${this.connectionRecords.size}. ` +
|
|
278
|
+
`Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}. ` +
|
|
279
|
+
`Termination stats (incoming): ${JSON.stringify(this.terminationStats.incoming)}, ` +
|
|
280
|
+
`(outgoing): ${JSON.stringify(this.terminationStats.outgoing)}`);
|
|
364
281
|
}, 10000);
|
|
365
282
|
}
|
|
366
283
|
async stop() {
|
|
@@ -375,4 +292,4 @@ export class PortProxy {
|
|
|
375
292
|
await done.promise;
|
|
376
293
|
}
|
|
377
294
|
}
|
|
378
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartproxy.portproxy.js","sourceRoot":"","sources":["../ts/smartproxy.portproxy.ts"],"names":[],"mappings":"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"}
|
|
295
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartproxy.portproxy.js","sourceRoot":"","sources":["../ts/smartproxy.portproxy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,106 +1,73 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
|
|
3
3
|
export interface IDomainConfig {
|
|
4
|
-
domain: string; //
|
|
5
|
-
allowedIPs: string[]; //
|
|
4
|
+
domain: string; // Glob pattern for domain
|
|
5
|
+
allowedIPs: string[]; // Glob patterns for allowed IPs
|
|
6
6
|
targetIP?: string; // Optional target IP for this domain
|
|
7
7
|
}
|
|
8
8
|
|
|
9
9
|
export interface IProxySettings extends plugins.tls.TlsOptions {
|
|
10
|
-
// Port configuration
|
|
11
10
|
fromPort: number;
|
|
12
11
|
toPort: number;
|
|
13
|
-
toHost?: string;
|
|
14
|
-
|
|
15
|
-
// Domain and security settings
|
|
12
|
+
toHost?: string; // Target host to proxy to, defaults to 'localhost'
|
|
16
13
|
domains: IDomainConfig[];
|
|
17
14
|
sniEnabled?: boolean;
|
|
18
|
-
defaultAllowedIPs?: string[];
|
|
19
|
-
preserveSourceIP?: boolean;
|
|
15
|
+
defaultAllowedIPs?: string[];
|
|
16
|
+
preserveSourceIP?: boolean;
|
|
20
17
|
}
|
|
21
18
|
|
|
22
19
|
/**
|
|
23
|
-
*
|
|
24
|
-
*
|
|
20
|
+
* Extracts the SNI (Server Name Indication) from a TLS ClientHello packet.
|
|
21
|
+
* @param buffer - Buffer containing the TLS ClientHello.
|
|
22
|
+
* @returns The server name if found, otherwise undefined.
|
|
25
23
|
*/
|
|
26
24
|
function extractSNI(buffer: Buffer): string | undefined {
|
|
27
25
|
let offset = 0;
|
|
28
|
-
|
|
29
|
-
if (buffer.length < 5) {
|
|
30
|
-
return undefined;
|
|
31
|
-
}
|
|
26
|
+
if (buffer.length < 5) return undefined;
|
|
32
27
|
|
|
33
|
-
// TLS record header
|
|
34
28
|
const recordType = buffer.readUInt8(0);
|
|
35
|
-
if (recordType !== 22)
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
// Read record length
|
|
29
|
+
if (recordType !== 22) return undefined; // 22 = handshake
|
|
30
|
+
|
|
39
31
|
const recordLength = buffer.readUInt16BE(3);
|
|
40
|
-
if (buffer.length < 5 + recordLength)
|
|
41
|
-
// Not all data arrived yet; in production you might need to accumulate more data.
|
|
42
|
-
return undefined;
|
|
43
|
-
}
|
|
32
|
+
if (buffer.length < 5 + recordLength) return undefined;
|
|
44
33
|
|
|
45
34
|
offset = 5;
|
|
46
|
-
// Handshake message type should be 1 for ClientHello.
|
|
47
35
|
const handshakeType = buffer.readUInt8(offset);
|
|
48
|
-
if (handshakeType !== 1)
|
|
49
|
-
return undefined;
|
|
50
|
-
}
|
|
51
|
-
// Skip handshake header (1 byte type + 3 bytes length)
|
|
52
|
-
offset += 4;
|
|
36
|
+
if (handshakeType !== 1) return undefined; // 1 = ClientHello
|
|
53
37
|
|
|
54
|
-
// Skip
|
|
55
|
-
offset += 2 + 32;
|
|
38
|
+
offset += 4; // Skip handshake header (type + length)
|
|
39
|
+
offset += 2 + 32; // Skip client version and random
|
|
56
40
|
|
|
57
|
-
// Session ID
|
|
58
41
|
const sessionIDLength = buffer.readUInt8(offset);
|
|
59
|
-
offset += 1 + sessionIDLength;
|
|
42
|
+
offset += 1 + sessionIDLength; // Skip session ID
|
|
60
43
|
|
|
61
|
-
// Cipher suites
|
|
62
44
|
const cipherSuitesLength = buffer.readUInt16BE(offset);
|
|
63
|
-
offset += 2 + cipherSuitesLength;
|
|
45
|
+
offset += 2 + cipherSuitesLength; // Skip cipher suites
|
|
64
46
|
|
|
65
|
-
// Compression methods
|
|
66
47
|
const compressionMethodsLength = buffer.readUInt8(offset);
|
|
67
|
-
offset += 1 + compressionMethodsLength;
|
|
48
|
+
offset += 1 + compressionMethodsLength; // Skip compression methods
|
|
68
49
|
|
|
69
|
-
|
|
70
|
-
if (offset + 2 > buffer.length) {
|
|
71
|
-
return undefined;
|
|
72
|
-
}
|
|
50
|
+
if (offset + 2 > buffer.length) return undefined;
|
|
73
51
|
const extensionsLength = buffer.readUInt16BE(offset);
|
|
74
52
|
offset += 2;
|
|
75
53
|
const extensionsEnd = offset + extensionsLength;
|
|
76
54
|
|
|
77
|
-
// Iterate over extensions
|
|
78
55
|
while (offset + 4 <= extensionsEnd) {
|
|
79
56
|
const extensionType = buffer.readUInt16BE(offset);
|
|
80
57
|
const extensionLength = buffer.readUInt16BE(offset + 2);
|
|
81
58
|
offset += 4;
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
if (extensionType === 0x0000) {
|
|
85
|
-
// SNI extension: first 2 bytes are the SNI list length.
|
|
86
|
-
if (offset + 2 > buffer.length) {
|
|
87
|
-
return undefined;
|
|
88
|
-
}
|
|
59
|
+
if (extensionType === 0x0000) { // SNI extension
|
|
60
|
+
if (offset + 2 > buffer.length) return undefined;
|
|
89
61
|
const sniListLength = buffer.readUInt16BE(offset);
|
|
90
62
|
offset += 2;
|
|
91
63
|
const sniListEnd = offset + sniListLength;
|
|
92
|
-
// Loop through the list; typically there is one entry.
|
|
93
64
|
while (offset + 3 < sniListEnd) {
|
|
94
|
-
const nameType = buffer.readUInt8(offset);
|
|
95
|
-
offset++;
|
|
65
|
+
const nameType = buffer.readUInt8(offset++);
|
|
96
66
|
const nameLen = buffer.readUInt16BE(offset);
|
|
97
67
|
offset += 2;
|
|
98
68
|
if (nameType === 0) { // host_name
|
|
99
|
-
if (offset + nameLen > buffer.length)
|
|
100
|
-
|
|
101
|
-
}
|
|
102
|
-
const serverName = buffer.toString('utf8', offset, offset + nameLen);
|
|
103
|
-
return serverName;
|
|
69
|
+
if (offset + nameLen > buffer.length) return undefined;
|
|
70
|
+
return buffer.toString('utf8', offset, offset + nameLen);
|
|
104
71
|
}
|
|
105
72
|
offset += nameLen;
|
|
106
73
|
}
|
|
@@ -112,18 +79,21 @@ function extractSNI(buffer: Buffer): string | undefined {
|
|
|
112
79
|
return undefined;
|
|
113
80
|
}
|
|
114
81
|
|
|
82
|
+
interface IConnectionRecord {
|
|
83
|
+
incoming: plugins.net.Socket;
|
|
84
|
+
outgoing: plugins.net.Socket | null;
|
|
85
|
+
incomingStartTime: number;
|
|
86
|
+
outgoingStartTime?: number;
|
|
87
|
+
connectionClosed: boolean;
|
|
88
|
+
}
|
|
89
|
+
|
|
115
90
|
export class PortProxy {
|
|
116
91
|
netServer: plugins.net.Server;
|
|
117
92
|
settings: IProxySettings;
|
|
118
|
-
//
|
|
119
|
-
private
|
|
120
|
-
// Record start times for incoming connections
|
|
121
|
-
private incomingConnectionTimes: Map<plugins.net.Socket, number> = new Map();
|
|
122
|
-
// Record start times for outgoing connections
|
|
123
|
-
private outgoingConnectionTimes: Map<plugins.net.Socket, number> = new Map();
|
|
93
|
+
// Unified record tracking each connection pair.
|
|
94
|
+
private connectionRecords: Set<IConnectionRecord> = new Set();
|
|
124
95
|
private connectionLogger: NodeJS.Timeout | null = null;
|
|
125
96
|
|
|
126
|
-
// Overall termination statistics
|
|
127
97
|
private terminationStats: {
|
|
128
98
|
incoming: Record<string, number>;
|
|
129
99
|
outgoing: Record<string, number>;
|
|
@@ -135,102 +105,89 @@ export class PortProxy {
|
|
|
135
105
|
constructor(settings: IProxySettings) {
|
|
136
106
|
this.settings = {
|
|
137
107
|
...settings,
|
|
138
|
-
toHost: settings.toHost || 'localhost'
|
|
108
|
+
toHost: settings.toHost || 'localhost',
|
|
139
109
|
};
|
|
140
110
|
}
|
|
141
111
|
|
|
142
|
-
// Helper to update termination stats.
|
|
143
112
|
private incrementTerminationStat(side: 'incoming' | 'outgoing', reason: string): void {
|
|
144
|
-
|
|
145
|
-
this.terminationStats[side][reason] = 1;
|
|
146
|
-
} else {
|
|
147
|
-
this.terminationStats[side][reason]++;
|
|
148
|
-
}
|
|
113
|
+
this.terminationStats[side][reason] = (this.terminationStats[side][reason] || 0) + 1;
|
|
149
114
|
}
|
|
150
115
|
|
|
151
116
|
public async start() {
|
|
152
|
-
//
|
|
153
|
-
const cleanUpSockets = (
|
|
154
|
-
if (!
|
|
155
|
-
|
|
156
|
-
}
|
|
157
|
-
if (to && !to.destroyed) {
|
|
158
|
-
to.destroy();
|
|
159
|
-
}
|
|
117
|
+
// Helper to forcefully destroy sockets.
|
|
118
|
+
const cleanUpSockets = (socketA: plugins.net.Socket, socketB?: plugins.net.Socket) => {
|
|
119
|
+
if (!socketA.destroyed) socketA.destroy();
|
|
120
|
+
if (socketB && !socketB.destroyed) socketB.destroy();
|
|
160
121
|
};
|
|
161
122
|
|
|
123
|
+
// Normalize an IP to include both IPv4 and IPv6 representations.
|
|
162
124
|
const normalizeIP = (ip: string): string[] => {
|
|
163
|
-
// Handle IPv4-mapped IPv6 addresses
|
|
164
125
|
if (ip.startsWith('::ffff:')) {
|
|
165
|
-
const ipv4 = ip.slice(7);
|
|
126
|
+
const ipv4 = ip.slice(7);
|
|
166
127
|
return [ip, ipv4];
|
|
167
128
|
}
|
|
168
|
-
// Handle IPv4 addresses by adding IPv4-mapped IPv6 variant
|
|
169
129
|
if (/^\d{1,3}(\.\d{1,3}){3}$/.test(ip)) {
|
|
170
130
|
return [ip, `::ffff:${ip}`];
|
|
171
131
|
}
|
|
172
132
|
return [ip];
|
|
173
133
|
};
|
|
174
134
|
|
|
175
|
-
|
|
176
|
-
|
|
135
|
+
// Check if a given IP matches any of the glob patterns.
|
|
136
|
+
const isAllowed = (ip: string, patterns: string[]): boolean => {
|
|
137
|
+
const normalizedIPVariants = normalizeIP(ip);
|
|
177
138
|
const expandedPatterns = patterns.flatMap(normalizeIP);
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
expandedPatterns.some(pattern => plugins.minimatch(ip, pattern))
|
|
139
|
+
return normalizedIPVariants.some(ipVariant =>
|
|
140
|
+
expandedPatterns.some(pattern => plugins.minimatch(ipVariant, pattern))
|
|
181
141
|
);
|
|
182
142
|
};
|
|
183
143
|
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
144
|
+
// Find a matching domain config based on the SNI.
|
|
145
|
+
const findMatchingDomain = (serverName: string): IDomainConfig | undefined =>
|
|
146
|
+
this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
|
|
187
147
|
|
|
188
|
-
// Create a plain net server for TLS passthrough.
|
|
189
148
|
this.netServer = plugins.net.createServer((socket: plugins.net.Socket) => {
|
|
190
149
|
const remoteIP = socket.remoteAddress || '';
|
|
150
|
+
const connectionRecord: IConnectionRecord = {
|
|
151
|
+
incoming: socket,
|
|
152
|
+
outgoing: null,
|
|
153
|
+
incomingStartTime: Date.now(),
|
|
154
|
+
connectionClosed: false,
|
|
155
|
+
};
|
|
156
|
+
this.connectionRecords.add(connectionRecord);
|
|
157
|
+
console.log(`New connection from ${remoteIP}. Active connections: ${this.connectionRecords.size}`);
|
|
191
158
|
|
|
192
|
-
// Record start time for the incoming connection.
|
|
193
|
-
this.activeConnections.add(socket);
|
|
194
|
-
this.incomingConnectionTimes.set(socket, Date.now());
|
|
195
|
-
console.log(`New connection from ${remoteIP}. Active connections: ${this.activeConnections.size}`);
|
|
196
|
-
|
|
197
|
-
// Flag to detect if we've received the first data chunk.
|
|
198
159
|
let initialDataReceived = false;
|
|
160
|
+
let incomingTerminationReason: string | null = null;
|
|
161
|
+
let outgoingTerminationReason: string | null = null;
|
|
199
162
|
|
|
200
|
-
//
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
console.log(`(Premature) Incoming socket error from ${remoteIP} before data received: ${err.message}`);
|
|
208
|
-
} else {
|
|
209
|
-
console.log(`(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`);
|
|
163
|
+
// Ensure cleanup happens only once for the entire connection record.
|
|
164
|
+
const cleanupOnce = () => {
|
|
165
|
+
if (!connectionRecord.connectionClosed) {
|
|
166
|
+
connectionRecord.connectionClosed = true;
|
|
167
|
+
cleanUpSockets(connectionRecord.incoming, connectionRecord.outgoing || undefined);
|
|
168
|
+
this.connectionRecords.delete(connectionRecord);
|
|
169
|
+
console.log(`Connection from ${remoteIP} terminated. Active connections: ${this.connectionRecords.size}`);
|
|
210
170
|
}
|
|
211
|
-
}
|
|
171
|
+
};
|
|
212
172
|
|
|
213
|
-
//
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
this.
|
|
220
|
-
if (to) {
|
|
221
|
-
this.outgoingConnectionTimes.delete(to);
|
|
222
|
-
}
|
|
223
|
-
if (this.activeConnections.has(socket)) {
|
|
224
|
-
this.activeConnections.delete(socket);
|
|
225
|
-
console.log(`Connection from ${remoteIP} terminated. Active connections: ${this.activeConnections.size}`);
|
|
226
|
-
}
|
|
173
|
+
// Helper to reject an incoming connection.
|
|
174
|
+
const rejectIncomingConnection = (reason: string, logMessage: string) => {
|
|
175
|
+
console.log(logMessage);
|
|
176
|
+
socket.end();
|
|
177
|
+
if (incomingTerminationReason === null) {
|
|
178
|
+
incomingTerminationReason = reason;
|
|
179
|
+
this.incrementTerminationStat('incoming', reason);
|
|
227
180
|
}
|
|
181
|
+
cleanupOnce();
|
|
228
182
|
};
|
|
229
183
|
|
|
230
|
-
|
|
231
|
-
|
|
184
|
+
socket.on('error', (err: Error) => {
|
|
185
|
+
const errorMessage = initialDataReceived
|
|
186
|
+
? `(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`
|
|
187
|
+
: `(Premature) Incoming socket error from ${remoteIP} before data received: ${err.message}`;
|
|
188
|
+
console.log(errorMessage);
|
|
189
|
+
});
|
|
232
190
|
|
|
233
|
-
// Handle errors by recording termination reason and cleaning up.
|
|
234
191
|
const handleError = (side: 'incoming' | 'outgoing') => (err: Error) => {
|
|
235
192
|
const code = (err as any).code;
|
|
236
193
|
let reason = 'error';
|
|
@@ -240,73 +197,47 @@ export class PortProxy {
|
|
|
240
197
|
} else {
|
|
241
198
|
console.log(`Error on ${side} side from ${remoteIP}: ${err.message}`);
|
|
242
199
|
}
|
|
243
|
-
if (side === 'incoming' &&
|
|
244
|
-
|
|
200
|
+
if (side === 'incoming' && incomingTerminationReason === null) {
|
|
201
|
+
incomingTerminationReason = reason;
|
|
245
202
|
this.incrementTerminationStat('incoming', reason);
|
|
246
|
-
} else if (side === 'outgoing' &&
|
|
247
|
-
|
|
203
|
+
} else if (side === 'outgoing' && outgoingTerminationReason === null) {
|
|
204
|
+
outgoingTerminationReason = reason;
|
|
248
205
|
this.incrementTerminationStat('outgoing', reason);
|
|
249
206
|
}
|
|
250
207
|
cleanupOnce();
|
|
251
208
|
};
|
|
252
209
|
|
|
253
|
-
// Handle close events. If no termination reason was recorded, mark as "normal".
|
|
254
210
|
const handleClose = (side: 'incoming' | 'outgoing') => () => {
|
|
255
211
|
console.log(`Connection closed on ${side} side from ${remoteIP}`);
|
|
256
|
-
if (side === 'incoming' &&
|
|
257
|
-
|
|
212
|
+
if (side === 'incoming' && incomingTerminationReason === null) {
|
|
213
|
+
incomingTerminationReason = 'normal';
|
|
258
214
|
this.incrementTerminationStat('incoming', 'normal');
|
|
259
|
-
} else if (side === 'outgoing' &&
|
|
260
|
-
|
|
215
|
+
} else if (side === 'outgoing' && outgoingTerminationReason === null) {
|
|
216
|
+
outgoingTerminationReason = 'normal';
|
|
261
217
|
this.incrementTerminationStat('outgoing', 'normal');
|
|
262
218
|
}
|
|
263
219
|
cleanupOnce();
|
|
264
220
|
};
|
|
265
221
|
|
|
266
|
-
// Setup connection, optionally accepting the initial data chunk.
|
|
267
222
|
const setupConnection = (serverName: string, initialChunk?: Buffer) => {
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
if (!
|
|
223
|
+
const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
|
|
224
|
+
|
|
225
|
+
if (!defaultAllowed && serverName) {
|
|
271
226
|
const domainConfig = findMatchingDomain(serverName);
|
|
272
227
|
if (!domainConfig) {
|
|
273
|
-
|
|
274
|
-
socket.end();
|
|
275
|
-
if (incomingTermReason === null) {
|
|
276
|
-
incomingTermReason = 'rejected';
|
|
277
|
-
this.incrementTerminationStat('incoming', 'rejected');
|
|
278
|
-
}
|
|
279
|
-
cleanupOnce();
|
|
280
|
-
return;
|
|
228
|
+
return rejectIncomingConnection('rejected', `Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
|
|
281
229
|
}
|
|
282
230
|
if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
|
|
283
|
-
|
|
284
|
-
socket.end();
|
|
285
|
-
if (incomingTermReason === null) {
|
|
286
|
-
incomingTermReason = 'rejected';
|
|
287
|
-
this.incrementTerminationStat('incoming', 'rejected');
|
|
288
|
-
}
|
|
289
|
-
cleanupOnce();
|
|
290
|
-
return;
|
|
291
|
-
}
|
|
292
|
-
} else if (!isDefaultAllowed && !serverName) {
|
|
293
|
-
console.log(`Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
|
|
294
|
-
socket.end();
|
|
295
|
-
if (incomingTermReason === null) {
|
|
296
|
-
incomingTermReason = 'rejected';
|
|
297
|
-
this.incrementTerminationStat('incoming', 'rejected');
|
|
231
|
+
return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
|
|
298
232
|
}
|
|
299
|
-
|
|
300
|
-
return;
|
|
301
|
-
} else {
|
|
233
|
+
} else if (!defaultAllowed && !serverName) {
|
|
234
|
+
return rejectIncomingConnection('rejected', `Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
|
|
235
|
+
} else if (defaultAllowed && !serverName) {
|
|
302
236
|
console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
|
|
303
237
|
}
|
|
304
238
|
|
|
305
|
-
// Determine target host.
|
|
306
239
|
const domainConfig = serverName ? findMatchingDomain(serverName) : undefined;
|
|
307
240
|
const targetHost = domainConfig?.targetIP || this.settings.toHost!;
|
|
308
|
-
|
|
309
|
-
// Create connection options.
|
|
310
241
|
const connectionOptions: plugins.net.NetConnectOpts = {
|
|
311
242
|
host: targetHost,
|
|
312
243
|
port: this.settings.toPort,
|
|
@@ -315,49 +246,47 @@ export class PortProxy {
|
|
|
315
246
|
connectionOptions.localAddress = remoteIP.replace('::ffff:', '');
|
|
316
247
|
}
|
|
317
248
|
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
249
|
+
const targetSocket = plugins.net.connect(connectionOptions);
|
|
250
|
+
connectionRecord.outgoing = targetSocket;
|
|
251
|
+
connectionRecord.outgoingStartTime = Date.now();
|
|
252
|
+
|
|
253
|
+
console.log(
|
|
254
|
+
`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}` +
|
|
255
|
+
`${serverName ? ` (SNI: ${serverName})` : ''}`
|
|
256
|
+
);
|
|
257
|
+
|
|
326
258
|
if (initialChunk) {
|
|
327
259
|
socket.unshift(initialChunk);
|
|
328
260
|
}
|
|
329
261
|
socket.setTimeout(120000);
|
|
330
|
-
socket.pipe(
|
|
331
|
-
|
|
262
|
+
socket.pipe(targetSocket);
|
|
263
|
+
targetSocket.pipe(socket);
|
|
332
264
|
|
|
333
|
-
// Attach event handlers for both sockets.
|
|
334
265
|
socket.on('error', handleError('incoming'));
|
|
335
|
-
|
|
266
|
+
targetSocket.on('error', handleError('outgoing'));
|
|
336
267
|
socket.on('close', handleClose('incoming'));
|
|
337
|
-
|
|
268
|
+
targetSocket.on('close', handleClose('outgoing'));
|
|
338
269
|
socket.on('timeout', () => {
|
|
339
270
|
console.log(`Timeout on incoming side from ${remoteIP}`);
|
|
340
|
-
if (
|
|
341
|
-
|
|
271
|
+
if (incomingTerminationReason === null) {
|
|
272
|
+
incomingTerminationReason = 'timeout';
|
|
342
273
|
this.incrementTerminationStat('incoming', 'timeout');
|
|
343
274
|
}
|
|
344
275
|
cleanupOnce();
|
|
345
276
|
});
|
|
346
|
-
|
|
277
|
+
targetSocket.on('timeout', () => {
|
|
347
278
|
console.log(`Timeout on outgoing side from ${remoteIP}`);
|
|
348
|
-
if (
|
|
349
|
-
|
|
279
|
+
if (outgoingTerminationReason === null) {
|
|
280
|
+
outgoingTerminationReason = 'timeout';
|
|
350
281
|
this.incrementTerminationStat('outgoing', 'timeout');
|
|
351
282
|
}
|
|
352
283
|
cleanupOnce();
|
|
353
284
|
});
|
|
354
285
|
socket.on('end', handleClose('incoming'));
|
|
355
|
-
|
|
286
|
+
targetSocket.on('end', handleClose('outgoing'));
|
|
356
287
|
};
|
|
357
288
|
|
|
358
|
-
// For SNI-enabled connections, set an initial data timeout before waiting for data.
|
|
359
289
|
if (this.settings.sniEnabled) {
|
|
360
|
-
// Set an initial timeout for receiving data (e.g., 5 seconds)
|
|
361
290
|
socket.setTimeout(5000, () => {
|
|
362
291
|
console.log(`Initial data timeout for ${remoteIP}`);
|
|
363
292
|
socket.end();
|
|
@@ -365,7 +294,6 @@ export class PortProxy {
|
|
|
365
294
|
});
|
|
366
295
|
|
|
367
296
|
socket.once('data', (chunk: Buffer) => {
|
|
368
|
-
// Clear the initial timeout since data has been received
|
|
369
297
|
socket.setTimeout(0);
|
|
370
298
|
initialDataReceived = true;
|
|
371
299
|
const serverName = extractSNI(chunk) || '';
|
|
@@ -373,47 +301,40 @@ export class PortProxy {
|
|
|
373
301
|
setupConnection(serverName, chunk);
|
|
374
302
|
});
|
|
375
303
|
} else {
|
|
376
|
-
// For non-SNI connections, simply check defaultAllowedIPs.
|
|
377
304
|
initialDataReceived = true;
|
|
378
305
|
if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
|
|
379
|
-
|
|
380
|
-
socket.end();
|
|
381
|
-
if (incomingTermReason === null) {
|
|
382
|
-
incomingTermReason = 'rejected';
|
|
383
|
-
this.incrementTerminationStat('incoming', 'rejected');
|
|
384
|
-
}
|
|
385
|
-
cleanupOnce();
|
|
386
|
-
return;
|
|
306
|
+
return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
|
|
387
307
|
}
|
|
388
308
|
setupConnection('');
|
|
389
309
|
}
|
|
390
310
|
})
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
311
|
+
.on('error', (err: Error) => {
|
|
312
|
+
console.log(`Server Error: ${err.message}`);
|
|
313
|
+
})
|
|
314
|
+
.listen(this.settings.fromPort, () => {
|
|
315
|
+
console.log(
|
|
316
|
+
`PortProxy -> OK: Now listening on port ${this.settings.fromPort}` +
|
|
317
|
+
`${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`
|
|
318
|
+
);
|
|
319
|
+
});
|
|
397
320
|
|
|
398
|
-
//
|
|
399
|
-
// and termination statistics every 10 seconds.
|
|
321
|
+
// Every 10 seconds log active connection count and longest running durations.
|
|
400
322
|
this.connectionLogger = setInterval(() => {
|
|
401
323
|
const now = Date.now();
|
|
402
324
|
let maxIncoming = 0;
|
|
403
|
-
for (const startTime of this.incomingConnectionTimes.values()) {
|
|
404
|
-
const duration = now - startTime;
|
|
405
|
-
if (duration > maxIncoming) {
|
|
406
|
-
maxIncoming = duration;
|
|
407
|
-
}
|
|
408
|
-
}
|
|
409
325
|
let maxOutgoing = 0;
|
|
410
|
-
for (const
|
|
411
|
-
|
|
412
|
-
if (
|
|
413
|
-
maxOutgoing =
|
|
326
|
+
for (const record of this.connectionRecords) {
|
|
327
|
+
maxIncoming = Math.max(maxIncoming, now - record.incomingStartTime);
|
|
328
|
+
if (record.outgoingStartTime) {
|
|
329
|
+
maxOutgoing = Math.max(maxOutgoing, now - record.outgoingStartTime);
|
|
414
330
|
}
|
|
415
331
|
}
|
|
416
|
-
console.log(
|
|
332
|
+
console.log(
|
|
333
|
+
`(Interval Log) Active connections: ${this.connectionRecords.size}. ` +
|
|
334
|
+
`Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}. ` +
|
|
335
|
+
`Termination stats (incoming): ${JSON.stringify(this.terminationStats.incoming)}, ` +
|
|
336
|
+
`(outgoing): ${JSON.stringify(this.terminationStats.outgoing)}`
|
|
337
|
+
);
|
|
417
338
|
}, 10000);
|
|
418
339
|
}
|
|
419
340
|
|