Skip to content

Move mTLS support to GA status #1587

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

Merged
merged 1 commit into from
Nov 20, 2024
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
2 changes: 0 additions & 2 deletions driver/src/main/java/org/neo4j/driver/ClientCertificate.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
package org.neo4j.driver;

import org.neo4j.driver.internal.InternalClientCertificate;
import org.neo4j.driver.util.Preview;

/**
* An opaque container for client certificate used for mTLS.
* <p>
* Use {@link ClientCertificates} to create new instances.
* @since 5.19
*/
@Preview(name = "mTLS")
public sealed interface ClientCertificate permits InternalClientCertificate {}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.neo4j.driver;

import java.util.concurrent.CompletionStage;
import org.neo4j.driver.util.Preview;

/**
* A manager of {@link ClientCertificate} instances used by the driver for mTLS.
Expand All @@ -31,7 +30,6 @@
* operations must not done on the calling thread.
* @since 5.19
*/
@Preview(name = "mTLS")
public interface ClientCertificateManager {
/**
* Returns a {@link CompletionStage} of a new {@link ClientCertificate}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@
package org.neo4j.driver;

import org.neo4j.driver.internal.InternalRotatingClientCertificateManager;
import org.neo4j.driver.util.Preview;

/**
* Implementations of {@link ClientCertificateManager}.
*
* @since 5.19
*/
@Preview(name = "mTLS")
public final class ClientCertificateManagers {
private ClientCertificateManagers() {}

Expand Down
2 changes: 0 additions & 2 deletions driver/src/main/java/org/neo4j/driver/ClientCertificates.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
import java.io.File;
import java.util.Objects;
import org.neo4j.driver.internal.InternalClientCertificate;
import org.neo4j.driver.util.Preview;

/**
* Creates new instances of {@link ClientCertificate}.
* @since 5.19
*/
@Preview(name = "mTLS")
public final class ClientCertificates {
private ClientCertificates() {}

Expand Down
13 changes: 0 additions & 13 deletions driver/src/main/java/org/neo4j/driver/GraphDatabase.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.neo4j.driver.internal.ValidatingClientCertificateManager;
import org.neo4j.driver.internal.security.StaticAuthTokenManager;
import org.neo4j.driver.internal.security.ValidatingAuthTokenManager;
import org.neo4j.driver.util.Preview;

/**
* Creates {@link Driver drivers}, optionally letting you {@link #driver(URI, Config)} to configure them.
Expand Down Expand Up @@ -190,7 +189,6 @@ public static Driver driver(String uri, AuthTokenManager authTokenManager, Confi
* @since 5.19
* @see ClientCertificateManager
*/
@Preview(name = "mTLS")
public static Driver driver(String uri, ClientCertificateManager clientCertificateManager) {
return driver(URI.create(uri), clientCertificateManager);
}
Expand All @@ -204,7 +202,6 @@ public static Driver driver(String uri, ClientCertificateManager clientCertifica
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(String uri, ClientCertificateManager clientCertificateManager, Config config) {
return driver(URI.create(uri), clientCertificateManager, config);
}
Expand All @@ -217,7 +214,6 @@ public static Driver driver(String uri, ClientCertificateManager clientCertifica
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(String uri, AuthToken authToken, ClientCertificateManager clientCertificateManager) {
return driver(URI.create(uri), authToken, clientCertificateManager);
}
Expand All @@ -232,7 +228,6 @@ public static Driver driver(String uri, AuthToken authToken, ClientCertificateMa
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(
String uri, AuthToken authToken, ClientCertificateManager clientCertificateManager, Config config) {
return driver(URI.create(uri), authToken, clientCertificateManager, config);
Expand All @@ -247,7 +242,6 @@ public static Driver driver(
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(
String uri, AuthTokenManager authTokenManager, ClientCertificateManager clientCertificateManager) {
return driver(URI.create(uri), authTokenManager, clientCertificateManager);
Expand All @@ -263,7 +257,6 @@ public static Driver driver(
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(
String uri,
AuthTokenManager authTokenManager,
Expand All @@ -279,7 +272,6 @@ public static Driver driver(
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(URI uri, ClientCertificateManager clientCertificateManager) {
return driver(uri, clientCertificateManager, Config.defaultConfig());
}
Expand All @@ -293,7 +285,6 @@ public static Driver driver(URI uri, ClientCertificateManager clientCertificateM
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(URI uri, ClientCertificateManager clientCertificateManager, Config config) {
return driver(uri, AuthTokens.none(), clientCertificateManager, config);
}
Expand All @@ -306,7 +297,6 @@ public static Driver driver(URI uri, ClientCertificateManager clientCertificateM
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(URI uri, AuthToken authToken, ClientCertificateManager clientCertificateManager) {
return driver(uri, authToken, clientCertificateManager, Config.defaultConfig());
}
Expand All @@ -321,7 +311,6 @@ public static Driver driver(URI uri, AuthToken authToken, ClientCertificateManag
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(
URI uri, AuthToken authToken, ClientCertificateManager clientCertificateManager, Config config) {
return driver(uri, authToken, clientCertificateManager, config, new DriverFactory());
Expand All @@ -336,7 +325,6 @@ public static Driver driver(
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(
URI uri, AuthTokenManager authTokenManager, ClientCertificateManager clientCertificateManager) {
return driver(uri, authTokenManager, clientCertificateManager, Config.defaultConfig());
Expand All @@ -352,7 +340,6 @@ public static Driver driver(
* @return a new driver to the database instance specified by the URL
* @since 5.19
*/
@Preview(name = "mTLS")
public static Driver driver(
URI uri,
AuthTokenManager authTokenManager,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@
*/
package org.neo4j.driver;

import org.neo4j.driver.util.Preview;

/**
* A {@link ClientCertificateManager} that supports rotating its {@link ClientCertificate}.
* @since 5.19
*/
@Preview(name = "mTLS")
public sealed interface RotatingClientCertificateManager extends ClientCertificateManager
permits org.neo4j.driver.internal.InternalRotatingClientCertificateManager {
/**
Expand Down