remove cruft
This commit is contained in:
parent
4f12286b55
commit
8f6a5f58ac
83
beacon.js
83
beacon.js
|
|
@ -1,83 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
var PromiseA = require('bluebird').Promise;
|
||||
var updateIp = require('./helpers/update-ip.js').update;
|
||||
var request = PromiseA.promisifyAll(require('request'));
|
||||
var requestAsync = PromiseA.promisify(require('request'));
|
||||
var upnpForward = require('./helpers/upnp-forward').upnpForward;
|
||||
var pmpForward = require('./helpers/pmp-forward').pmpForward;
|
||||
var loopbackHttps = require('./loopback-https');
|
||||
//var checkip = require('check-ip-address');
|
||||
|
||||
function openPort(ip, port) {
|
||||
if (!/tcp|https|http/.test(port.protocol || 'tcp')) {
|
||||
throw new Error('not yet supported \'' + port.protocol + '\'');
|
||||
}
|
||||
|
||||
if (false === port.testable) {
|
||||
return PromiseA.resolve();
|
||||
}
|
||||
|
||||
return loopbackHttps.create(ip, port.private, port.public).then(function () {
|
||||
console.log('success');
|
||||
}).catch(function (err) {
|
||||
// TODO test err
|
||||
return upnpForward(port).catch(function (err) {
|
||||
console.error('[ERROR] UPnP Port Forward');
|
||||
console.error(err);
|
||||
// TODO test err
|
||||
return pmpForward(port);
|
||||
}).then(function () {
|
||||
return loopbackHttps.create(ip, port.private, port.public);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// 1. update dyndns
|
||||
// 1.5. check ip every 5 min
|
||||
// 2. loopback test on ip for http / https / ssh
|
||||
// 3. if needed: discover gateway, map ports
|
||||
function beacon(hostnames, ports) {
|
||||
// test with
|
||||
// dig -p 53 @redirect-www.org pi.nadal.daplie.com A
|
||||
return updateIp({
|
||||
updater: 'redirect-www.org'
|
||||
, port: 65443
|
||||
, ddns: hostnames.map(function (hostname) {
|
||||
return { "name": hostname /*, "value": ipaddress, "type": "A"*/ };
|
||||
})
|
||||
}).then(function (data) {
|
||||
var promises = [];
|
||||
|
||||
console.log("Updated DynDNS");
|
||||
console.log(data);
|
||||
|
||||
ports.forEach(function (port) {
|
||||
promises.push(openPort(JSON.parse(data)[0].answers[0] || hostname, port));
|
||||
});
|
||||
|
||||
return PromiseA.all(promises);
|
||||
}).then(function () {
|
||||
console.log('opened ports');
|
||||
});
|
||||
|
||||
/*
|
||||
request.getAsync('http://checkip.hellabit.com').spread(function (resp, data) {
|
||||
console.log("External IP is", data);
|
||||
}).then(function () {
|
||||
return upnpForward().catch(function (err) {
|
||||
console.error('ERROR: UPnP failure:');
|
||||
console.error(err);
|
||||
});
|
||||
}).then(function () {
|
||||
return pmpForward().catch(function (err) {
|
||||
console.error('TODO: Notify user that their router is not compatible');
|
||||
});
|
||||
});
|
||||
|
||||
// TODO test roundtrip
|
||||
*/
|
||||
}
|
||||
|
||||
//setInterval(beacon, 5 * 60 * 1000);
|
||||
exports.run = beacon;
|
||||
|
|
@ -1,124 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
var https = require('https');
|
||||
var path = require('path');
|
||||
var fs = require('fs');
|
||||
var PromiseA = global.Promise || require('bluebird').Promise;
|
||||
|
||||
exports.create = function (ip, localPort, externalPort) {
|
||||
return new PromiseA(function (resolve, reject) {
|
||||
var token = Math.random().toString(16).split('.')[1];
|
||||
var tokenPath = Math.random().toString(16).split('.')[1];
|
||||
var options;
|
||||
var server;
|
||||
var options;
|
||||
var certsPath = path.join(__dirname, 'certs', 'server');
|
||||
var caCertsPath = path.join(__dirname, 'certs', 'ca');
|
||||
|
||||
|
||||
function testConnection() {
|
||||
var awesome = false;
|
||||
var timetok;
|
||||
var webreq;
|
||||
var options = {
|
||||
// not hostname because we set headers.host on our own
|
||||
host: ip
|
||||
, headers: {
|
||||
// whatever's on the fake cert
|
||||
'Host': 'redirect-www.org'
|
||||
}
|
||||
, port: externalPort
|
||||
, path: '/' + tokenPath
|
||||
, ca: fs.readFileSync(path.join(caCertsPath, 'my-root-ca.crt.pem'))
|
||||
};
|
||||
options.agent = new https.Agent(options);
|
||||
|
||||
timetok = setTimeout(function () {
|
||||
reject(new Error("timed out while testing NAT loopback for port " + externalPort));
|
||||
}, 2000);
|
||||
|
||||
function finishHim(err) {
|
||||
clearTimeout(timetok);
|
||||
server.close(function () {
|
||||
if (!err && awesome) {
|
||||
resolve();
|
||||
}
|
||||
});
|
||||
|
||||
if (err || !awesome) {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
else if (!awesome) {
|
||||
reject(new Error("loopback failed. Why? here's my best guess: "
|
||||
+ "the ssl cert matched, so you've probably got two boxes and this isn't the right one"));
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
webreq = https.request(options, function(res) {
|
||||
res.on('data', function (resToken) {
|
||||
if (resToken.toString() === token) {
|
||||
awesome = true;
|
||||
return;
|
||||
}
|
||||
});
|
||||
res.on('error', function (err) {
|
||||
console.error('[ERROR] https.request.response');
|
||||
console.error(err);
|
||||
finishHim(new Error("loopback failed. Why? here's my best guess: "
|
||||
+ "the connection was interrupted"));
|
||||
});
|
||||
res.on('end', function () {
|
||||
finishHim();
|
||||
});
|
||||
});
|
||||
|
||||
webreq.on('error', function (err) {
|
||||
console.error('[ERROR] https.request');
|
||||
console.error(err);
|
||||
if (/ssl|cert|chain/i.test(err.message || err.toString())) {
|
||||
finishHim(new Error("loopback failed. Why? here's my best guess: "
|
||||
+ "the ssl cert validation may have failed (might port-forward to the wrong box)"));
|
||||
} else {
|
||||
finishHim(new Error("loopback failed. Why? here's my best guess: "
|
||||
+ "port forwarding isn't configured for " + ip + ":" + externalPort + " to " + localPort));
|
||||
}
|
||||
});
|
||||
webreq.end();
|
||||
}
|
||||
|
||||
//
|
||||
// SSL Certificates
|
||||
//
|
||||
options = {
|
||||
key: fs.readFileSync(path.join(certsPath, 'my-server.key.pem'))
|
||||
, ca: [ fs.readFileSync(path.join(caCertsPath, 'my-root-ca.crt.pem')) ]
|
||||
, cert: fs.readFileSync(path.join(certsPath, 'my-server.crt.pem'))
|
||||
, requestCert: false
|
||||
, rejectUnauthorized: false
|
||||
};
|
||||
|
||||
//
|
||||
// Serve an Express App securely with HTTPS
|
||||
//
|
||||
server = https.createServer(options);
|
||||
function listen(app) {
|
||||
server.on('request', app);
|
||||
server.listen(localPort, function () {
|
||||
localPort = server.address().port;
|
||||
setTimeout(testConnection, 2000);
|
||||
});
|
||||
}
|
||||
|
||||
listen(function (req, res) {
|
||||
if (('/' + tokenPath) === req.url) {
|
||||
res.end(token);
|
||||
return;
|
||||
}
|
||||
|
||||
res.end('loopback failure');
|
||||
});
|
||||
});
|
||||
};
|
||||
Loading…
Reference in New Issue