coolaj86/telebit-relay.js
1
1
Fork 0
Code Issues 4 Pull Requests Releases Activity

prefer token.domains over token.name

Browse Source
This commit is contained in:
AJ ONeal 2016-10-11 19:00:03 -04:00
parent 578c50b8d2
commit 6185b79263
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wstunneld.js
View File

@ -36,13 +36,27 @@ module.exports.create = function (opts) {
return; return;
} }
if (!token.name) { if (!Array.isArray(token.domains)) {
if ('string' === typeof token.name) {
token.domains = [ token.name ];
}
}
if (!Array.isArray(token.domains)) {
ws.send(JSON.stringify({ error: { message: "invalid server name", code: "E_INVALID_NAME" } })); ws.send(JSON.stringify({ error: { message: "invalid server name", code: "E_INVALID_NAME" } }));
ws.close(); ws.close();
return; return;
} }
var remote = remotes[token.name] = remotes[token.name] || {}; var remote;
token.domains.some(function (domainname) {
remote = remotes[domainname];
return remote;
});
remote = remote || {};
token.domains.forEach(function (domainname) {
remotes[domainname] = remote;
});
var handlers = { var handlers = {
onmessage: function (opts) { onmessage: function (opts) {
// opts.data // opts.data
@ -85,7 +99,7 @@ module.exports.create = function (opts) {
}; };
// TODO allow more than one remote per servername // TODO allow more than one remote per servername
remote.ws = ws; remote.ws = ws;
remote.servername = token.name; remote.servername = token.domains.join(',');
remote.id = packer.socketToId(ws.upgradeReq.socket); remote.id = packer.socketToId(ws.upgradeReq.socket);
console.log("remote.id", remote.id); console.log("remote.id", remote.id);
// TODO allow tls to be decrypted by server if client is actually a browser // TODO allow tls to be decrypted by server if client is actually a browser
@ -263,7 +277,7 @@ module.exports.create = function (opts) {
console.log('servername', servername); console.log('servername', servername);
if (/HTTP\//i.test(str)) { if (/HTTP\//i.test(str)) {
service = 'http'; service = 'http';
if (/\/\.well-known\//.test(str)) { if (/\/\.well-known\/acme-challenge\//.test(str)) {
// HTTP // HTTP
if (remotes[servername]) { if (remotes[servername]) {
pipeWs(servername, service, browser, remotes[servername]); pipeWs(servername, service, browser, remotes[servername]);