Add location access control to config class

Add a per field access parameter to the config class which specifies
which of master, slave and control can access the given field.  A
location is added to the config class to specify which party owns it and
fields which do not have an access parameter are not present in the
config and will throw if attempted to be read from or writen to.

The serialize, load, update, get, set and setProp are ammended with a
location parameter which specifiy where the data is from or destined to
and the access checks are performed to ensure remote access to the
config is still limited by the access parameter of field.

With this system in place the master config can be shared with control
and slave connections without compromising secrets that should stay
private.  This is primarily the master authentication secret, but other
plugins may define secrets it does not want to have shared with slave
and/or control connections.
This commit is contained in:
Hornwitser committed 2021-02-24 15:46:19 +01:00
1 parent 77cf4947b6
commit 2c74a67738
13 files changed
+399 -109

No files matched your search

+14 -14
View File
@@ -372,7 +372,7 @@ async function loadInstances(databaseDirectory, file) {
try {
let serialized = JSON.parse(await fs.readFile(filePath));
for (let serializedConfig of serialized) {
let instanceConfig = new libConfig.InstanceConfig();
let instanceConfig = new libConfig.InstanceConfig("master");
await instanceConfig.load(serializedConfig);
let status = instanceConfig.get("instance.assigned_slave") === null ? "unassigned" : "unknown";
instances.set(instanceConfig.get("instance.id"), { config: instanceConfig, status });
@@ -707,7 +707,7 @@ class ControlConnection extends BaseConnection {
}
async createSlaveConfigRequestHandler(message) {
let slaveConfig = new libConfig.SlaveConfig();
let slaveConfig = new libConfig.SlaveConfig("control");
await slaveConfig.init();
slaveConfig.set("slave.master_url", getMasterUrl());
@@ -739,7 +739,7 @@ class ControlConnection extends BaseConnection {
// XXX should probably add a hook for slave reuqests?
async createInstanceRequestHandler(message) {
let instanceConfig = new libConfig.InstanceConfig();
let instanceConfig = new libConfig.InstanceConfig("master");
await instanceConfig.load(message.data.serialized_config);
let instanceId = instanceConfig.get("instance.id");
@@ -795,7 +795,7 @@ class ControlConnection extends BaseConnection {
}
return {
serialized_config: instance.config.serialize(),
serialized_config: instance.config.serialize("control"),
};
}
@@ -806,7 +806,7 @@ class ControlConnection extends BaseConnection {
if (connection) {
await libLink.messages.assignInstance.send(connection, {
instance_id: instance.config.get("instance.id"),
serialized_config: instance.config.serialize(),
serialized_config: instance.config.serialize("slave"),
});
}
}
@@ -827,7 +827,7 @@ class ControlConnection extends BaseConnection {
throw new libErrors.RequestError("Setting instance.id is not supported");
}
instance.config.set(message.data.field, message.data.value);
instance.config.set(message.data.field, message.data.value, "control");
await this.updateInstanceConfig(instance);
}
@@ -838,7 +838,7 @@ class ControlConnection extends BaseConnection {
}
let { field, prop, value } = message.data;
instance.config.setProp(field, prop, value);
instance.config.setProp(field, prop, value, "control");
await this.updateInstanceConfig(instance);
}
@@ -877,7 +877,7 @@ class ControlConnection extends BaseConnection {
if (slave_id !== null) {
await libLink.messages.assignInstance.send(newSlaveConnection, {
instance_id,
serialized_config: instance.config.serialize(),
serialized_config: instance.config.serialize("slave"),
});
}
}
@@ -1202,15 +1202,15 @@ class SlaveConnection extends BaseConnection {
if (instance.config.get("instance.assigned_slave") === this._id) {
await libLink.messages.assignInstance.send(this, {
instance_id: instance.config.get("instance.id"),
serialized_config: instance.config.serialize(),
serialized_config: instance.config.serialize("slave"),
});
}
}
// Assign instances the slave has but master does not
for (let instance of message.data.instances) {
let instanceConfig = new libConfig.InstanceConfig();
await instanceConfig.load(instance.serialized_config);
let instanceConfig = new libConfig.InstanceConfig("master");
await instanceConfig.load(instance.serialized_config, "slave");
let masterInstance = db.instances.get(instanceConfig.get("instance.id"));
if (masterInstance) {
@@ -1239,7 +1239,7 @@ class SlaveConnection extends BaseConnection {
});
await libLink.messages.assignInstance.send(this, {
instance_id: instanceConfig.get("instance.id"),
serialized_config: instanceConfig.serialize(),
serialized_config: instanceConfig.serialize("slave"),
});
}
@@ -1797,7 +1797,7 @@ async function handleBootstrapCommand(args) {
process.exitCode = 1;
return;
}
let controlConfig = new libConfig.ControlConfig();
let controlConfig = new libConfig.ControlConfig("control");
await controlConfig.init();
controlConfig.set("control.master_url", getMasterUrl());
@@ -1909,7 +1909,7 @@ async function initialize() {
masterConfigPath = args.config;
logger.info(`Loading config from ${masterConfigPath}`);
masterConfig = new libConfig.MasterConfig();
masterConfig = new libConfig.MasterConfig("master");
try {
await masterConfig.load(JSON.parse(await fs.readFile(masterConfigPath)));