Skip to content

Fix SAML Metadata when EntityID is a URL #3662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fhanik merged 2 commits into from
Nov 13, 2025
Merged

Fix SAML Metadata when EntityID is a URL #3662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91117cf
Add metadata tests when login.entityID is a URL
fhanik Nov 6, 2025
b2e36ec
Addressing issue: https://github.com/cloudfoundry/uaa/issues/3661
fhanik Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...cloudfoundry/identity/uaa/provider/saml/SamlRelyingPartyRegistrationRepositoryConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import lombok.extern.slf4j.Slf4j;
import org.cloudfoundry.identity.uaa.provider.SamlIdentityProviderDefinition;
import org.cloudfoundry.identity.uaa.util.KeyWithCert;
import org.cloudfoundry.identity.uaa.util.UaaStringUtils;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -49,7 +50,8 @@ RelyingPartyRegistrationRepository relyingPartyRegistrationRepository(SamlIdenti
List<KeyWithCert> defaultKeysWithCerts = samlKeyManager.getAvailableCredentials();

List<RelyingPartyRegistration> relyingPartyRegistrations = new ArrayList<>();
String uaaWideSamlEntityIDAlias = samlConfigProps.getEntityIDAlias() != null ? samlConfigProps.getEntityIDAlias() : samlEntityID;
String uaaWideSamlEntityIDAlias = samlConfigProps.getEntityIDAlias() != null ? samlConfigProps.getEntityIDAlias() :
UaaStringUtils.getHostIfArgIsURL(samlEntityID);

@SuppressWarnings("java:S125")
// Spring Security requires at least one relyingPartyRegistration before SAML SP metadata generation;
Expand Down
38 changes: 38 additions & 0 deletions ...c/test/java/org/cloudfoundry/identity/uaa/mock/saml/SamlMetadataEndpointMockMvcTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,44 @@ void nonDefaultZoneSamlMetadataXMLValidationZoneSamlEntityIDNotSet() throws Exce
}
}

@Nested
@DefaultTestContext
@TestPropertySource(properties = {
"login.entityID = http://some.saml.provider/url/entityId"
})
class SamlMetadataWhenEntityIDIsAUrlMockMvcTests {
@Autowired
private MockMvc mockMvc;

@Test
void samlMetadataXMLValidation() throws Exception {

mockMvc.perform(get(new URI("/saml/metadata")))
.andDo(print())
.andExpectAll(
status().isOk(),
header().string(HttpHeaders.CONTENT_DISPOSITION, containsString("filename=\"saml-sp.xml\";")),
xpath("/EntityDescriptor/SPSSODescriptor/AssertionConsumerService/@Location").string(containsString("/saml/SSO/alias/some.saml.provider")),
xpath("/EntityDescriptor/@entityID").string("http://some.saml.provider/url/entityId")
);
}

@Test
void samlMetadataXMLValidationInZone() throws Exception {
IdentityZone alternativeSpZone = setupIdentityZone(false);
String zoneSubdomain = alternativeSpZone.getSubdomain();
mockMvc.perform(get(new URI("/saml/metadata"))
.header(HOST, zoneSubdomain + ".localhost:8080"))
.andDo(print())
.andExpectAll(
status().isOk(),
header().string(HttpHeaders.CONTENT_DISPOSITION, containsString("filename=\"saml-%s-sp.xml\";".formatted(zoneSubdomain))),
xpath("/EntityDescriptor/SPSSODescriptor/AssertionConsumerService/@Location").string(containsString("/saml/SSO/alias/%s.some.saml.provider".formatted(zoneSubdomain))),
xpath("/EntityDescriptor/@entityID").string("http://%s.some.saml.provider/url/entityId".formatted(zoneSubdomain))
);
}
}

private IdentityZone setupIdentityZone(boolean hasEntityId) throws Exception {
UaaClientDetails adminClient = new UaaClientDetails("admin", "", "", "client_credentials", "uaa.admin");
adminClient.setClientSecret("adminsecret");
Expand Down
Loading