From 997aba3f856b59862e72b5c25171e4a15f9a1b15 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Mon, 29 Apr 2024 15:43:06 +0200
Subject: [PATCH] added length check for createRandomJwtSettings

---
 .../security/auth/jwt/settings/DefaultJwtSettingsService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java
index dd7cd8ae04..f7922f6a68 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java
@@ -61,7 +61,7 @@ public class DefaultJwtSettingsService implements JwtSettingsService {
         if (getJwtSettingsFromDb() == null) {
             log.info("Creating JWT admin settings...");
             this.jwtSettings = getJwtSettingsFromYml();
-            if (isSigningKeyDefault(jwtSettings)) {
+            if (isSigningKeyDefault(jwtSettings) || Base64.getDecoder().decode(jwtSettings.getTokenSigningKey()).length * Byte.SIZE < 512) {
                 this.jwtSettings.setTokenSigningKey(Base64.getEncoder().encodeToString(
                         RandomStringUtils.randomAlphanumeric(64).getBytes(StandardCharsets.UTF_8)));
             }