Update versions to resolve security issues 71/39871/1
authorTimoney, Dan (dt5972) <dt5972@att.com>
Wed, 28 Mar 2018 23:01:21 +0000 (19:01 -0400)
committerTimoney, Dan (dt5972) <dt5972@att.com>
Wed, 28 Mar 2018 23:01:43 +0000 (19:01 -0400)
Update versions of sdc distribution client and jackson to address
security issues.

Issue-ID: CCSDK-164

Change-Id: Id02d879e87bb1a957968482578818928b6e3c281
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
19 files changed:
.gitignore
dmaap-listener/pom.xml
ueb-listener/pom.xml
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModel.java
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebClient.java
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModel.java
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java
ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModelTest.java
ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModelTest.java
ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModelTest.java
ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModelTest.java
ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/TestSdncOdlConnection.java
ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/TestSdncUebCallback.java

index 8b49fb2..d11ed58 100755 (executable)
@@ -20,6 +20,7 @@ MANIFEST.MF
 
 ## Misc Ignores (OS specific etc) ##
 bin/
+lib/
 dist
 *~
 *.ipr
index 9c0ced0..7515731 100755 (executable)
@@ -19,7 +19,7 @@
 
     <properties>
         <sdc.client.version>1.2.0-SNAPSHOT</sdc.client.version>
-        <fasterxml.jackson.version>2.9.0.pr1</fasterxml.jackson.version>
+        <fasterxml.jackson.version>2.9.4</fasterxml.jackson.version>
         <velocity.version>2.0</velocity.version>
         <skip.SWM>true</skip.SWM>
         <dmaap.listener.base>/opt/app/dmaap-listener</dmaap.listener.base>
index b8ec986..4cb1180 100755 (executable)
@@ -17,9 +17,9 @@
        <description>UEB Listener</description>
 
        <properties>
-               <sdc.client.version>1.1.32</sdc.client.version>
-                <sdc.tosca.version>1.1.32</sdc.tosca.version>
-               <fasterxml.jackson.version>2.9.0.pr1</fasterxml.jackson.version>
+               <sdc.client.version>1.3.0</sdc.client.version>
+                <sdc.tosca.version>1.3.0</sdc.tosca.version>
+               <fasterxml.jackson.version>2.9.4</fasterxml.jackson.version>
                <skip.SWM>true</skip.SWM>
                <ueb.listener.base>/opt/app/ueb-listener</ueb.listener.base>
                <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
        <dependencies>
 
                <dependency>
-                       <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+                       <groupId>org.onap.sdc.sdc-distribution-client</groupId>
                        <artifactId>sdc-distribution-client</artifactId>
                        <version>${sdc.client.version}</version>
                        <scope>compile</scope>
                </dependency>
         <dependency>
-            <groupId>org.openecomp.sdc.sdc-tosca</groupId>
+            <groupId>org.onap.sdc.sdc-tosca</groupId>
             <artifactId>sdc-tosca</artifactId>
             <version>${sdc.tosca.version}</version>
             <scope>compile</scope>
index 6521559..f285db1 100644 (file)
 
 package org.onap.ccsdk.sli.northbound.uebclient;
 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index c77ad70..315f3c3 100644 (file)
@@ -24,11 +24,11 @@ package org.onap.ccsdk.sli.northbound.uebclient;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 0a49317..69f3787 100644 (file)
@@ -21,9 +21,9 @@
 
 package org.onap.ccsdk.sli.northbound.uebclient;
 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 012c3d9..c1efadb 100644 (file)
@@ -21,9 +21,9 @@
 
 package org.onap.ccsdk.sli.northbound.uebclient;
 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index cf6a2ab..8ea041e 100644 (file)
@@ -62,24 +62,24 @@ import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.tuple.Pair;
 import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
 import org.onap.ccsdk.sli.northbound.uebclient.SdncArtifactMap.SdncArtifactType;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
