This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
The following commit(s) were added to refs/heads/master by this push:
new c798e6f Fixes #217 . Renamed whitelist to allowlist
new 4642e2c Merge pull request #221 from
AdrianMirica/renaming-whitelist-to-allowlist
c798e6f is described below
commit c798e6f4a6aaa045bdd2c7a426c1e76a35bfc39e
Author: Adrian Mirica <[email protected]>
AuthorDate: Fri Apr 30 10:29:53 2021 +0300
Fixes #217 . Renamed whitelist to allowlist
---
.../net/tls/ClientFingerprintTrustManager.java | 2 +-
.../net/tls/ServerFingerprintTrustManager.java | 2 +-
.../tuweni/net/tls/TrustManagerFactories.java | 48 +++++++++++-----------
.../apache/tuweni/net/tls/VertxTrustOptions.java | 48 +++++++++++-----------
...WhitelistTest.java => ClientAllowlistTest.java} | 8 ++--
...elistTest.java => ClientCaOrAllowlistTest.java} | 8 ++--
...WhitelistTest.java => ServerAllowlistTest.java} | 8 ++--
...elistTest.java => ServerCaOrAllowlistTest.java} | 8 ++--
8 files changed, 66 insertions(+), 66 deletions(-)
diff --git
a/net/src/main/java/org/apache/tuweni/net/tls/ClientFingerprintTrustManager.java
b/net/src/main/java/org/apache/tuweni/net/tls/ClientFingerprintTrustManager.java
index d701b51..623fd11 100644
---
a/net/src/main/java/org/apache/tuweni/net/tls/ClientFingerprintTrustManager.java
+++
b/net/src/main/java/org/apache/tuweni/net/tls/ClientFingerprintTrustManager.java
@@ -41,7 +41,7 @@ final class ClientFingerprintTrustManager extends
X509ExtendedTrustManager {
return new ClientFingerprintTrustManager(repository, true, false);
}
- static ClientFingerprintTrustManager whitelist(FingerprintRepository
repository) {
+ static ClientFingerprintTrustManager allowlist(FingerprintRepository
repository) {
return new ClientFingerprintTrustManager(repository, false, false);
}
diff --git
a/net/src/main/java/org/apache/tuweni/net/tls/ServerFingerprintTrustManager.java
b/net/src/main/java/org/apache/tuweni/net/tls/ServerFingerprintTrustManager.java
index 174d04c..c75929c 100644
---
a/net/src/main/java/org/apache/tuweni/net/tls/ServerFingerprintTrustManager.java
+++
b/net/src/main/java/org/apache/tuweni/net/tls/ServerFingerprintTrustManager.java
@@ -37,7 +37,7 @@ final class ServerFingerprintTrustManager extends
X509ExtendedTrustManager {
return new ServerFingerprintTrustManager(repository, true, false);
}
- static ServerFingerprintTrustManager whitelist(FingerprintRepository
repository) {
+ static ServerFingerprintTrustManager allowlist(FingerprintRepository
repository) {
return new ServerFingerprintTrustManager(repository, false, false);
}
diff --git
a/net/src/main/java/org/apache/tuweni/net/tls/TrustManagerFactories.java
b/net/src/main/java/org/apache/tuweni/net/tls/TrustManagerFactories.java
index 2062f1d..537dd3b 100644
--- a/net/src/main/java/org/apache/tuweni/net/tls/TrustManagerFactories.java
+++ b/net/src/main/java/org/apache/tuweni/net/tls/TrustManagerFactories.java
@@ -258,9 +258,9 @@ public final class TrustManagerFactories {
* @param knownServersFile The path to the file containing fingerprints by
host.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistServers(Path knownServersFile) {
+ public static TrustManagerFactory allowlistServers(Path knownServersFile) {
requireNonNull(knownServersFile);
- return whitelistServers(new
FileBackedFingerprintRepository(knownServersFile));
+ return allowlistServers(new
FileBackedFingerprintRepository(knownServersFile));
}
/**
@@ -273,9 +273,9 @@ public final class TrustManagerFactories {
* @param repository The repository in which to record fingerprints by host.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistServers(FingerprintRepository
repository) {
+ public static TrustManagerFactory allowlistServers(FingerprintRepository
repository) {
requireNonNull(repository);
- return whitelistServers(repository, true);
+ return allowlistServers(repository, true);
}
/**
@@ -289,9 +289,9 @@ public final class TrustManagerFactories {
* @param acceptCASigned If {@code true}, CA-signed certificates will always
be accepted.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistServers(Path knownServersFile,
boolean acceptCASigned) {
+ public static TrustManagerFactory allowlistServers(Path knownServersFile,
boolean acceptCASigned) {
requireNonNull(knownServersFile);
- return whitelistServers(new
FileBackedFingerprintRepository(knownServersFile), acceptCASigned);
+ return allowlistServers(new
FileBackedFingerprintRepository(knownServersFile), acceptCASigned);
}
/**
@@ -305,9 +305,9 @@ public final class TrustManagerFactories {
* @param acceptCASigned If {@code true}, CA-signed certificates will always
be accepted.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistServers(FingerprintRepository
repository, boolean acceptCASigned) {
+ public static TrustManagerFactory allowlistServers(FingerprintRepository
repository, boolean acceptCASigned) {
requireNonNull(repository);
- return wrap(ServerFingerprintTrustManager.whitelist(repository),
acceptCASigned);
+ return wrap(ServerFingerprintTrustManager.allowlist(repository),
acceptCASigned);
}
/**
@@ -321,10 +321,10 @@ public final class TrustManagerFactories {
* @param tmf A {@link TrustManagerFactory} for checking server certificates
against a CA.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistServers(Path knownServersFile,
TrustManagerFactory tmf) {
+ public static TrustManagerFactory allowlistServers(Path knownServersFile,
TrustManagerFactory tmf) {
requireNonNull(knownServersFile);
requireNonNull(tmf);
- return whitelistServers(new
FileBackedFingerprintRepository(knownServersFile), tmf);
+ return allowlistServers(new
FileBackedFingerprintRepository(knownServersFile), tmf);
}
/**
@@ -338,10 +338,10 @@ public final class TrustManagerFactories {
* @param tmf A {@link TrustManagerFactory} for checking server certificates
against a CA.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistServers(FingerprintRepository
repository, TrustManagerFactory tmf) {
+ public static TrustManagerFactory allowlistServers(FingerprintRepository
repository, TrustManagerFactory tmf) {
requireNonNull(repository);
requireNonNull(tmf);
- return wrap(ServerFingerprintTrustManager.whitelist(repository), tmf);
+ return wrap(ServerFingerprintTrustManager.allowlist(repository), tmf);
}
/**
@@ -611,9 +611,9 @@ public final class TrustManagerFactories {
* @param knownClientsFile The path to the file containing fingerprints.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistClients(Path knownClientsFile) {
+ public static TrustManagerFactory allowlistClients(Path knownClientsFile) {
requireNonNull(knownClientsFile);
- return whitelistClients(new
FileBackedFingerprintRepository(knownClientsFile));
+ return allowlistClients(new
FileBackedFingerprintRepository(knownClientsFile));
}
/**
@@ -625,9 +625,9 @@ public final class TrustManagerFactories {
* @param repository The repository containing fingerprints.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistClients(FingerprintRepository
repository) {
+ public static TrustManagerFactory allowlistClients(FingerprintRepository
repository) {
requireNonNull(repository);
- return whitelistClients(repository, true);
+ return allowlistClients(repository, true);
}
/**
@@ -640,9 +640,9 @@ public final class TrustManagerFactories {
* @param acceptCASigned If {@code true}, CA-signed certificates will always
be accepted.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistClients(Path knownClientsFile,
boolean acceptCASigned) {
+ public static TrustManagerFactory allowlistClients(Path knownClientsFile,
boolean acceptCASigned) {
requireNonNull(knownClientsFile);
- return whitelistClients(new
FileBackedFingerprintRepository(knownClientsFile), acceptCASigned);
+ return allowlistClients(new
FileBackedFingerprintRepository(knownClientsFile), acceptCASigned);
}
/**
@@ -655,9 +655,9 @@ public final class TrustManagerFactories {
* @param acceptCASigned If {@code true}, CA-signed certificates will always
be accepted.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistClients(FingerprintRepository
repository, boolean acceptCASigned) {
+ public static TrustManagerFactory allowlistClients(FingerprintRepository
repository, boolean acceptCASigned) {
requireNonNull(repository);
- return wrap(ClientFingerprintTrustManager.whitelist(repository),
acceptCASigned);
+ return wrap(ClientFingerprintTrustManager.allowlist(repository),
acceptCASigned);
}
/**
@@ -670,10 +670,10 @@ public final class TrustManagerFactories {
* @param tmf A {@link TrustManagerFactory} for checking server certificates
against a CA.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistClients(Path knownClientsFile,
TrustManagerFactory tmf) {
+ public static TrustManagerFactory allowlistClients(Path knownClientsFile,
TrustManagerFactory tmf) {
requireNonNull(knownClientsFile);
requireNonNull(tmf);
- return whitelistClients(new
FileBackedFingerprintRepository(knownClientsFile), tmf);
+ return allowlistClients(new
FileBackedFingerprintRepository(knownClientsFile), tmf);
}
/**
@@ -686,10 +686,10 @@ public final class TrustManagerFactories {
* @param tmf A {@link TrustManagerFactory} for checking server certificates
against a CA.
* @return A trust manager factory.
*/
- public static TrustManagerFactory whitelistClients(FingerprintRepository
repository, TrustManagerFactory tmf) {
+ public static TrustManagerFactory allowlistClients(FingerprintRepository
repository, TrustManagerFactory tmf) {
requireNonNull(repository);
requireNonNull(tmf);
- return wrap(ClientFingerprintTrustManager.whitelist(repository), tmf);
+ return wrap(ClientFingerprintTrustManager.allowlist(repository), tmf);
}
private static TrustManagerFactory wrap(X509TrustManager trustManager,
boolean acceptCASigned) {
diff --git a/net/src/main/java/org/apache/tuweni/net/tls/VertxTrustOptions.java
b/net/src/main/java/org/apache/tuweni/net/tls/VertxTrustOptions.java
index cc64b02..e3d15ae 100644
--- a/net/src/main/java/org/apache/tuweni/net/tls/VertxTrustOptions.java
+++ b/net/src/main/java/org/apache/tuweni/net/tls/VertxTrustOptions.java
@@ -241,8 +241,8 @@ public final class VertxTrustOptions {
* @param knownServersFile The path to the file containing fingerprints by
host.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistServers(Path knownServersFile) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistServers(knownServersFile));
+ public static TrustOptions allowlistServers(Path knownServersFile) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistServers(knownServersFile));
}
/**
@@ -255,8 +255,8 @@ public final class VertxTrustOptions {
* @param repository The repository containing fingerprints by host.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistServers(FingerprintRepository
repository) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistServers(repository));
+ public static TrustOptions allowlistServers(FingerprintRepository
repository) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistServers(repository));
}
/**
@@ -270,8 +270,8 @@ public final class VertxTrustOptions {
* @param acceptCASigned If {@code true}, CA-signed certificates will always
be accepted.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistServers(Path knownServersFile, boolean
acceptCASigned) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistServers(knownServersFile,
acceptCASigned));
+ public static TrustOptions allowlistServers(Path knownServersFile, boolean
acceptCASigned) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistServers(knownServersFile,
acceptCASigned));
}
/**
@@ -285,8 +285,8 @@ public final class VertxTrustOptions {
* @param acceptCASigned If {@code true}, CA-signed certificates will always
be accepted.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistServers(FingerprintRepository
repository, boolean acceptCASigned) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistServers(repository,
acceptCASigned));
+ public static TrustOptions allowlistServers(FingerprintRepository
repository, boolean acceptCASigned) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistServers(repository,
acceptCASigned));
}
/**
@@ -300,8 +300,8 @@ public final class VertxTrustOptions {
* @param tmf A {@link TrustManagerFactory} for checking server certificates
against a CA.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistServers(Path knownServersFile,
TrustManagerFactory tmf) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistServers(knownServersFile,
tmf));
+ public static TrustOptions allowlistServers(Path knownServersFile,
TrustManagerFactory tmf) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistServers(knownServersFile,
tmf));
}
/**
@@ -315,8 +315,8 @@ public final class VertxTrustOptions {
* @param tmf A {@link TrustManagerFactory} for checking server certificates
against a CA.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistServers(FingerprintRepository
repository, TrustManagerFactory tmf) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistServers(repository,
tmf));
+ public static TrustOptions allowlistServers(FingerprintRepository
repository, TrustManagerFactory tmf) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistServers(repository,
tmf));
}
/**
@@ -571,8 +571,8 @@ public final class VertxTrustOptions {
* @param knownClientsFile The path to the file containing fingerprints by
common name.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistClients(Path knownClientsFile) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistClients(knownClientsFile));
+ public static TrustOptions allowlistClients(Path knownClientsFile) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistClients(knownClientsFile));
}
/**
@@ -585,8 +585,8 @@ public final class VertxTrustOptions {
* @param repository The repository containing fingerprints by common name.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistClients(FingerprintRepository
repository) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistClients(repository));
+ public static TrustOptions allowlistClients(FingerprintRepository
repository) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistClients(repository));
}
/**
@@ -599,8 +599,8 @@ public final class VertxTrustOptions {
* @param acceptCASigned If {@code true}, CA-signed certificates will always
be accepted.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistClients(Path knownClientsFile, boolean
acceptCASigned) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistClients(knownClientsFile,
acceptCASigned));
+ public static TrustOptions allowlistClients(Path knownClientsFile, boolean
acceptCASigned) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistClients(knownClientsFile,
acceptCASigned));
}
/**
@@ -613,8 +613,8 @@ public final class VertxTrustOptions {
* @param acceptCASigned If {@code true}, CA-signed certificates will always
be accepted.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistClients(FingerprintRepository
repository, boolean acceptCASigned) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistClients(repository,
acceptCASigned));
+ public static TrustOptions allowlistClients(FingerprintRepository
repository, boolean acceptCASigned) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistClients(repository,
acceptCASigned));
}
/**
@@ -628,8 +628,8 @@ public final class VertxTrustOptions {
* @param tmf A {@link TrustManagerFactory} for checking client certificates
against a CA.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistClients(Path knownClientsFile,
TrustManagerFactory tmf) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistClients(knownClientsFile,
tmf));
+ public static TrustOptions allowlistClients(Path knownClientsFile,
TrustManagerFactory tmf) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistClients(knownClientsFile,
tmf));
}
/**
@@ -643,7 +643,7 @@ public final class VertxTrustOptions {
* @param tmf A {@link TrustManagerFactory} for checking client certificates
against a CA.
* @return A Vert.x {@link TrustOptions}.
*/
- public static TrustOptions whitelistClients(FingerprintRepository
repository, TrustManagerFactory tmf) {
- return new
TrustManagerFactoryWrapper(TrustManagerFactories.whitelistClients(repository,
tmf));
+ public static TrustOptions allowlistClients(FingerprintRepository
repository, TrustManagerFactory tmf) {
+ return new
TrustManagerFactoryWrapper(TrustManagerFactories.allowlistClients(repository,
tmf));
}
}
diff --git
a/net/src/test/java/org/apache/tuweni/net/tls/ClientWhitelistTest.java
b/net/src/test/java/org/apache/tuweni/net/tls/ClientAllowlistTest.java
similarity index 97%
rename from net/src/test/java/org/apache/tuweni/net/tls/ClientWhitelistTest.java
rename to net/src/test/java/org/apache/tuweni/net/tls/ClientAllowlistTest.java
index a6a3bc4..4fe6448 100644
--- a/net/src/test/java/org/apache/tuweni/net/tls/ClientWhitelistTest.java
+++ b/net/src/test/java/org/apache/tuweni/net/tls/ClientAllowlistTest.java
@@ -48,7 +48,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(TempDirectoryExtension.class)
@ExtendWith(VertxExtension.class)
-class ClientWhitelistTest {
+class ClientAllowlistTest {
private static String caValidFingerprint;
private static HttpServer caValidServer;
@@ -96,7 +96,7 @@ class ClientWhitelistTest {
HttpClientOptions options = new HttpClientOptions();
options
.setSsl(true)
- .setTrustOptions(VertxTrustOptions.whitelistServers(knownServersFile,
false))
+ .setTrustOptions(VertxTrustOptions.allowlistServers(knownServersFile,
false))
.setConnectTimeout(1500)
.setReuseAddress(true)
.setReusePort(true);
@@ -143,7 +143,7 @@ class ClientWhitelistTest {
}
@Test
- void shouldValidateWhitelisted() {
+ void shouldValidateAllowlisted() {
CompletableFuture<Integer> statusCode = new CompletableFuture<>();
client
.post(fooServer.actualPort(), "localhost", "/sample", response ->
statusCode.complete(response.statusCode()))
@@ -153,7 +153,7 @@ class ClientWhitelistTest {
}
@Test
- void shouldRejectNonWhitelisted() {
+ void shouldRejectNonAllowlisted() {
CompletableFuture<Integer> statusCode = new CompletableFuture<>();
client
.post(barServer.actualPort(), "localhost", "/sample", response ->
statusCode.complete(response.statusCode()))
diff --git
a/net/src/test/java/org/apache/tuweni/net/tls/ClientCaOrWhitelistTest.java
b/net/src/test/java/org/apache/tuweni/net/tls/ClientCaOrAllowlistTest.java
similarity index 97%
rename from
net/src/test/java/org/apache/tuweni/net/tls/ClientCaOrWhitelistTest.java
rename to
net/src/test/java/org/apache/tuweni/net/tls/ClientCaOrAllowlistTest.java
index e8b54bb..5060ffe 100644
--- a/net/src/test/java/org/apache/tuweni/net/tls/ClientCaOrWhitelistTest.java
+++ b/net/src/test/java/org/apache/tuweni/net/tls/ClientCaOrAllowlistTest.java
@@ -48,7 +48,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(TempDirectoryExtension.class)
@ExtendWith(VertxExtension.class)
-class ClientCaOrWhitelistTest {
+class ClientCaOrAllowlistTest {
private static HttpServer caValidServer;
private static String fooFingerprint;
@@ -94,7 +94,7 @@ class ClientCaOrWhitelistTest {
HttpClientOptions options = new HttpClientOptions();
options
.setSsl(true)
- .setTrustOptions(VertxTrustOptions.whitelistServers(knownServersFile))
+ .setTrustOptions(VertxTrustOptions.allowlistServers(knownServersFile))
.setConnectTimeout(1500)
.setReuseAddress(true)
.setReusePort(true);
@@ -135,7 +135,7 @@ class ClientCaOrWhitelistTest {
}
@Test
- void shouldValidateWhitelisted() {
+ void shouldValidateAllowlisted() {
CompletableFuture<Integer> statusCode = new CompletableFuture<>();
client
.post(fooServer.actualPort(), "localhost", "/sample", response ->
statusCode.complete(response.statusCode()))
@@ -145,7 +145,7 @@ class ClientCaOrWhitelistTest {
}
@Test
- void shouldRejectNonWhitelisted() {
+ void shouldRejectNonAllowlisted() {
CompletableFuture<Integer> statusCode = new CompletableFuture<>();
client
.post(barServer.actualPort(), "localhost", "/sample", response ->
statusCode.complete(response.statusCode()))
diff --git
a/net/src/test/java/org/apache/tuweni/net/tls/ServerWhitelistTest.java
b/net/src/test/java/org/apache/tuweni/net/tls/ServerAllowlistTest.java
similarity index 97%
rename from net/src/test/java/org/apache/tuweni/net/tls/ServerWhitelistTest.java
rename to net/src/test/java/org/apache/tuweni/net/tls/ServerAllowlistTest.java
index 943ecc4..099385e 100644
--- a/net/src/test/java/org/apache/tuweni/net/tls/ServerWhitelistTest.java
+++ b/net/src/test/java/org/apache/tuweni/net/tls/ServerAllowlistTest.java
@@ -48,7 +48,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(TempDirectoryExtension.class)
@ExtendWith(VertxExtension.class)
-class ServerWhitelistTest {
+class ServerAllowlistTest {
private static HttpClient caClient;
private static String fooFingerprint;
@@ -104,7 +104,7 @@ class ServerWhitelistTest {
.setSsl(true)
.setClientAuth(ClientAuth.REQUIRED)
.setPemKeyCertOptions(serverCert.keyCertOptions())
- .setTrustOptions(VertxTrustOptions.whitelistClients(knownClientsFile,
false))
+ .setTrustOptions(VertxTrustOptions.allowlistClients(knownClientsFile,
false))
.setIdleTimeout(1500)
.setReuseAddress(true)
.setReusePort(true);
@@ -140,7 +140,7 @@ class ServerWhitelistTest {
}
@Test
- void shouldValidateWhitelisted() {
+ void shouldValidateAllowlisted() {
HttpClientRequest req = fooClient.get(httpServer.actualPort(),
"localhost", "/upcheck");
CompletableFuture<HttpClientResponse> respFuture = new
CompletableFuture<>();
req.handler(respFuture::complete).exceptionHandler(respFuture::completeExceptionally).end();
@@ -149,7 +149,7 @@ class ServerWhitelistTest {
}
@Test
- void shouldRejectNonWhitelisted() {
+ void shouldRejectNonAllowlisted() {
HttpClientRequest req = barClient.get(httpServer.actualPort(),
"localhost", "/upcheck");
CompletableFuture<HttpClientResponse> respFuture = new
CompletableFuture<>();
req.handler(respFuture::complete).exceptionHandler(respFuture::completeExceptionally).end();
diff --git
a/net/src/test/java/org/apache/tuweni/net/tls/ServerCaOrWhitelistTest.java
b/net/src/test/java/org/apache/tuweni/net/tls/ServerCaOrAllowlistTest.java
similarity index 97%
rename from
net/src/test/java/org/apache/tuweni/net/tls/ServerCaOrWhitelistTest.java
rename to
net/src/test/java/org/apache/tuweni/net/tls/ServerCaOrAllowlistTest.java
index ad1e0ed..4c47690 100644
--- a/net/src/test/java/org/apache/tuweni/net/tls/ServerCaOrWhitelistTest.java
+++ b/net/src/test/java/org/apache/tuweni/net/tls/ServerCaOrAllowlistTest.java
@@ -48,7 +48,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(TempDirectoryExtension.class)
@ExtendWith(VertxExtension.class)
-class ServerCaOrWhitelistTest {
+class ServerCaOrAllowlistTest {
private static HttpClient caClient;
private static String fooFingerprint;
@@ -104,7 +104,7 @@ class ServerCaOrWhitelistTest {
.setSsl(true)
.setClientAuth(ClientAuth.REQUIRED)
.setPemKeyCertOptions(serverCert.keyCertOptions())
- .setTrustOptions(VertxTrustOptions.whitelistClients(knownClientsFile))
+ .setTrustOptions(VertxTrustOptions.allowlistClients(knownClientsFile))
.setIdleTimeout(1500)
.setReuseAddress(true)
.setReusePort(true);
@@ -139,7 +139,7 @@ class ServerCaOrWhitelistTest {
}
@Test
- void shouldValidateWhitelisted() {
+ void shouldValidateAllowlisted() {
HttpClientRequest req = fooClient.get(httpServer.actualPort(),
"localhost", "/upcheck");
CompletableFuture<HttpClientResponse> respFuture = new
CompletableFuture<>();
req.handler(respFuture::complete).exceptionHandler(respFuture::completeExceptionally).end();
@@ -148,7 +148,7 @@ class ServerCaOrWhitelistTest {
}
@Test
- void shouldRejectNonWhitelisted() {
+ void shouldRejectNonAllowlisted() {
HttpClientRequest req = barClient.get(httpServer.actualPort(),
"localhost", "/upcheck");
CompletableFuture<HttpClientResponse> respFuture = new
CompletableFuture<>();
req.handler(respFuture::complete).exceptionHandler(respFuture::completeExceptionally).end();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
