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

sysinfo: fixed provider now takes ipv6 optionally

Browse Source 
part of #264
This commit is contained in:
Girish Ramakrishnan
2022-01-06 17:56:15 -08:00
parent d65ac353fe
commit f4a21bdeb4
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrations/20220107015249-settings-sysinfo-ip-to-ipv4.js
+17
View File
@@ -0,0 +1,17 @@
'use strict';
exports.up = function(db, callback) {
db.runSql('SELECT value FROM settings WHERE name=?', [ 'sysinfo_config' ], function (error, result) {
if (error || result.length === 0) return callback(error);
const sysinfoConfig = JSON.parse(result[0].value);
if (sysinfoConfig.provider !== 'fixed' || !sysinfoConfig.ip) return callback();
sysinfoConfig.ipv4 = sysinfoConfig.ip;
delete sysinfoConfig.ip;
db.runSql('REPLACE INTO settings (name, value) VALUES(?, ?)', [ 'sysinfo_config', JSON.stringify(sysinfoConfig) ], callback);
});
};
exports.down = function(db, callback) {
callback();
};
src/sysinfo/fixed.js
+4 -4
View File
@@ -13,7 +13,7 @@ const assert = require('assert'),
async function getServerIPv4(config) {
assert.strictEqual(typeof config, 'object');
return config.ip;
return config.ipv4;
}
async function getServerIPv6(config) {
@@ -27,12 +27,12 @@ async function getServerIPv6(config) {
async function testConfig(config) {
assert.strictEqual(typeof config, 'object');
if (typeof config.ip !== 'string') return new BoxError(BoxError.BAD_FIELD, 'ipv4 must be a string');
if (!net.isIPv4(config.ip)) return new BoxError(BoxError.BAD_FIELD, 'ip is not a valid ipv4');
if (typeof config.ipv4 !== 'string') return new BoxError(BoxError.BAD_FIELD, 'ipv4 must be a string');
if (!net.isIPv4(config.ipv4)) return new BoxError(BoxError.BAD_FIELD, 'invalid IPv4');
if ('ipv6' in config) {
if (typeof config.ipv6 !== 'string') return new BoxError(BoxError.BAD_FIELD, 'ipv6 must be a string');
if (!net.isIPv6(config.ipv6)) return new BoxError(BoxError.BAD_FIELD, 'ipv6 is not a valid ipv6');
if (!net.isIPv6(config.ipv6)) return new BoxError(BoxError.BAD_FIELD, 'invalid IPv6');
}
return null;