mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 00:13:12 +09:00
Expose computed tls_ca config
Provide the loaded file of the tls_ca config available to slave, instance and ctl code. This ensures they can easily use it when connecting to the master server.
This commit is contained in:
1 parent
6a29cd9715
commit
4efd09de31
2 files changed
+16
-5
No files matched your search
+7
-2
@@ -698,10 +698,15 @@ class ControlConnector extends libLink.WebSocketClientConnector {
|
|||||||
*/
|
*/
|
||||||
class Control extends libLink.Link {
|
class Control extends libLink.Link {
|
||||||
|
|
||||||
constructor(connector, controlPlugins) {
|
constructor(connector, tlsCa, controlPlugins) {
|
||||||
super("control", "master", connector);
|
super("control", "master", connector);
|
||||||
libLink.attachAllMessages(this);
|
libLink.attachAllMessages(this);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Certificate authority used to validate TLS connections to the master.
|
||||||
|
* @type {?string}
|
||||||
|
*/
|
||||||
|
this.tlsCa = tlsCa;
|
||||||
/**
|
/**
|
||||||
* Mapping of plugin names to their instance for loaded plugins.
|
* Mapping of plugin names to their instance for loaded plugins.
|
||||||
* @type {Map<string, module:lib/plugin.BaseControlPlugin>}
|
* @type {Map<string, module:lib/plugin.BaseControlPlugin>}
|
||||||
@@ -917,7 +922,7 @@ async function startControl() {
|
|||||||
tlsCa,
|
tlsCa,
|
||||||
controlConfig.get("control.master_token")
|
controlConfig.get("control.master_token")
|
||||||
);
|
);
|
||||||
let control = new Control(controlConnector, controlPlugins);
|
let control = new Control(controlConnector, tlsCa, controlPlugins);
|
||||||
try {
|
try {
|
||||||
await controlConnector.connect();
|
await controlConnector.connect();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -736,7 +736,7 @@ class Instance extends libLink.Link {
|
|||||||
let response = await phin({
|
let response = await phin({
|
||||||
url, method: "PUT",
|
url, method: "PUT",
|
||||||
data: content,
|
data: content,
|
||||||
core: { rejectUnauthorized: false },
|
core: { ca: this._slave.tlsCa },
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/zip",
|
"Content-Type": "application/zip",
|
||||||
"x-access-token": this._slave.config.get("slave.master_token"),
|
"x-access-token": this._slave.config.get("slave.master_token"),
|
||||||
@@ -976,7 +976,7 @@ function checkFilename(name) {
|
|||||||
class Slave extends libLink.Link {
|
class Slave extends libLink.Link {
|
||||||
// I don't like God classes, but the alternative of putting all this state
|
// I don't like God classes, but the alternative of putting all this state
|
||||||
// into global variables is not much better.
|
// into global variables is not much better.
|
||||||
constructor(connector, slaveConfig, pluginInfos) {
|
constructor(connector, slaveConfig, tlsCa, pluginInfos) {
|
||||||
super("slave", "master", connector);
|
super("slave", "master", connector);
|
||||||
libLink.attachAllMessages(this);
|
libLink.attachAllMessages(this);
|
||||||
|
|
||||||
@@ -987,6 +987,12 @@ class Slave extends libLink.Link {
|
|||||||
|
|
||||||
this.config = slaveConfig;
|
this.config = slaveConfig;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Certificate authority used to validate TLS connections to the master.
|
||||||
|
* @type {?string}
|
||||||
|
*/
|
||||||
|
this.tlsCa = tlsCa;
|
||||||
|
|
||||||
this.instanceConnections = new Map();
|
this.instanceConnections = new Map();
|
||||||
this.discoveredInstanceInfos = new Map();
|
this.discoveredInstanceInfos = new Map();
|
||||||
this.instanceInfos = new Map();
|
this.instanceInfos = new Map();
|
||||||
@@ -1618,7 +1624,7 @@ async function startSlave() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let slaveConnector = new SlaveConnector(slaveConfig, tlsCa, pluginInfos);
|
let slaveConnector = new SlaveConnector(slaveConfig, tlsCa, pluginInfos);
|
||||||
let slave = new Slave(slaveConnector, slaveConfig, pluginInfos);
|
let slave = new Slave(slaveConnector, slaveConfig, tlsCa, pluginInfos);
|
||||||
|
|
||||||
// Handle interrupts
|
// Handle interrupts
|
||||||
let secondSigint = false;
|
let secondSigint = false;
|
||||||
|
|||||||
Reference in new issue
Block a user