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

[MqyrvomD] Upgrade lettuce version to 6.2.5 to mitigate CVE-2023-34462 #3688

Merged
merged 1 commit into from
Jul 31, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ Here is a list of all available Redis procedures:
== Install Dependencies

The Redis procedures have dependencies on a client library that is not included in the APOC Library.
You can download it from https://github.com/lettuce-io/lettuce-core/releases/tag/6.1.9.RELEASE[the lettuce-core repository](except for `netty` jars because they are already included within neo4j)
You can download it from https://github.com/lettuce-io/lettuce-core/releases/tag/6.2.5.RELEASE[the lettuce-core repository](except for `netty` jars because they are already included within neo4j)
or https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-redis-dependencies-{apoc-release}.jar[apoc repository]
Once that file is downloaded, it should be placed in the `plugins` directory and the Neo4j Server restarted.

[[redis-uri]]
== URI description

The first parameter of Redis procedure is always the URI.
This URI follows https://lettuce.io/core/release/reference/#redisuri.uri-syntax[this sintax].
This URI follows https://lettuce.io/core/release/reference/#redisuri.uri-syntax[this syntax].
One example of valid uri is `redis://myPassword@localhost:6379`


Expand Down
2 changes: 1 addition & 1 deletion extra-dependencies/redis/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jar {
}

dependencies {
compile group: 'io.lettuce', name: 'lettuce-core', version: '6.1.9.RELEASE', {
compile group: 'io.lettuce', name: 'lettuce-core', version: '6.2.5.RELEASE', {
exclude group: 'io.netty'
}
}
4 changes: 2 additions & 2 deletions full/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ dependencies {
compileOnly group: 'com.couchbase.client', name: 'java-client', version: '3.3.0', withoutJacksons
testCompile group: 'com.couchbase.client', name: 'java-client', version: '3.3.0', withoutJacksons

compileOnly group: 'io.lettuce', name: 'lettuce-core', version: '6.1.9.RELEASE'
testCompile group: 'io.lettuce', name: 'lettuce-core', version: '6.1.9.RELEASE'
compileOnly group: 'io.lettuce', name: 'lettuce-core', version: '6.2.5.RELEASE'
testCompile group: 'io.lettuce', name: 'lettuce-core', version: '6.2.5.RELEASE'

compileOnly group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective

Expand Down
4 changes: 2 additions & 2 deletions full/src/main/java/apoc/redis/RedisConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public RedisConnection getRedisConnection(String uri, Map<String, Object> config
return (RedisConnection) constructor.newInstance(uri, redisConfig);
} catch (NoClassDefFoundError e) {
throw new MissingDependencyException("Cannot find the Redis client jar. \n" +
"Please put the lettuce-core-6.1.9.RELEASE.jar into plugin folder. \n" +
"See the documentation: https://neo4j.com/labs/apoc/4.1/database-integration/redis/");
"Please put the lettuce-core-6.2.5.RELEASE.jar into plugin folder. \n" +
"See the documentation: https://neo4j.com/labs/apoc/4.4/database-integration/redis/");
} catch (Exception e) {
throw new RuntimeException(e);
}
Expand Down