diff options
| -rw-r--r-- | pom.xml | 19 | ||||
| -rw-r--r-- | src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java | 30 | ||||
| -rw-r--r-- | src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 18 insertions, 35 deletions
@@ -14,7 +14,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId> <artifactId>msgrtr</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.4-SNAPSHOT</version> <packaging>jar</packaging> <name>dmaap-messagerouter-msgrtr</name> <description>Message Router - Restful interface built for kafka</description> @@ -85,17 +85,17 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-catalina</artifactId> - <version>8.0.49</version> + <version>8.5.23</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-util</artifactId> - <version>8.0.49</version> + <version>8.5.23</version> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> - <version>8.0.49</version> + <version>8.5.23</version> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -257,13 +257,18 @@ </dependency> <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>4.3.16.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>${spring.version}</version> + <version>4.3.15.RELEASE</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> + <artifactId>spring-core</artifactId> + <version>4.3.15.RELEASE</version> </dependency> <dependency> <groupId>javax.servlet</groupId> diff --git a/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java index 6f4d9c9..e8f697e 100644 --- a/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java +++ b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java @@ -21,17 +21,12 @@ *******************************************************************************/ package com.att.nsa.cambria.security; -import java.util.Date; import javax.servlet.http.HttpServletRequest; -import org.apache.http.HttpStatus; import com.att.nsa.cambria.CambriaApiException; import com.att.nsa.cambria.constants.CambriaConstants; -import com.att.nsa.cambria.exception.DMaaPResponseCode; -import com.att.nsa.cambria.exception.ErrorResponse; -import com.att.nsa.cambria.utils.Utils; /** @@ -60,28 +55,9 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator { public String aafPermissionString(String topicName, String action) throws CambriaApiException { - String permission = ""; - String nameSpace =""; - if(topicName.contains(".") && (topicName.contains("com.onap")||topicName.contains("org"))) { - //String topic = topicName.substring(topicName.lastIndexOf(".")+1); - nameSpace = topicName.substring(0,topicName.lastIndexOf(".")); - } - else { - nameSpace = null; - nameSpace= com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"defaultNSforUEB"); - - if(null==nameSpace)nameSpace="com.onap.dmaap.mr.ueb"; - - - /*ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_FORBIDDEN, - DMaaPResponseCode.TOPIC_NOT_IN_AAF.getResponseCode(), "Topic does not exist in AAF" - , null, Utils.getFormattedDate(new Date()), topicName, - null, null, null, null); - - throw new CambriaApiException(errRes);*/ - } - - permission = nameSpace+".mr.topic|:topic."+topicName+"|"+action; + String mrNameS = com.att.ajsc.beans.PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, + "msgRtr.namespace.aaf"); + String permission = mrNameS+"|:topic."+topicName+"|"+action; return permission; } diff --git a/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java index f539199..7875b90 100644 --- a/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java +++ b/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java @@ -314,7 +314,9 @@ public class TopicServiceImpl implements TopicService { // String permission = "com.att.dmaap.mr.topic"+"|"+topicName+"|"+"manage"; String permission = ""; String nameSpace=""; + if(topicName.indexOf(".")>1){ nameSpace = topicName.substring(0,topicName.lastIndexOf(".")); + } String mrFactoryVal=AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"msgRtr.topicfactory.aaf"); // String tokens[] = topicName.split(".mr.topic."); permission = mrFactoryVal+nameSpace+"|destroy"; diff --git a/version.properties b/version.properties index 05dc9e5..e7654d1 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=3 +patch=4 base_version=${major}.${minor}.${patch} |