From bd9c085e11b6c735cd674599454e44f00b708400 Mon Sep 17 00:00:00 2001 From: su622b Date: Mon, 19 Mar 2018 16:46:51 -0400 Subject: changes for deployment errors Issue-ID: DMAAP-332 Change-Id: I740d03e88dd5104806c5302a01fd579a7c280b5c Signed-off-by: su622b --- .../nsa/cambria/exception/DMaaPErrorMessages.java | 55 +++++++--------------- .../cambria/security/DMaaPAuthenticatorImpl.java | 5 ++ .../nsa/cambria/service/impl/AdminServiceImpl.java | 2 +- .../nsa/cambria/service/impl/TopicServiceImpl.java | 6 ++- 4 files changed, 28 insertions(+), 40 deletions(-) (limited to 'src/main/java/com/att') diff --git a/src/main/java/com/att/nsa/cambria/exception/DMaaPErrorMessages.java b/src/main/java/com/att/nsa/cambria/exception/DMaaPErrorMessages.java index eb9be06..dfcb227 100644 --- a/src/main/java/com/att/nsa/cambria/exception/DMaaPErrorMessages.java +++ b/src/main/java/com/att/nsa/cambria/exception/DMaaPErrorMessages.java @@ -21,7 +21,6 @@ *******************************************************************************/ package com.att.nsa.cambria.exception; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; /** @@ -33,61 +32,43 @@ import org.springframework.stereotype.Component; @Component public class DMaaPErrorMessages { - @Value("${resource.not.found}") - private String notFound; + private String notFound="The requested resource was not found.Please verify the URL and try again."; - @Value("${server.unavailable}") - private String serverUnav; + private String serverUnav="Server is temporarily unavailable or busy.Try again later, or try another server in the cluster."; - @Value("${http.method.not.allowed}") - private String methodNotAllowed; + private String methodNotAllowed="The specified HTTP method is not allowed for the requested resource.Enter a valid HTTP method and try again."; - @Value("${incorrect.request.json}") - private String badRequest; + private String badRequest="Incorrect JSON object. Please correct the JSON format and try again."; - @Value("${network.time.out}") - private String nwTimeout; + private String nwTimeout="Connection to the DMaaP MR was timed out.Please try again."; - @Value("${get.topic.failure}") - private String topicsfailure; + private String topicsfailure="Failed to retrieve list of all topics."; - @Value("${not.permitted.access.1}") - private String notPermitted1; + private String notPermitted1="Access Denied.User does not have permission to perform"; - @Value("${not.permitted.access.2}") - private String notPermitted2; + private String notPermitted2="operation on Topic"; - @Value("${get.topic.details.failure}") - private String topicDetailsFail; + private String topicDetailsFail="Failed to retrieve details of topic:"; - @Value("${create.topic.failure}") - private String createTopicFail; + private String createTopicFail="Failed to create topic:"; - @Value("${delete.topic.failure}") - private String deleteTopicFail; + private String deleteTopicFail="Failed to delete topic:"; - @Value("${incorrect.json}") - private String incorrectJson; + private String incorrectJson="Incorrect JSON object.Could not parse JSON. Please correct the JSON format and try again."; - @Value("${consume.msg.error}") - private String consumeMsgError; + private String consumeMsgError="Error while reading data from topic."; - @Value("${publish.msg.error}") - private String publishMsgError; + private String publishMsgError="Error while publishing data to topic."; - @Value("${publish.msg.count}") - private String publishMsgCount; + private String publishMsgCount="Successfully published number of messages :"; - @Value("${authentication.failure}") - private String authFailure; - @Value("${msg_size_exceeds}") - private String msgSizeExceeds; + private String authFailure="Access Denied: Invalid Credentials. Enter a valid MechId and Password and try again."; + private String msgSizeExceeds="Message size exceeds the default size."; - @Value("${topic.not.exist}") - private String topicNotExist; + private String topicNotExist="No such topic exists."; public String getMsgSizeExceeds() { return msgSizeExceeds; diff --git a/src/main/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImpl.java b/src/main/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImpl.java index eb2a483..dfcb0d5 100644 --- a/src/main/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImpl.java +++ b/src/main/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImpl.java @@ -131,5 +131,10 @@ public class DMaaPAuthenticatorImpl implements DMaaPAuthent { this.fAuthenticators.add(a); } + + public static boolean isIgnoreAuth(){ + return (System.getenv("ignoreAuth")!=null) ? Boolean.valueOf(System.getenv("ignoreAuth")):(System.getProperty("ignoreAuth")!=null? Boolean.valueOf(System.getProperty("ignoreAuth")):false ); + + } } diff --git a/src/main/java/com/att/nsa/cambria/service/impl/AdminServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/AdminServiceImpl.java index 2585ab5..ead9c36 100644 --- a/src/main/java/com/att/nsa/cambria/service/impl/AdminServiceImpl.java +++ b/src/main/java/com/att/nsa/cambria/service/impl/AdminServiceImpl.java @@ -161,7 +161,7 @@ public class AdminServiceImpl implements AdminService { { final NsaApiKey user = DMaaPAuthenticatorImpl.getAuthenticatedUser(dMaaPContext); - if ( user == null || !user.getKey ().equals ( "admin" ) ) + if ( (!DMaaPAuthenticatorImpl.isIgnoreAuth())&&(user == null || !user.getKey ().equals ( "admin" )) ) { throw new AccessDeniedException (); } 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 c12be2f..3690583 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 @@ -195,7 +195,7 @@ public class TopicServiceImpl implements TopicService { String key = null; String appName=dmaapContext.getRequest().getHeader("AppName"); String enfTopicName= com.att.ajsc.beans.PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop,"enforced.topic.name.AAF"); - + if(DMaaPAuthenticatorImpl.isIgnoreAuth()){ if(user != null) { key = user.getKey(); @@ -266,6 +266,7 @@ public class TopicServiceImpl implements TopicService { } } + } try { final String topicName = topicBean.getTopicName(); @@ -315,7 +316,8 @@ public class TopicServiceImpl implements TopicService { LOGGER.info("Authenticating the user, as ACL authentication is not provided"); // String permission = "com.att.dmaap.mr.topic"+"|"+topicName+"|"+"manage"; String permission = ""; - String nameSpace = topicName.substring(0,topicName.lastIndexOf(".")); + String nameSpace=""; + 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"; -- cgit 1.2.3-korg