enable/disable AAF using a flag

Issue-ID: DMAAP-849
Change-Id: I9aa4cce6c9b484170e006866a58f99926b53e2fc
Signed-off-by: sunil unnava <sunil.unnava@att.com>

diff --git a/pom.xml b/pom.xml
index b92d7ef..f9e9c99 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
        <artifactId>msgrtr</artifactId>
-       <version>1.1.9-SNAPSHOT</version>
+       <version>1.1.10-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>dmaap-messagerouter-msgrtr</name>
        <description>Message Router - Restful interface built for kafka</description>

diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java b/src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java
index f5751f0..1e78b01 100644 (file)
--- a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java
+++ b/src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java
@@ -75,10 +75,11 @@ public class KafkaPublisher implements Publisher {
                }
                
        
-           
+           if(Utils.isCadiEnabled()){
                transferSetting( props, "sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='"+Utils.getKafkaproperty()+"';");
                transferSetting( props, "security.protocol", "SASL_PLAINTEXT");
-               transferSetting( props, "sasl.mechanism", "PLAIN");             
+               transferSetting( props, "sasl.mechanism", "PLAIN");     
+           }
                transferSetting( props, "bootstrap.servers",kafkaConnUrl);
                        
                transferSetting( props, "request.required.acks", "1");

diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
index 2f13be8..fb0ace0 100644 (file)
--- a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
+++ b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
@@ -289,10 +289,11 @@ public class DMaaPKafkaConsumerFactory implements ConsumerFactory {
                props.put("group.id", fakeGroupName);
                props.put("enable.auto.commit", "false"); // 0.11
                props.put("bootstrap.servers", fkafkaBrokers);
+               if(Utils.isCadiEnabled()){
                props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='"+Utils.getKafkaproperty()+"';");
                props.put("security.protocol", "SASL_PLAINTEXT");
                props.put("sasl.mechanism", "PLAIN");
-               
+               }
                props.put("client.id", consumerId);
 
                // additional settings: start with our defaults, then pull in configured

diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
index cbb58e4..acf4824 100644 (file)
--- a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
+++ b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
@@ -84,9 +84,11 @@ public class DMaaPKafkaMetaBroker implements Broker1 {
                }
                
             props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, fkafkaBrokers );
+            if(Utils.isCadiEnabled()){
             props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='"+Utils.getKafkaproperty()+"';");
                 props.put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT");            
             props.put("sasl.mechanism", "PLAIN");
+            }
           
             fKafkaAdminClient=AdminClient.create ( props );
            
@@ -119,10 +121,11 @@ public class DMaaPKafkaMetaBroker implements Broker1 {
                        fkafkaBrokers = "localhost:9092";
                }
                
-               
+                if(Utils.isCadiEnabled()){
                 props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='"+Utils.getKafkaproperty()+"';");
                 props.put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT");            
             props.put("sasl.mechanism", "PLAIN");
+                }
             props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, fkafkaBrokers );
             
             fKafkaAdminClient=AdminClient.create ( props );

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 f6d7b21..983af7e 100644 (file)
--- a/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java
+++ b/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java
@@ -52,6 +52,7 @@ import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl;
 import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;
 import com.att.dmf.mr.service.TopicService;
 import com.att.dmf.mr.utils.DMaaPResponseBuilder;
+import com.att.dmf.mr.utils.Utils;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.nsa.configs.ConfigDbException;
@@ -215,7 +216,7 @@ public class TopicServiceImpl implements TopicService {
                // else if (user==null &&
                // (null==dmaapContext.getRequest().getHeader("Authorization") && null
                // == dmaapContext.getRequest().getHeader("cookie")) ) {
-               else if (user == null && null == dmaapContext.getRequest().getHeader("Authorization")
+               else if (Utils.isCadiEnabled()&&user == null && null == dmaapContext.getRequest().getHeader("Authorization")
                                && (null == appName && null == dmaapContext.getRequest().getHeader("cookie"))) {
                        LOGGER.error("Failed to create topic" + topicBean.getTopicName() + ", Authentication failed.");
 

diff --git a/src/main/java/com/att/dmf/mr/utils/Utils.java b/src/main/java/com/att/dmf/mr/utils/Utils.java
index c2b8b88..5f84d85 100644 (file)
--- a/src/main/java/com/att/dmf/mr/utils/Utils.java
+++ b/src/main/java/com/att/dmf/mr/utils/Utils.java
@@ -162,4 +162,14 @@ public class Utils {
                        
                  
          }
+         
+         public static boolean isCadiEnabled(){
+                 boolean enableCadi=false;
+                 if(System.getenv("enableCadi")!=null){
+                               enableCadi=Boolean.getBoolean(System.getenv("enableCadi"));
+                       }
+                 
+                 return enableCadi;
+         }
+                 
 }

diff --git a/version.properties b/version.properties
index ad77b29..7ce0f80 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=1
-patch=9
+patch=10
 
 base_version=${major}.${minor}.${patch}