mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2025-12-21 06:20:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when importing SAML EntityDescriptor without SPSSODescriptor (#44431)

Browse Source 
closes #44430


Signed-off-by: PavlNekrasov <95914807+PavlNekrasov@users.noreply.github.com>
This commit is contained in:
PavlNekrasov
2025-12-01 14:45:35 +03:00
committed by GitHub
parent 2b4855ff97
commit a92221ba38
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/src/main/java/org/keycloak/protocol/saml/EntityDescriptorDescriptionConverter.java
View File

@@ -27,6 +27,8 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jakarta.ws.rs.BadRequestException;
import org.keycloak.Config; import org.keycloak.Config;
import org.keycloak.dom.saml.v2.metadata.EndpointType; import org.keycloak.dom.saml.v2.metadata.EndpointType;
import org.keycloak.dom.saml.v2.metadata.EntitiesDescriptorType; import org.keycloak.dom.saml.v2.metadata.EntitiesDescriptorType;
@@ -153,7 +155,7 @@ public class EntityDescriptorDescriptionConverter implements ClientDescriptionCo
try { try {
metadata = SAMLParser.getInstance().parse(is); metadata = SAMLParser.getInstance().parse(is);
} catch (ParsingException e) { } catch (ParsingException e) {
throw new RuntimeException(e); throw new BadRequestException(e);
} }
EntitiesDescriptorType entities; EntitiesDescriptorType entities;
@@ -165,7 +167,7 @@ public class EntityDescriptorDescriptionConverter implements ClientDescriptionCo
} }
if (entities.getEntityDescriptor().size() != 1) { if (entities.getEntityDescriptor().size() != 1) {
throw new RuntimeException("Expected one entity descriptor"); throw new BadRequestException("Expected one entity descriptor");
} }
EntityDescriptorType entity = (EntityDescriptorType) entities.getEntityDescriptor().get(0); EntityDescriptorType entity = (EntityDescriptorType) entities.getEntityDescriptor().get(0);
@@ -187,6 +189,9 @@ public class EntityDescriptorDescriptionConverter implements ClientDescriptionCo
attributes.put(SamlConfigAttributes.SAML_SIGNATURE_ALGORITHM, SignatureAlgorithm.RSA_SHA256.toString()); attributes.put(SamlConfigAttributes.SAML_SIGNATURE_ALGORITHM, SignatureAlgorithm.RSA_SHA256.toString());
attributes.put(SamlConfigAttributes.SAML_AUTHNSTATEMENT, SamlProtocol.ATTRIBUTE_TRUE_VALUE); attributes.put(SamlConfigAttributes.SAML_AUTHNSTATEMENT, SamlProtocol.ATTRIBUTE_TRUE_VALUE);
SPSSODescriptorType spDescriptorType = getSPDescriptor(entity); SPSSODescriptorType spDescriptorType = getSPDescriptor(entity);
if (spDescriptorType == null) {
throw new BadRequestException("No SPSSODescriptorType defined in the entity descriptor file");
}
if (spDescriptorType.isWantAssertionsSigned()) { if (spDescriptorType.isWantAssertionsSigned()) {
attributes.put(SamlConfigAttributes.SAML_ASSERTION_SIGNATURE, SamlProtocol.ATTRIBUTE_TRUE_VALUE); attributes.put(SamlConfigAttributes.SAML_ASSERTION_SIGNATURE, SamlProtocol.ATTRIBUTE_TRUE_VALUE);
} }
@@ -265,9 +270,9 @@ public class EntityDescriptorDescriptionConverter implements ClientDescriptionCo
try { try {
cert = SAMLMetadataUtil.getCertificate(keyDescriptor); cert = SAMLMetadataUtil.getCertificate(keyDescriptor);
} catch (ConfigurationException e) { } catch (ConfigurationException e) {
throw new RuntimeException(e); throw new BadRequestException(e);
} catch (ProcessingException e) { } catch (ProcessingException e) {
throw new RuntimeException(e); throw new BadRequestException(e);
} }
String certPem = KeycloakModelUtils.getPemFromCertificate(cert); String certPem = KeycloakModelUtils.getPemFromCertificate(cert);
if (keyDescriptor.getUse() == KeyTypes.SIGNING) { if (keyDescriptor.getUse() == KeyTypes.SIGNING) {