Skip to content

Retry reactive Vault login after failures #1006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
goutamadwant wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Retry reactive Vault login after failures #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions ...n/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,25 +308,35 @@ private void dropCurrentToken() {
public Mono<VaultToken> getVaultToken() throws VaultException {
Mono<TokenWrapper> tokenWrapper = this.token.get();
if (tokenWrapper == EMPTY) {
Mono<TokenWrapper> obtainToken = this.clientAuthentication.getVaultToken()
.flatMap(this::doSelfLookup) //
.onErrorMap(it -> {
multicastEvent(new LoginFailedEvent(this.clientAuthentication, it));
return it;
})
.doOnNext(it -> {
if (isTokenRenewable(it.getToken())) {
scheduleRenewal(it.getToken());
}
multicastEvent(new AfterLoginEvent(it.getToken()));
});

this.token.compareAndSet(tokenWrapper, obtainToken.cache());
Mono<TokenWrapper> obtainToken = createLoginTokenMono();
this.token.compareAndSet(tokenWrapper, obtainToken);
}

return this.token.get().map(TokenWrapper::getToken);
}

private Mono<TokenWrapper> createLoginTokenMono() {
AtomicReference<Mono<TokenWrapper>> cachedLoginRef = new AtomicReference<>(EMPTY);
Mono<TokenWrapper> obtainToken = this.clientAuthentication.getVaultToken()
.flatMap(this::doSelfLookup) //
.onErrorMap(it -> {
multicastEvent(new LoginFailedEvent(this.clientAuthentication, it));
return it;
})
.doOnNext(it -> {
if (isTokenRenewable(it.getToken())) {
scheduleRenewal(it.getToken());
}
multicastEvent(new AfterLoginEvent(it.getToken()));
})
.doOnError(it -> this.token.compareAndSet(cachedLoginRef.get(), EMPTY))
.cache();

cachedLoginRef.set(obtainToken);

return obtainToken;
}

private Mono<TokenWrapper> doSelfLookup(VaultToken token) {
TokenWrapper wrapper = new TokenWrapper(token, token instanceof LoginToken);
if (isTokenSelfLookupEnabled() && !ClassUtils.isAssignableValue(LoginToken.class, token)) {
Expand Down
20 changes: 20 additions & 0 deletions ...g/springframework/vault/authentication/ReactiveLifecycleAwareSessionManagerUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,26 @@ void loginShouldFail() {
verify(this.errorListener).onAuthenticationError(any(LoginFailedEvent.class));
}

@Test
void shouldRetryLoginAfterFailure() {

when(this.tokenSupplier.getVaultToken()).thenReturn(Mono.error(new VaultLoginException("foo")),
Mono.just(LoginToken.of("login")));

this.sessionManager.getSessionToken() //
.as(StepVerifier::create) //
.verifyError(VaultLoginException.class);

this.sessionManager.getSessionToken() //
.as(StepVerifier::create) //
.expectNext(LoginToken.of("login")) //
.verifyComplete();

verify(this.tokenSupplier, times(2)).getVaultToken();
verify(this.errorListener).onAuthenticationError(any(LoginFailedEvent.class));
verify(this.listener).onAuthenticationEvent(any(AfterLoginEvent.class));
}

@Test
@SuppressWarnings("unchecked")
void shouldSelfLookupToken() {
Expand Down