From 10528fbb90dff122bcaaa00e13558d8b7f340821 Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Wed, 22 Feb 2023 23:01:44 +0100 Subject: [PATCH] Allow pre-rename host tokens Ease migration to the new controller/host naming by allowing tokens issued to the slave naming to be authenticated by the controller. --- packages/controller/src/WsServer.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/controller/src/WsServer.js b/packages/controller/src/WsServer.js index f32bb1cd..bad09f17 100644 --- a/packages/controller/src/WsServer.js +++ b/packages/controller/src/WsServer.js @@ -216,10 +216,12 @@ ${err.stack}` let tokenPayload = jwt.verify( data.token, Buffer.from(this.controller.config.get("controller.auth_secret"), "base64"), - { audience: "host" } + // migrate: allow pre-rename tokens issued to hosts before alpha-14 + { audience: ["host", "slave"] } ); - if (tokenPayload.host !== data.id) { + // migrate: allow pre-rename tokens issued to hosts before alpha-14 + if ((tokenPayload.host !== undefined ? tokenPayload.host : tokenPayload.slave) !== data.id) { throw new Error("missmatched host id"); }