diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppIdAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppIdAuthentication.java index c87db9b0..7331eac6 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppIdAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppIdAuthentication.java @@ -76,7 +76,7 @@ public class AppIdAuthentication implements ClientAuthentication { .getUserIdMechanism().createUserId()); try { - VaultResponse response = restOperations.postForObject("/auth/{mount}/login", + VaultResponse response = restOperations.postForObject("auth/{mount}/login", login, VaultResponse.class, options.getPath()); logger.debug("Login successful using AppId authentication"); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java index cc591b5c..c7d8424c 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java @@ -78,7 +78,7 @@ public class AppRoleAuthentication implements ClientAuthentication { options.getSecretId()); try { - VaultResponse response = restOperations.postForObject("/auth/{mount}/login", + VaultResponse response = restOperations.postForObject("auth/{mount}/login", login, VaultResponse.class, options.getPath()); logger.debug("Login successful using AppRole authentication"); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java index d79ab504..5c34ee42 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java @@ -102,7 +102,7 @@ public class AwsEc2Authentication implements ClientAuthentication { try { VaultResponse response = this.vaultRestOperations.postForObject( - "/auth/{mount}/login", login, VaultResponse.class, options.getPath()); + "auth/{mount}/login", login, VaultResponse.class, options.getPath()); if (logger.isDebugEnabled()) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java index cac4badd..bce66095 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java @@ -60,7 +60,7 @@ public class ClientCertificateAuthentication implements ClientAuthentication { private VaultToken createTokenUsingTlsCertAuthentication(String path) { try { - VaultResponse response = restOperations.postForObject("/auth/{mount}/login", + VaultResponse response = restOperations.postForObject("auth/{mount}/login", Collections.emptyMap(), VaultResponse.class, path); logger.debug("Login successful using TLS certificates"); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java index 212cb903..357c8f81 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java @@ -137,7 +137,7 @@ public class LifecycleAwareSessionManager implements SessionManager, DisposableB private void revoke(VaultToken token) { try { - restOperations.postForObject("/auth/token/revoke-self", + restOperations.postForObject("auth/token/revoke-self", new HttpEntity(VaultHttpHeaders.from(token)), Map.class); } catch (HttpStatusCodeException e) { @@ -165,7 +165,7 @@ public class LifecycleAwareSessionManager implements SessionManager, DisposableB } try { - restOperations.postForObject("/auth/token/renew-self", + restOperations.postForObject("auth/token/renew-self", new HttpEntity(VaultHttpHeaders.from(token)), Map.class); return true; } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java index 1b665cf9..9794a22b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java @@ -86,7 +86,7 @@ public class LoginTokenAdapter implements ClientAuthentication { try { ResponseEntity entity = restOperations.exchange( - "/auth/token/lookup-self", HttpMethod.GET, new HttpEntity( + "auth/token/lookup-self", HttpMethod.GET, new HttpEntity( VaultHttpHeaders.from(token)), VaultResponse.class); return entity.getBody().getData(); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java index 85f5ec4d..68e90435 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java @@ -56,9 +56,9 @@ public class VaultSysTemplate implements VaultSysOperations { private static final Seal SEAL = new Seal(); - private static final GetMounts GET_MOUNTS = new GetMounts("/sys/mounts"); + private static final GetMounts GET_MOUNTS = new GetMounts("sys/mounts"); - private static final GetMounts GET_AUTH_MOUNTS = new GetMounts("/sys/auth"); + private static final GetMounts GET_AUTH_MOUNTS = new GetMounts("sys/auth"); private static final Health HEALTH = new Health(); @@ -82,10 +82,11 @@ public class VaultSysTemplate implements VaultSysOperations { return vaultOperations.doWithVault(new RestOperationsCallback() { @Override + @SuppressWarnings("unchecked") public Boolean doWithRestOperations(RestOperations restOperations) { try { - Map body = restOperations.getForObject("/sys/init", + Map body = restOperations.getForObject("sys/init", Map.class); return body.get("initialized"); @@ -112,7 +113,7 @@ public class VaultSysTemplate implements VaultSysOperations { try { ResponseEntity exchange = restOperations - .exchange("/sys/init", HttpMethod.PUT, + .exchange("sys/init", HttpMethod.PUT, new HttpEntity( vaultInitializationRequest), VaultInitializationResponseImpl.class); @@ -142,7 +143,7 @@ public class VaultSysTemplate implements VaultSysOperations { ResponseEntity response = restOperations .exchange( - "/sys/unseal", + "sys/unseal", HttpMethod.PUT, new HttpEntity(Collections.singletonMap( "key", keyShare)), @@ -164,7 +165,7 @@ public class VaultSysTemplate implements VaultSysOperations { Assert.hasText(path, "Path must not be empty"); Assert.notNull(vaultMount, "VaultMount must not be null"); - vaultOperations.write(String.format("/sys/mounts/%s", path), vaultMount); + vaultOperations.write(String.format("sys/mounts/%s", path), vaultMount); } @Override @@ -177,7 +178,7 @@ public class VaultSysTemplate implements VaultSysOperations { Assert.hasText(path, "Path must not be empty"); - vaultOperations.delete(String.format("/sys/mounts/%s", path)); + vaultOperations.delete(String.format("sys/mounts/%s", path)); } @Override @@ -187,7 +188,7 @@ public class VaultSysTemplate implements VaultSysOperations { Assert.hasText(path, "Path must not be empty"); Assert.notNull(vaultMount, "VaultMount must not be null"); - vaultOperations.write(String.format("/sys/auth/%s", path), vaultMount); + vaultOperations.write(String.format("sys/auth/%s", path), vaultMount); } @Override @@ -200,7 +201,7 @@ public class VaultSysTemplate implements VaultSysOperations { Assert.hasText(path, "Path must not be empty"); - vaultOperations.delete(String.format("/sys/auth/%s", path)); + vaultOperations.delete(String.format("sys/auth/%s", path)); } @Override @@ -213,7 +214,7 @@ public class VaultSysTemplate implements VaultSysOperations { @Override public VaultUnsealStatus doWithRestOperations(RestOperations restOperations) { - return restOperations.getForObject("/sys/seal-status", + return restOperations.getForObject("sys/seal-status", VaultUnsealStatusImpl.class); } } @@ -222,7 +223,7 @@ public class VaultSysTemplate implements VaultSysOperations { @Override public Void doWithRestOperations(RestOperations restOperations) { - restOperations.put("/sys/seal", null); + restOperations.put("sys/seal", null); return null; } @@ -296,7 +297,7 @@ public class VaultSysTemplate implements VaultSysOperations { try { ResponseEntity healthResponse = restOperations.exchange( - "/sys/health", HttpMethod.GET, null, VaultHealthImpl.class); + "sys/health", HttpMethod.GET, null, VaultHealthImpl.class); return healthResponse.getBody(); } catch (HttpStatusCodeException responseError) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java index b27b3923..5db9928b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java @@ -58,7 +58,7 @@ public class VaultTokenTemplate implements VaultTokenOperations { Assert.notNull(request, "VaultTokenRequest must not be null"); - return write("/auth/token/create", request, VaultTokenResponse.class); + return write("auth/token/create", request, VaultTokenResponse.class); } @Override @@ -71,7 +71,7 @@ public class VaultTokenTemplate implements VaultTokenOperations { Assert.notNull(request, "VaultTokenRequest must not be null"); - return write("/auth/token/create-orphan", request, VaultTokenResponse.class); + return write("auth/token/create-orphan", request, VaultTokenResponse.class); } @Override @@ -79,7 +79,7 @@ public class VaultTokenTemplate implements VaultTokenOperations { Assert.notNull(vaultToken, "VaultToken must not be null"); - return write(String.format("/auth/token/renew/%s", vaultToken.getToken()), null, + return write(String.format("auth/token/renew/%s", vaultToken.getToken()), null, VaultTokenResponse.class); } @@ -88,7 +88,7 @@ public class VaultTokenTemplate implements VaultTokenOperations { Assert.notNull(vaultToken, "VaultToken must not be null"); - write(String.format("/auth/token/revoke/%s", vaultToken.getToken()), null, + write(String.format("auth/token/revoke/%s", vaultToken.getToken()), null, VaultTokenResponse.class); } @@ -97,7 +97,7 @@ public class VaultTokenTemplate implements VaultTokenOperations { Assert.notNull(vaultToken, "VaultToken must not be null"); - write(String.format("/auth/token/revoke-orphan/%s", vaultToken.getToken()), null, + write(String.format("auth/token/revoke-orphan/%s", vaultToken.getToken()), null, VaultTokenResponse.class); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java index e2f68143..56103032 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java @@ -523,7 +523,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements public ResponseEntity> doWithRestOperations( RestOperations restOperations) { return (ResponseEntity) restOperations.exchange( - "/sys/renew/{leaseId}", HttpMethod.PUT, null, Map.class, + "sys/renew/{leaseId}", HttpMethod.PUT, null, Map.class, lease.getLeaseId()); } }); @@ -574,7 +574,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements public ResponseEntity> doWithRestOperations( RestOperations restOperations) { return (ResponseEntity) restOperations.exchange( - "/sys/revoke/{leaseId}", HttpMethod.PUT, null, + "sys/revoke/{leaseId}", HttpMethod.PUT, null, Map.class, lease.getLeaseId()); } }); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java index a4df30a1..f219d11d 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java @@ -88,7 +88,7 @@ public class LifecycleAwareSessionManagerUnitTests { verify(restOperations) .postForObject( - eq("/auth/token/revoke-self"), + eq("auth/token/revoke-self"), eq(new HttpEntity(VaultHttpHeaders.from(LoginToken .of("login")))), any(Class.class)); } @@ -119,7 +119,7 @@ public class LifecycleAwareSessionManagerUnitTests { verify(restOperations) .postForObject( - eq("/auth/token/revoke-self"), + eq("auth/token/revoke-self"), eq(new HttpEntity(VaultHttpHeaders.from(LoginToken .of("login")))), any(Class.class)); } @@ -147,7 +147,7 @@ public class LifecycleAwareSessionManagerUnitTests { runnableCaptor.getValue().run(); verify(restOperations).postForObject( - eq("/auth/token/renew-self"), + eq("auth/token/renew-self"), eq(new HttpEntity(VaultHttpHeaders.from(LoginToken.renewable( "login", 5)))), any(Class.class)); verify(clientAuthentication, times(1)).login();