Skip to content

[Test #24097] Fix CVE-2022-34917 #24211

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.

Sign up for GitHub

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

Draft
imjalpreet wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[Test #24097] Fix CVE-2022-34917 #24211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d921b6
Fix CVE-2022-34917 about kafka-client dependency
adkharat Nov 20, 2024
d122402
Upgraded version to 3.7.1
adkharat Dec 2, 2024
12e14fc
Use jitpack for custom version of tempto-kafka
imjalpreet Dec 6, 2024
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
19 changes: 15 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<dep.gcs.version>1.9.17</dep.gcs.version>
<dep.alluxio.version>313</dep.alluxio.version>
<dep.slf4j.version>1.7.32</dep.slf4j.version>
<dep.kafka.version>2.3.1</dep.kafka.version>
<dep.kafka.version>3.7.1</dep.kafka.version>
<dep.pinot.version>0.11.0</dep.pinot.version>
<dep.druid.version>0.19.0</dep.druid.version>
<dep.jaxb.version>2.3.1</dep.jaxb.version>
Expand Down Expand Up @@ -201,6 +201,13 @@
<module>presto-openapi</module>
</modules>

<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -1232,7 +1239,7 @@
<dependency>
<groupId>org.pcollections</groupId>
<artifactId>pcollections</artifactId>
<version>2.1.2</version>
<version>4.0.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1829,6 +1836,10 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -2009,9 +2020,9 @@
</dependency>

<dependency>
<groupId>io.prestodb.tempto</groupId>
<groupId>com.github.adkharat.tempto</groupId>
<artifactId>tempto-kafka</artifactId>
<version>${dep.tempto.version}</version>
<version>upgrade_kafka_client_version_cve_2022_34917-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.datastax.cassandra</groupId>
Expand Down
10 changes: 10 additions & 0 deletions presto-kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,16 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredResourcePatterns>
<ignoredResourcePattern>kafka/kafka-version.properties</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
31 changes: 21 additions & 10 deletions presto-kafka/src/test/java/com/facebook/presto/kafka/util/EmbeddedKafka.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,23 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.common.io.Files;
import kafka.admin.AdminUtils;
import kafka.admin.RackAwareMode;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServerStartable;
import kafka.utils.ZkUtils;
import kafka.server.KafkaServer;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.AdminClientConfig;
import org.apache.kafka.clients.admin.NewTopic;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.common.serialization.LongSerializer;
import org.apache.kafka.common.utils.SystemTime;
import org.apache.kafka.common.utils.Time;

import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;

import static com.facebook.presto.kafka.util.TestUtils.findUnusedPort;
Expand All @@ -48,7 +52,8 @@ public class EmbeddedKafka
private final EmbeddedZookeeper zookeeper;
private final int port;
private final File kafkaDataDir;
private final KafkaServerStartable kafka;
private final KafkaServer kafka;
private final AdminClient adminClient;

private final AtomicBoolean started = new AtomicBoolean();
private final AtomicBoolean stopped = new AtomicBoolean();
Expand Down Expand Up @@ -91,7 +96,11 @@ public static EmbeddedKafka createEmbeddedKafka(Properties overrideProperties)
.build();

KafkaConfig config = new KafkaConfig(toProperties(properties));
this.kafka = new KafkaServerStartable(config);
Time time = new SystemTime();
this.kafka = new KafkaServer(config, time, scala.Option.empty(), false);
Properties adminProps = new Properties();
adminProps.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, getConnectString());
this.adminClient = AdminClient.create(adminProps);
}

public void start()
Expand All @@ -112,6 +121,7 @@ public void close()
kafka.awaitShutdown();
zookeeper.close();
deleteRecursively(kafkaDataDir.toPath(), ALLOW_INSECURE);
adminClient.close();
}
}

Expand All @@ -124,14 +134,15 @@ public void createTopics(int partitions, int replication, Properties topicProper
{
checkState(started.get() && !stopped.get(), "not started!");

ZkUtils zkUtils = ZkUtils.apply(getZookeeperConnectString(), 30_000, 30_000, false);
try {
for (String topic : topics) {
AdminUtils.createTopic(zkUtils, topic, partitions, replication, topicProperties, RackAwareMode.Disabled$.MODULE$);
NewTopic newTopic = new NewTopic(topic, partitions, (short) replication);
newTopic.configs(Maps.fromProperties(topicProperties));
adminClient.createTopics(Collections.singleton(newTopic)).all().get();
}
}
finally {
zkUtils.close();
catch (InterruptedException | ExecutionException e) {
throw new RuntimeException("Failed to create topics", e);
}
}

Expand Down
19 changes: 18 additions & 1 deletion presto-product-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
<scala.version>2.12.2</scala.version>
</properties>

<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.apache.avro</groupId>
Expand Down Expand Up @@ -53,8 +60,14 @@
<artifactId>tempto-ldap</artifactId>
</dependency>
<dependency>
<groupId>io.prestodb.tempto</groupId>
<groupId>com.github.adkharat.tempto</groupId>
<artifactId>tempto-kafka</artifactId>
<exclusions>
<exclusion>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.prestodb.tempto</groupId>
Expand Down Expand Up @@ -141,6 +154,10 @@
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down