From b56650100a9ef03c7bf6ab9f1fcf230ea779463a Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 31 Jan 2025 22:43:24 +0100 Subject: [PATCH] Removes the use of `StringUtils` from `DelegatingPasswordEncoder` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes gh-16442 Signed-off-by: Christian Hösel --- .../crypto/password/DelegatingPasswordEncoder.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java index a7bdc66073..8b0833d37c 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,6 @@ package org.springframework.security.crypto.password; import java.util.HashMap; import java.util.Map; -import org.springframework.util.StringUtils; - /** * A password encoder that delegates to another PasswordEncoder based upon a prefixed * identifier. @@ -297,10 +295,10 @@ public class DelegatingPasswordEncoder implements PasswordEncoder { @Override public boolean matches(CharSequence rawPassword, String prefixEncodedPassword) { String id = extractId(prefixEncodedPassword); - if (StringUtils.hasText(id)) { + if (id != null && !id.isBlank()) { throw new IllegalArgumentException(String.format(NO_PASSWORD_ENCODER_MAPPED, id)); } - if (StringUtils.hasText(prefixEncodedPassword)) { + if (prefixEncodedPassword != null && !prefixEncodedPassword.isBlank()) { int start = prefixEncodedPassword.indexOf(DelegatingPasswordEncoder.this.idPrefix); int end = prefixEncodedPassword.indexOf(DelegatingPasswordEncoder.this.idSuffix, start); if (start < 0 && end < 0) {