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

Add API resources and access control for user share API. #6373

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Add API resources and access control for user share API. #6373

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
24 changes: 24 additions & 0 deletions ...rg.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,30 @@
description="Introspect tokens"/>
</Scopes>
</APIResource>
<APIResource name="User Sharing API" identifier="/api/server/v1/users"
requiresAuthorization="true"
description="API representation of the user share API" type="TENANT">
<Scopes>
<Scope displayName="Share Users" name="internal_user_share"
description="Share users with organizations"/>
<Scope displayName="Unshare users" name="internal_user_unshare"
description="Unshare users from organizations"/>
<Scope displayName="View Shared Users" name="internal_user_shared_access_view"
description="View users shared with organizations"/>
</Scopes>
</APIResource>
<APIResource name="User Sharing API" identifier="/o/api/server/v1/users"
requiresAuthorization="true"
description="API representation of the user share API" type="ORGANIZATION">
<Scopes>
<Scope displayName="Share Users" name="internal_org_user_share"
description="Share users with organizations"/>
<Scope displayName="Unshare users" name="internal_org_user_unshare"
description="Unshare users from organizations"/>
<Scope displayName="View Shared Users" name="internal_org_user_shared_access_view"
description="View users shared with organizations"/>
</Scopes>
</APIResource>
<APIResource name="Application Management Feature" identifier="console:applications"
requiresAuthorization="true"
description="Resource representation of the Application Management Feature"
Expand Down
24 changes: 24 additions & 0 deletions ...wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,30 @@
description="Introspect tokens"/>
</Scopes>
</APIResource>
<APIResource name="User Sharing API" identifier="/api/server/v1/users"
requiresAuthorization="true"
description="API representation of the user share API" type="TENANT">
<Scopes>
<Scope displayName="Share Users" name="internal_user_share"
description="Share users with organizations"/>
<Scope displayName="Unshare users" name="internal_user_unshare"
description="Unshare users from organizations"/>
<Scope displayName="View Shared Users" name="internal_user_shared_access_view"
description="View users shared with organizations"/>
</Scopes>
</APIResource>
<APIResource name="User Sharing API" identifier="/o/api/server/v1/users"
requiresAuthorization="true"
description="API representation of the user share API" type="ORGANIZATION">
<Scopes>
<Scope displayName="Share Users" name="internal_org_user_share"
description="Share users with organizations"/>
<Scope displayName="Unshare users" name="internal_org_user_unshare"
description="Unshare users from organizations"/>
<Scope displayName="View Shared Users" name="internal_org_user_shared_access_view"
description="View users shared with organizations"/>
</Scopes>
</APIResource>
<APIResource name="Application Management Feature" identifier="console:applications"
requiresAuthorization="true"
description="Resource representation of the Application Management Feature"
Expand Down
40 changes: 40 additions & 0 deletions ...ore/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,46 @@
<Scopes>internal_custom_authenticator_delete</Scopes>
</Resource>

<!-- [Organization] User share API -->
<Resource context="(.*)/o/api/server/v1/users/share(.*)" secured="true" http-method="POST">
<Scopes>internal_org_user_share</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v1/users/share-with-all(.*)" secured="true" http-method="POST">
Yasasr1 marked this conversation as resolved.
Show resolved Hide resolved
<Scopes>internal_org_user_share</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v1/users/unshare(.*)" secured="true" http-method="POST">
<Scopes>internal_org_user_unshare</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v1/users/unshare-with-all(.*)" secured="true" http-method="POST">
<Scopes>internal_org_user_unshare</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v1/users/(.*)/shared-organizations" secured="true" http-method="GET">
<Scopes>internal_org_user_shared_access_view</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/(.*)/shared-roles" secured="true" http-method="GET">
<Scopes>internal_org_user_shared_access_view</Scopes>
</Resource>

<!-- User share API -->
<Resource context="(.*)/api/server/v1/users/share(.*)" secured="true" http-method="POST">
<Scopes>internal_user_share</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/share-with-all(.*)" secured="true" http-method="POST">
<Scopes>internal_user_share</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/unshare(.*)" secured="true" http-method="POST">
<Scopes>internal_user_unshare</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/unshare-with-all(.*)" secured="true" http-method="POST">
<Scopes>internal_user_unshare</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/(.*)/shared-organizations" secured="true" http-method="GET">
<Scopes>internal_user_shared_access_view</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/(.*)/shared-roles" secured="true" http-method="GET">
<Scopes>internal_user_shared_access_view</Scopes>
</Resource>

<Resource context="/carbon(.*)" secured="false" http-method="all"/>
<Resource context="(.*)/myaccount(.*)" secured="false" http-method="all"/>
<Resource context="(.*)/console(.*)" secured="false" http-method="all"/>
Expand Down
40 changes: 40 additions & 0 deletions .../org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,46 @@
<Scopes>internal_custom_authenticator_delete</Scopes>
</Resource>

<!-- [Organization] User share API -->
<Resource context="(.*)/o/api/server/v1/users/share(.*)" secured="true" http-method="POST">
<Scopes>internal_org_user_share</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v1/users/share-with-all(.*)" secured="true" http-method="POST">
<Scopes>internal_org_user_share</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v1/users/unshare(.*)" secured="true" http-method="POST">
<Scopes>internal_org_user_unshare</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v1/users/unshare-with-all(.*)" secured="true" http-method="POST">
<Scopes>internal_org_user_unshare</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v1/users/(.*)/shared-organizations" secured="true" http-method="GET">
<Scopes>internal_org_user_shared_access_view</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/(.*)/shared-roles" secured="true" http-method="GET">
<Scopes>internal_org_user_shared_access_view</Scopes>
</Resource>

<!-- User share API -->
<Resource context="(.*)/api/server/v1/users/share(.*)" secured="true" http-method="POST">
<Scopes>internal_user_share</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/share-with-all(.*)" secured="true" http-method="POST">
<Scopes>internal_user_share</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/unshare(.*)" secured="true" http-method="POST">
<Scopes>internal_user_unshare</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/unshare-with-all(.*)" secured="true" http-method="POST">
<Scopes>internal_user_unshare</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/(.*)/shared-organizations" secured="true" http-method="GET">
<Scopes>internal_user_shared_access_view</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1/users/(.*)/shared-roles" secured="true" http-method="GET">
<Scopes>internal_user_shared_access_view</Scopes>
</Resource>

<Resource context="/carbon(.*)" secured="false" http-method="all"/>
<Resource context="(.*)/myaccount(.*)" secured="false" http-method="all"/>
<Resource context="(.*)/console(.*)" secured="false" http-method="all"/>
Expand Down
Loading