Skip to content

Commit 8584f63

Browse files
steve-perkinssteve-perkins
authored
Merge pull request #184 from casz/fix/optionalVaultToken
make x-vault-token optional, allows using Vault Agent
2 parents 3a93812 + e25f4b8 commit 8584f63

File tree

15 files changed

+246
-36
lines changed

15 files changed

+246
-36
lines changed

‎src/main/java/com/bettercloud/vault/Vault.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ private Map<String, String> collectSecretEngineVersions() {
254254
try {
255255
final RestResponse restResponse = new Rest()//NOPMD
256256
.url(vaultConfig.getAddress() + "/v1/sys/mounts")
257-
.header("X-Vault-Token", vaultConfig.getToken())
257+
.optionalHeader("X-Vault-Token", vaultConfig.getToken())
258258
.optionalHeader("X-Vault-Namespace", this.vaultConfig.getNameSpace())
259259
.connectTimeoutSeconds(vaultConfig.getOpenTimeout())
260260
.readTimeoutSeconds(vaultConfig.getReadTimeout())

‎src/main/java/com/bettercloud/vault/api/Auth.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public AuthResponse createToken(final TokenRequest tokenRequest, final String to
261261
// HTTP request to Vault
262262
final RestResponse restResponse = new Rest()//NOPMD
263263
.url(url)
264-
.header("X-Vault-Token", config.getToken())
264+
.optionalHeader("X-Vault-Token", config.getToken())
265265
.optionalHeader("X-Vault-Namespace", this.nameSpace)
266266
.body(requestJson.getBytes(StandardCharsets.UTF_8))
267267
.connectTimeoutSeconds(config.getOpenTimeout())
@@ -1152,7 +1152,7 @@ public AuthResponse renewSelf(final long increment, final String tokenAuthMount)
11521152
final String requestJson = Json.object().add("increment", increment).toString();
11531153
final RestResponse restResponse = new Rest()//NOPMD
11541154
.url(config.getAddress() + "/v1/auth/" + mount + "/renew-self")
1155-
.header("X-Vault-Token", config.getToken())
1155+
.optionalHeader("X-Vault-Token", config.getToken())
11561156
.optionalHeader("X-Vault-Namespace", this.nameSpace)
11571157
.body(increment < 0 ? null : requestJson.getBytes(StandardCharsets.UTF_8))
11581158
.connectTimeoutSeconds(config.getOpenTimeout())
@@ -1215,7 +1215,7 @@ public LookupResponse lookupSelf(final String tokenAuthMount) throws VaultExcept
12151215
// HTTP request to Vault
12161216
final RestResponse restResponse = new Rest()//NOPMD
12171217
.url(config.getAddress() + "/v1/auth/" + mount + "/lookup-self")
1218-
.header("X-Vault-Token", config.getToken())
1218+
.optionalHeader("X-Vault-Token", config.getToken())
12191219
.optionalHeader("X-Vault-Namespace", this.nameSpace)
12201220
.connectTimeoutSeconds(config.getOpenTimeout())
12211221
.readTimeoutSeconds(config.getReadTimeout())
@@ -1277,7 +1277,7 @@ public LogicalResponse lookupWrap() throws VaultException {
12771277
// HTTP request to Vault
12781278
final RestResponse restResponse = new Rest()//NOPMD
12791279
.url(config.getAddress() + "/v1/sys/wrapping/lookup")
1280-
.header("X-Vault-Token", config.getToken())
1280+
.optionalHeader("X-Vault-Token", config.getToken())
12811281
.optionalHeader("X-Vault-Namespace", this.nameSpace)
12821282
.connectTimeoutSeconds(config.getOpenTimeout())
12831283
.readTimeoutSeconds(config.getReadTimeout())
@@ -1339,7 +1339,7 @@ public void revokeSelf(final String tokenAuthMount) throws VaultException {
13391339
// HTTP request to Vault
13401340
final RestResponse restResponse = new Rest()//NOPMD
13411341
.url(config.getAddress() + "/v1/auth/" + mount + "/revoke-self")
1342-
.header("X-Vault-Token", config.getToken())
1342+
.optionalHeader("X-Vault-Token", config.getToken())
13431343
.optionalHeader("X-Vault-Namespace", this.nameSpace)
13441344
.connectTimeoutSeconds(config.getOpenTimeout())
13451345
.readTimeoutSeconds(config.getReadTimeout())
@@ -1440,7 +1440,7 @@ public AuthResponse unwrap(final String wrappedToken) throws VaultException {
14401440
// HTTP request to Vault
14411441
final RestResponse restResponse = new Rest()
14421442
.url(url)
1443-
.header("X-Vault-Token", config.getToken())
1443+
.optionalHeader("X-Vault-Token", config.getToken())
14441444
.optionalHeader("X-Vault-Namespace", this.nameSpace)
14451445
.body(requestJson.getBytes(StandardCharsets.UTF_8))
14461446
.connectTimeoutSeconds(config.getOpenTimeout())

‎src/main/java/com/bettercloud/vault/api/Debug.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ public HealthResponse health(
9696
.sslVerification(config.getSslConfig().isVerify())
9797
.sslContext(config.getSslConfig().getSslContext());
9898
// Add token if present
99-
if (config.getToken() != null) {
100-
rest.header("X-Vault-Token", config.getToken());
101-
}
99+
rest.optionalHeader("X-Vault-Token", config.getToken());
102100
rest.optionalHeader("X-Vault-Namespace", this.nameSpace);
103101
// Add params if present
104102
if (standbyOk != null) rest.parameter("standbyok", standbyOk.toString());

‎src/main/java/com/bettercloud/vault/api/Leases.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public VaultResponse revoke(final String leaseId) throws VaultException {
6262
*/
6363
final RestResponse restResponse = new Rest()//NOPMD
6464
.url(config.getAddress() + "/v1/sys/leases/revoke/" + leaseId)
65-
.header("X-Vault-Token", config.getToken())
65+
.optionalHeader("X-Vault-Token", config.getToken())
6666
.optionalHeader("X-Vault-Namespace", this.nameSpace)
6767
.connectTimeoutSeconds(config.getOpenTimeout())
6868
.readTimeoutSeconds(config.getReadTimeout())
@@ -117,7 +117,7 @@ public VaultResponse revokePrefix(final String prefix) throws VaultException {
117117
try {
118118
final RestResponse restResponse = new Rest()//NOPMD
119119
.url(config.getAddress() + "/v1/sys/revoke-prefix/" + prefix)
120-
.header("X-Vault-Token", config.getToken())
120+
.optionalHeader("X-Vault-Token", config.getToken())
121121
.optionalHeader("X-Vault-Namespace", this.nameSpace)
122122
.connectTimeoutSeconds(config.getOpenTimeout())
123123
.readTimeoutSeconds(config.getReadTimeout())
@@ -175,7 +175,7 @@ public VaultResponse revokeForce(final String prefix) throws VaultException {
175175
try {
176176
final RestResponse restResponse = new Rest()//NOPMD
177177
.url(config.getAddress() + "/v1/sys/revoke-force/" + prefix)
178-
.header("X-Vault-Token", config.getToken())
178+
.optionalHeader("X-Vault-Token", config.getToken())
179179
.optionalHeader("X-Vault-Namespace", this.nameSpace)
180180
.connectTimeoutSeconds(config.getOpenTimeout())
181181
.readTimeoutSeconds(config.getReadTimeout())
@@ -238,7 +238,7 @@ public VaultResponse renew(final String leaseId, final long increment) throws Va
238238
final String requestJson = Json.object().add("increment", increment).toString();
239239
final RestResponse restResponse = new Rest()//NOPMD
240240
.url(config.getAddress() + "/v1/sys/renew/" + leaseId)
241-
.header("X-Vault-Token", config.getToken())
241+
.optionalHeader("X-Vault-Token", config.getToken())
242242
.optionalHeader("X-Vault-Namespace", this.nameSpace)
243243
.body(increment < 0 ? null : requestJson.getBytes(StandardCharsets.UTF_8))
244244
.connectTimeoutSeconds(config.getOpenTimeout())

‎src/main/java/com/bettercloud/vault/api/Logical.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private LogicalResponse read(final String path, Boolean shouldRetry, final logic
8383
// Make an HTTP request to Vault
8484
final RestResponse restResponse = new Rest()//NOPMD
8585
.url(config.getAddress() + "/v1/" + adjustPathForReadOrWrite(path, operation))
86-
.header("X-Vault-Token", config.getToken())
86+
.optionalHeader("X-Vault-Token", config.getToken())
8787
.optionalHeader("X-Vault-Namespace", this.nameSpace)
8888
.connectTimeoutSeconds(config.getOpenTimeout())
8989
.readTimeoutSeconds(config.getReadTimeout())
@@ -151,7 +151,7 @@ public LogicalResponse read(final String path, Boolean shouldRetry, final Intege
151151
// Make an HTTP request to Vault
152152
final RestResponse restResponse = new Rest()//NOPMD
153153
.url(config.getAddress() + "/v1/" + adjustPathForReadOrWrite(path, logicalOperations.readV2))
154-
.header("X-Vault-Token", config.getToken())
154+
.optionalHeader("X-Vault-Token", config.getToken())
155155
.optionalHeader("X-Vault-Namespace", this.nameSpace)
156156
.parameter("version", version.toString())
157157
.connectTimeoutSeconds(config.getOpenTimeout())
@@ -251,7 +251,7 @@ private LogicalResponse write(final String path, final Map<String, Object> nameV
251251
final RestResponse restResponse = new Rest()//NOPMD
252252
.url(config.getAddress() + "/v1/" + adjustPathForReadOrWrite(path, operation))
253253
.body(jsonObjectToWriteFromEngineVersion(operation, requestJson).toString().getBytes(StandardCharsets.UTF_8))
254-
.header("X-Vault-Token", config.getToken())
254+
.optionalHeader("X-Vault-Token", config.getToken())
255255
.optionalHeader("X-Vault-Namespace", this.nameSpace)
256256
.connectTimeoutSeconds(config.getOpenTimeout())
257257
.readTimeoutSeconds(config.getReadTimeout())
@@ -355,7 +355,7 @@ private LogicalResponse delete(final String path, final Logical.logicalOperation
355355
// Make an HTTP request to Vault
356356
final RestResponse restResponse = new Rest()//NOPMD
357357
.url(config.getAddress() + "/v1/" + adjustPathForDelete(path, operation))
358-
.header("X-Vault-Token", config.getToken())
358+
.optionalHeader("X-Vault-Token", config.getToken())
359359
.optionalHeader("X-Vault-Namespace", this.nameSpace)
360360
.connectTimeoutSeconds(config.getOpenTimeout())
361361
.readTimeoutSeconds(config.getReadTimeout())
@@ -415,7 +415,7 @@ public LogicalResponse delete(final String path, final int[] versions) throws Va
415415
JsonObject versionsToDelete = new JsonObject().add("versions", versions);
416416
final RestResponse restResponse = new Rest()//NOPMD
417417
.url(config.getAddress() + "/v1/" + adjustPathForVersionDelete(path))
418-
.header("X-Vault-Token", config.getToken())
418+
.optionalHeader("X-Vault-Token", config.getToken())
419419
.optionalHeader("X-Vault-Namespace", this.nameSpace)
420420
.connectTimeoutSeconds(config.getOpenTimeout())
421421
.readTimeoutSeconds(config.getReadTimeout())
@@ -486,7 +486,7 @@ public LogicalResponse unDelete(final String path, final int[] versions) throws
486486
JsonObject versionsToUnDelete = new JsonObject().add("versions", versions);
487487
final RestResponse restResponse = new Rest()//NOPMD
488488
.url(config.getAddress() + "/v1/" + adjustPathForVersionUnDelete(path))
489-
.header("X-Vault-Token", config.getToken())
489+
.optionalHeader("X-Vault-Token", config.getToken())
490490
.optionalHeader("X-Vault-Namespace", this.nameSpace)
491491
.connectTimeoutSeconds(config.getOpenTimeout())
492492
.readTimeoutSeconds(config.getReadTimeout())
@@ -545,7 +545,7 @@ public LogicalResponse destroy(final String path, final int[] versions) throws V
545545
JsonObject versionsToDestroy = new JsonObject().add("versions", versions);
546546
final RestResponse restResponse = new Rest()//NOPMD
547547
.url(config.getAddress() + "/v1/" + adjustPathForVersionDestroy(path))
548-
.header("X-Vault-Token", config.getToken())
548+
.optionalHeader("X-Vault-Token", config.getToken())
549549
.optionalHeader("X-Vault-Namespace", this.nameSpace)
550550
.connectTimeoutSeconds(config.getOpenTimeout())
551551
.readTimeoutSeconds(config.getReadTimeout())
@@ -596,7 +596,7 @@ public LogicalResponse upgrade(final String kvPath) throws VaultException {
596596
JsonObject kvToUpgrade = new JsonObject().add("options", new JsonObject().add("version", 2));
597597
final RestResponse restResponse = new Rest()//NOPMD
598598
.url(config.getAddress() + "/v1/sys/mounts/" + (kvPath.replaceAll("/", "") + "/tune"))
599-
.header("X-Vault-Token", config.getToken())
599+
.optionalHeader("X-Vault-Token", config.getToken())
600600
.optionalHeader("X-Vault-Namespace", this.nameSpace)
601601
.connectTimeoutSeconds(config.getOpenTimeout())
602602
.readTimeoutSeconds(config.getReadTimeout())

‎src/main/java/com/bettercloud/vault/api/Seal.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void seal() throws VaultException {
4747
// HTTP request to Vault
4848
final RestResponse restResponse = new Rest()//NOPMD
4949
.url(config.getAddress() + "/v1/sys/seal")
50-
.header("X-Vault-Token", config.getToken())
50+
.optionalHeader("X-Vault-Token", config.getToken())
5151
.optionalHeader("X-Vault-Namespace", this.nameSpace)
5252
.connectTimeoutSeconds(config.getOpenTimeout())
5353
.readTimeoutSeconds(config.getReadTimeout())

‎src/main/java/com/bettercloud/vault/api/mounts/Mounts.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public MountResponse list() throws VaultException {
4747
try {
4848
final RestResponse restResponse = new Rest()//NOPMD
4949
.url(String.format("%s/v1/sys/mounts", config.getAddress()))
50-
.header("X-Vault-Token", config.getToken())
50+
.optionalHeader("X-Vault-Token", config.getToken())
5151
.connectTimeoutSeconds(config.getOpenTimeout())
5252
.readTimeoutSeconds(config.getReadTimeout())
5353
.sslVerification(config.getSslConfig().isVerify())
@@ -132,7 +132,7 @@ public MountResponse enable(final String path, final MountType type, final Mount
132132

133133
final RestResponse restResponse = new Rest()//NOPMD
134134
.url(String.format("%s/v1/sys/mounts/%s", config.getAddress(), path))
135-
.header("X-Vault-Token", config.getToken())
135+
.optionalHeader("X-Vault-Token", config.getToken())
136136
.body(requestJson.getBytes("UTF-8"))
137137
.connectTimeoutSeconds(config.getOpenTimeout())
138138
.readTimeoutSeconds(config.getReadTimeout())
@@ -199,7 +199,7 @@ public MountResponse disable(final String path) throws VaultException {
199199
try {
200200
final RestResponse restResponse = new Rest()//NOPMD
201201
.url(String.format("%s/v1/sys/mounts/%s", config.getAddress(), path))
202-
.header("X-Vault-Token", config.getToken())
202+
.optionalHeader("X-Vault-Token", config.getToken())
203203
.connectTimeoutSeconds(config.getOpenTimeout())
204204
.readTimeoutSeconds(config.getReadTimeout())
205205
.sslVerification(config.getSslConfig().isVerify())
@@ -265,7 +265,7 @@ public MountResponse read(final String path) throws VaultException {
265265
try {
266266
final RestResponse restResponse = new Rest()//NOPMD
267267
.url(String.format("%s/v1/sys/mounts/%s/tune", config.getAddress(), path))
268-
.header("X-Vault-Token", config.getToken())
268+
.optionalHeader("X-Vault-Token", config.getToken())
269269
.connectTimeoutSeconds(config.getOpenTimeout())
270270
.readTimeoutSeconds(config.getReadTimeout())
271271
.sslVerification(config.getSslConfig().isVerify())
@@ -346,7 +346,7 @@ public MountResponse tune(final String path, final MountPayload payload) throws
346346

347347
final RestResponse restResponse = new Rest()//NOPMD
348348
.url(String.format("%s/v1/sys/mounts/%s/tune", config.getAddress(), path))
349-
.header("X-Vault-Token", config.getToken())
349+
.optionalHeader("X-Vault-Token", config.getToken())
350350
.body(requestJson.getBytes("UTF-8"))
351351
.connectTimeoutSeconds(config.getOpenTimeout())
352352
.readTimeoutSeconds(config.getReadTimeout())

0 commit comments

Comments
 (0)