libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Filter empty domains from OrganizationsRepresentation before running validation

Browse source 
Closes #29809

Signed-off-by: vramik <vramik@redhat.com>
This commit is contained in:
vramik 2024-05-23 12:36:33 +02:00 committed by Pedro Igor
parent c6e071cf07
commit 0508d279f7
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java
View file

@ -92,7 +92,10 @@ public class OrganizationsResource {
throw ErrorResponse.error("Organization cannot be null.", Response.Status.BAD_REQUEST);
}
Set<String> domains = ofNullable(organization.getDomains()).orElse(Set.of()).stream().map(OrganizationDomainRepresentation::getName).collect(Collectors.toSet());
Set<String> domains = ofNullable(organization.getDomains()).orElse(Set.of()).stream()
.map(OrganizationDomainRepresentation::getName)
.filter(StringUtil::isNotBlank)
.collect(Collectors.toSet());
OrganizationModel model = provider.create(organization.getName(), domains);
Organizations.toModel(organization, model);

1
services/src/main/java/org/keycloak/organization/utils/Organizations.java
View file

@ -170,6 +170,7 @@ public class Organizations {
model.setAttributes(rep.getAttributes());
model.setDomains(ofNullable(rep.getDomains()).orElse(Set.of()).stream()
.filter(Objects::nonNull)
.filter(domain -> StringUtil.isNotBlank(domain.getName()))
.map(Organizations::toModel)
.collect(Collectors.toSet()));

6
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java
View file

@ -375,6 +375,12 @@ public class OrganizationTest extends AbstractOrganizationTest {
assertNotNull(existing.getDomain("acme.com"));
}
@Test
public void testFilterEmptyDomain() {
//org should be created with only one domain
assertThat(createOrganization("singleValidDomainOrg", "validDomain.com", "", null).getDomains(), hasSize(1));
}
@Test
public void testDisabledOrganizationProvider() throws IOException {
OrganizationRepresentation existing = createOrganization("acme", "acme.org", "acme.net");