From 7c4e06d323135ef8ab616ff083c420ba26287f18 Mon Sep 17 00:00:00 2001 From: Paras Jain Date: Sat, 13 May 2023 07:17:35 +0530 Subject: [PATCH] `deserializeSafeFromHeader` uses `context.getHeader(headerName)` instead of `context.getHeaders()` (#2768) --- .../org/opensearch/security/support/HeaderHelper.java | 10 +--------- 1 file changed, 1 insertion(+), 9 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..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; @@ -57,15 +56,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;