Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove unnecessary elasticsearch dependencies to fix CVE regressions #15443

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion extensions-core/druid-ranger-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,21 @@
<relativePath>../../pom.xml</relativePath>
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.4.0</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
<version>${aws.sdk.version}</version>
</dependency>
Comment on lines +45 to +48
Copy link
Contributor

@LakshSingla LakshSingla Feb 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This upgrade blows up the size of the extension from 94MB to 440MB. Is there a way to import only the required JARs from the bundle?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@janjwerner-confluent is this something you could look into?

</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.druid</groupId>
Expand Down Expand Up @@ -133,6 +148,18 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.elasticsearch</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.elasticsearch.client</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -144,14 +171,27 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.elasticsearch</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.elasticsearch.client</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${apache.ranger.gson.version}</version>
<scope>compile</scope>
<version>${gson.version}</version>
</dependency>

<!-- Tests -->
Expand Down
56 changes: 12 additions & 44 deletions licenses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4608,6 +4608,16 @@ libraries:

---

name: gson
license_category: binary
module: druid-ranger-security
license_name: Apache License version 2.0
version: 2.10.1
libraries:
- com.google.code.gson: gson

---

name: com.kstruct gethostname4j
license_category: binary
version: 1.0.0
Expand All @@ -4620,7 +4630,7 @@ libraries:

name: com.amazonaws aws-java-sdk-bundle
license_category: binary
version: 1.12.125
version: 1.12.497
module: druid-ranger-security
license_name: Apache License version 2.0
libraries:
Expand Down Expand Up @@ -4699,16 +4709,6 @@ libraries:

---

name: org.elasticsearch securesm
license_category: binary
version: 2.1.9
module: druid-ranger-security
license_name: Creative Commons CC0
libraries:
- org.hdrhistogram: HdrHistogram

---

name: Apache Lucene
license_category: binary
version: 8.4.0
Expand All @@ -4733,38 +4733,6 @@ libraries:

---

name: org.elasticsearch securesm
license_category: binary
version: 1.2
module: druid-ranger-security
license_name: Apache License version 2.0
libraries:
- org.elasticsearch: securesm

---

name: Elastic Search
license_category: binary
version: 7.10.2
module: druid-ranger-security
license_name: Apache License version 2.0
libraries:
- org.elasticsearch: elasticsearch
- org.elasticsearch: elasticsearch-cli
- org.elasticsearch: elasticsearch-core
- org.elasticsearch: elasticsearch-geo
- org.elasticsearch: elasticsearch-secure-sm
- org.elasticsearch: elasticsearch-x-content
- org.elasticsearch.client: elasticsearch-rest-client
- org.elasticsearch.client: elasticsearch-rest-high-level-client
- org.elasticsearch.plugin: aggs-matrix-stats-client
- org.elasticsearch.plugin: lang-mustache-client
- org.elasticsearch.plugin: mapper-extras-client
- org.elasticsearch.plugin: parent-join-client
- org.elasticsearch.plugin: rank-eval-client

---

name: org.apache.httpcomponents httpcore-nio
license_category: binary
version: 4.4.6
Expand Down Expand Up @@ -4803,7 +4771,7 @@ libraries:

name: Woodstox
license_category: binary
version: 6.2.4
version: 6.4.0
module: druid-ranger-security
license_name: Apache License version 2.0
libraries:
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<apache.curator.version>5.5.0</apache.curator.version>
<apache.kafka.version>3.6.0</apache.kafka.version>
<apache.ranger.version>2.4.0</apache.ranger.version>
<gson.version>2.10.1</gson.version>
<apache.ranger.gson.version>2.10.1</apache.ranger.gson.version>
<scala.library.version>2.13.11</scala.library.version>
<avatica.version>1.23.0</avatica.version>
Expand Down
Loading