diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java | 3 |
2 files changed, 3 insertions, 4 deletions
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 97ca1fd..6f4d9c9 100644 --- a/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java +++ b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java @@ -62,7 +62,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator { String permission = ""; String nameSpace =""; - if(topicName.contains(".") && (topicName.contains("com.att")||topicName.contains("org"))) { + if(topicName.contains(".") && (topicName.contains("com.onap")||topicName.contains("org"))) { //String topic = topicName.substring(topicName.lastIndexOf(".")+1); nameSpace = topicName.substring(0,topicName.lastIndexOf(".")); } @@ -70,7 +70,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator { nameSpace = null; nameSpace= com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"defaultNSforUEB"); - if(null==nameSpace)nameSpace="com.att.dmaap.mr.ueb"; + if(null==nameSpace)nameSpace="com.onap.dmaap.mr.ueb"; /*ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_FORBIDDEN, 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 a9c1882..f539199 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 @@ -224,8 +224,7 @@ public class TopicServiceImpl implements TopicService { throw new DMaaPAccessDeniedException(errRes); }*/ - if (user == null && (null!=dmaapContext.getRequest().getHeader("Authorization") || - null != dmaapContext.getRequest().getHeader("cookie"))) { + if (user == null && (null!=dmaapContext.getRequest().getHeader("Authorization"))) { //if (user == null && (null!=dmaapContext.getRequest().getHeader("Authorization") || null != dmaapContext.getRequest().getHeader("cookie"))) { // ACL authentication is not provided so we will use the aaf authentication LOGGER.info("Authorization the topic"); |