X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdmf%2Fmr%2Futils%2FUtils.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdmf%2Fmr%2Futils%2FUtils.java;h=40e68404b75cea0847931a6c537ad89b3d0df980;hb=08f656f11693e4b172f696d14eec5237217217d0;hp=3048251da2223b2f8b0b497e662d4c291342ea3d;hpb=360b04b616c672fd95921f5638e4d843355d082c;p=dmaap%2Fmessagerouter%2Fmsgrtr.git

diff --git a/src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java
index 3048251..40e6840 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java
@@ -23,6 +23,7 @@ package org.onap.dmaap.dmf.mr.utils;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.security.Principal;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -46,7 +47,9 @@ public class Utils {
 
 	private static final String DATE_FORMAT = "dd-MM-yyyy::hh:mm:ss:SSS";
 	public static final String CAMBRIA_AUTH_HEADER = "X-CambriaAuth";
+	private static final String AUTH_HEADER = "Authorization";
 	private static final String BATCH_ID_FORMAT = "000000";
+	private static final String X509_ATTR = "javax.servlet.request.X509Certificate";
 	private static final EELFLogger log = EELFManager.getInstance().getLogger(Utils.class);
 
 	private Utils() {
@@ -75,15 +78,21 @@ public class Utils {
 		if (null != auth) {
 			final String[] splittedAuthKey = auth.split(":");
 			return splittedAuthKey[0];
-		}else if (null!=request.getHeader("Authorization")){
+		}else if (null != request.getHeader(AUTH_HEADER) || null != request.getAttribute(X509_ATTR)){
 			/**
 			 * AAF implementation enhancement
 			 */
-			 String user= request.getUserPrincipal().getName().toString();
-			return user.substring(0, user.lastIndexOf("@"));
+			Principal principal = request.getUserPrincipal();
+			if(principal != null){
+				String name = principal.getName();
+				return name.substring(0, name.lastIndexOf('@'));
+			}
+			log.warn("No principal has been provided on HTTP request");
 		}
 		return null;
 	}
+
+
 	/**
 	 * to format the batch sequence id
 	 * @param batchId