From ae3897e5081c78744308c63b4423777188241219 Mon Sep 17 00:00:00 2001 From: Vijay VK Date: Thu, 1 Mar 2018 15:16:47 +0000 Subject: address clm-security issues Change-Id: I7bfd3583b16c5f2b914a9b5f3cca2d3a07614895 Signed-off-by: VENKATESH KUMAR Issue-ID: DCAEGEN2-360 --- pom.xml | 798 +++++++++++---------- .../dcae/commonFunction/EventPublisherHash.java | 2 +- 2 files changed, 408 insertions(+), 392 deletions(-) diff --git a/pom.xml b/pom.xml index 7d5746b7..af798f78 100644 --- a/pom.xml +++ b/pom.xml @@ -1,391 +1,407 @@ - - - - 4.0.0 - - org.onap.oparent - oparent - 0.1.1 - - - org.onap.dcaegen2.collectors.ves - VESCollector - 1.2.0-SNAPSHOT - dcaegen2-collectors-ves - VESCollector - - - 1.7 - 1.7 - ${project.basedir} - 3.3 - 2.4 - 2.8 - 2.4 - 2.10.4 - - - true - - - - false - - - https://nexus.onap.org - content/repositories/snapshots/ - content/repositories/releases/ - content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version} - - - - - - JCenter - JCenter Repository - http://jcenter.bintray.com - - - - Restlet - Restlet Repository - http://maven.restlet.com - - - - - - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - com.google.guava - guava - 18.0 - - - - com.github.fge - json-schema-validator - 2.2.6 - - - - com.google.code.gson - gson - 2.3.1 - - - - - com.att.nsa - nsaServerLibrary - 1.0.10 - - - - - - org.slf4j - slf4j-log4j12 - 1.7.21 - - - log4j - apache-log4j-extras - 1.2.17 - - - - - - org.json - json - 20160810 - - - - - - - commons-configuration - commons-configuration - 1.10 - - - - - - - - external-repository - https://oss.sonatype.org/content/repositories - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.plugin.version} - - ${compiler.target.version} - ${compiler.source.version} - - - - - - org.apache.maven.plugins - maven-source-plugin - ${source.plugin.version} - - true - - - - attach-sources - verify - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${jar.plugin.version} - - - - true - - - ${project.version} - - - - - - - maven-assembly-plugin - 2.4.1 - - - src/assembly/dep.xml - - - - - - make-assembly - package - - single - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadoc.plugin.version} - - - true - false - false - - - - aggregate - site - - aggregate - - - - attach-javadoc - - jar - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${session.executionRootDirectory}/mvn-phase-script.sh - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${onap.nexus.url} - ${onap.nexus.rawrepo.baseurl.upload} - ${onap.nexus.rawrepo.baseurl.download} - ${onap.nexus.rawrepo.serverid} - ${onap.nexus.dockerregistry.daily} - ${onap.nexus.dockerregistry.release} - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.apache.maven.plugins - maven-jar-plugin - - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - maven-assembly-plugin - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - deploy script - deploy - - exec - - - - __ - deploy - - - - - install script - install - - exec - - - - __ - install - - - - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.6 - - - - dependencies - license - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - - - - - - - - - - - com.github.fge - json-schema-core - 1.2.5 - - - javax.mail - mail - 1.4.7 - - - - - + + + + 4.0.0 + + org.onap.oparent + oparent + 0.1.1 + + + org.onap.dcaegen2.collectors.ves + VESCollector + 1.2.0-SNAPSHOT + dcaegen2-collectors-ves + VESCollector + + + 1.7 + 1.7 + ${project.basedir} + 3.3 + 2.4 + 2.8 + 2.4 + 2.10.4 + + + true + + + + false + + + https://nexus.onap.org + content/repositories/snapshots/ + content/repositories/releases/ + content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version} + + + + + + JCenter + JCenter Repository + http://jcenter.bintray.com + + + + Restlet + Restlet Repository + http://maven.restlet.com + + + + + + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + + com.google.guava + guava + 18.0 + + + + com.github.fge + json-schema-validator + 2.2.6 + + + + + com.google.code.gson + gson + 2.3.1 + + + + + com.att.nsa + nsaServerLibrary + 1.0.10 + + + + + + org.slf4j + slf4j-log4j12 + 1.7.21 + + + log4j + apache-log4j-extras + 1.2.17 + + + + + + org.json + json + 20160810 + + + + + + + commons-configuration + commons-configuration + 1.10 + + + + + + + + external-repository + https://oss.sonatype.org/content/repositories + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${compiler.plugin.version} + + ${compiler.target.version} + ${compiler.source.version} + + + + + + org.apache.maven.plugins + maven-source-plugin + ${source.plugin.version} + + true + + + + attach-sources + verify + + jar-no-fork + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${jar.plugin.version} + + + + true + + + ${project.version} + + + + + + + maven-assembly-plugin + 2.4.1 + + + src/assembly/dep.xml + + + + + + make-assembly + package + + single + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.plugin.version} + + + true + false + false + + + + aggregate + site + + aggregate + + + + attach-javadoc + + jar + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + ${session.executionRootDirectory}/mvn-phase-script.sh + + + ${project.groupId} + ${project.artifactId} + ${project.version} + ${onap.nexus.url} + ${onap.nexus.rawrepo.baseurl.upload} + ${onap.nexus.rawrepo.baseurl.download} + ${onap.nexus.rawrepo.serverid} + ${onap.nexus.dockerregistry.daily} + ${onap.nexus.dockerregistry.release} + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.apache.maven.plugins + maven-jar-plugin + + + + + org.apache.maven.plugins + maven-source-plugin + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + maven-assembly-plugin + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + deploy script + deploy + + exec + + + + __ + deploy + + + + + install script + install + + exec + + + + __ + install + + + + + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.6 + + + + dependencies + license + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + + + + + + + + com.github.fge + json-schema-core + 1.2.5 + + + javax.mail + mail + 1.4.7 + + + commons-collections + commons-collections + 3.2.2 + + + org.apache.httpcomponents + httpclient + 4.5.3 + + + com.fasterxml.jackson.core + jackson-core + 2.8.10 + + + + + diff --git a/src/main/java/org/onap/dcae/commonFunction/EventPublisherHash.java b/src/main/java/org/onap/dcae/commonFunction/EventPublisherHash.java index f8bdcaa2..49221418 100644 --- a/src/main/java/org/onap/dcae/commonFunction/EventPublisherHash.java +++ b/src/main/java/org/onap/dcae/commonFunction/EventPublisherHash.java @@ -84,7 +84,7 @@ public class EventPublisherHash { } - if (authuser != null) { + if ((authuser != null) && (authpwd != null)) { log.debug(String.format("URL:%sTOPIC:%sAuthUser:%sAuthpwd:%s", ueburl, topic, authuser, authpwd)); pub = new CambriaClientBuilders.PublisherBuilder().usingHosts(ueburl).onTopic(topic).usingHttps() .authenticatedByHttp(authuser, authpwd).logSendFailuresAfter(5) -- cgit 1.2.3-korg