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

Preserve remember-me option after authentication failure #6844

Merged
merged 1 commit into from
Oct 12, 2024
Merged

Preserve remember-me option after authentication failure #6844

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
2 changes: 1 addition & 1 deletion ...in/java/run/halo/app/security/authentication/rememberme/TokenBasedRememberMeServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ private boolean isValidCookieTokensLength(String[] cookieTokens) {
public Mono<Void> loginFail(ServerWebExchange exchange) {
log.debug("Interactive login attempt was unsuccessful.");
cancelCookie(exchange);
return Mono.empty();
return rememberMeRequestCache.saveRememberMe(exchange);
}

@Override
Expand Down
22 changes: 7 additions & 15 deletions ...ava/run/halo/app/security/authentication/rememberme/WebSessionRememberMeRequestCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package run.halo.app.security.authentication.rememberme;

import static java.lang.Boolean.parseBoolean;

import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebSession;
import reactor.core.publisher.Mono;
Expand All @@ -23,9 +21,7 @@ public class WebSessionRememberMeRequestCache implements RememberMeRequestCache
@Override
public Mono<Void> saveRememberMe(ServerWebExchange exchange) {
return resolveFromQuery(exchange)
.filter(Boolean::booleanValue)
.switchIfEmpty(resolveFromForm(exchange))
.filter(Boolean::booleanValue)
.flatMap(rememberMe -> exchange.getSession().doOnNext(
session -> session.getAttributes().put(SESSION_ATTRIBUTE_NAME, rememberMe))
)
Expand All @@ -35,9 +31,7 @@ public Mono<Void> saveRememberMe(ServerWebExchange exchange) {
@Override
public Mono<Boolean> isRememberMe(ServerWebExchange exchange) {
return resolveFromQuery(exchange)
.filter(Boolean::booleanValue)
.switchIfEmpty(resolveFromForm(exchange))
.filter(Boolean::booleanValue)
.switchIfEmpty(resolveFromSession(exchange))
.defaultIfEmpty(false);
}
Expand All @@ -50,22 +44,20 @@ public Mono<Void> removeRememberMe(ServerWebExchange exchange) {
}

private Mono<Boolean> resolveFromQuery(ServerWebExchange exchange) {
return Mono.just(
parseBoolean(exchange.getRequest().getQueryParams().getFirst(DEFAULT_PARAMETER))
);
return Mono.justOrEmpty(exchange.getRequest().getQueryParams().getFirst(DEFAULT_PARAMETER))
.map(Boolean::parseBoolean);
}

private Mono<Boolean> resolveFromForm(ServerWebExchange exchange) {
return exchange.getFormData()
.map(form -> parseBoolean(form.getFirst(DEFAULT_PARAMETER)))
.filter(Boolean::booleanValue);
.mapNotNull(form -> form.getFirst(DEFAULT_PARAMETER))
.map(Boolean::parseBoolean);
}

private Mono<Boolean> resolveFromSession(ServerWebExchange exchange) {
return exchange.getSession()
.map(session -> {
var rememberMeObject = session.getAttribute(SESSION_ATTRIBUTE_NAME);
return rememberMeObject instanceof Boolean rememberMe ? rememberMe : false;
});
.mapNotNull(session -> session.getAttribute(SESSION_ATTRIBUTE_NAME))
.filter(Boolean.class::isInstance)
.cast(Boolean.class);
}
}
8 changes: 7 additions & 1 deletion application/src/main/java/run/halo/app/security/preauth/PreAuthLoginEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import run.halo.app.security.AuthProviderService;
import run.halo.app.security.HaloServerRequestCache;
import run.halo.app.security.authentication.CryptoService;
import run.halo.app.security.authentication.rememberme.RememberMeRequestCache;
import run.halo.app.security.authentication.rememberme.WebSessionRememberMeRequestCache;

/**
* Pre-auth login endpoints.
Expand All @@ -40,6 +42,9 @@ class PreAuthLoginEndpoint {

private final ServerRequestCache serverRequestCache = new HaloServerRequestCache();

private final RememberMeRequestCache rememberMeRequestCache =
new WebSessionRememberMeRequestCache();

PreAuthLoginEndpoint(CryptoService cryptoService, GlobalInfoService globalInfoService,
AuthProviderService authProviderService) {
this.cryptoService = cryptoService;
Expand Down Expand Up @@ -91,7 +96,8 @@ RouterFunction<ServerResponse> preAuthLoginEndpoints() {
"authProvider", authProvider,
"fragmentTemplateName", fragmentTemplateName,
"socialAuthProviders", socialAuthProviders,
"formAuthProviders", formAuthProviders
"formAuthProviders", formAuthProviders,
"rememberMe", rememberMeRequestCache.isRememberMe(exchange)
// TODO Add more models here
))
));
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/resources/templates/gateway_fragments/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div th:replace="~{__${fragmentTemplateName}__::form}"></div>

<div th:if="${authProvider.spec.rememberMeSupport}" class="form-item-compact">
<input type="checkbox" id="remember-me" name="remember-me" value="true" />
<input type="checkbox" id="remember-me" name="remember-me" value="true" th:checked="${rememberMe}"/>
<label for="remember-me" th:text="#{form.rememberMe.label}"></label>
</div>

Expand Down
Loading