Skip to content

Extend Agent Authorization Protocol to organizations #3228

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

Open
HasiniSama wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −2
Open

Extend Agent Authorization Protocol to organizations #3228

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
6 changes: 5 additions & 1 deletion components/org.wso2.carbon.identity.oauth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@
<groupId>org.wso2.carbon.identity.organization.management</groupId>
<artifactId>org.wso2.carbon.identity.organization.management.organization.user.sharing</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.organization.management</groupId>
<artifactId>org.wso2.carbon.identity.organization.management.organization.agent.sharing</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.organization.management</groupId>
<artifactId>org.wso2.carbon.identity.organization.resource.hierarchy.traverse.service</artifactId>
Expand Down Expand Up @@ -467,6 +471,7 @@
org.wso2.carbon.identity.organization.management.role.management.service.models; version="${carbon.identity.organization.management.version.range}",
org.wso2.carbon.identity.organization.management.organization.user.sharing.util;version="${carbon.identity.organization.management.version.range}",
org.wso2.carbon.identity.organization.management.organization.user.sharing.models;version="${carbon.identity.organization.management.version.range}",
org.wso2.carbon.identity.organization.management.organization.agent.sharing.util;version="${carbon.identity.organization.management.version.range}",
org.wso2.carbon.identity.organization.resource.hierarchy.traverse.service;
version="${carbon.identity.organization.management.version.range}",
org.wso2.carbon.identity.organization.resource.hierarchy.traverse.service.exception;
Expand Down Expand Up @@ -641,4 +646,3 @@
</build>

</project>

18 changes: 18 additions & 0 deletions ...2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/AuthzUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@
import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
import org.wso2.carbon.identity.application.common.model.ClaimMapping;
import org.wso2.carbon.identity.application.common.model.Scope;
import org.wso2.carbon.identity.core.util.IdentityUtil;
import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration;
import org.wso2.carbon.identity.oauth.internal.OAuthComponentServiceHolder;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2ClientException;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
import org.wso2.carbon.identity.oauth2.internal.OAuth2ServiceComponentHolder;
import org.wso2.carbon.identity.organization.management.organization.agent.sharing.util.OrganizationSharedAgentUtil;
import org.wso2.carbon.identity.organization.management.organization.user.sharing.util.OrganizationSharedUserUtil;
import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
import org.wso2.carbon.identity.role.v2.mgt.core.exception.IdentityRoleManagementException;
Expand Down Expand Up @@ -205,6 +207,22 @@ public static String getUserIdOfAssociatedUser(AuthenticatedUser authenticatedUs
} else {
associatedUserId = getUserId(authenticatedUser);
}
// For agents, perform the agent-specific org association lookup instead of the user sharing lookup.
if (IdentityUtil.isAgentIdentityEnabled()) {
String agentStoreName = IdentityUtil.getAgentIdentityUserstoreName();
Comment thread
HasiniSama marked this conversation as resolved.
if (StringUtils.isNotEmpty(agentStoreName) &&
agentStoreName.equalsIgnoreCase(authenticatedUser.getUserStoreDomain())) {
try {
Optional<String> sharedAgentId = OrganizationSharedAgentUtil
Comment thread
HasiniSama marked this conversation as resolved.
.getAgentIdOfAssociatedAgentByOrgId(associatedUserId,
authenticatedUser.getAccessingOrganization());
return sharedAgentId.orElseThrow(() ->
new IdentityOAuth2ClientException("Agent is not allowed to access the organization"));
} catch (OrganizationManagementException e) {
throw new IdentityOAuth2Exception("Error while resolving shared agent ID", e);
}
}
}
Copy link
Copy Markdown
Contributor Author

@HasiniSama HasiniSama May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be combined with the below user sharing logic

try {
Optional<String> optionalOrganizationUserId = OrganizationSharedUserUtil
.getUserIdOfAssociatedUserByOrgId(associatedUserId, authenticatedUser.getAccessingOrganization());
Expand Down
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,11 @@
<artifactId>org.wso2.carbon.identity.organization.management.organization.user.sharing</artifactId>
<version>${carbon.identity.organization.management.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.organization.management</groupId>
<artifactId>org.wso2.carbon.identity.organization.management.organization.agent.sharing</artifactId>
<version>${carbon.identity.organization.management.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.organization.management</groupId>
<artifactId>org.wso2.carbon.identity.organization.resource.hierarchy.traverse.service</artifactId>
Expand Down Expand Up @@ -993,7 +998,7 @@
</carbon.identity.framework.imp.pkg.version.range>
<identity.oauth.xacml.version.range>[2.0.0, 3.0.0)</identity.oauth.xacml.version.range>

<carbon.identity.organization.management.version>2.4.4
<carbon.identity.organization.management.version>2.4.18
</carbon.identity.organization.management.version>
<carbon.identity.organization.management.version.range>[1.1.14, 3.0.0)
</carbon.identity.organization.management.version.range>
Expand Down
Loading