From: su622b <su622b@att.com>
Date: Thu, 25 Jul 2019 18:57:54 +0000 (-0400)
Subject: configurable AAF permissions parts
X-Git-Tag: 1.1.18~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmsgrtr.git;a=commitdiff_plain;h=bceb38a3a8ff0b4d80210724e339905bc714891d

configurable AAF permissions parts

Issue-ID: DMAAP-1248
Change-Id: I998de1e52b961082f8af3997ab89e4a335e128f3
Signed-off-by: su622b <su622b@att.com>
---

diff --git a/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java
index 0e6b0f6..642a2ec 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java
@@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest;
 import org.onap.dmaap.dmf.mr.CambriaApiException;
 import org.onap.dmaap.dmf.mr.constants.CambriaConstants;
 
-
 /**
  * 
  * @author sneha.d.desai
@@ -36,8 +35,11 @@ import org.onap.dmaap.dmf.mr.constants.CambriaConstants;
 public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
 
 	private static final String NAMESPACE_PROPERTY = "defaultNSforUEB";
-  private static final String DEFAULT_NAMESPACE = "org.onap.dmaap.mr";
-  private static final String NAMESPACE_PREFIX = "org.onap";
+	private static final String DEFAULT_NAMESPACE = "org.onap.dmaap.mr";
+	private static final String NAMESPACE_PREFIX = "org.onap";
+	private static final String NAMESPACE_PREFIX_VAR = "namespacePrefix";
+	private static final String DEFAULT_NAMESPACE_VAR = "defaultNamespace";
+	private static final String INSTANCE_PART_VAR = "pubSubInstPart";
 
 	/**
 	 * @param req
@@ -51,21 +53,25 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
 	@Override
 	public String aafPermissionString(String topicName, String action) throws CambriaApiException {
 
-		String nameSpace = topicName.startsWith(NAMESPACE_PREFIX) ? parseNamespace(topicName) :
-			readNamespaceFromProperties();
+		String nameSpace = topicName.startsWith(
+				System.getenv(NAMESPACE_PREFIX_VAR) != null ? System.getenv(NAMESPACE_PREFIX_VAR) : NAMESPACE_PREFIX)
+						? parseNamespace(topicName) : readNamespaceFromProperties();
 
-		nameSpace = !nameSpace.isEmpty()? nameSpace : DEFAULT_NAMESPACE;
+		nameSpace = !nameSpace.isEmpty() ? nameSpace
+				: (System.getenv(DEFAULT_NAMESPACE_VAR) != null ? System.getenv(DEFAULT_NAMESPACE_VAR)
+						: DEFAULT_NAMESPACE);
 
-		return new StringBuilder(nameSpace).append(".topic|:topic.").append(topicName)
-			.append("|").append(action).toString();
+		return new StringBuilder(nameSpace).append(
+				(System.getenv(INSTANCE_PART_VAR) != null ? System.getenv(INSTANCE_PART_VAR) : ".topic") + "|:topic.")
+				.append(topicName).append("|").append(action).toString();
 	}
 
 	String readNamespaceFromProperties() {
-		return AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,NAMESPACE_PROPERTY);
+		return AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, NAMESPACE_PROPERTY);
 	}
 
 	private String parseNamespace(String topicName) {
-		return topicName.substring(0,topicName.lastIndexOf('.'));
+		return topicName.substring(0, topicName.lastIndexOf('.'));
 	}
 
 }