Skip to content

Make SecurityGrpcExceptionHandler ordered #371

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
skjolber wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −2
Open

Make SecurityGrpcExceptionHandler ordered #371

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
14 changes: 13 additions & 1 deletion .../src/main/java/org/springframework/grpc/server/security/SecurityGrpcExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,24 @@
import org.apache.commons.logging.LogFactory;
import org.jspecify.annotations.Nullable;

import org.springframework.core.Ordered;
import org.springframework.grpc.server.exception.GrpcExceptionHandler;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.core.AuthenticationException;

import io.grpc.Status;
import io.grpc.StatusException;

public class SecurityGrpcExceptionHandler implements GrpcExceptionHandler {
public class SecurityGrpcExceptionHandler implements GrpcExceptionHandler, Ordered {

private static final Log logger = LogFactory.getLog(SecurityGrpcExceptionHandler.class);

private final int order;

public SecurityGrpcExceptionHandler(int order) {
this.order = order;
}

@Override
public @Nullable StatusException handleException(Throwable exception) {
if (exception instanceof AuthenticationException) {
Expand All @@ -48,4 +55,9 @@ public class SecurityGrpcExceptionHandler implements GrpcExceptionHandler {
return null;
}

@Override
public int getOrder() {
return this.order;
}

}
2 changes: 1 addition & 1 deletion ...pringframework/boot/grpc/server/autoconfigure/security/GrpcSecurityAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ static class ExceptionHandlerConfiguration {

@Bean
GrpcExceptionHandler accessExceptionHandler() {
return new SecurityGrpcExceptionHandler();
return new SecurityGrpcExceptionHandler(0);
}

}
Expand Down
Loading