From 82495a6529e6f91fa9b1e49ff15a9a44489f3b76 Mon Sep 17 00:00:00 2001 From: rcooke-warwick Date: Fri, 6 Oct 2023 16:13:58 +0100 Subject: [PATCH 1/2] enable using direct ip for manual testing Change-type: patch Signed-off-by: Ryan Cooke --- core/lib/common/worker.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/lib/common/worker.js b/core/lib/common/worker.js index 8576f1961..76d5a2d6d 100644 --- a/core/lib/common/worker.js +++ b/core/lib/common/worker.js @@ -320,7 +320,17 @@ module.exports = class Worker { command = command instanceof Array ? command.join(' ') : command; let config = {}; // depending on if the target argument is a .local uuid or not, SSH via the proxy or directly - if (/.*\.local/.test(target)) { + + if (/^(\d{1,3}\.){3}\d{1,3}$/.test(target)){ + console.log(`using local ip: ${target}`) + let ip = target + config = { + host: ip, + port: '22222', + username: 'root', + }; + } + else if (/.*\.local/.test(target)) { let ip = await this.ip(target); config = { host: ip, From 7bd7aaa5ea706b0d5be8568330de59709736e512 Mon Sep 17 00:00:00 2001 From: rcooke-warwick Date: Wed, 11 Oct 2023 13:31:10 +0100 Subject: [PATCH 2/2] user balena cloud authentication for ssh by ip Change-type: patch Signed-off-by: Ryan Cooke --- core/lib/common/worker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/common/worker.js b/core/lib/common/worker.js index 76d5a2d6d..1abc21fb3 100644 --- a/core/lib/common/worker.js +++ b/core/lib/common/worker.js @@ -327,7 +327,7 @@ module.exports = class Worker { config = { host: ip, port: '22222', - username: 'root', + username: this.username, }; } else if (/.*\.local/.test(target)) {