Skip to content

Include mapped roles when setting userInfo in ThreadContext #5369

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
merged 2 commits into from
Jun 2, 2025
+5 −5
Merged

Include mapped roles when setting userInfo in ThreadContext #5369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92c2d5e
Include mapped roles when setting userInfo in ThreadContext
cwperks May 30, 2025
3a018c6
Add to CHANGELOG
cwperks May 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
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Use extendedPlugins in integrationTest framework for sample resource plugin testing ([#5322](https://github.com/opensearch-project/security/pull/5322))
- Refactor ResourcePermissions to refer to action groups as access levels ([#5335](https://github.com/opensearch-project/security/pull/5335))
- Introduced new, performance-optimized implementation for tenant privileges ([#5339](https://github.com/opensearch-project/security/pull/5339))

- Performance improvements: Immutable user object ([#5212])
- Performance improvements: Immutable user object ([#5212](https://github.com/opensearch-project/security/pull/5212))
- Include mapped roles when setting userInfo in ThreadContext ([#5369](https://github.com/opensearch-project/security/pull/5369))

### Dependencies
- Bump `guava_version` from 33.4.6-jre to 33.4.8-jre ([#5284](https://github.com/opensearch-project/security/pull/5284))
Expand Down
6 changes: 3 additions & 3 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 @@ -279,13 +279,13 @@ public boolean isInitialized() {
return configModel != null && dcm != null && actionPrivileges.get() != null;
}

private void setUserInfoInThreadContext(User user) {
private void setUserInfoInThreadContext(User user, Set<String> mappedRoles) {
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(",", user.getSecurityRoles())));
joiner.add(escapePipe(String.join(",", mappedRoles)));

String requestedTenant = user.getRequestedTenant();
if (!Strings.isNullOrEmpty(requestedTenant)) {
Expand Down Expand Up @@ -357,7 +357,7 @@ public PrivilegesEvaluatorResponse evaluate(PrivilegesEvaluationContext context)
context.setMappedRoles(mappedRoles);
}

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

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