-import org.openecomp.sdc.api.consumer.INotificationCallback;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
-import org.openecomp.sdc.utils.ArtifactTypeEnum;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;
+import org.onap.sdc.api.consumer.INotificationCallback;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.utils.ArtifactTypeEnum;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.DistributionStatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
index 0694a6d..d37518f 100644 (file)
 
 package org.onap.ccsdk.sli.northbound.uebclient;
 
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.impl.DistributionClientFactory;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.impl.DistributionClientFactory;
+import org.onap.sdc.utils.DistributionActionResultEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index bf7dc88..0500954 100644 (file)
@@ -29,7 +29,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.api.consumer.IConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,6 +54,7 @@ public class SdncUebConfiguration implements IConfiguration{
        private String sdncPasswd = null;
        private String asdcApiBaseUrl = null;
        private String asdcApiNamespace = null;
+       private List<String> msgBusAddress = null;
 
        private SdncArtifactMap artifactMap = SdncArtifactMap.getInstance();
 
@@ -192,6 +193,16 @@ public class SdncUebConfiguration implements IConfiguration{
                        LOG.warn("artifact-map is unset");
                }
 
+               msgBusAddress = new LinkedList<>();
+               String msgBusAddressStr = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.msg-bus-address");
+               if (msgBusAddressStr != null) {
+                   String[] msgBusAddressArray = msgBusAddressStr.split(",");
+                   for (int i = 0 ; i < msgBusAddressArray.length ; i++) {
+                       msgBusAddress.add(msgBusAddressArray[i]);
+                   }
+               }
+
+
        }
 
        @Override
@@ -297,5 +308,10 @@ public class SdncUebConfiguration implements IConfiguration{
                return false;
        }
 
+    @Override
+    public List<String> getMsgBusAddress() {
+        return msgBusAddress;
+    }
+
 
 }
index 55814ac..d7ed19e 100644 (file)
@@ -21,9 +21,9 @@
 
 package org.onap.ccsdk.sli.northbound.uebclient;
 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index fd71527..32f25c5 100644 (file)
 
 package org.onap.ccsdk.sli.northbound.uebclient;
 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 3663c97..60bc3c4 100644 (file)
@@ -21,9 +21,9 @@
 
 package org.onap.ccsdk.sli.northbound.uebclient;
 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Group;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.Group;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 0d152e5..e8c7b1a 100644 (file)
@@ -4,8 +4,8 @@ package org.onap.ccsdk.sli.northbound.uebclient;
  import static org.mockito.Mockito.*;
  
  import org.junit.Test;
- import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
- import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+ import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+ import org.onap.sdc.toscaparser.api.NodeTemplate;
  
  public class SdncARModelTest {
  
index 4a66c02..9df89fb 100644 (file)
@@ -6,8 +6,8 @@ import static org.mockito.Mockito.*;
  
 import org.junit.Before; 
 import org.junit.Test; 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; 
-import org.openecomp.sdc.toscaparser.api.NodeTemplate; 
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; 
+import org.onap.sdc.toscaparser.api.NodeTemplate; 
  
 public class SdncNodeModelTest { 
  
@@ -46,4 +46,4 @@ public class SdncNodeModelTest {
                String result = sdncNodeModel.getVpnBindingsSql(); 
                assertNotNull(result); 
        } 
-}
\ No newline at end of file
+}
index d2bafbf..f03a09f 100644 (file)
@@ -6,8 +6,8 @@ import static org.mockito.Mockito.*;
  
 import org.junit.Before; 
 import org.junit.Test; 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; 
-import org.openecomp.sdc.toscaparser.api.NodeTemplate; 
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; 
+import org.onap.sdc.toscaparser.api.NodeTemplate; 
  
 public class SdncVFCModelTest { 
  
@@ -33,4 +33,4 @@ public class SdncVFCModelTest {
                assertEquals(testSdncVFCModel.getVmCount(), "5"); 
        } 
  
-}
\ No newline at end of file
+}
index 2185543..881018e 100644 (file)
@@ -4,8 +4,8 @@ import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock; 
  
 import org.junit.Test; 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; 
-import org.openecomp.sdc.toscaparser.api.Group; 
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; 
+import org.onap.sdc.toscaparser.api.Group; 
  
 public class SdncVFModuleModelTest { 
  
@@ -17,4 +17,4 @@ public class SdncVFModuleModelTest {
                assertNotNull(testSdncVFModel); 
        } 
  
-}
\ No newline at end of file
+}
index 1fac0c2..1b4b22f 100644 (file)
@@ -6,8 +6,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.notification.INotificationData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 21854f9..b53bdb3 100644 (file)
@@ -18,10 +18,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;