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

network: simply use ip instead of ipv4/ipv6

Browse Source 
this makes it simpler for openapi docs
This commit is contained in:
Girish Ramakrishnan
2023-09-12 20:13:27 +05:30
parent 58bf5ec677
commit 964dc990a6
4 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/fixed.js
+6 -6
View File
@@ -14,13 +14,13 @@ const assert = require('assert'),
async function getIPv4(config) {
assert.strictEqual(typeof config, 'object');
return config.ipv4;
return config.ip;
}
async function getIPv6(config) {
assert.strictEqual(typeof config, 'object');
if ('ipv6' in config) return config.ipv6;
if ('ip' in config) return config.ip;
throw new BoxError(BoxError.NETWORK_ERROR, 'No IPv6 configured');
}
@@ -28,8 +28,8 @@ async function getIPv6(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 (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, 'invalid IPv4');
return null;
}
@@ -37,8 +37,8 @@ async function testIPv4Config(config) {
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');
if (typeof config.ip !== 'string') return new BoxError(BoxError.BAD_FIELD, 'ipv6 must be a string');
if (!net.isIPv6(config.ip)) return new BoxError(BoxError.BAD_FIELD, 'invalid IPv6');
return null;
}