Skip to content

Commit defdeb2

Browse files
committed
fix key length check logic
1 parent 1a1797b commit defdeb2

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

src/settings.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,17 @@ impl Settings {
320320
.unwrap_or_default()
321321
.is_empty();
322322

323-
let any_api_key_is_short = self.service.api_key.clone().unwrap_or_default().len()
324-
< JWT_RECOMMENDED_SECRET_LENGTH
325-
|| self.service.alt_api_key.clone().unwrap_or_default().len()
326-
< JWT_RECOMMENDED_SECRET_LENGTH;
323+
let min_length = [
324+
self.service.api_key.as_ref(),
325+
self.service.alt_api_key.as_ref(),
326+
]
327+
.into_iter()
328+
.flatten()
329+
.map(|key| key.len())
330+
.min()
331+
.unwrap_or_default();
332+
333+
let any_api_key_is_short = min_length < JWT_RECOMMENDED_SECRET_LENGTH;
327334

328335
// Log if JWT RBAC is enabled but no API key is set
329336
if self.service.jwt_rbac.unwrap_or_default() {

0 commit comments

Comments
 (0)