make ipv4 and ipv6 settings separate

2022-02-15 12:31:55 -08:00
parent 0dbe8ee8f2
commit c6da8c8167
14 changed files with 102 additions and 68 deletions
@@ -3,7 +3,8 @@
 exports = module.exports = {
    getServerIPv4,
    getServerIPv6,
-    testConfig
+    testIPv4Config,
+    testIPv6Config
 };

 const assert = require('assert'),
@@ -24,16 +25,20 @@ async function getServerIPv6(config) {
    throw new BoxError(BoxError.NETWORK_ERROR, 'No IPv6 configured');
 }

-async function testConfig(config) {
+async function testIPv4Config(config) {
    assert.strictEqual(typeof config, 'object');

    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, 'invalid IPv6');
-    }
+    return null;
+}
+
+async function testIPv6Config(config) {
+    assert.strictEqual(typeof config, 'object');
+
+    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, 'invalid IPv6');

    return null;
 }