From 596a0977076e214c34b1c021e15473c89b8084d1 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Wed, 16 Oct 2019 17:49:49 +0200 Subject: [PATCH] fix API endpoint for token lookup --- CHANGELOG.md | 3 ++ .../jvault/connector/HTTPVaultConnector.java | 4 ++- .../connector/HTTPVaultConnectorTest.java | 33 ++++++++++++++++++- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d115410..e1cf8db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## unreleased +### Fixes +* Fixed token lookup (#31) + ### Improvements * Updated dependencies diff --git a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java index 759b5a3..2494b12 100644 --- a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java +++ b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java @@ -696,7 +696,9 @@ public class HTTPVaultConnector implements VaultConnector { requireAuth(); /* Request HTTP response and parse Secret */ - return request.get(PATH_TOKEN + "/lookup/" + token, new HashMap<>(), token, TokenResponse.class); + Map param = new HashMap<>(); + param.put("token", token); + return request.get(PATH_TOKEN + PATH_LOOKUP, param, token, TokenResponse.class); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 3fc4461..1215bb9 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -1026,7 +1026,7 @@ public class HTTPVaultConnectorTest { } /** - * Test revocation of secrets. + * Test token creation. */ @Test @Order(20) @@ -1101,6 +1101,37 @@ public class HTTPVaultConnectorTest { assertThat(stackTrace(e), not(stringContainsInOrder(token.getId()))); } } + + /** + * Test token lookuo. + */ + @Test + @Order(30) + @DisplayName("Lookup token") + public void lookupTokenTest() { + authRoot(); + assumeTrue(connector.isAuthorized()); + + /* Create token with attributes */ + Token token = Token.builder() + .withId("my-token") + .build(); + try { + connector.createToken(token); + } catch (VaultConnectorException e) { + fail("Token creation failed."); + } + + authRoot(); + assumeTrue(connector.isAuthorized()); + + try { + TokenResponse res = connector.lookupToken("my-token"); + assertThat("Unexpected token ID", res.getData().getId(), is(token.getId())); + } catch (VaultConnectorException e) { + fail("Token creation failed."); + } + } } @Nested