fix bad merge in setUserInfoInThreadContext

markdboyd · markdboyd · commit 9971210ab970 · 2025-08-05T17:17:51.000-04:00
Signed-off-by: Mark Boyd &lt;mark.boyd@gsa.gov&gt;
diff --git a/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java b/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java
@@ -310,8 +310,6 @@ private void setUserInfoInThreadContext(PrivilegesEvaluationContext context) {
             joiner.add(tenantAccessToCheck);
             log.debug(joiner);
 
-            joiner.add(Base64Helper.serializeObject((Serializable) context.getUser().getCustomAttributesMap()));
-
             if (this.isUserAttributeSerializationEnabled()) {
                 joiner.add(Base64Helper.serializeObject((Serializable) context.getUser().getCustomAttributesMap()));
             }

Original file line number	Diff line number	Diff line change
`@@ -310,8 +310,6 @@ private void setUserInfoInThreadContext(PrivilegesEvaluationContext context) {`
`310`	`310`	`joiner.add(tenantAccessToCheck);`
`311`	`311`	`log.debug(joiner);`
`312`	`312`
`313`		`- joiner.add(Base64Helper.serializeObject((Serializable) context.getUser().getCustomAttributesMap()));`
`314`		`-`
`315`	`313`	`if (this.isUserAttributeSerializationEnabled()) {`
`316`	`314`	`joiner.add(Base64Helper.serializeObject((Serializable) context.getUser().getCustomAttributesMap()));`
`317`	`315`	`}`