Skip to content

Add tenancy access info to serialized user in threadcontext #5519

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
DarshitChanpura merged 5 commits into from
Jul 30, 2025
Merged

Add tenancy access info to serialized user in threadcontext #5519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f883e3
Add tenancy access info to serialized user in threadcontext
cwperks Jul 29, 2025
91d2af2
Only use context
cwperks Jul 29, 2025
f4a9f8e
Use hasTenantPrivileges
cwperks Jul 30, 2025
fc787c9
Add to CHANGELOG
cwperks Jul 30, 2025
006d839
Pass the correct param
cwperks Jul 30, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
* Refactor JWT Vender to take a claims builder and rename oboEnabled to enabled ([#5436](https://github.com/opensearch-project/security/pull/5436))
* Remove ASN1 reflection methods ([#5454](https://github.com/opensearch-project/security/pull/5454))
* Remove provider reflection code ([#5457](https://github.com/opensearch-project/security/pull/5457))
* Add tenancy access info to serialized user in threadcontext ([#5519](https://github.com/opensearch-project/security/pull/5519))

### Maintenance
- Bump `org.eclipse.platform:org.eclipse.core.runtime` from 3.33.0 to 3.33.100 ([#5400](https://github.com/opensearch-project/security/pull/5400))
Expand Down
39 changes: 29 additions & 10 deletions src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@

public class PrivilegesEvaluator {

private static final String USER_TENANT = "__user__";
private static final String GLOBAL_TENANT = "global_tenant";
private static final String READ_ACCESS = "READ";
private static final String WRITE_ACCESS = "WRITE";
private static final String NO_ACCESS = "NONE";

static final WildcardMatcher DNFOF_MATCHER = WildcardMatcher.from(
ImmutableList.of(
"indices:data/read/*",
Expand Down Expand Up @@ -278,18 +284,19 @@ public boolean isInitialized() {
return configModel != null && dcm != null && actionPrivileges.get() != null;
}

private void setUserInfoInThreadContext(User user, Set<String> mappedRoles) {
private void setUserInfoInThreadContext(PrivilegesEvaluationContext context) {
if (threadContext.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT) == null) {
StringJoiner joiner = new StringJoiner("|");
// Escape any pipe characters in the values before joining
joiner.add(escapePipe(user.getName()));
joiner.add(escapePipe(String.join(",", user.getRoles())));
joiner.add(escapePipe(String.join(",", mappedRoles)));

String requestedTenant = user.getRequestedTenant();
if (!Strings.isNullOrEmpty(requestedTenant)) {
joiner.add(escapePipe(requestedTenant));
}
joiner.add(escapePipe(context.getUser().getName()));
joiner.add(escapePipe(String.join(",", context.getUser().getRoles())));
joiner.add(escapePipe(String.join(",", context.getMappedRoles())));

String requestedTenant = context.getUser().getRequestedTenant();
joiner.add(requestedTenant);
String tenantAccessToCheck = getTenancyAccess(context);
joiner.add(tenantAccessToCheck);
log.debug(joiner);
threadContext.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, joiner.toString());
}
}
Expand All @@ -298,6 +305,18 @@ public PrivilegesEvaluationContext createContext(User user, String action) {
return createContext(user, action, null, null, null);
}

private String getTenancyAccess(PrivilegesEvaluationContext context) {
String requestedTenant = context.getUser().getRequestedTenant();
final String tenant = Strings.isNullOrEmpty(requestedTenant) ? GLOBAL_TENANT : requestedTenant;
if (tenantPrivileges.get().hasTenantPrivilege(context, tenant, TenantPrivileges.ActionType.WRITE)) {
return WRITE_ACCESS;
} else if (tenantPrivileges.get().hasTenantPrivilege(context, tenant, TenantPrivileges.ActionType.READ)) {
return READ_ACCESS;
} else {
return NO_ACCESS;
}
}

public PrivilegesEvaluationContext createContext(
User user,
String action0,
Expand Down Expand Up @@ -387,7 +406,7 @@ public PrivilegesEvaluatorResponse evaluate(PrivilegesEvaluationContext context)
context.setMappedRoles(mappedRoles);
}

setUserInfoInThreadContext(user, mappedRoles);
setUserInfoInThreadContext(context);

final boolean isDebugEnabled = log.isDebugEnabled();
if (isDebugEnabled) {
Expand Down
Loading