From a9b007d518ac4916c48b8fcad8cc468aedfea097 Mon Sep 17 00:00:00 2001 From: Enrico Bianchi Date: Sun, 9 Jul 2023 18:04:52 +0200 Subject: [PATCH 1/4] Added java block in build.gradle --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 4bebb356..92fef640 100644 --- a/build.gradle +++ b/build.gradle @@ -130,6 +130,11 @@ artifacts { archives javadocJar, sourcesJar } +java { + withSourcesJar() + withJavadocJar() +} + if (hasProperty("publish")) { publishing { From c71ef941d819c1c29cc3f5af61ba9bb4a6f9b4d3 Mon Sep 17 00:00:00 2001 From: Enrico Bianchi Date: Sun, 13 Aug 2023 22:42:06 +0200 Subject: [PATCH 2/4] Updated minimum TLS version --- .github/workflows/gradle.yml | 2 +- src/main/java/io/github/jopenlibs/vault/SslConfig.java | 4 ++-- src/main/java/io/github/jopenlibs/vault/rest/Rest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8423b6aa..b5eda6cc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,7 +17,6 @@ jobs: java: - 11 vault: - - 1.11.12 - 1.12.0 - 1.12.1 - 1.12.2 @@ -33,6 +32,7 @@ jobs: - 1.13.3 - 1.13.4 - 1.14.0 + - 1.14.1 - latest os: - ubuntu-latest diff --git a/src/main/java/io/github/jopenlibs/vault/SslConfig.java b/src/main/java/io/github/jopenlibs/vault/SslConfig.java index 78dc75a5..e2adc5e3 100644 --- a/src/main/java/io/github/jopenlibs/vault/SslConfig.java +++ b/src/main/java/io/github/jopenlibs/vault/SslConfig.java @@ -578,7 +578,7 @@ private SSLContext buildSslContextFromJks() throws VaultException { } try { - final SSLContext sslContext = SSLContext.getInstance("TLS"); + final SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); sslContext.init(keyManagers, trustManagers, null); return sslContext; } catch (NoSuchAlgorithmException | KeyManagementException e) { @@ -643,7 +643,7 @@ private SSLContext buildSslContextFromPem() throws VaultException { keyManagers = keyManagerFactory.getKeyManagers(); } - final SSLContext sslContext = SSLContext.getInstance("TLS"); + final SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); sslContext.init(keyManagers, trustManagers, null); return sslContext; } catch (CertificateException | IOException | NoSuchAlgorithmException | KeyStoreException | diff --git a/src/main/java/io/github/jopenlibs/vault/rest/Rest.java b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java index 782789b0..8aa5d545 100644 --- a/src/main/java/io/github/jopenlibs/vault/rest/Rest.java +++ b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java @@ -76,7 +76,7 @@ public class Rest { static { try { - DISABLED_SSL_CONTEXT = SSLContext.getInstance("TLS"); + DISABLED_SSL_CONTEXT = SSLContext.getInstance("TLSv1.2"); DISABLED_SSL_CONTEXT.init(null, new TrustManager[]{new X509TrustManager() { @Override public void checkClientTrusted(final X509Certificate[] x509Certificates, From 1508a930e120ce056a1a4b4d083e09d643916302 Mon Sep 17 00:00:00 2001 From: Enrico Bianchi Date: Mon, 14 Aug 2023 17:08:05 +0200 Subject: [PATCH 3/4] Increased HTTP timeout connection in test --- .../java/io/github/jopenlibs/vault/ConnectionReUsageTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java b/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java index 544da225..10b7a8f6 100644 --- a/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java +++ b/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java @@ -52,7 +52,7 @@ public void readShouldReuseConnectionAfterSuccessfulRequestByHttp() throws Excep int readNum = 10; HttpClient httpClient = HttpClient.newBuilder() - .connectTimeout(Duration.of(5, ChronoUnit.SECONDS)) + .connectTimeout(Duration.of(10, ChronoUnit.SECONDS)) .build(); Logical vault = Vault.create(new VaultConfig() From aa1fd69c8b8f5bd38e5fc96dea20ae5be79ab734 Mon Sep 17 00:00:00 2001 From: Enrico Bianchi Date: Mon, 14 Aug 2023 17:50:14 +0200 Subject: [PATCH 4/4] Increased HTTP read timeout in test --- .../java/io/github/jopenlibs/vault/ConnectionReUsageTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java b/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java index 10b7a8f6..7c6f652f 100644 --- a/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java +++ b/src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java @@ -59,7 +59,7 @@ public void readShouldReuseConnectionAfterSuccessfulRequestByHttp() throws Excep .httpClient(httpClient) .address("http://localhost:8999") .token(TOKEN) - .readTimeout(1) + .readTimeout(10) .engineVersion(1) .build()).logical();