ssh-delivery 0.2.8 → 0.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.
- package/README.md +11 -0
- package/dist/delivery.d.ts +1 -0
- package/dist/delivery.js +34 -2
- package/dist/delivery.js.map +1 -1
- package/dist/tunnel.d.ts +4 -0
- package/dist/tunnel.js +38 -4
- package/dist/tunnel.js.map +1 -1
- package/dist/types/index.d.ts +4 -0
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -32,6 +32,12 @@ module.exports = {
|
|
|
32
32
|
host: 'gate.myweb.com',
|
|
33
33
|
username: 'root',
|
|
34
34
|
password: 'secret',
|
|
35
|
+
// Optional: Socks5 proxy settings for connecting to the first SSH server in the chain
|
|
36
|
+
socksProxyHost: '127.0.0.1',
|
|
37
|
+
socksProxyPort: 1080,
|
|
38
|
+
// socksProxyUsername and socksProxyPassword are optional if your proxy requires authentication
|
|
39
|
+
// socksProxyUsername: 'proxyUser',
|
|
40
|
+
// socksProxyPassword: 'proxyPass',
|
|
35
41
|
},
|
|
36
42
|
web: {
|
|
37
43
|
host: 'myweb.com',
|
|
@@ -85,6 +91,11 @@ module.exports = {
|
|
|
85
91
|
host: 'gate.myweb.com',
|
|
86
92
|
username: 'root',
|
|
87
93
|
password: 'secret',
|
|
94
|
+
// Optional Socks5 proxy settings:
|
|
95
|
+
// socksProxyHost: '127.0.0.1',
|
|
96
|
+
// socksProxyPort: 1080,
|
|
97
|
+
// socksProxyUsername: 'proxyUser',
|
|
98
|
+
// socksProxyPassword: 'proxyPass',
|
|
88
99
|
},
|
|
89
100
|
web: {
|
|
90
101
|
host: 'myweb.com',
|
package/dist/delivery.d.ts
CHANGED
package/dist/delivery.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
1
2
|
"use strict";
|
|
2
3
|
var __assign = (this && this.__assign) || function () {
|
|
3
4
|
__assign = Object.assign || function(t) {
|
|
@@ -260,6 +261,10 @@ var Delivery = /** @class */ (function () {
|
|
|
260
261
|
dstPort: targetServer.port,
|
|
261
262
|
localHost: '127.0.0.1',
|
|
262
263
|
localPort: 0,
|
|
264
|
+
socksProxyHost: gateServer.socksProxyHost,
|
|
265
|
+
socksProxyPort: gateServer.socksProxyPort,
|
|
266
|
+
socksProxyUsername: gateServer.socksProxyUsername,
|
|
267
|
+
socksProxyPassword: gateServer.socksProxyPassword,
|
|
263
268
|
})];
|
|
264
269
|
case 2:
|
|
265
270
|
tunnel = _a.sent();
|
|
@@ -278,8 +283,35 @@ var Delivery = /** @class */ (function () {
|
|
|
278
283
|
return [4 /*yield*/, new Promise(function (resolve, reject) {
|
|
279
284
|
sshConnection
|
|
280
285
|
.on('ready', function () { return resolve(); })
|
|
281
|
-
|
|
282
|
-
|
|
286
|
+
.on('error', reject);
|
|
287
|
+
var connectionOptions = __assign(__assign({}, serverOptions), dstConnectionTarget);
|
|
288
|
+
if (serverOptions.socksProxyHost && serverOptions.socksProxyPort) {
|
|
289
|
+
var SocksClient = require('socks').SocksClient;
|
|
290
|
+
var socksOptions = {
|
|
291
|
+
proxy: {
|
|
292
|
+
host: serverOptions.socksProxyHost,
|
|
293
|
+
port: serverOptions.socksProxyPort,
|
|
294
|
+
type: 5,
|
|
295
|
+
userId: serverOptions.socksProxyUsername,
|
|
296
|
+
password: serverOptions.socksProxyPassword,
|
|
297
|
+
},
|
|
298
|
+
command: 'connect',
|
|
299
|
+
destination: {
|
|
300
|
+
host: serverOptions.host,
|
|
301
|
+
port: serverOptions.port,
|
|
302
|
+
},
|
|
303
|
+
timeout: 10000,
|
|
304
|
+
};
|
|
305
|
+
SocksClient.createConnection(socksOptions)
|
|
306
|
+
.then(function (info) {
|
|
307
|
+
connectionOptions.sock = info.socket;
|
|
308
|
+
sshConnection.connect(connectionOptions);
|
|
309
|
+
})
|
|
310
|
+
.catch(reject);
|
|
311
|
+
}
|
|
312
|
+
else {
|
|
313
|
+
sshConnection.connect(connectionOptions);
|
|
314
|
+
}
|
|
283
315
|
})];
|
|
284
316
|
case 6:
|
|
285
317
|
_a.sent();
|
package/dist/delivery.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../src/delivery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../src/delivery.ts"],"names":[],"mappings":"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"}
|
package/dist/tunnel.d.ts
CHANGED
|
@@ -8,6 +8,10 @@ declare type TunnelConfig = ConnectConfig & {
|
|
|
8
8
|
localPort: number;
|
|
9
9
|
srcHost: string;
|
|
10
10
|
srcPort: number;
|
|
11
|
+
socksProxyHost?: string;
|
|
12
|
+
socksProxyPort?: number;
|
|
13
|
+
socksProxyUsername?: string;
|
|
14
|
+
socksProxyPassword?: string;
|
|
11
15
|
};
|
|
12
16
|
declare function createTunnel(configArgs: Partial<TunnelConfig>): Promise<Server>;
|
|
13
17
|
export default createTunnel;
|
package/dist/tunnel.js
CHANGED
|
@@ -89,11 +89,45 @@ function createServer(config) {
|
|
|
89
89
|
});
|
|
90
90
|
});
|
|
91
91
|
connections.push(sshConnection, netConnection);
|
|
92
|
-
|
|
93
|
-
|
|
92
|
+
var connectConfig = omit(config, ['localPort', 'localHost']);
|
|
93
|
+
if (config.socksProxyHost && config.socksProxyPort) {
|
|
94
|
+
var SocksClient = require('socks').SocksClient;
|
|
95
|
+
var socksOptions = {
|
|
96
|
+
proxy: {
|
|
97
|
+
host: config.socksProxyHost,
|
|
98
|
+
port: config.socksProxyPort,
|
|
99
|
+
type: 5,
|
|
100
|
+
userId: config.socksProxyUsername,
|
|
101
|
+
password: config.socksProxyPassword,
|
|
102
|
+
},
|
|
103
|
+
command: 'connect',
|
|
104
|
+
destination: {
|
|
105
|
+
host: config.host,
|
|
106
|
+
port: config.port,
|
|
107
|
+
},
|
|
108
|
+
timeout: 10000,
|
|
109
|
+
};
|
|
110
|
+
SocksClient.createConnection(socksOptions)
|
|
111
|
+
.then(function (info) {
|
|
112
|
+
connectConfig.sock = info.socket;
|
|
113
|
+
try {
|
|
114
|
+
sshConnection.connect(connectConfig);
|
|
115
|
+
}
|
|
116
|
+
catch (error) {
|
|
117
|
+
server.emit('error', error);
|
|
118
|
+
}
|
|
119
|
+
})
|
|
120
|
+
.catch(function (error) {
|
|
121
|
+
server.emit('error', error);
|
|
122
|
+
});
|
|
94
123
|
}
|
|
95
|
-
|
|
96
|
-
|
|
124
|
+
else {
|
|
125
|
+
try {
|
|
126
|
+
sshConnection.connect(connectConfig);
|
|
127
|
+
}
|
|
128
|
+
catch (error) {
|
|
129
|
+
server.emit('error', error);
|
|
130
|
+
}
|
|
97
131
|
}
|
|
98
132
|
});
|
|
99
133
|
server.on('close', function () {
|
package/dist/tunnel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../src/tunnel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA2B;AAC3B,6CAAiC;AACjC,6BAA4D;
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../src/tunnel.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -2,6 +2,10 @@ import { ConnectConfig } from 'ssh2';
|
|
|
2
2
|
export declare type ServerOptions = ConnectConfig & {
|
|
3
3
|
name: string;
|
|
4
4
|
via?: string;
|
|
5
|
+
socksProxyHost?: string;
|
|
6
|
+
socksProxyPort?: number;
|
|
7
|
+
socksProxyUsername?: string;
|
|
8
|
+
socksProxyPassword?: string;
|
|
5
9
|
};
|
|
6
10
|
export declare type TaskOptions = {
|
|
7
11
|
name: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ssh-delivery",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"author": "Avin Lambrero",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -46,6 +46,7 @@
|
|
|
46
46
|
"revalidator": "^0.3.1",
|
|
47
47
|
"ssh2": "^1.11.0",
|
|
48
48
|
"tar": "^6.1.11",
|
|
49
|
-
"yargs": "^17.5.1"
|
|
49
|
+
"yargs": "^17.5.1",
|
|
50
|
+
"socks": "^2.8.0"
|
|
50
51
|
}
|
|
51
52
|
}
|