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

Introduce mappedLocalSubjectMandatory service provider configuration #521

Merged
merged 4 commits into from
Nov 6, 2023
Merged

Introduce mappedLocalSubjectMandatory service provider configuration #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a72e59
add generated files
Yasasr1 Oct 30, 2023
a2639ed
add support for mappedLocalSubjectMandatory sp config
Yasasr1 Oct 30, 2023
c55442c
address review comments
Yasasr1 Oct 30, 2023
9787ea0
bump carbon-identity-framework-version
Yasasr1 Oct 31, 2023
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
3 changes: 3 additions & 0 deletions ...bon/identity/api/server/application/management/common/ApplicationManagementConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ public enum ErrorMessage {
INVALID_POLICY_TYPE_FOR_API_RESOURCE("60512", "Invalid policy type provided for the API " +
"resource.", "API resource with id: %s doesn't allow the provided policy type: %s."),

ERROR_ASSERT_LOCAL_SUBJECT_IDENTIFIER_DISABLED("60513",
"Invalid configuration.",
"'useMappedLocalSubject' cannot be disabled when 'mappedLocalSubjectMandatory' is enabled."),
// Server Errors.
ERROR_RETRIEVING_SAML_METADATA("65001",
"Error occurred while retrieving SAML Metadata.",
Expand Down
25 changes: 23 additions & 2 deletions ...gen/java/org/wso2/carbon/identity/api/server/application/management/v1/SubjectConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class SubjectConfig {
private Boolean includeUserDomain;
private Boolean includeTenantDomain;
private Boolean useMappedLocalSubject;
private Boolean mappedLocalSubjectMandatory;

/**
**/
Expand Down Expand Up @@ -110,6 +111,24 @@ public void setUseMappedLocalSubject(Boolean useMappedLocalSubject) {
this.useMappedLocalSubject = useMappedLocalSubject;
}

/**
**/
public SubjectConfig mappedLocalSubjectMandatory(Boolean mappedLocalSubjectMandatory) {

this.mappedLocalSubjectMandatory = mappedLocalSubjectMandatory;
return this;
}

@ApiModelProperty(example = "false", value = "")
@JsonProperty("mappedLocalSubjectMandatory")
@Valid
public Boolean getMappedLocalSubjectMandatory() {
return mappedLocalSubjectMandatory;
}
public void setMappedLocalSubjectMandatory(Boolean mappedLocalSubjectMandatory) {
this.mappedLocalSubjectMandatory = mappedLocalSubjectMandatory;
}



@Override
Expand All @@ -125,12 +144,13 @@ public boolean equals(java.lang.Object o) {
return Objects.equals(this.claim, subjectConfig.claim) &&
Objects.equals(this.includeUserDomain, subjectConfig.includeUserDomain) &&
Objects.equals(this.includeTenantDomain, subjectConfig.includeTenantDomain) &&
Objects.equals(this.useMappedLocalSubject, subjectConfig.useMappedLocalSubject);
Objects.equals(this.useMappedLocalSubject, subjectConfig.useMappedLocalSubject) &&
Objects.equals(this.mappedLocalSubjectMandatory, subjectConfig.mappedLocalSubjectMandatory);
}

@Override
public int hashCode() {
return Objects.hash(claim, includeUserDomain, includeTenantDomain, useMappedLocalSubject);
return Objects.hash(claim, includeUserDomain, includeTenantDomain, useMappedLocalSubject, mappedLocalSubjectMandatory);
}

@Override
Expand All @@ -143,6 +163,7 @@ public String toString() {
sb.append(" includeUserDomain: ").append(toIndentedString(includeUserDomain)).append("\n");
sb.append(" includeTenantDomain: ").append(toIndentedString(includeTenantDomain)).append("\n");
sb.append(" useMappedLocalSubject: ").append(toIndentedString(useMappedLocalSubject)).append("\n");
sb.append(" mappedLocalSubjectMandatory: ").append(toIndentedString(mappedLocalSubjectMandatory)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
1 change: 1 addition & 0 deletions ...erver/application/management/v1/core/functions/application/ServiceProviderToApiModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ private SubjectConfig buildSubjectClaimConfig(ServiceProvider application) {

if (application.getClaimConfig() != null) {
subjectConfig.useMappedLocalSubject(application.getClaimConfig().isAlwaysSendMappedLocalSubjectId());
subjectConfig.mappedLocalSubjectMandatory(application.getClaimConfig().isMappedLocalSubjectMandatory());
}

LocalAndOutboundAuthenticationConfig localAndOutboundAuthConfig =
Expand Down
9 changes: 9 additions & 0 deletions ...server/application/management/v1/core/functions/application/UpdateClaimConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import java.util.Optional;
import java.util.stream.Collectors;

import static org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementConstants.ErrorMessage.ERROR_ASSERT_LOCAL_SUBJECT_IDENTIFIER_DISABLED;
import static org.wso2.carbon.identity.api.server.application.management.v1.core.functions.Utils.buildBadRequestError;
import static org.wso2.carbon.identity.api.server.application.management.v1.core.functions.Utils.setIfNotNull;

/**
Expand Down Expand Up @@ -131,6 +133,12 @@ private void updateSubjectClaimConfigs(SubjectConfig subjectApiModel, ServicePro

if (subjectApiModel != null) {

if (Boolean.TRUE.equals(subjectApiModel.getMappedLocalSubjectMandatory()) &&
Boolean.FALSE.equals(subjectApiModel.getUseMappedLocalSubject())) {
throw buildBadRequestError(ERROR_ASSERT_LOCAL_SUBJECT_IDENTIFIER_DISABLED.getCode(),
ERROR_ASSERT_LOCAL_SUBJECT_IDENTIFIER_DISABLED.getDescription());
}

LocalAndOutboundAuthenticationConfig authConfig = getLocalAndOutboundConfig(application);
if (subjectApiModel.getClaim() != null) {
setIfNotNull(subjectApiModel.getClaim().getUri(), authConfig::setSubjectClaimUri);
Expand All @@ -142,6 +150,7 @@ private void updateSubjectClaimConfigs(SubjectConfig subjectApiModel, ServicePro

ClaimConfig claimConfig = getClaimConfig(application);
setIfNotNull(subjectApiModel.getUseMappedLocalSubject(), claimConfig::setAlwaysSendMappedLocalSubjectId);
setIfNotNull(subjectApiModel.getMappedLocalSubjectMandatory(), claimConfig::setMappedLocalSubjectMandatory);
}
}

Expand Down
3 changes: 3 additions & 0 deletions ...carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2934,6 +2934,9 @@ components:
useMappedLocalSubject:
type: boolean
example: false
mappedLocalSubjectMandatory:
type: boolean
example: false
RoleConfig:
type: object
properties:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@
<maven.buildnumber.plugin.version>1.4</maven.buildnumber.plugin.version>
<org.apache.felix.annotations.version>1.2.4</org.apache.felix.annotations.version>
<identity.governance.version>1.8.62</identity.governance.version>
<carbon.identity.framework.version>5.25.430</carbon.identity.framework.version>
<carbon.identity.framework.version>5.25.481</carbon.identity.framework.version>
<maven.findbugsplugin.version>3.0.5</maven.findbugsplugin.version>
<identity.workflow.impl.bps.version>5.2.0</identity.workflow.impl.bps.version>
<maven.checkstyleplugin.excludes>**/gen/**/*</maven.checkstyleplugin.excludes>
Expand Down
Loading