-
Notifications
You must be signed in to change notification settings - Fork 4.1k
chore: login metric added #40325
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.
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
Merged
Merged
chore: login metric added #40325
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
8 changes: 8 additions & 0 deletions
8
...er/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/LoginSpan.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.appsmith.external.constants.spans; | ||
|
|
||
| import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX; | ||
|
|
||
| public class LoginSpan { | ||
| public static final String LOGIN_FAILURE = APPSMITH_SPAN_PREFIX + "login_failure"; | ||
| public static final String LOGIN_ATTEMPT = APPSMITH_SPAN_PREFIX + "login_total"; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
...n/java/com/appsmith/server/authentication/handlers/ce/AuthenticationFailureHandlerCE.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,50 @@ | ||
| package com.appsmith.server.authentication.handlers.ce; | ||
|
|
||
| import com.appsmith.server.authentication.helpers.AuthenticationFailureRetryHandler; | ||
| import io.micrometer.core.instrument.MeterRegistry; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.security.core.AuthenticationException; | ||
| import org.springframework.security.oauth2.core.OAuth2AuthenticationException; | ||
| import org.springframework.security.web.server.WebFilterExchange; | ||
| import org.springframework.security.web.server.authentication.ServerAuthenticationFailureHandler; | ||
| import reactor.core.publisher.Mono; | ||
|
|
||
| import static com.appsmith.external.constants.spans.LoginSpan.LOGIN_FAILURE; | ||
|
|
||
| @Slf4j | ||
| @RequiredArgsConstructor | ||
| public class AuthenticationFailureHandlerCE implements ServerAuthenticationFailureHandler { | ||
|
|
||
| private final AuthenticationFailureRetryHandler authenticationFailureRetryHandler; | ||
| private final MeterRegistry meterRegistry; | ||
|
|
||
| @Override | ||
| public Mono<Void> onAuthenticationFailure(WebFilterExchange webFilterExchange, AuthenticationException exception) { | ||
| String source = exception instanceof OAuth2AuthenticationException | ||
| ? ((OAuth2AuthenticationException) exception).getError().getErrorCode() | ||
| : "form"; | ||
|
|
||
| String errorMessage = exception.getMessage(); | ||
|
|
||
| meterRegistry | ||
| .counter(LOGIN_FAILURE, "source", source, "message", errorMessage) | ||
| .increment(); | ||
| return authenticationFailureRetryHandler.retryAndRedirectOnAuthenticationFailure(webFilterExchange, exception); | ||
| } | ||
|
|
||
| public Mono<Void> handleErrorRedirect(WebFilterExchange webFilterExchange) { | ||
| String error = | ||
| webFilterExchange.getExchange().getRequest().getQueryParams().getFirst("error"); | ||
| String message = | ||
| webFilterExchange.getExchange().getRequest().getQueryParams().getFirst("message"); | ||
|
|
||
| if ("true".equals(error)) { | ||
| meterRegistry | ||
| .counter(LOGIN_FAILURE, "source", "redirect", "message", message) | ||
ApekshaBhosale marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .increment(); | ||
| } | ||
|
|
||
| return Mono.empty(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
app/server/appsmith-server/src/main/java/com/appsmith/server/filters/LoginMetricsFilter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package com.appsmith.server.filters; | ||
|
|
||
| import io.micrometer.core.instrument.MeterRegistry; | ||
| import io.micrometer.core.instrument.Timer; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.web.server.ServerWebExchange; | ||
| import org.springframework.web.server.WebFilter; | ||
| import org.springframework.web.server.WebFilterChain; | ||
| import reactor.core.publisher.Mono; | ||
|
|
||
| import static com.appsmith.external.constants.spans.LoginSpan.LOGIN_ATTEMPT; | ||
| import static com.appsmith.external.constants.spans.LoginSpan.LOGIN_FAILURE; | ||
|
|
||
| @Slf4j | ||
| public class LoginMetricsFilter implements WebFilter { | ||
|
|
||
| private final MeterRegistry meterRegistry; | ||
|
|
||
| public LoginMetricsFilter(MeterRegistry meterRegistry) { | ||
| this.meterRegistry = meterRegistry; | ||
| } | ||
|
|
||
| @Override | ||
| public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) { | ||
| Timer.Sample sample = Timer.start(meterRegistry); | ||
ApekshaBhosale marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return chain.filter(exchange) | ||
| .doOnSuccess(aVoid -> { | ||
| sample.stop(Timer.builder(LOGIN_ATTEMPT).register(meterRegistry)); | ||
| }) | ||
| .doOnError(throwable -> { | ||
| sample.stop(Timer.builder(LOGIN_ATTEMPT) | ||
| .tag("message", throwable.getMessage()) | ||
| .register(meterRegistry)); | ||
|
|
||
| meterRegistry | ||
| .counter( | ||
| LOGIN_FAILURE, | ||
| "source", | ||
| "form_login", | ||
| "errorCode", | ||
| "AuthenticationFailed", | ||
| "message", | ||
| throwable.getMessage()) | ||
| .increment(); | ||
| }); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.