From 98ac14dfbedbef3d1c57591394066047fb4e49f4 Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Thu, 22 Aug 2024 13:08:45 +0300 Subject: [PATCH] VC: Fix error message when using https url with private key authentication --- .../org/thingsboard/server/service/sync/vc/GitRepository.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java index 751945a360..aaa4c22289 100644 --- a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java +++ b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java @@ -467,6 +467,9 @@ public class GitRepository { if (RepositoryAuthMethod.USERNAME_PASSWORD.equals(settings.getAuthMethod())) { credentialsProvider = newCredentialsProvider(settings.getUsername(), settings.getPassword()); } else if (RepositoryAuthMethod.PRIVATE_KEY.equals(settings.getAuthMethod())) { + if (StringUtils.startsWith(settings.getRepositoryUri(), "https://")) { + throw new IllegalArgumentException("Invalid URI format for private key authentication"); + } sshSessionFactory = newSshdSessionFactory(settings.getPrivateKey(), settings.getPrivateKeyPassword(), directory); } return new AuthHandler(credentialsProvider, sshSessionFactory);