mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 15:33:12 +09:00
Address review of host pairing
Revoking a host now unassigns its instances instead of being refused while it has any, and removes its system metrics. Approving and revoking no longer force a save. Hosts are saved by autosave and on exit like everything else, which also removes the approving state from pairing requests. The approval code and link are logged as warnings so they show up in the systemd service, which only prints warnings and above. The pairing limits are now the controller.host_pairing_timeout and controller.host_pairing_max_pending config values, 0 removes the limit. Subscribers take an optional permitted function, used for the pairing requests instead of overrides in a subclass.
This commit is contained in:
29 files changed
+356
-418
No files matched your search
@@ -12,13 +12,11 @@ const addr = lib.Address.fromShorthand;
|
||||
describe("web_ui/util/host_pairing", function() {
|
||||
describe("class HostPairingSubscriber", function() {
|
||||
let mockControl;
|
||||
let permitted;
|
||||
let subscriber;
|
||||
|
||||
beforeEach(function() {
|
||||
mockControl = new MockControl(new MockConnector(addr({ controlId: 0 }), addr("controller")));
|
||||
permitted = true;
|
||||
subscriber = new HostPairingSubscriber(mockControl, () => permitted);
|
||||
subscriber = new HostPairingSubscriber(mockControl, () => true);
|
||||
});
|
||||
|
||||
function pairing(code, updatedAtMs) {
|
||||
@@ -33,65 +31,6 @@ describe("web_ui/util/host_pairing", function() {
|
||||
return mockControl.connector.sentMessages.filter(message => message.name === "SubscriptionRequest");
|
||||
}
|
||||
|
||||
it("should not send requests on connect or account updates without permission", async function() {
|
||||
permitted = false;
|
||||
mockControl.connector.emit("connect");
|
||||
subscriber.handleConnectionEvent("resume");
|
||||
subscriber.handleAccountEvent();
|
||||
await settle();
|
||||
assert.deepEqual(sentRequests(), []);
|
||||
});
|
||||
|
||||
it("should resubscribe on connect with permission", async function() {
|
||||
subscriber.subscribe(() => {});
|
||||
await events.once(mockControl.connector, "send");
|
||||
mockControl.connector.sentMessages.length = 0;
|
||||
|
||||
mockControl.connector.emit("connect");
|
||||
await settle();
|
||||
assert.equal(sentRequests().length, 1);
|
||||
assert.deepEqual(sentRequests()[0].data, new lib.SubscriptionRequest(
|
||||
lib.HostPairingUpdatesEvent.name, "replace", -1, lib.SubscriptionFilters.all()
|
||||
));
|
||||
});
|
||||
|
||||
it("should resubscribe on account updates with permission", async function() {
|
||||
subscriber.subscribe(() => {});
|
||||
await events.once(mockControl.connector, "send");
|
||||
mockControl.connector.sentMessages.length = 0;
|
||||
|
||||
permitted = false;
|
||||
subscriber.handleAccountEvent();
|
||||
await settle();
|
||||
assert.deepEqual(sentRequests(), []);
|
||||
|
||||
permitted = true;
|
||||
subscriber.handleAccountEvent();
|
||||
await settle();
|
||||
assert.equal(sentRequests().length, 1);
|
||||
});
|
||||
|
||||
it("should clear requests when a new session starts", async function() {
|
||||
await subscriber._handleEvent(new lib.HostPairingUpdatesEvent([pairing("ABC-DEF", 10)]));
|
||||
assert.equal(subscriber.values.size, 1);
|
||||
const [before] = subscriber.getSnapshot();
|
||||
|
||||
mockControl.connector.emit("connect");
|
||||
assert.equal(subscriber.values.size, 0);
|
||||
assert.equal(subscriber.lastUpdatedMs, -1);
|
||||
const [after] = subscriber.getSnapshot();
|
||||
assert.notEqual(after, before);
|
||||
assert.equal(after.size, 0);
|
||||
});
|
||||
|
||||
it("should keep requests when a session is resumed", async function() {
|
||||
await subscriber._handleEvent(new lib.HostPairingUpdatesEvent([pairing("ABC-DEF", 10)]));
|
||||
subscriber.handleConnectionEvent("drop");
|
||||
subscriber.handleConnectionEvent("resume");
|
||||
assert.equal(subscriber.values.size, 1);
|
||||
assert.equal(subscriber.lastUpdatedMs, 10);
|
||||
});
|
||||
|
||||
it("should clear requests when subscribing again after the last unsubscribe", async function() {
|
||||
const unsubscribe = subscriber.subscribe(() => {});
|
||||
await events.once(mockControl.connector, "send");
|
||||
|
||||
Reference in new issue
Block a user