jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Ask the api server for public ip instead of local interface

Browse Source 
Part of #106 and #86
Might fix #115 pending testing
This commit is contained in:
Johannes
2016-11-29 15:26:25 +01:00
parent a2afadfe92
commit 756b36d227
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/sysinfo/generic.js
View File

@@ -5,26 +5,30 @@ exports = module.exports = {
};
var assert = require('assert'),
os = require('os'),
async = require('async'),
config = require('../config.js'),
superagent = require('superagent'),
SysInfoError = require('../sysinfo.js').SysInfoError;
function getIp(callback) {
assert.strictEqual(typeof callback, 'function');
try {
var interfaces = os.networkInterfaces();
// https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
for (var ifname in interfaces) {
if (!ifname.match(/^(en|eth)/)) continue;
for (var obj of interfaces[ifname]) { // array
if (obj.family === 'IPv4') return callback(null, obj.address);
async.retry({ times: 10, interval: 5000 }, function (callback) {
superagent.get(config.apiServerOrigin() + '/api/v1/helper/public_ip').timeout(30 * 1000).end(function (error, result) {
if (error || result.statusCode !== 200) {
console.error('Error getting IP', error);
return callback(new SysInfoError(SysInfoError.INTERNAL_ERROR, 'Unable to contact api server'));
}
if (!result.body && !result.body.ip) {
console.error('Unexpected answer. No "ip" found in response body.', result.body);
return callback(new SysInfoError(SysInfoError.INTERNAL_ERROR, 'No IP found in body'));
}
}
return callback(new SysInfoError(SysInfoError.INTERNAL_ERROR, new Error('Could not find interface')));
} catch (e) {
return callback(new SysInfoError(SysInfoError.INTERNAL_ERROR, e));
}
callback(null, result.body.ip);
});
}, function (error, result) {
if (error) return callback(error);
callback(null, result);
});
}