summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2018-09-13 20:28:32 +0300
committerTal Gitelman <tg851x@intl.att.com>2018-09-13 17:31:22 +0000
commit0e9742f33076348a98dcff8190091b2a89cd327f (patch)
treec3b1759fdbee5682bf3d6ce1cc799f1fb1e3541c
parentc726f770af3e625686658a14563bdfb7666d3450 (diff)
fix security vilation CVE-2018-1000134
Change-Id: Id93a27648c622460db2e86689b64bfa7dc425ef4 Issue-ID: SDC-1726 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
-rw-r--r--asdctool/pom.xml7
-rw-r--r--catalog-be/pom.xml6
-rw-r--r--catalog-dao/pom.xml7
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/dao/es/ElasticSearchClient.java3
-rw-r--r--openecomp-ui/yarn.lock6
5 files changed, 4 insertions, 25 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index e1feb7f630..73fbf08d5c 100644
--- 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 a375c6ae3a..c50a78ec35 100644
--- 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 2a2e02ae81..940047db9f 100644
--- 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 47ce679c29..1547d01ac2 100644
--- 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 e3dd7fab33..e7eee7ed02 100644
--- 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"