IP lists and ranges in config.json can now be placed in a file. #3401
Ylian Saint-Hilaire committed
Jan 3, 2022 at 17:12 UTC
41ea6ece28a647f7a8ec0e2e05fe11cbb336c0ca
1 file changed
+20
-1
meshcentral.js
+20
-1
@@ -738,6 +738,14 @@ function CreateMeshCentralServer(config, args) {
738
// Check top level configuration for any unreconized values
739
if (config) { for (var i in config) { if ((typeof i == 'string') && (i.length > 0) && (i[0] != '_') && (['settings', 'domaindefaults', 'domains', 'configfiles', 'smtp', 'letsencrypt', 'peers', 'sms', 'sendgrid', 'sendmail', 'firebase', 'firebaserelay', '$schema'].indexOf(i) == -1)) { addServerWarning('Unrecognized configuration option \"' + i + '\".', 3, [ i ]); } } }
740
741
+ // Read IP lists from files if applicable
742
+ config.settings.userallowedip = obj.args.userallowedip = readIpListFromFile(obj.args.userallowedip);
743
+ config.settings.userblockedip = obj.args.userblockedip = readIpListFromFile(obj.args.userblockedip);
744
+ config.settings.agentallowedip = obj.args.agentallowedip = readIpListFromFile(obj.args.agentallowedip);
745
+ config.settings.agentblockedip = obj.args.agentblockedip = readIpListFromFile(obj.args.agentblockedip);
746
+ config.settings.swarmallowedip = obj.args.swarmallowedip = readIpListFromFile(obj.args.swarmallowedip);
747
+
748
+ // Check IP lists and ranges
749
if (typeof obj.args.userallowedip == 'string') { if (obj.args.userallowedip == '') { config.settings.userallowedip = obj.args.userallowedip = null; } else { config.settings.userallowedip = obj.args.userallowedip = obj.args.userallowedip.split(','); } }
750
if (typeof obj.args.userblockedip == 'string') { if (obj.args.userblockedip == '') { config.settings.userblockedip = obj.args.userblockedip = null; } else { config.settings.userblockedip = obj.args.userblockedip = obj.args.userblockedip.split(','); } }
751
if (typeof obj.args.agentallowedip == 'string') { if (obj.args.agentallowedip == '') { config.settings.agentallowedip = obj.args.agentallowedip = null; } else { config.settings.agentallowedip = obj.args.agentallowedip = obj.args.agentallowedip.split(','); } }
@@ -3126,7 +3134,18 @@ function CreateMeshCentralServer(config, args) {
3134
} catch (ex) { obj.serverSelfWriteAllowed = false; }
3135
} catch (ex) { } // Do nothing since this is not a critical feature.
3136
};
3129
-
3137
+
3138
+ // Read a list of IP addresses from a file
3139
+ function readIpListFromFile(arg) {
3140
+ if ((typeof arg != 'string') || (!arg.startsWith('file:'))) return arg;
3141
+ var lines = null;
3142
+ try { lines = obj.fs.readFileSync(obj.path.join(obj.datapath, arg.substring(5))).toString().split('\r\n').join('\r').split('\r'); } catch (ex) { }
3143
+ if (lines == null) return null;
3144
+ var validLines = [];
3145
+ for (var i in lines) { if ((lines[i].length > 0) && (((lines[i].charAt(0) > '0') && (lines[i].charAt(0) < '9')) || (lines[i].charAt(0) == ':'))) validLines.push(lines[i]); }
3146
+ return validLines;
3147
+ }
3148
+
3149
// Logging funtions
3150
function logException(e) { e += ''; logErrorEvent(e); }
3151
function logInfoEvent(msg) { if (obj.servicelog != null) { obj.servicelog.info(msg); } console.log(msg); }