From be1aaeafeccff4465f086d79c00aa0a2c62031e6 Mon Sep 17 00:00:00 2001 From: Paras Jain Date: Fri, 12 May 2023 15:00:24 +0530 Subject: [PATCH 1/2] `deserializeSafeFromHeader` uses `context.getHeader(headerName)` instead of `context.getHeaders()` Signed-off-by: Paras Jain --- .../org/opensearch/security/support/HeaderHelper.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/org/opensearch/security/support/HeaderHelper.java b/src/main/java/org/opensearch/security/support/HeaderHelper.java index a4ee123347..34e2a8b100 100644 --- a/src/main/java/org/opensearch/security/support/HeaderHelper.java +++ b/src/main/java/org/opensearch/security/support/HeaderHelper.java @@ -57,15 +57,8 @@ public static String getSafeFromHeader(final ThreadContext context, final String return null; } - String headerValue = null; - - Map headers = context.getHeaders(); - if (!headers.containsKey(headerName) || (headerValue = headers.get(headerName)) == null) { - return null; - } - if (isInterClusterRequest(context) || isTrustedClusterRequest(context) || isDirectRequest(context)) { - return headerValue; + return context.getHeader(headerName); } return null; From 62967b2445f9242ef9f0cd76196206c236fb624d Mon Sep 17 00:00:00 2001 From: Paras Jain Date: Fri, 12 May 2023 19:17:07 +0530 Subject: [PATCH 2/2] Removed unused import Signed-off-by: Paras Jain --- src/main/java/org/opensearch/security/support/HeaderHelper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/opensearch/security/support/HeaderHelper.java b/src/main/java/org/opensearch/security/support/HeaderHelper.java index 34e2a8b100..1a7484a781 100644 --- a/src/main/java/org/opensearch/security/support/HeaderHelper.java +++ b/src/main/java/org/opensearch/security/support/HeaderHelper.java @@ -27,7 +27,6 @@ package org.opensearch.security.support; import java.io.Serializable; -import java.util.Map; import com.google.common.base.Strings;