Skip to content

Propagate externalGroupsWhitelist for bootstrapped OAuth/OIDC identity providers #4005

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
duanemay merged 1 commit into from
Jul 28, 2026
+17 −0
Merged

Propagate externalGroupsWhitelist for bootstrapped OAuth/OIDC identity providers #4005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ...rc/main/java/org/cloudfoundry/identity/uaa/provider/oauth/OauthIDPWrapperFactoryBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import static org.cloudfoundry.identity.uaa.constants.OriginKeys.OAUTH20;
import static org.cloudfoundry.identity.uaa.constants.OriginKeys.OIDC10;
import static org.cloudfoundry.identity.uaa.provider.ExternalIdentityProviderDefinition.ATTRIBUTE_MAPPINGS;
import static org.cloudfoundry.identity.uaa.provider.ExternalIdentityProviderDefinition.EXTERNAL_GROUPS_WHITELIST;
import static org.cloudfoundry.identity.uaa.provider.ExternalIdentityProviderDefinition.STORE_CUSTOM_ATTRIBUTES_NAME;
import static org.springframework.util.StringUtils.hasText;

Expand Down Expand Up @@ -148,6 +149,7 @@ protected void setCommonProperties(Map<String, Object> idpDefinitionMap, Abstrac
idpDefinition.setTokenKey((String) idpDefinitionMap.get("tokenKey"));
idpDefinition.setIssuer((String) idpDefinitionMap.get("issuer"));
idpDefinition.setAttributeMappings((Map<String, Object>) idpDefinitionMap.get(ATTRIBUTE_MAPPINGS));
idpDefinition.setExternalGroupsWhitelist((List<String>) idpDefinitionMap.get(EXTERNAL_GROUPS_WHITELIST));
idpDefinition.setAdditionalConfiguration((Map<String, Object>) idpDefinitionMap.get("additionalConfiguration"));
idpDefinition.setScopes((List<String>) idpDefinitionMap.get("scopes"));
idpDefinition.setUserPropagationParameter((String) idpDefinitionMap.get("userPropagationParameter"));
Expand Down
15 changes: 15 additions & 0 deletions ...udfoundry/identity/uaa/provider/oauth/OauthIdentityProviderDefinitionFactoryBeanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.cloudfoundry.identity.uaa.provider.ExternalIdentityProviderDefinition.EXTERNAL_GROUPS_WHITELIST;
import static org.cloudfoundry.identity.uaa.provider.ExternalIdentityProviderDefinition.GROUP_ATTRIBUTE_NAME;
import static org.cloudfoundry.identity.uaa.provider.ExternalIdentityProviderDefinition.STORE_CUSTOM_ATTRIBUTES_NAME;
import static org.cloudfoundry.identity.uaa.util.UaaMapUtils.entry;
Expand Down Expand Up @@ -119,6 +121,19 @@ void external_group_mapping_default_in_body() {
assertThat(providerDefinition.getGroupMappingMode()).isNull();
}

@Test
void external_groups_whitelist_default_is_empty() {
factoryBean.setCommonProperties(idpDefinitionMap, providerDefinition);
assertThat(providerDefinition.getExternalGroupsWhitelist()).isEmpty();
}

@Test
void external_groups_whitelist_in_body() {
idpDefinitionMap.put(EXTERNAL_GROUPS_WHITELIST, List.of("*"));
factoryBean.setCommonProperties(idpDefinitionMap, providerDefinition);
assertThat(providerDefinition.getExternalGroupsWhitelist()).containsExactly("*");
}

@Test
void additionalConfigurationIsMapped() {
Map<String, Object> additionalConfiguration = map(
Expand Down
Loading