Add Reactive One-Time Token Login support
Closes gh-15699
This commit is contained in:
committed by
Josh Cummings
parent
1adb13db66
commit
2ca2e56383
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
* Copyright 2002-2024 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.security.authentication.ott.reactive;
|
||||
|
||||
import java.time.Clock;
|
||||
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import org.springframework.security.authentication.ott.GenerateOneTimeTokenRequest;
|
||||
import org.springframework.security.authentication.ott.InMemoryOneTimeTokenService;
|
||||
import org.springframework.security.authentication.ott.OneTimeToken;
|
||||
import org.springframework.security.authentication.ott.OneTimeTokenAuthenticationToken;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* Reactive adapter for {@link InMemoryOneTimeTokenService}
|
||||
*
|
||||
* @author Max Batischev
|
||||
* @since 6.4
|
||||
* @see InMemoryOneTimeTokenService
|
||||
*/
|
||||
public final class InMemoryReactiveOneTimeTokenService implements ReactiveOneTimeTokenService {
|
||||
|
||||
private final InMemoryOneTimeTokenService oneTimeTokenService = new InMemoryOneTimeTokenService();
|
||||
|
||||
@Override
|
||||
public Mono<OneTimeToken> generate(GenerateOneTimeTokenRequest request) {
|
||||
return Mono.just(request).map(this.oneTimeTokenService::generate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<OneTimeToken> consume(OneTimeTokenAuthenticationToken authenticationToken) {
|
||||
return Mono.just(authenticationToken).mapNotNull(this.oneTimeTokenService::consume);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the {@link Clock} used when generating one-time token and checking token
|
||||
* expiry.
|
||||
* @param clock the clock
|
||||
*/
|
||||
public void setClock(Clock clock) {
|
||||
Assert.notNull(clock, "clock cannot be null");
|
||||
this.oneTimeTokenService.setClock(clock);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
/*
|
||||
* Copyright 2002-2024 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.security.authentication.ott.reactive;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import org.springframework.security.authentication.ReactiveAuthenticationManager;
|
||||
import org.springframework.security.authentication.ott.InvalidOneTimeTokenException;
|
||||
import org.springframework.security.authentication.ott.OneTimeTokenAuthenticationToken;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* A {@link ReactiveAuthenticationManager} for one time tokens.
|
||||
*
|
||||
* @author Max Batischev
|
||||
* @since 6.4
|
||||
*/
|
||||
public final class OneTimeTokenReactiveAuthenticationManager implements ReactiveAuthenticationManager {
|
||||
|
||||
private final ReactiveOneTimeTokenService oneTimeTokenService;
|
||||
|
||||
private final ReactiveUserDetailsService userDetailsService;
|
||||
|
||||
public OneTimeTokenReactiveAuthenticationManager(ReactiveOneTimeTokenService oneTimeTokenService,
|
||||
ReactiveUserDetailsService userDetailsService) {
|
||||
Assert.notNull(oneTimeTokenService, "oneTimeTokenService cannot be null");
|
||||
Assert.notNull(userDetailsService, "userDetailsService cannot be null");
|
||||
this.oneTimeTokenService = oneTimeTokenService;
|
||||
this.userDetailsService = userDetailsService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Authentication> authenticate(Authentication authentication) {
|
||||
if (!(authentication instanceof OneTimeTokenAuthenticationToken otpAuthenticationToken)) {
|
||||
return Mono.empty();
|
||||
}
|
||||
return this.oneTimeTokenService.consume(otpAuthenticationToken)
|
||||
.switchIfEmpty(Mono.error(new InvalidOneTimeTokenException("Invalid token")))
|
||||
.flatMap((consumed) -> this.userDetailsService.findByUsername(consumed.getUsername()))
|
||||
.map(onSuccess(otpAuthenticationToken));
|
||||
}
|
||||
|
||||
private Function<UserDetails, OneTimeTokenAuthenticationToken> onSuccess(OneTimeTokenAuthenticationToken token) {
|
||||
return (user) -> {
|
||||
OneTimeTokenAuthenticationToken authenticated = OneTimeTokenAuthenticationToken.authenticated(user,
|
||||
user.getAuthorities());
|
||||
authenticated.setDetails(token.getDetails());
|
||||
return authenticated;
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Copyright 2002-2024 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.security.authentication.ott.reactive;
|
||||
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import org.springframework.security.authentication.ott.GenerateOneTimeTokenRequest;
|
||||
import org.springframework.security.authentication.ott.OneTimeToken;
|
||||
import org.springframework.security.authentication.ott.OneTimeTokenAuthenticationToken;
|
||||
|
||||
/**
|
||||
* Reactive interface for generating and consuming one-time tokens.
|
||||
*
|
||||
* @author Max Batischev
|
||||
* @since 6.4
|
||||
*/
|
||||
public interface ReactiveOneTimeTokenService {
|
||||
|
||||
/**
|
||||
* Generates a one-time token based on the provided generate request.
|
||||
* @param request the generate request containing the necessary information to
|
||||
* generate the token
|
||||
* @return the generated {@link OneTimeToken}.
|
||||
*/
|
||||
Mono<OneTimeToken> generate(GenerateOneTimeTokenRequest request);
|
||||
|
||||
/**
|
||||
* Consumes a one-time token based on the provided authentication token.
|
||||
* @param authenticationToken the authentication token containing the one-time token
|
||||
* value to be consumed
|
||||
* @return the consumed {@link OneTimeToken} or empty Mono if the token is invalid
|
||||
*/
|
||||
Mono<OneTimeToken> consume(OneTimeTokenAuthenticationToken authenticationToken);
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user