Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consider delay for token renewal.

Browse Source 
Adopt TaskExecutor capabilities. Use scheduler API if executor is a `TaskScheduler`, delay task execution otherwise.

Fixes gh-15.
This commit is contained in:
Mark Paluch
2016-10-06 17:23:52 +02:00
parent 2f38bf3ceb
commit 4100d9f886
2 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java
View File

@@ -22,6 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.util.Assert;
import org.springframework.util.NumberUtils;
import org.springframework.util.StringUtils;
@@ -158,11 +159,13 @@ public class LifecycleAwareSessionManager implements SessionManager, DisposableB
private void scheduleRefresh() {
logger.debug("Refreshing token");
LoginToken loginToken = (LoginToken) token;
int seconds = NumberUtils.convertNumberToTargetClass(
final int seconds = NumberUtils.convertNumberToTargetClass(
Math.max(1, loginToken.getLeaseDuration() - REFRESH_PERIOD_BEFORE_EXPIRY), Integer.class);
taskExecutor.execute(new Runnable() {
final Runnable task = new Runnable() {
@Override
public void run() {
try {
@@ -175,7 +178,26 @@ public class LifecycleAwareSessionManager implements SessionManager, DisposableB
logger.error("Cannot refresh VaultToken", e);
}
}
}, TimeUnit.SECONDS.toMillis(seconds));
};
if (taskExecutor instanceof TaskScheduler) {
TaskScheduler taskScheduler = (TaskScheduler) taskExecutor;
taskScheduler.scheduleWithFixedDelay(task, TimeUnit.SECONDS.toMillis(seconds));
return;
}
taskExecutor.execute(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(TimeUnit.SECONDS.toMillis(seconds));
task.run();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
});
}
private static String buildExceptionMessage(VaultResponseEntity<?> response) {

34
spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java
View File

@@ -106,28 +106,28 @@ public class LifecycleAwareSessionManagerUnitTests {
@Test
public void shouldScheduleTokenRenewal() {
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 10));
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 5));
sessionManager.getSessionToken();
verify(taskExecutor).execute(any(Runnable.class), eq(5000L));
verify(taskExecutor).execute(any(Runnable.class));
}
@Test
public void shouldRunTokenRenewal() {
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 10));
when(vaultClient.postForEntity(eq("auth/token/renew-self"), eq(LoginToken.renewable("login", 10)),
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 5));
when(vaultClient.postForEntity(eq("auth/token/renew-self"), eq(LoginToken.renewable("login", 5)),
ArgumentMatchers.any(), any(Class.class)))
.thenReturn(new ResponseEntity<Object>(null, HttpStatus.OK, null, null));
ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
sessionManager.getSessionToken();
verify(taskExecutor).execute(runnableCaptor.capture(), eq(5000L));
verify(taskExecutor).execute(runnableCaptor.capture());
runnableCaptor.getValue().run();
verify(vaultClient).postForEntity(eq("auth/token/renew-self"), eq(LoginToken.renewable("login", 10)),
verify(vaultClient).postForEntity(eq("auth/token/renew-self"), eq(LoginToken.renewable("login", 5)),
ArgumentMatchers.any(), any(Class.class));
verify(clientAuthentication, times(1)).login();
}
@@ -135,54 +135,54 @@ public class LifecycleAwareSessionManagerUnitTests {
@Test
public void shouldReScheduleTokenRenewalAfterSucessfulRenewal() {
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 10));
when(vaultClient.postForEntity(eq("auth/token/renew-self"), eq(LoginToken.renewable("login", 10)),
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 5));
when(vaultClient.postForEntity(eq("auth/token/renew-self"), eq(LoginToken.renewable("login", 5)),
ArgumentMatchers.any(), any(Class.class)))
.thenReturn(new ResponseEntity<Object>(null, HttpStatus.OK, null, null));
ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
sessionManager.getSessionToken();
verify(taskExecutor).execute(runnableCaptor.capture(), eq(5000L));
verify(taskExecutor).execute(runnableCaptor.capture());
runnableCaptor.getValue().run();
verify(taskExecutor, times(2)).execute(any(Runnable.class), anyLong());
verify(taskExecutor, times(2)).execute(any(Runnable.class));
}
@Test
public void shouldNotReScheduleTokenRenewalAfterFailedRenewal() {
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 10));
when(vaultClient.postForEntity(eq("auth/token/renew-self"), eq(LoginToken.renewable("login", 10)),
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 5));
when(vaultClient.postForEntity(eq("auth/token/renew-self"), eq(LoginToken.renewable("login", 5)),
ArgumentMatchers.any(), any(Class.class)))
.thenReturn(new ResponseEntity<Object>(null, HttpStatus.INTERNAL_SERVER_ERROR, null, null));
ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
sessionManager.getSessionToken();
verify(taskExecutor).execute(runnableCaptor.capture(), eq(5000L));
verify(taskExecutor).execute(runnableCaptor.capture());
runnableCaptor.getValue().run();
verify(taskExecutor, times(1)).execute(any(Runnable.class), anyLong());
verify(taskExecutor, times(1)).execute(any(Runnable.class));
}
@Test
public void shouldObtainTokenIfNoTokenAvailable() {
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 10));
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 5));
sessionManager.renewToken();
assertThat(sessionManager.getSessionToken()).isEqualTo(LoginToken.renewable("login", 10));
assertThat(sessionManager.getSessionToken()).isEqualTo(LoginToken.renewable("login", 5));
verify(clientAuthentication, times(1)).login();
}
@Test
public void renewShouldReportFalseIfTokenRenewalFails() {
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 10));
when(clientAuthentication.login()).thenReturn(LoginToken.renewable("login", 5));
when(vaultClient.postForEntity(anyString(), any(VaultToken.class), ArgumentMatchers.any(), any(Class.class)))
.thenReturn(new ResponseEntity<Object>(null, HttpStatus.BAD_REQUEST, null, null));