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

Prevent NPE in CryptoIntegration.setProvider

Browse Source 
Closes #38596

Signed-off-by: Leonid Rozenblyum <lrozenblyum@gmail.com>
This commit is contained in:
lrozenblyum 2025-04-03 11:06:00 +03:00 committed by GitHub
parent 50fef70f14
commit a0852eaa2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/keycloak/common/crypto/CryptoIntegration.java
View File

@ -94,7 +94,7 @@ public class CryptoIntegration {
}
public static void setProvider(CryptoProvider provider) {
logger.debugf("Using the crypto provider: %s", provider.getClass().getName());
logger.debugf("Using the crypto provider: %s", provider != null ? provider.getClass().getName() : "null");
cryptoProvider = provider;
}
}

36
common/src/test/java/org/keycloak/common/crypto/CryptoIntegrationTest.java Normal file
View File

@ -0,0 +1,36 @@
package org.keycloak.common.crypto;
import static org.junit.Assert.assertNull;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class CryptoIntegrationTest {
private static CryptoProvider originalProvider;
@BeforeClass
public static void keepOriginalProvider() {
CryptoIntegrationTest.originalProvider = getSelectedProvider();
}
// doing our best to avoid any side effects on other tests by restoring the initial state of CryptoIntegration
@AfterClass
public static void restoreOriginalProvider() {
CryptoIntegration.setProvider(originalProvider);
}
@Test
public void canSetNullProvider() {
CryptoIntegration.setProvider(null);
assertNull(getSelectedProvider());
}
private static CryptoProvider getSelectedProvider() {
try {
return CryptoIntegration.getProvider();
} catch (IllegalStateException e) {
return null;
}
}
}