diff options
| -rw-r--r-- | src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java b/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java index 6f041f1..571f004 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java +++ b/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java @@ -216,17 +216,17 @@ public class TopicServiceImpl implements TopicService { // (null==dmaapContext.getRequest().getHeader("Authorization") && null - /*else if (user == null && null == dmaapContext.getRequest().getHeader("Authorization") - ) { - LOGGER.error("Failed to create topic" + topicBean.getTopicName() + ", Authentication failed."); + + + - ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_UNAUTHORIZED, - DMaaPResponseCode.ACCESS_NOT_PERMITTED.getResponseCode(), - "Failed to create topic: Access Denied.User does not have permission to perform create topic"); + + + - LOGGER.info(errRes.toString()); - // throw new DMaaPAccessDeniedException(errRes); - }*/ + + + if (user == null /*&& (null != dmaapContext.getRequest().getHeader("Authorization") )*/) { @@ -235,20 +235,20 @@ public class TopicServiceImpl implements TopicService { // ACL authentication is not provided so we will use the aaf // authentication - /*LOGGER.info("Authorization the topic"); + - String permission = ""; - String nameSpace = ""; - if (topicBean.getTopicName().indexOf(".") > 1) - nameSpace = topicBean.getTopicName().substring(0, topicBean.getTopicName().lastIndexOf(".")); + + + + - String mrFactoryVal = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, - "msgRtr.topicfactory.aaf"); + + - // AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,kSettings_KafkaZookeeper); + - permission = mrFactoryVal + nameSpace + "|create"; - DMaaPAAFAuthenticator aaf = new DMaaPAAFAuthenticatorImpl();*/ + + if (false) { @@ -273,7 +273,7 @@ public class TopicServiceImpl implements TopicService { */ - //key="admin"; + //LOGGER.info("key ==================== " + key); } @@ -511,7 +511,7 @@ public class TopicServiceImpl implements TopicService { // - // String permission = aaf.aafPermissionString(topicName, "manage"); + // if(!aaf.aafAuthentication(dmaapContext.getRequest(), permission)) // { // LOGGER.error("Failed to permit write access to producer [" + @@ -521,7 +521,7 @@ public class TopicServiceImpl implements TopicService { // DMaaPResponseCode.ACCESS_NOT_PERMITTED.getResponseCode(), // errorMessages.getNotPermitted1()+" <Grant publish permissions> - // LOGGER.info(errRes); + // throw new DMaaPAccessDeniedException(errRes); // } // } @@ -576,7 +576,7 @@ public class TopicServiceImpl implements TopicService { // DMaaPResponseCode.ACCESS_NOT_PERMITTED.getResponseCode(), // errorMessages.getNotPermitted1()+" <Revoke publish permissions> - // LOGGER.info(errRes); + // throw new DMaaPAccessDeniedException(errRes); // @@ -616,7 +616,7 @@ public class TopicServiceImpl implements TopicService { // //// String permission = - // DMaaPAAFAuthenticator aaf = new DMaaPAAFAuthenticatorImpl(); + // String permission = aaf.aafPermissionString(topicName, "manage"); // if(!aaf.aafAuthentication(dmaapContext.getRequest(), permission)) // { @@ -627,7 +627,7 @@ public class TopicServiceImpl implements TopicService { // DMaaPResponseCode.ACCESS_NOT_PERMITTED.getResponseCode(), // errorMessages.getNotPermitted1()+" <Grant consume permissions> - // LOGGER.info(errRes); + // throw new DMaaPAccessDeniedException(errRes); // } // } |