Skip to content
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

Persist existing behavior for federated authenticator properties validation #754

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Persist existing behavior for federated authenticator properties validation #754

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
29 changes: 20 additions & 9 deletions ...o2/carbon/identity/api/server/idp/v1/impl/FederatedAuthenticatorConfigBuilderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public static FederatedAuthenticatorConfig build(FederatedAuthenticatorPUTReques
List<Property> properties = Optional.ofNullable(authenticator.getProperties())
.map(props -> props.stream().map(propertyToInternal).collect(Collectors.toList()))
.orElse(null);
validateAuthPropForFederatedAuthenticatorPUTRequest(authenticatorName, properties);
FederatedAuthenticatorConfigBuilderFactory.Config config =
new FederatedAuthenticatorConfigBuilderFactory.Config(authenticatorName,
getDisplayNameOfAuthenticator(authenticatorName),
Expand All @@ -92,6 +93,7 @@ public static FederatedAuthenticatorConfig build(FederatedAuthenticator authenti
List<Property> properties = Optional.ofNullable(authenticator.getProperties())
.map(props -> props.stream().map(propertyToInternal).collect(Collectors.toList()))
.orElse(null);
validateAuthPropForFederatedAuthenticator(authenticatorName, properties);
FederatedAuthenticatorConfigBuilderFactory.Config config =
new FederatedAuthenticatorConfigBuilderFactory.Config(authenticatorName,
getDisplayNameOfAuthenticator(authenticatorName),
Expand Down Expand Up @@ -176,8 +178,6 @@ private static void validateSystemDefinedFederatedAuthenticatorModel(Config conf
throw new IdentityProviderManagementClientException(error.getCode(), error.getMessage(),
String.format(error.getDescription(), config.authenticatorName));
}

validateAuthenticatorProperties(config.authenticatorName, config.properties);
}

private static UserDefinedFederatedAuthenticatorConfig createUserDefinedFederatedAuthenticator(Config config)
Expand Down Expand Up @@ -222,8 +222,8 @@ private static void validateUserDefinedFederatedAuthenticatorModel(Config config
}
}

private static void validateAuthenticatorProperties(String authenticatorName, List<Property> properties)
throws IdentityProviderManagementClientException {
private static void validateAuthPropForFederatedAuthenticator(
String authenticatorName, List<Property> properties) throws IdentityProviderManagementClientException {

if (properties == null) {
return;
Expand All @@ -232,18 +232,29 @@ private static void validateAuthenticatorProperties(String authenticatorName, Li
if (IdentityApplicationConstants.Authenticator.SAML2SSO.FED_AUTH_NAME.equals(authenticatorName)) {
validateSamlMetadata(properties);
}
if (IdentityApplicationConstants.Authenticator.OIDC.FED_AUTH_NAME.equals(authenticatorName)) {
validateDuplicateOpenIDConnectScopes(properties);
validateDefaultOpenIDConnectScopes(properties);
}

if (!areAllDistinct(properties)) {
Constants.ErrorMessage error = Constants.ErrorMessage.ERROR_CODE_INVALID_INPUT;
throw new IdentityProviderManagementClientException(error.getCode(), error.getMessage(),
error.getDescription());
}
}

private static void validateAuthPropForFederatedAuthenticatorPUTRequest(
String authenticatorName, List<Property> properties) throws IdentityProviderManagementClientException {

if (properties == null) {
return;
}

if (IdentityApplicationConstants.Authenticator.SAML2SSO.FED_AUTH_NAME.equals(authenticatorName)) {
validateSamlMetadata(properties);
}
if (IdentityApplicationConstants.Authenticator.OIDC.FED_AUTH_NAME.equals(authenticatorName)) {
validateDuplicateOpenIDConnectScopes(properties);
validateDefaultOpenIDConnectScopes(properties);
}
}

/**
* If selectMode property is set as saml metadata file configuration mode, this function validates whether a
* valid base-64 encoded SAML metadata file content is provided with the property key 'meta_data_saml'. If found,
Expand Down
Loading