stklcode/jvaultconnector
stklcode/jvaultconnector
1
0
Fork 0
Code Issues Actions Releases 33 Wiki Activity

LeaseDuration checked for authorization status

Browse Source
This commit is contained in:
Stefan Kalscheuer 2016-08-13 18:00:44 +02:00
parent 27eb1a1e8a
commit ee5b112704
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java
View File

@ -50,6 +50,7 @@ public class HTTPVaultConnector implements VaultConnector {
private boolean authorized = false; /* authorization status */ private boolean authorized = false; /* authorization status */
private String token; /* current token */ private String token; /* current token */
private long tokenTTL = 0; /* expiration time for current token */
/** /**
* Create connector using hostname and schema. * Create connector using hostname and schema.
@ -97,6 +98,7 @@ public class HTTPVaultConnector implements VaultConnector {
@Override @Override
public void resetAuth() { public void resetAuth() {
token = null; token = null;
tokenTTL = 0;
authorized = false; authorized = false;
} }
@ -139,7 +141,7 @@ public class HTTPVaultConnector implements VaultConnector {
@Override @Override
public boolean isAuthorized() { public boolean isAuthorized() {
return authorized; return authorized && (tokenTTL == 0 || tokenTTL >= System.currentTimeMillis());
} }
@Override @Override
@ -164,6 +166,7 @@ public class HTTPVaultConnector implements VaultConnector {
public TokenResponse authToken(final String token) throws VaultConnectorException { public TokenResponse authToken(final String token) throws VaultConnectorException {
/* set token */ /* set token */
this.token = token; this.token = token;
this.tokenTTL = 0;
try { try {
String response = requestPost(PATH_TOKEN_LOOKUP, new HashMap<>()); String response = requestPost(PATH_TOKEN_LOOKUP, new HashMap<>());
TokenResponse res = jsonMapper.readValue(response, TokenResponse.class); TokenResponse res = jsonMapper.readValue(response, TokenResponse.class);
@ -185,6 +188,7 @@ public class HTTPVaultConnector implements VaultConnector {
AuthResponse upr = jsonMapper.readValue(response, AuthResponse.class); AuthResponse upr = jsonMapper.readValue(response, AuthResponse.class);
/* verify response */ /* verify response */
this.token = upr.getAuth().getClientToken(); this.token = upr.getAuth().getClientToken();
this.tokenTTL = System.currentTimeMillis() + upr.getAuth().getLeaseDuration() * 1000L;
this.authorized = true; this.authorized = true;
return upr; return upr;
} catch (IOException e) { } catch (IOException e) {
@ -204,6 +208,7 @@ public class HTTPVaultConnector implements VaultConnector {
AuthResponse auth = jsonMapper.readValue(response, AuthResponse.class); AuthResponse auth = jsonMapper.readValue(response, AuthResponse.class);
/* verify response */ /* verify response */
this.token = auth.getAuth().getClientToken(); this.token = auth.getAuth().getClientToken();
this.tokenTTL = System.currentTimeMillis() + auth.getAuth().getLeaseDuration() * 1000L;
this.authorized = true; this.authorized = true;
return auth; return auth;
} catch (IOException e) { } catch (IOException e) {
@ -284,7 +289,7 @@ public class HTTPVaultConnector implements VaultConnector {
* @param path URL path (relative to base) * @param path URL path (relative to base)
* @param payload Map of payload values (will be converted to JSON) * @param payload Map of payload values (will be converted to JSON)
* @return HTTP response * @return HTTP response
* @throws VaultConnectorException * @throws VaultConnectorException on connection error
*/ */
private String requestPost(final String path, final Map payload) throws VaultConnectorException { private String requestPost(final String path, final Map payload) throws VaultConnectorException {
/* Initialize post */ /* Initialize post */
@ -311,7 +316,7 @@ public class HTTPVaultConnector implements VaultConnector {
* @param path URL path (relative to base) * @param path URL path (relative to base)
* @param payload Map of payload values (will be converted to JSON) * @param payload Map of payload values (will be converted to JSON)
* @return HTTP response * @return HTTP response
* @throws VaultConnectorException * @throws VaultConnectorException on connection error
*/ */
private String requestPut(final String path, final Map<String, Object> payload) throws VaultConnectorException { private String requestPut(final String path, final Map<String, Object> payload) throws VaultConnectorException {
/* Initialize post */ /* Initialize post */
@ -337,7 +342,7 @@ public class HTTPVaultConnector implements VaultConnector {
* @param path URL path (relative to base) * @param path URL path (relative to base)
* @param payload Map of payload values (will be converted to JSON) * @param payload Map of payload values (will be converted to JSON)
* @return HTTP response * @return HTTP response
* @throws VaultConnectorException * @throws VaultConnectorException on connection error
*/ */
private String requestGet(final String path, final Map<String, Object> payload) throws VaultConnectorException { private String requestGet(final String path, final Map<String, Object> payload) throws VaultConnectorException {
/* Initialize post */ /* Initialize post */
@ -358,7 +363,7 @@ public class HTTPVaultConnector implements VaultConnector {
* Execute prepared HTTP request and return result * Execute prepared HTTP request and return result
* @param base Prepares Request * @param base Prepares Request
* @return HTTP response * @return HTTP response
* @throws VaultConnectorException * @throws VaultConnectorException on connection error
*/ */
private String request(HttpRequestBase base) throws VaultConnectorException { private String request(HttpRequestBase base) throws VaultConnectorException {
/* Set JSON Header */ /* Set JSON Header */