fix security vilation CVE-2018-1000134

Change-Id: Id93a27648c622460db2e86689b64bfa7dc425ef4
Issue-ID: SDC-1726
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index e1feb7f..73fbf08 100644 (file)
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -434,13 +434,6 @@
                        <scope>compile</scope>
                </dependency>
 
-               <dependency>
-                       <groupId>org.elasticsearch.plugin</groupId>
-                       <artifactId>shield</artifactId>
-                       <version>${elastic-search.version}</version>
-                       <scope>compile</scope>
-               </dependency>
-
                <!-- CASSANDRA -->
                <dependency>
                        <groupId>com.datastax.cassandra</groupId>

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index a375c6a..c50a78e 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -370,12 +370,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.elasticsearch.plugin</groupId>
-            <artifactId>shield</artifactId>
-            <version>${elastic-search.version}</version>
-            <scope>compile</scope>
-        </dependency>
         <!-- functional java -->
         <dependency>
             <groupId>org.functionaljava</groupId>

diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 2a2e02a..940047d 100644 (file)
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -62,13 +62,6 @@ Modifications copyright (c) 2018 Nokia
                        <scope>provided</scope>
                </dependency>
 
-               <dependency>
-                       <groupId>org.elasticsearch.plugin</groupId>
-                       <artifactId>shield</artifactId>
-                       <version>${elastic-search.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-
                <!-- SPRING -->
                <dependency>
                        <groupId>org.springframework</groupId>

diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/es/ElasticSearchClient.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/es/ElasticSearchClient.java
index 47ce679..1547d01 100644 (file)
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/es/ElasticSearchClient.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/es/ElasticSearchClient.java
@@ -27,7 +27,6 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.NodeBuilder;
-import org.elasticsearch.shield.ShieldPlugin;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -99,7 +98,7 @@ public class ElasticSearchClient {
                }
                if (isTransportClient()) {
                        log.info("******* ElasticSearchClient type is Transport Client *****");
-                       TransportClient transportClient = TransportClient.builder().addPlugin(ShieldPlugin.class).settings(settings)
+                       TransportClient transportClient = TransportClient.builder().settings(settings)
                                        .build();
 
                        String[] nodesArray = transportClient.settings().getAsArray("transport.client.initial_nodes");

diff --git a/openecomp-ui/yarn.lock b/openecomp-ui/yarn.lock
index e3dd7fa..e7eee7e 100644 (file)
--- a/openecomp-ui/yarn.lock
+++ b/openecomp-ui/yarn.lock
@@ -9286,9 +9286,9 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
-sdc-ui@1.6.57:
-  version "1.6.57"
-  resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.57.tgz#9250faa279163e13f36bb91c835b8fe78f77ebaf"
+sdc-ui@1.6.58:
+  version "1.6.58"
+  resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.58.tgz#5cc709dbc21a7d3bcb3b82e044aaaa92142b2032"
   dependencies:
     "@angular/common" "~2.4.8"
     "@angular/core" "~2.4.8"