Skip to content
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

Jump to bottom

fix subscribe on Publisher #143

Merged
merged 1 commit into from
Aug 16, 2023
Merged

fix subscribe on Publisher #143

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
41 changes: 23 additions & 18 deletions ...m/c4_soft/springaddons/security/oidc/starter/reactive/client/ReactiveSpringAddonsAop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,38 +60,43 @@ public void logout() {
public void afterSaveAuthorizedClient(JoinPoint jp) {
var authorizedClient = (OAuth2AuthorizedClient) jp.getArgs()[0];
var exchange = (ServerWebExchange) jp.getArgs()[2];
exchange.getSession().subscribe(session -> {
final var registrationId = authorizedClient.getClientRegistration().getRegistrationId();
final var name = authorizedClient.getPrincipalName();
OAuth2PrincipalSupport.add(session, registrationId, name);
this.authorizedSessionRepository.map(r -> r.save(new OAuth2AuthorizedClientId(registrationId, name), session.getId())).orElse(Mono.empty());
});
exchange
.getSession()
.flatMap(session -> {
final var registrationId = authorizedClient.getClientRegistration().getRegistrationId();
final var name = authorizedClient.getPrincipalName();
OAuth2PrincipalSupport.add(session, registrationId, name);
return Mono.justOrEmpty(authorizedSessionRepository)
.flatMap(r -> r.save(new OAuth2AuthorizedClientId(registrationId, name), session.getId()));
})
.subscribe();
}

@Before("removeAuthorizedClient()")
public void beforeRemoveAuthorizedClient(JoinPoint jp) {
var registrationId = (String) jp.getArgs()[0];
var principal = (Authentication) jp.getArgs()[1];
var exchange = (ServerWebExchange) jp.getArgs()[2];
exchange.getSession().subscribe(session -> {
OAuth2PrincipalSupport.add(session, registrationId, principal.getName());
this.authorizedSessionRepository.map(r -> r.save(new OAuth2AuthorizedClientId(registrationId, principal.getName()), session.getId()))
.orElse(Mono.empty());
});
exchange
.getSession()
.flatMap(session -> {
OAuth2PrincipalSupport.add(session, registrationId, principal.getName());
return Mono.justOrEmpty(authorizedSessionRepository)
.flatMap(r -> r.save(new OAuth2AuthorizedClientId(registrationId, principal.getName()), session.getId()));
})
.subscribe();
}

@Before("logout()")
public void beforeServerLogoutHandlerLogout(JoinPoint jp) {
var exchange = (WebFilterExchange) jp.getArgs()[0];
var authentication = (Authentication) jp.getArgs()[1];
if (authentication instanceof OAuth2AuthenticationToken oauth) {
exchange.getExchange().getSession().subscribe(session -> {
OAuth2PrincipalSupport.getName(session, oauth.getAuthorizedClientRegistrationId()).ifPresent(name -> {
authorizedClientRepo
.removeAuthorizedClient(oauth.getAuthorizedClientRegistrationId(), new StubAuthentication(name), exchange.getExchange())
.subscribe();
});
});
exchange.getExchange()
.getSession()
.flatMap(session -> Mono.justOrEmpty(OAuth2PrincipalSupport.getName(session, oauth.getAuthorizedClientRegistrationId())))
.flatMap(name -> authorizedClientRepo.removeAuthorizedClient(oauth.getAuthorizedClientRegistrationId(), new StubAuthentication(name), exchange.getExchange()))
.subscribe();
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions ...ons/security/oidc/starter/reactive/client/ReactiveSpringAddonsBackChannelLogoutBeans.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import com.c4_soft.springaddons.security.oidc.starter.reactive.ReactiveSpringAddonsOidcBeans;

import lombok.RequiredArgsConstructor;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

/**
Expand Down Expand Up @@ -212,11 +213,11 @@ public void deleteById() {

@AfterReturning(value = "createSession()", returning = "session")
public void afterSessionCreated(Mono<? extends Session> session) {
session.doOnSuccess(s -> {
listeners.forEach(l -> {
l.sessionCreated(s);
});
});
session
.flatMap(s -> Flux.fromIterable(listeners)
.doOnNext(l -> l.sessionCreated(s))
.then(Mono.just(s)))
.subscribe();
}

@Before(value = "deleteById()")
Expand Down
4 changes: 2 additions & 2 deletions ...ity/oidc/starter/reactive/resourceserver/ReactiveSpringAddonsOidcResourceServerBeans.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ ReactiveAuthenticationManagerResolver<ServerWebExchange> authenticationManagerRe
Converter<Jwt, ? extends Mono<? extends AbstractAuthenticationToken>> jwtAuthenticationConverter) {
final var jwtProps = Optional.ofNullable(auth2ResourceServerProperties).map(OAuth2ResourceServerProperties::getJwt);
// @formatter:off
Optional.ofNullable(jwtProps.map(OAuth2ResourceServerProperties.Jwt::getIssuerUri)).orElse(jwtProps.map(OAuth2ResourceServerProperties.Jwt::getJwkSetUri))
Optional.ofNullable(jwtProps.map(OAuth2ResourceServerProperties.Jwt::getIssuerUri).orElse(jwtProps.map(OAuth2ResourceServerProperties.Jwt::getJwkSetUri).orElse(null)))
.filter(StringUtils::hasLength)
.ifPresent(jwtConf -> {
log.warn("spring.security.oauth2.resourceserver configuration will be ignored in favor of com.c4-soft.springaddons.oidc");
Expand Down Expand Up @@ -294,4 +294,4 @@ WebFilter csrfCookieWebFilter() {
}).then(chain.filter(exchange));
};
}
}
}
12 changes: 6 additions & 6 deletions ...t/springaddons/security/oidc/starter/synchronised/client/AuthorizedSessionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
*/
public interface AuthorizedSessionRepository extends HttpSessionListener, HttpSessionIdListener {

public abstract HttpSession save(OAuth2AuthorizedClientId authorizedClientId, HttpSession session);
HttpSession save(OAuth2AuthorizedClientId authorizedClientId, HttpSession session);

public abstract Optional<HttpSession> delete(OAuth2AuthorizedClientId authorizedClientId);
Optional<HttpSession> delete(OAuth2AuthorizedClientId authorizedClientId);

public abstract Optional<HttpSession> findById(OAuth2AuthorizedClientId authorizedClientId);
Optional<HttpSession> findById(OAuth2AuthorizedClientId authorizedClientId);

public abstract Collection<OAuth2AuthorizedClientId> findAuthorizedClientIdsBySessionId(String sessionId);
Collection<OAuth2AuthorizedClientId> findAuthorizedClientIdsBySessionId(String sessionId);

@Override
default void sessionIdChanged(HttpSessionEvent event, String oldSessionId) {
Expand All @@ -43,8 +43,8 @@ default void sessionDestroyed(HttpSessionEvent se) {
// FIXME: remove once https://github.com/spring-projects/spring-security/pull/13648 is merged
@Data
@AllArgsConstructor
public static class OAuth2AuthorizedClientId {
class OAuth2AuthorizedClientId {
private final String clientRegistrationId;
private final String principalName;
}
}
}