Add a jwt token authorization #200

Closed
neptunish wants to merge 4 commits from add_a_jwt_token_authorization into master
3 changed files with 20 additions and 4 deletions
Showing only changes of commit 3c06736520 - Show all commits
+5
View File
@@ -31,6 +31,10 @@ const argv = optimist
default: 10, default: 10,
describe: 'maximum number of tcp sockets each client is allowed to establish at one time (the tunnels)' describe: 'maximum number of tcp sockets each client is allowed to establish at one time (the tunnels)'
}) })
.options('range', {
default: null,
describe: 'will bind incoming connections only on ports in range xxx:xxxx'
})
.argv; .argv;
if (argv.help) { if (argv.help) {
@@ -42,6 +46,7 @@ const server = CreateServer({
max_tcp_sockets: argv['max-sockets'], max_tcp_sockets: argv['max-sockets'],
secure: argv.secure, secure: argv.secure,
domain: argv.domain, domain: argv.domain,
range: argv.range,
}); });
server.listen(argv.port, argv.address, () => { server.listen(argv.port, argv.address, () => {
+4
View File
@@ -3,6 +3,7 @@ import Debug from 'debug';
import Client from './Client'; import Client from './Client';
import TunnelAgent from './TunnelAgent'; import TunnelAgent from './TunnelAgent';
import PortManager from "./PortManager";
// Manage sets of clients // Manage sets of clients
// //
@@ -13,6 +14,7 @@ class ClientManager {
// id -> client instance // id -> client instance
this.clients = new Map(); this.clients = new Map();
this.portManager = new PortManager({range: this.opt.range||null})
// statistics // statistics
this.stats = { this.stats = {
@@ -39,6 +41,7 @@ class ClientManager {
const maxSockets = this.opt.max_tcp_sockets; const maxSockets = this.opt.max_tcp_sockets;
const agent = new TunnelAgent({ const agent = new TunnelAgent({
portManager: this.portManager,
clientId: id, clientId: id,
maxSockets: 10, maxSockets: 10,
}); });
@@ -79,6 +82,7 @@ class ClientManager {
if (!client) { if (!client) {
return; return;
} }
this.portManager.release(client.agent.port);
--this.stats.tunnels; --this.stats.tunnels;
delete this.clients[id]; delete this.clients[id];
client.close(); client.close();
+11 -4
View File
@@ -20,6 +20,9 @@ class TunnelAgent extends Agent {
// sockets we can hand out via createConnection // sockets we can hand out via createConnection
this.availableSockets = []; this.availableSockets = [];
this.port = null;
this.clientId = options.clientId
this.portManager = options.portManager || null;
// when a createConnection cannot return a socket, it goes into a queue // when a createConnection cannot return a socket, it goes into a queue
// once a socket is available it is handed out to the next callback // once a socket is available it is handed out to the next callback
@@ -63,13 +66,14 @@ class TunnelAgent extends Agent {
}); });
return new Promise((resolve) => { return new Promise((resolve) => {
server.listen(() => { const port = this.portManager ? this.portManager.getNextAvailable(this.options.clientId) : null;
const port = server.address().port; server.listen(port,() => {
this.debug('tcp server listening on port: %d', port); this.port = server.address().port
this.debug('tcp server listening on port: %d (%s)', this.port, this.clientId);
resolve({ resolve({
// port for lt client tcp connections // port for lt client tcp connections
port: port, port: this.port,
}); });
}); });
}); });
@@ -115,6 +119,9 @@ class TunnelAgent extends Agent {
socket.once('error', (err) => { socket.once('error', (err) => {
// we do not log these errors, sessions can drop from clients for many reasons // we do not log these errors, sessions can drop from clients for many reasons
// these are not actionable errors for our server // these are not actionable errors for our server
if(this.portManager){
this.portManager.release(this.port);
}
socket.destroy(); socket.destroy();
}); });