Skip to content

Commit fa3d2b0

Browse files
tledkovtledkov
authored
VJD-15 Port the PR added X-Vault-Request header (#16)
1 parent f59c241 commit fa3d2b0

File tree

9 files changed

+47
-0
lines changed

9 files changed

+47
-0
lines changed

‎src/main/java/io/github/jopenlibs/vault/Vault.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ private Map<String, String> collectSecretEngineVersions() {
255255
.url(vaultConfig.getAddress() + "/v1/sys/mounts")
256256
.header("X-Vault-Token", vaultConfig.getToken())
257257
.header("X-Vault-Namespace", this.vaultConfig.getNameSpace())
258+
.header("X-Vault-Request", "true")
258259
.connectTimeoutSeconds(vaultConfig.getOpenTimeout())
259260
.readTimeoutSeconds(vaultConfig.getReadTimeout())
260261
.sslVerification(vaultConfig.getSslConfig().isVerify())

‎src/main/java/io/github/jopenlibs/vault/api/Auth.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ public AuthResponse createToken(final TokenRequest tokenRequest, final String to
381381
.url(url)
382382
.header("X-Vault-Token", config.getToken())
383383
.header("X-Vault-Namespace", this.nameSpace)
384+
.header("X-Vault-Request", "true")
384385
.body(requestJson.getBytes(StandardCharsets.UTF_8))
385386
.connectTimeoutSeconds(config.getOpenTimeout())
386387
.readTimeoutSeconds(config.getReadTimeout())
@@ -528,6 +529,7 @@ public AuthResponse loginByAppRole(final String path, final String roleId,
528529
final RestResponse restResponse = new Rest()//NOPMD
529530
.url(config.getAddress() + "/v1/auth/" + path + "/login")
530531
.header("X-Vault-Namespace", this.nameSpace)
532+
.header("X-Vault-Request", "true")
531533
.body(requestJson.getBytes(StandardCharsets.UTF_8))
532534
.connectTimeoutSeconds(config.getOpenTimeout())
533535
.readTimeoutSeconds(config.getReadTimeout())
@@ -604,6 +606,7 @@ public AuthResponse loginByUserPass(final String username, final String password
604606
final RestResponse restResponse = new Rest()//NOPMD
605607
.url(config.getAddress() + "/v1/auth/" + mount + "/login/" + username)
606608
.header("X-Vault-Namespace", this.nameSpace)
609+
.header("X-Vault-Request", "true")
607610
.body(requestJson.getBytes(StandardCharsets.UTF_8))
608611
.connectTimeoutSeconds(config.getOpenTimeout())
609612
.readTimeoutSeconds(config.getReadTimeout())
@@ -723,6 +726,7 @@ public AuthResponse loginByAwsEc2(final String role, final String identity,
723726
.url(config.getAddress() + "/v1/auth/" + mount + "/login")
724727
.body(requestJson.getBytes(StandardCharsets.UTF_8))
725728
.header("X-Vault-Namespace", this.nameSpace)
729+
.header("X-Vault-Request", "true")
726730
.connectTimeoutSeconds(config.getOpenTimeout())
727731
.readTimeoutSeconds(config.getReadTimeout())
728732
.sslVerification(config.getSslConfig().isVerify())
@@ -789,6 +793,7 @@ public AuthResponse loginByAwsEc2(final String role, final String pkcs7, final S
789793
final RestResponse restResponse = new Rest()//NOPMD
790794
.url(config.getAddress() + "/v1/auth/" + mount + "/login")
791795
.header("X-Vault-Namespace", this.nameSpace)
796+
.header("X-Vault-Request", "true")
792797
.body(requestJson.getBytes(StandardCharsets.UTF_8))
793798
.connectTimeoutSeconds(config.getOpenTimeout())
794799
.readTimeoutSeconds(config.getReadTimeout())
@@ -864,6 +869,7 @@ public AuthResponse loginByAwsIam(final String role, final String iamRequestUrl,
864869
final RestResponse restResponse = new Rest()//NOPMD
865870
.url(config.getAddress() + "/v1/auth/" + mount + "/login")
866871
.header("X-Vault-Namespace", this.nameSpace)
872+
.header("X-Vault-Request", "true")
867873
.body(requestJson.getBytes(StandardCharsets.UTF_8))
868874
.connectTimeoutSeconds(config.getOpenTimeout())
869875
.readTimeoutSeconds(config.getReadTimeout())
@@ -936,6 +942,7 @@ public AuthResponse loginByGithub(final String githubToken, final String githubA
936942
final RestResponse restResponse = new Rest()//NOPMD
937943
.url(config.getAddress() + "/v1/auth/" + mount + "/login")
938944
.header("X-Vault-Namespace", this.nameSpace)
945+
.header("X-Vault-Request", "true")
939946
.body(requestJson.getBytes(StandardCharsets.UTF_8))
940947
.connectTimeoutSeconds(config.getOpenTimeout())
941948
.readTimeoutSeconds(config.getReadTimeout())
@@ -988,6 +995,7 @@ public AuthResponse loginByJwt(final String provider, final String role, final S
988995
final RestResponse restResponse = new Rest()
989996
.url(config.getAddress() + "/v1/auth/" + provider + "/login")
990997
.header("X-Vault-Namespace", this.nameSpace)
998+
.header("X-Vault-Request", "true")
991999
.body(requestJson.getBytes(StandardCharsets.UTF_8))
9921000
.connectTimeoutSeconds(config.getOpenTimeout())
9931001
.readTimeoutSeconds(config.getReadTimeout())
@@ -1119,6 +1127,7 @@ public AuthResponse loginByCert(final String certAuthMount) throws VaultExceptio
11191127
final RestResponse restResponse = new Rest()//NOPMD
11201128
.url(config.getAddress() + "/v1/auth/" + mount + "/login")
11211129
.header("X-Vault-Namespace", this.nameSpace)
1130+
.header("X-Vault-Request", "true")
11221131
.connectTimeoutSeconds(config.getOpenTimeout())
11231132
.readTimeoutSeconds(config.getReadTimeout())
11241133
.sslVerification(config.getSslConfig().isVerify())
@@ -1191,6 +1200,7 @@ public AuthResponse renewSelf(final long increment, final String tokenAuthMount)
11911200
.url(config.getAddress() + "/v1/auth/" + mount + "/renew-self")
11921201
.header("X-Vault-Token", config.getToken())
11931202
.header("X-Vault-Namespace", this.nameSpace)
1203+
.header("X-Vault-Request", "true")
11941204
.body(increment < 0 ? null : requestJson.getBytes(StandardCharsets.UTF_8))
11951205
.connectTimeoutSeconds(config.getOpenTimeout())
11961206
.readTimeoutSeconds(config.getReadTimeout())
@@ -1246,6 +1256,7 @@ public LookupResponse lookupSelf(final String tokenAuthMount) throws VaultExcept
12461256
.url(config.getAddress() + "/v1/auth/" + mount + "/lookup-self")
12471257
.header("X-Vault-Token", config.getToken())
12481258
.header("X-Vault-Namespace", this.nameSpace)
1259+
.header("X-Vault-Request", "true")
12491260
.connectTimeoutSeconds(config.getOpenTimeout())
12501261
.readTimeoutSeconds(config.getReadTimeout())
12511262
.sslVerification(config.getSslConfig().isVerify())
@@ -1294,6 +1305,7 @@ public LogicalResponse lookupWrap() throws VaultException {
12941305
.url(config.getAddress() + "/v1/sys/wrapping/lookup")
12951306
.header("X-Vault-Token", config.getToken())
12961307
.header("X-Vault-Namespace", this.nameSpace)
1308+
.header("X-Vault-Request", "true")
12971309
.connectTimeoutSeconds(config.getOpenTimeout())
12981310
.readTimeoutSeconds(config.getReadTimeout())
12991311
.sslVerification(config.getSslConfig().isVerify())
@@ -1343,6 +1355,7 @@ public void revokeSelf(final String tokenAuthMount) throws VaultException {
13431355
.url(config.getAddress() + "/v1/auth/" + mount + "/revoke-self")
13441356
.header("X-Vault-Token", config.getToken())
13451357
.header("X-Vault-Namespace", this.nameSpace)
1358+
.header("X-Vault-Request", "true")
13461359
.connectTimeoutSeconds(config.getOpenTimeout())
13471360
.readTimeoutSeconds(config.getReadTimeout())
13481361
.sslVerification(config.getSslConfig().isVerify())
@@ -1454,6 +1467,7 @@ public UnwrapResponse unwrap(final String wrappedToken) throws VaultException {
14541467
.url(url)
14551468
.header("X-Vault-Token", config.getToken())
14561469
.header("X-Vault-Namespace", this.nameSpace)
1470+
.header("X-Vault-Request", "true")
14571471
.body(requestJson.getBytes(StandardCharsets.UTF_8))
14581472
.connectTimeoutSeconds(config.getOpenTimeout())
14591473
.readTimeoutSeconds(config.getReadTimeout())
@@ -1549,6 +1563,7 @@ public WrapResponse wrap(final JsonObject jsonObject, int ttlInSec) throws Vault
15491563
.header("X-Vault-Token", config.getToken())
15501564
.header("X-Vault-Wrap-TTL", Integer.toString(ttlInSec))
15511565
.header("X-Vault-Namespace", this.nameSpace)
1566+
.header("X-Vault-Request", "true")
15521567
.body(requestJson.getBytes(StandardCharsets.UTF_8))
15531568
.connectTimeoutSeconds(config.getOpenTimeout())
15541569
.readTimeoutSeconds(config.getReadTimeout())

‎src/main/java/io/github/jopenlibs/vault/api/Debug.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public HealthResponse health(
101101
.url(config.getAddress() + "/v1/" + path)
102102
.header("X-Vault-Token", config.getToken())
103103
.header("X-Vault-Namespace", this.nameSpace)
104+
.header("X-Vault-Request", "true")
104105
.connectTimeoutSeconds(config.getOpenTimeout())
105106
.readTimeoutSeconds(config.getReadTimeout())
106107
.sslVerification(config.getSslConfig().isVerify())

‎src/main/java/io/github/jopenlibs/vault/api/Leases.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public VaultResponse revoke(final String leaseId) throws VaultException {
6161
.url(config.getAddress() + "/v1/sys/leases/revoke/" + leaseId)
6262
.header("X-Vault-Token", config.getToken())
6363
.header("X-Vault-Namespace", this.nameSpace)
64+
.header("X-Vault-Request", "true")
6465
.connectTimeoutSeconds(config.getOpenTimeout())
6566
.readTimeoutSeconds(config.getReadTimeout())
6667
.sslVerification(config.getSslConfig().isVerify())
@@ -100,6 +101,7 @@ public VaultResponse revokePrefix(final String prefix) throws VaultException {
100101
.url(config.getAddress() + "/v1/sys/revoke-prefix/" + prefix)
101102
.header("X-Vault-Token", config.getToken())
102103
.header("X-Vault-Namespace", this.nameSpace)
104+
.header("X-Vault-Request", "true")
103105
.connectTimeoutSeconds(config.getOpenTimeout())
104106
.readTimeoutSeconds(config.getReadTimeout())
105107
.sslVerification(config.getSslConfig().isVerify())
@@ -141,6 +143,7 @@ public VaultResponse revokeForce(final String prefix) throws VaultException {
141143
.url(config.getAddress() + "/v1/sys/revoke-force/" + prefix)
142144
.header("X-Vault-Token", config.getToken())
143145
.header("X-Vault-Namespace", this.nameSpace)
146+
.header("X-Vault-Request", "true")
144147
.connectTimeoutSeconds(config.getOpenTimeout())
145148
.readTimeoutSeconds(config.getReadTimeout())
146149
.sslVerification(config.getSslConfig().isVerify())
@@ -188,6 +191,7 @@ public VaultResponse renew(final String leaseId, final long increment) throws Va
188191
.url(config.getAddress() + "/v1/sys/renew/" + leaseId)
189192
.header("X-Vault-Token", config.getToken())
190193
.header("X-Vault-Namespace", this.nameSpace)
194+
.header("X-Vault-Request", "true")
191195
.body(increment < 0 ? null : requestJson.getBytes(StandardCharsets.UTF_8))
192196
.connectTimeoutSeconds(config.getOpenTimeout())
193197
.readTimeoutSeconds(config.getReadTimeout())

‎src/main/java/io/github/jopenlibs/vault/api/Logical.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ private LogicalResponse read(final String path, final logicalOperations operatio
9090
config.getPrefixPathDepth(), operation))
9191
.header("X-Vault-Token", config.getToken())
9292
.header("X-Vault-Namespace", this.nameSpace)
93+
.header("X-Vault-Request", "true")
9394
.connectTimeoutSeconds(config.getOpenTimeout())
9495
.readTimeoutSeconds(config.getReadTimeout())
9596
.sslVerification(config.getSslConfig().isVerify())
@@ -147,6 +148,7 @@ public LogicalResponse read(final String path, Boolean shouldRetry, final Intege
147148
config.getPrefixPathDepth(), logicalOperations.readV2))
148149
.header("X-Vault-Token", config.getToken())
149150
.header("X-Vault-Namespace", this.nameSpace)
151+
.header("X-Vault-Request", "true")
150152
.parameter("version", version.toString())
151153
.connectTimeoutSeconds(config.getOpenTimeout())
152154
.readTimeoutSeconds(config.getReadTimeout())
@@ -243,6 +245,7 @@ private LogicalResponse write(final String path, final Map<String, Object> nameV
243245
.getBytes(StandardCharsets.UTF_8))
244246
.header("X-Vault-Token", config.getToken())
245247
.header("X-Vault-Namespace", this.nameSpace)
248+
.header("X-Vault-Request", "true")
246249
.connectTimeoutSeconds(config.getOpenTimeout())
247250
.readTimeoutSeconds(config.getReadTimeout())
248251
.sslVerification(config.getSslConfig().isVerify())
@@ -332,6 +335,7 @@ private LogicalResponse delete(final String path, final Logical.logicalOperation
332335
config.getPrefixPathDepth(), operation))
333336
.header("X-Vault-Token", config.getToken())
334337
.header("X-Vault-Namespace", this.nameSpace)
338+
.header("X-Vault-Request", "true")
335339
.connectTimeoutSeconds(config.getOpenTimeout())
336340
.readTimeoutSeconds(config.getReadTimeout())
337341
.sslVerification(config.getSslConfig().isVerify())
@@ -381,6 +385,7 @@ public LogicalResponse delete(final String path, final int[] versions) throws Va
381385
config.getPrefixPathDepth()))
382386
.header("X-Vault-Token", config.getToken())
383387
.header("X-Vault-Namespace", this.nameSpace)
388+
.header("X-Vault-Request", "true")
384389
.connectTimeoutSeconds(config.getOpenTimeout())
385390
.readTimeoutSeconds(config.getReadTimeout())
386391
.sslVerification(config.getSslConfig().isVerify())
@@ -440,6 +445,7 @@ public LogicalResponse unDelete(final String path, final int[] versions) throws
440445
config.getPrefixPathDepth()))
441446
.header("X-Vault-Token", config.getToken())
442447
.header("X-Vault-Namespace", this.nameSpace)
448+
.header("X-Vault-Request", "true")
443449
.connectTimeoutSeconds(config.getOpenTimeout())
444450
.readTimeoutSeconds(config.getReadTimeout())
445451
.sslVerification(config.getSslConfig().isVerify())
@@ -486,6 +492,7 @@ public LogicalResponse destroy(final String path, final int[] versions) throws V
486492
config.getPrefixPathDepth()))
487493
.header("X-Vault-Token", config.getToken())
488494
.header("X-Vault-Namespace", this.nameSpace)
495+
.header("X-Vault-Request", "true")
489496
.connectTimeoutSeconds(config.getOpenTimeout())
490497
.readTimeoutSeconds(config.getReadTimeout())
491498
.sslVerification(config.getSslConfig().isVerify())
@@ -522,6 +529,7 @@ public LogicalResponse upgrade(final String kvPath) throws VaultException {
522529
+ "/tune"))
523530
.header("X-Vault-Token", config.getToken())
524531
.header("X-Vault-Namespace", this.nameSpace)
532+
.header("X-Vault-Request", "true")
525533
.connectTimeoutSeconds(config.getOpenTimeout())
526534
.readTimeoutSeconds(config.getReadTimeout())
527535
.sslVerification(config.getSslConfig().isVerify())

‎src/main/java/io/github/jopenlibs/vault/api/Seal.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public void seal() throws VaultException {
4848
.url(config.getAddress() + "/v1/sys/seal")
4949
.header("X-Vault-Token", config.getToken())
5050
.header("X-Vault-Namespace", this.nameSpace)
51+
.header("X-Vault-Request", "true")
5152
.connectTimeoutSeconds(config.getOpenTimeout())
5253
.readTimeoutSeconds(config.getReadTimeout())
5354
.sslVerification(config.getSslConfig().isVerify())
@@ -108,6 +109,7 @@ public SealResponse unseal(final String key, final Boolean reset) throws VaultEx
108109
final RestResponse restResponse = new Rest()//NOPMD
109110
.url(config.getAddress() + "/v1/sys/unseal")
110111
.header("X-Vault-Namespace", this.nameSpace)
112+
.header("X-Vault-Request", "true")
111113
.body(requestJson.getBytes(StandardCharsets.UTF_8))
112114
.connectTimeoutSeconds(config.getOpenTimeout())
113115
.readTimeoutSeconds(config.getReadTimeout())
@@ -151,6 +153,7 @@ public SealResponse sealStatus() throws VaultException {
151153
final RestResponse restResponse = new Rest()//NOPMD
152154
.url(config.getAddress() + "/v1/sys/seal-status")
153155
.header("X-Vault-Namespace", this.nameSpace)
156+
.header("X-Vault-Request", "true")
154157
.connectTimeoutSeconds(config.getOpenTimeout())
155158
.readTimeoutSeconds(config.getReadTimeout())
156159
.sslVerification(config.getSslConfig().isVerify())

0 commit comments

Comments
 (0)