From cdf31a8acc6266d615a7bbc78b36d8b395e832b7 Mon Sep 17 00:00:00 2001 From: tledkov Date: Tue, 11 Oct 2022 15:07:17 +0300 Subject: [PATCH 1/6] VJD-15 Port the PR added X-Vault-Request header --- .../java/io/github/jopenlibs/vault/Vault.java | 1 + .../java/io/github/jopenlibs/vault/api/Auth.java | 15 +++++++++++++++ .../java/io/github/jopenlibs/vault/api/Debug.java | 1 + .../io/github/jopenlibs/vault/api/Leases.java | 4 ++++ .../io/github/jopenlibs/vault/api/Logical.java | 8 ++++++++ .../java/io/github/jopenlibs/vault/api/Seal.java | 3 +++ .../jopenlibs/vault/api/database/Database.java | 5 +++++ .../github/jopenlibs/vault/api/mounts/Mounts.java | 5 +++++ .../io/github/jopenlibs/vault/api/pki/Pki.java | 5 +++++ 9 files changed, 47 insertions(+) diff --git a/src/main/java/io/github/jopenlibs/vault/Vault.java b/src/main/java/io/github/jopenlibs/vault/Vault.java index b8fb0599..7fc73cdd 100644 --- a/src/main/java/io/github/jopenlibs/vault/Vault.java +++ b/src/main/java/io/github/jopenlibs/vault/Vault.java @@ -255,6 +255,7 @@ private Map collectSecretEngineVersions() { .url(vaultConfig.getAddress() + "/v1/sys/mounts") .header("X-Vault-Token", vaultConfig.getToken()) .header("X-Vault-Namespace", this.vaultConfig.getNameSpace()) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(vaultConfig.getOpenTimeout()) .readTimeoutSeconds(vaultConfig.getReadTimeout()) .sslVerification(vaultConfig.getSslConfig().isVerify()) diff --git a/src/main/java/io/github/jopenlibs/vault/api/Auth.java b/src/main/java/io/github/jopenlibs/vault/api/Auth.java index 87f681d0..e7a5c06f 100644 --- a/src/main/java/io/github/jopenlibs/vault/api/Auth.java +++ b/src/main/java/io/github/jopenlibs/vault/api/Auth.java @@ -381,6 +381,7 @@ public AuthResponse createToken(final TokenRequest tokenRequest, final String to .url(url) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -528,6 +529,7 @@ public AuthResponse loginByAppRole(final String path, final String roleId, final RestResponse restResponse = new Rest()//NOPMD .url(config.getAddress() + "/v1/auth/" + path + "/login") .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -604,6 +606,7 @@ public AuthResponse loginByUserPass(final String username, final String password final RestResponse restResponse = new Rest()//NOPMD .url(config.getAddress() + "/v1/auth/" + mount + "/login/" + username) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -723,6 +726,7 @@ public AuthResponse loginByAwsEc2(final String role, final String identity, .url(config.getAddress() + "/v1/auth/" + mount + "/login") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -789,6 +793,7 @@ public AuthResponse loginByAwsEc2(final String role, final String pkcs7, final S final RestResponse restResponse = new Rest()//NOPMD .url(config.getAddress() + "/v1/auth/" + mount + "/login") .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -864,6 +869,7 @@ public AuthResponse loginByAwsIam(final String role, final String iamRequestUrl, final RestResponse restResponse = new Rest()//NOPMD .url(config.getAddress() + "/v1/auth/" + mount + "/login") .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -936,6 +942,7 @@ public AuthResponse loginByGithub(final String githubToken, final String githubA final RestResponse restResponse = new Rest()//NOPMD .url(config.getAddress() + "/v1/auth/" + mount + "/login") .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -988,6 +995,7 @@ public AuthResponse loginByJwt(final String provider, final String role, final S final RestResponse restResponse = new Rest() .url(config.getAddress() + "/v1/auth/" + provider + "/login") .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -1119,6 +1127,7 @@ public AuthResponse loginByCert(final String certAuthMount) throws VaultExceptio final RestResponse restResponse = new Rest()//NOPMD .url(config.getAddress() + "/v1/auth/" + mount + "/login") .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -1191,6 +1200,7 @@ public AuthResponse renewSelf(final long increment, final String tokenAuthMount) .url(config.getAddress() + "/v1/auth/" + mount + "/renew-self") .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(increment < 0 ? null : requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -1246,6 +1256,7 @@ public LookupResponse lookupSelf(final String tokenAuthMount) throws VaultExcept .url(config.getAddress() + "/v1/auth/" + mount + "/lookup-self") .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -1294,6 +1305,7 @@ public LogicalResponse lookupWrap() throws VaultException { .url(config.getAddress() + "/v1/sys/wrapping/lookup") .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -1343,6 +1355,7 @@ public void revokeSelf(final String tokenAuthMount) throws VaultException { .url(config.getAddress() + "/v1/auth/" + mount + "/revoke-self") .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -1454,6 +1467,7 @@ public UnwrapResponse unwrap(final String wrappedToken) throws VaultException { .url(url) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -1549,6 +1563,7 @@ public WrapResponse wrap(final JsonObject jsonObject, int ttlInSec) throws Vault .header("X-Vault-Token", config.getToken()) .header("X-Vault-Wrap-TTL", Integer.toString(ttlInSec)) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) diff --git a/src/main/java/io/github/jopenlibs/vault/api/Debug.java b/src/main/java/io/github/jopenlibs/vault/api/Debug.java index d901af26..7b262060 100644 --- a/src/main/java/io/github/jopenlibs/vault/api/Debug.java +++ b/src/main/java/io/github/jopenlibs/vault/api/Debug.java @@ -101,6 +101,7 @@ public HealthResponse health( .url(config.getAddress() + "/v1/" + path) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) diff --git a/src/main/java/io/github/jopenlibs/vault/api/Leases.java b/src/main/java/io/github/jopenlibs/vault/api/Leases.java index 18ff9921..77cadd74 100644 --- a/src/main/java/io/github/jopenlibs/vault/api/Leases.java +++ b/src/main/java/io/github/jopenlibs/vault/api/Leases.java @@ -61,6 +61,7 @@ public VaultResponse revoke(final String leaseId) throws VaultException { .url(config.getAddress() + "/v1/sys/leases/revoke/" + leaseId) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -100,6 +101,7 @@ public VaultResponse revokePrefix(final String prefix) throws VaultException { .url(config.getAddress() + "/v1/sys/revoke-prefix/" + prefix) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -141,6 +143,7 @@ public VaultResponse revokeForce(final String prefix) throws VaultException { .url(config.getAddress() + "/v1/sys/revoke-force/" + prefix) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -188,6 +191,7 @@ public VaultResponse renew(final String leaseId, final long increment) throws Va .url(config.getAddress() + "/v1/sys/renew/" + leaseId) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(increment < 0 ? null : requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) diff --git a/src/main/java/io/github/jopenlibs/vault/api/Logical.java b/src/main/java/io/github/jopenlibs/vault/api/Logical.java index 425680a9..6347dd2b 100644 --- a/src/main/java/io/github/jopenlibs/vault/api/Logical.java +++ b/src/main/java/io/github/jopenlibs/vault/api/Logical.java @@ -90,6 +90,7 @@ private LogicalResponse read(final String path, final logicalOperations operatio config.getPrefixPathDepth(), operation)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -147,6 +148,7 @@ public LogicalResponse read(final String path, Boolean shouldRetry, final Intege config.getPrefixPathDepth(), logicalOperations.readV2)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .parameter("version", version.toString()) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -243,6 +245,7 @@ private LogicalResponse write(final String path, final Map nameV .getBytes(StandardCharsets.UTF_8)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -332,6 +335,7 @@ private LogicalResponse delete(final String path, final Logical.logicalOperation config.getPrefixPathDepth(), operation)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -381,6 +385,7 @@ public LogicalResponse delete(final String path, final int[] versions) throws Va config.getPrefixPathDepth())) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -440,6 +445,7 @@ public LogicalResponse unDelete(final String path, final int[] versions) throws config.getPrefixPathDepth())) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -486,6 +492,7 @@ public LogicalResponse destroy(final String path, final int[] versions) throws V config.getPrefixPathDepth())) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -522,6 +529,7 @@ public LogicalResponse upgrade(final String kvPath) throws VaultException { + "/tune")) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) diff --git a/src/main/java/io/github/jopenlibs/vault/api/Seal.java b/src/main/java/io/github/jopenlibs/vault/api/Seal.java index 22485a84..90a17392 100644 --- a/src/main/java/io/github/jopenlibs/vault/api/Seal.java +++ b/src/main/java/io/github/jopenlibs/vault/api/Seal.java @@ -48,6 +48,7 @@ public void seal() throws VaultException { .url(config.getAddress() + "/v1/sys/seal") .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -108,6 +109,7 @@ public SealResponse unseal(final String key, final Boolean reset) throws VaultEx final RestResponse restResponse = new Rest()//NOPMD .url(config.getAddress() + "/v1/sys/unseal") .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -151,6 +153,7 @@ public SealResponse sealStatus() throws VaultException { final RestResponse restResponse = new Rest()//NOPMD .url(config.getAddress() + "/v1/sys/seal-status") .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) diff --git a/src/main/java/io/github/jopenlibs/vault/api/database/Database.java b/src/main/java/io/github/jopenlibs/vault/api/database/Database.java index 24feeb70..074b5302 100644 --- a/src/main/java/io/github/jopenlibs/vault/api/database/Database.java +++ b/src/main/java/io/github/jopenlibs/vault/api/database/Database.java @@ -96,6 +96,7 @@ public DatabaseResponse createOrUpdateRole(final String roleName, roleName)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -141,6 +142,7 @@ public DatabaseResponse getRole(final String roleName) throws VaultException { roleName)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -192,6 +194,7 @@ public DatabaseResponse revoke(final String serialNumber) throws VaultException .url(String.format("%s/v1/%s/revoke", config.getAddress(), this.mountPath)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .body(requestJson.getBytes(StandardCharsets.UTF_8)) @@ -237,6 +240,7 @@ public DatabaseResponse deleteRole(final String roleName) throws VaultException roleName)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -283,6 +287,7 @@ public DatabaseResponse creds(final String roleName) throws VaultException { roleName)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) diff --git a/src/main/java/io/github/jopenlibs/vault/api/mounts/Mounts.java b/src/main/java/io/github/jopenlibs/vault/api/mounts/Mounts.java index 295c25ac..b9ea0c03 100644 --- a/src/main/java/io/github/jopenlibs/vault/api/mounts/Mounts.java +++ b/src/main/java/io/github/jopenlibs/vault/api/mounts/Mounts.java @@ -49,6 +49,7 @@ public MountResponse list() throws VaultException { final RestResponse restResponse = new Rest()//NOPMD .url(String.format("%s/v1/sys/mounts", config.getAddress())) .header("X-Vault-Token", config.getToken()) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -117,6 +118,7 @@ public MountResponse enable(final String path, final MountType type, final Mount final RestResponse restResponse = new Rest()//NOPMD .url(String.format("%s/v1/sys/mounts/%s", config.getAddress(), path)) .header("X-Vault-Token", config.getToken()) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -165,6 +167,7 @@ public MountResponse disable(final String path) throws VaultException { final RestResponse restResponse = new Rest()//NOPMD .url(String.format("%s/v1/sys/mounts/%s", config.getAddress(), path)) .header("X-Vault-Token", config.getToken()) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -212,6 +215,7 @@ public MountResponse read(final String path) throws VaultException { final RestResponse restResponse = new Rest()//NOPMD .url(String.format("%s/v1/sys/mounts/%s/tune", config.getAddress(), path)) .header("X-Vault-Token", config.getToken()) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -274,6 +278,7 @@ public MountResponse tune(final String path, final MountPayload payload) throws final RestResponse restResponse = new Rest()//NOPMD .url(String.format("%s/v1/sys/mounts/%s/tune", config.getAddress(), path)) .header("X-Vault-Token", config.getToken()) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) diff --git a/src/main/java/io/github/jopenlibs/vault/api/pki/Pki.java b/src/main/java/io/github/jopenlibs/vault/api/pki/Pki.java index 345817ff..a8e8dc43 100644 --- a/src/main/java/io/github/jopenlibs/vault/api/pki/Pki.java +++ b/src/main/java/io/github/jopenlibs/vault/api/pki/Pki.java @@ -122,6 +122,7 @@ public PkiResponse createOrUpdateRole(final String roleName, final RoleOptions o roleName)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) @@ -169,6 +170,7 @@ public PkiResponse getRole(final String roleName) throws VaultException { roleName)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -219,6 +221,7 @@ public PkiResponse revoke(final String serialNumber) throws VaultException { .url(String.format("%s/v1/%s/revoke", config.getAddress(), this.mountPath)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .body(requestJson.getBytes(StandardCharsets.UTF_8)) @@ -264,6 +267,7 @@ public PkiResponse deleteRole(final String roleName) throws VaultException { roleName)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) .sslVerification(config.getSslConfig().isVerify()) @@ -428,6 +432,7 @@ public PkiResponse issue( .url(String.format(endpoint, config.getAddress(), this.mountPath, roleName)) .header("X-Vault-Token", config.getToken()) .header("X-Vault-Namespace", this.nameSpace) + .header("X-Vault-Request", "true") .body(requestJson.getBytes(StandardCharsets.UTF_8)) .connectTimeoutSeconds(config.getOpenTimeout()) .readTimeoutSeconds(config.getReadTimeout()) From e115aae506e0ff9c597895fb1536384a3514d071 Mon Sep 17 00:00:00 2001 From: tledkov Date: Tue, 11 Oct 2022 15:42:10 +0300 Subject: [PATCH 2/6] VJD-15 wip --- src/main/java/io/github/jopenlibs/vault/rest/Rest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c2beb0e6..0c742dd9 100644 --- a/src/main/java/io/github/jopenlibs/vault/rest/Rest.java +++ b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java @@ -199,7 +199,7 @@ public Rest optionalHeader(final String name, final String value) { *

The number of seconds to wait before giving up on establishing an HTTP(S) connection.

* * @param connectTimeoutSeconds Number of seconds to wait for an HTTP(S) connection to successfully establish - * @return This object, with connectTimeoutSeconds populated, ready for other builder-pattern config methods or an HTTP verb method + * @return This object, with connectTimeoutSeconds populated, ready for other builder-pattern config methods or an HTTP verb method */ public Rest connectTimeoutSeconds(final Integer connectTimeoutSeconds) { this.connectTimeoutSeconds = connectTimeoutSeconds; From dda0cdc42f709b980bf91c0bc7cdacd5e7740edb Mon Sep 17 00:00:00 2001 From: tledkov Date: Tue, 11 Oct 2022 15:42:19 +0300 Subject: [PATCH 3/6] VJD-15 wip --- src/main/java/io/github/jopenlibs/vault/rest/Rest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0c742dd9..c2beb0e6 100644 --- a/src/main/java/io/github/jopenlibs/vault/rest/Rest.java +++ b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java @@ -199,7 +199,7 @@ public Rest optionalHeader(final String name, final String value) { *

The number of seconds to wait before giving up on establishing an HTTP(S) connection.

* * @param connectTimeoutSeconds Number of seconds to wait for an HTTP(S) connection to successfully establish - * @return This object, with connectTimeoutSeconds populated, ready for other builder-pattern config methods or an HTTP verb method + * @return This object, with connectTimeoutSeconds populated, ready for other builder-pattern config methods or an HTTP verb method */ public Rest connectTimeoutSeconds(final Integer connectTimeoutSeconds) { this.connectTimeoutSeconds = connectTimeoutSeconds; From 421bf5a6fd5f9315a15c909c03c760ba7a9392a1 Mon Sep 17 00:00:00 2001 From: tledkov Date: Tue, 11 Oct 2022 16:03:59 +0300 Subject: [PATCH 4/6] wip --- src/main/java/io/github/jopenlibs/vault/rest/Rest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c2beb0e6..0b64a902 100644 --- a/src/main/java/io/github/jopenlibs/vault/rest/Rest.java +++ b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java @@ -196,7 +196,7 @@ public Rest optionalHeader(final String name, final String value) { } /** - *

The number of seconds to wait before giving up on establishing an HTTP(S) connection.

+ *

The number of seconds to wait before giving up on establishing an HTTP(S) connection.

* * @param connectTimeoutSeconds Number of seconds to wait for an HTTP(S) connection to successfully establish * @return This object, with connectTimeoutSeconds populated, ready for other builder-pattern config methods or an HTTP verb method From beffe1be0885a06ff13c874b940ba0bcf7566ad2 Mon Sep 17 00:00:00 2001 From: tledkov Date: Tue, 11 Oct 2022 16:04:06 +0300 Subject: [PATCH 5/6] wip --- src/main/java/io/github/jopenlibs/vault/rest/Rest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0b64a902..c2beb0e6 100644 --- a/src/main/java/io/github/jopenlibs/vault/rest/Rest.java +++ b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java @@ -196,7 +196,7 @@ public Rest optionalHeader(final String name, final String value) { } /** - *

The number of seconds to wait before giving up on establishing an HTTP(S) connection.

+ *

The number of seconds to wait before giving up on establishing an HTTP(S) connection.

* * @param connectTimeoutSeconds Number of seconds to wait for an HTTP(S) connection to successfully establish * @return This object, with connectTimeoutSeconds populated, ready for other builder-pattern config methods or an HTTP verb method From fff0ddf2ae33b0ed33a9b9c4ddf778cdda91252a Mon Sep 17 00:00:00 2001 From: tledkov Date: Tue, 11 Oct 2022 16:14:17 +0300 Subject: [PATCH 6/6] test artifacts path --- .github/workflows/test-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-report.yml b/.github/workflows/test-report.yml index 522d313f..f455648a 100644 --- a/.github/workflows/test-report.yml +++ b/.github/workflows/test-report.yml @@ -12,5 +12,5 @@ jobs: with: artifact: test-results # artifact name name: Tests vault-java-driver # Name of the check run which will be created - path: '*.xml' # Path to test results (inside artifact .zip) + path: '**/*.xml' # Path to test results (inside artifact .zip) reporter: jest-junit \ No newline at end of file