root/sclient.js
2
1
Fork 0
mirror of https://git.coolaj86.com/coolaj86/sclient.js synced 2025-02-22 15:58:04 +00:00
Code Issues Releases Wiki Activity

v1.4.2: add undocumented staging features: vpn and --socks5 <port>

Browse Source
This commit is contained in:
AJ ONeal 2018-09-12 13:57:16 -06:00
parent 58cbe914c1
commit 6fdf889b0b
2 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
bin/sclient.js
View File

@ -21,19 +21,6 @@ function parseFlags(argv) {
var args = argv.slice(); var args = argv.slice();
var flags = {}; var flags = {};
args.sort(function (a, b) {
if ('-' === a[0]) {
if ('-' === b[0]) {
return 0;
}
return 1;
}
if ('-' === b[0]) {
return -1;
}
return 0;
});
args.some(function (arg, i) { args.some(function (arg, i) {
if (/^-k|--?insecure$/.test(arg)) { if (/^-k|--?insecure$/.test(arg)) {
flags.rejectUnauthorized = false; flags.rejectUnauthorized = false;
@ -70,6 +57,32 @@ function parseFlags(argv) {
return true; return true;
} }
}); });
args.some(function (arg, i) {
if (/^--?socks5$/.test(arg)) {
flags.socks5 = args[i + 1];
if (!flags.socks5 || /^-/.test(flags.socks5)) {
usage();
process.exit(202);
}
args.splice(i, 2);
return true;
}
});
// This works for most (but not all)
// of the ssh and rsync flags - because they mostly don't have arguments
args.sort(function (a, b) {
if ('-' === a[0]) {
if ('-' === b[0]) {
return 0;
}
return 1;
}
if ('-' === b[0]) {
return -1;
}
return 0;
});
return { return {
flags: flags flags: flags
@ -109,6 +122,10 @@ function testRemote(opts) {
var remote = args.shift() + ':' + opts.remotePath; var remote = args.shift() + ':' + opts.remotePath;
args = [ remote, '-e', 'ssh ' + args.join(' ') ]; args = [ remote, '-e', 'ssh ' + args.join(' ') ];
} }
if (opts.socks5) {
args.push('-D');
args.push('localhost:' + opts.socks5);
}
args = args.concat(opts.args); args = args.concat(opts.args);
var child = spawn(opts.command, args, { stdio: 'inherit' }); var child = spawn(opts.command, args, { stdio: 'inherit' });
child.on('exit', function () { child.on('exit', function () {
@ -139,7 +156,7 @@ function main() {
// Re-arrange argument order for ssh // Re-arrange argument order for ssh
if (cmd.flags.wrapSsh) { if (cmd.flags.wrapSsh) {
cmd.args.splice(3, 0, 'ssh'); cmd.args.splice(3, 0, 'ssh');
} else if (-1 !== [ 'ssh', 'rsync' ].indexOf((cmd.args[2]||'').split(':')[0])) { } else if (-1 !== [ 'ssh', 'rsync', 'vpn' ].indexOf((cmd.args[2]||'').split(':')[0])) {
cmd.flags.wrapSsh = true; cmd.flags.wrapSsh = true;
binParam = cmd.args.splice(2, 1); binParam = cmd.args.splice(2, 1);
cmd.args.splice(3, 0, binParam[0]); cmd.args.splice(3, 0, binParam[0]);
@ -157,7 +174,7 @@ function main() {
} }
local = (cmd.args[3]||'').split(':'); local = (cmd.args[3]||'').split(':');
if (-1 !== [ 'ssh', 'rsync' ].indexOf(local[0])) { if (-1 !== [ 'ssh', 'rsync', 'vpn' ].indexOf(local[0])) {
cmd.flags.wrapSsh = true; cmd.flags.wrapSsh = true;
} }
@ -212,16 +229,24 @@ function main() {
opts.stdin = process.stdin; opts.stdin = process.stdin;
opts.stdout = process.stdout; opts.stdout = process.stdout;
// no need for port // no need for port
} else if (-1 !== [ 'ssh', 'rsync' ].indexOf(localAddress)) { } else if (-1 !== [ 'ssh', 'rsync', 'vpn' ].indexOf(localAddress)) {
cmd.flags.wrapSsh = true; cmd.flags.wrapSsh = true;
opts.localAddress = 'localhost'; opts.localAddress = 'localhost';
opts.localPort = local[1] || 0; // choose at random opts.localPort = local[1] || 0; // choose at random
opts.command = localAddress; opts.command = localAddress;
opts.args = cmd.args.slice(4); // node, sclient, ssh, addr opts.args = cmd.args.slice(4); // node, sclient, ssh, addr
opts.socks5 = cmd.flags.socks5;
if ('rsync' === opts.command) { if ('rsync' === opts.command) {
opts.remotePath = opts.remotePort; opts.remotePath = opts.remotePort;
opts.remotePort = 0; opts.remotePort = 0;
} }
if ('vpn' === opts.command) {
opts.command = 'ssh';
if (!opts.socks5) {
usage();
return;
}
}
if (!opts.remotePort) { if (!opts.remotePort) {
opts.remotePort = cmd.flags.port || 443; opts.remotePort = cmd.flags.port || 443;
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "sclient", "name": "sclient",
"version": "1.4.1", "version": "1.4.2",
"description": "Secure Client for exposing TLS (aka SSL) secured services as plain-text connections locally. Also ideal for multiplexing a single port with multiple protocols using SNI.", "description": "Secure Client for exposing TLS (aka SSL) secured services as plain-text connections locally. Also ideal for multiplexing a single port with multiple protocols using SNI.",
"main": "index.js", "main": "index.js",
"homepage": "https://telebit.cloud/sclient/", "homepage": "https://telebit.cloud/sclient/",