From a4e98021b301f4146fd45e7089d8749f3b8448b9 Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Tue, 29 Oct 2019 15:54:42 +0000 Subject: update getBasicAuthUserName prevent excess error throwing in getBasicAuthUserName Issue-ID: LOG-1184 Signed-off-by: Smokowski, Kevin (ks6305) Change-Id: I226185ef19525095dbb9e5f480e43bd7b087bf8f --- .../src/main/java/org/onap/logging/filter/base/MDCSetup.java | 2 +- .../test/java/org/onap/logging/filter/base/MDCSetupTest.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java index d0caa46..a900968 100644 --- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java +++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java @@ -248,7 +248,7 @@ public class MDCSetup { protected String getBasicAuthUserName(SimpleMap headers) { String encodedAuthorizationValue = headers.get(HttpHeaders.AUTHORIZATION); - if (encodedAuthorizationValue != null) { + if (encodedAuthorizationValue != null && encodedAuthorizationValue.startsWith("Basic")) { try { // This will strip the word Basic and single space encodedAuthorizationValue = encodedAuthorizationValue.substring(6); diff --git a/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java b/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java index 22ab9c3..bdf8bd0 100644 --- a/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java +++ b/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java @@ -190,6 +190,18 @@ public class MDCSetupTest extends MDCSetup { assertEquals("Bad Gateway", MDC.get(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION)); } + @Test + public void setMDCPartnerNameBearerToken() { + MultivaluedMap headerMap = new MultivaluedHashMap<>(); + String value = "Bearer some-compex-token"; + headerMap.putSingle(HttpHeaders.AUTHORIZATION, value); + SimpleMap headers = new SimpleJaxrsHeadersMap(headerMap); + + setMDCPartnerName(headers); + + assertEquals(Constants.DefaultValues.UNKNOWN, MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME)); + } + @Test public void setMDCPartnerNameFromBasicAuth() { MultivaluedMap headerMap = new MultivaluedHashMap<>(); -- cgit 1.2.3-korg