External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-10 15:32:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Use previous password in SMTP when the the authType defaults to basic

Browse Source 
Closes #39781

Signed-off-by: rmartinc <rmartinc@redhat.com>
This commit is contained in:
rmartinc 2025-05-29 12:18:39 +02:00 committed by Marek Posolda
parent 6e11f9c9ed
commit 669cc2533c
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java
View File

@ -891,8 +891,16 @@ public class DefaultExportImportManager implements ExportImportManager {
Map<String, String> config = new HashMap<>(rep.getSmtpServer());
if(rep.getSmtpServer().containsKey("authType") && "basic".equals(rep.getSmtpServer().get("authType"))) {
if (rep.getSmtpServer().containsKey("password") && ComponentRepresentation.SECRET_VALUE.equals(rep.getSmtpServer().get("password"))) {
if (!Boolean.parseBoolean(config.get("auth"))) {
config.remove("authTokenUrl");
config.remove("authTokenScope");
config.remove("authTokenClientId");
config.remove("authTokenClientSecret");
config.remove("password");
config.remove("user");
config.remove("authType");
} else if (config.get("authType") == null || "basic".equals(config.get("authType"))) {
if (ComponentRepresentation.SECRET_VALUE.equals(config.get("password"))) {
String passwordValue = realm.getSmtpConfig() != null ? realm.getSmtpConfig().get("password") : null;
config.put("password", passwordValue);
}
@ -900,10 +908,8 @@ public class DefaultExportImportManager implements ExportImportManager {
config.remove("authTokenScope");
config.remove("authTokenClientId");
config.remove("authTokenClientSecret");
}
if(rep.getSmtpServer().containsKey("authType") && "token".equals(rep.getSmtpServer().get("authType"))) {
if (rep.getSmtpServer().containsKey("authTokenClientSecret") && ComponentRepresentation.SECRET_VALUE.equals(rep.getSmtpServer().get("authTokenClientSecret"))) {
} else if ("token".equals(config.get("authType"))) {
if (ComponentRepresentation.SECRET_VALUE.equals(config.get("authTokenClientSecret"))) {
String authTokenClientSecretValue = realm.getSmtpConfig() != null ? realm.getSmtpConfig().get("authTokenClientSecret") : null;
config.put("authTokenClientSecret", authTokenClientSecretValue);
}

14
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java
View File

@ -436,6 +436,7 @@ public class RealmTest extends AbstractAdminTest {
public void smtpPasswordSecret() {
RealmRepresentation rep = RealmBuilder.create().testEventListener().testMail().build();
rep.setRealm("realm-with-smtp");
rep.getSmtpServer().put("auth", "true");
rep.getSmtpServer().put("user", "user");
rep.getSmtpServer().put("password", "secret");
@ -462,6 +463,19 @@ public class RealmTest extends AbstractAdminTest {
RealmRepresentation realm = adminClient.realms().findAll().stream().filter(r -> r.getRealm().equals("realm-with-smtp")).findFirst().get();
assertEquals(ComponentRepresentation.SECRET_VALUE, realm.getSmtpServer().get("password"));
// updating setting the secret value with asterisks
rep.getSmtpServer().put("password", ComponentRepresentation.SECRET_VALUE);
adminClient.realm("realm-with-smtp").update(rep);
event = testingClient.testing().pollAdminEvent();
assertTrue(event.getRepresentation().contains(ComponentRepresentation.SECRET_VALUE));
internalRep = serverClient.fetch(RunHelpers.internalRealm());
assertEquals("secret", internalRep.getSmtpServer().get("password"));
realm = adminClient.realm("realm-with-smtp").toRepresentation();
assertEquals(ComponentRepresentation.SECRET_VALUE, realm.getSmtpServer().get("password"));
}
@Test