Skip to content

Commit 47dbec7

Browse files
committed
revert special handling of requested tenant when setting user info in thread context
Signed-off-by: Mark Boyd <[email protected]>
1 parent 55a401e commit 47dbec7

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,7 @@ private void setUserInfoInThreadContext(PrivilegesEvaluationContext context) {
300300
joiner.add(escapePipe(String.join(",", context.getMappedRoles())));
301301

302302
String requestedTenant = context.getUser().getRequestedTenant();
303-
if (!Strings.isNullOrEmpty(requestedTenant)) {
304-
joiner.add(escapePipe(requestedTenant));
305-
} else {
306-
joiner.add("null");
307-
}
303+
joiner.add(requestedTenant);
308304

309305
String tenantAccessToCheck = getTenancyAccess(context);
310306
joiner.add(tenantAccessToCheck);

0 commit comments

Comments
 (0)