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

Handling NPE on login #1655

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Handling NPE on login #1655

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
8 changes: 7 additions & 1 deletion src/main/java/org/akhq/controllers/AbstractController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ protected List<Group> getUserGroups() {
return List.of();
}

List<Group> groupBindings = AKHQSecurityRule.decompressGroups(authentication.get()).values()
var groups = AKHQSecurityRule.decompressGroups(authentication.get());

if (groups == null) {
return List.of();
}

List<Group> groupBindings = groups.values()
.stream()
.flatMap(Collection::stream)
.map(gb -> new ObjectMapper().convertValue(gb, Group.class))
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/akhq/controllers/ErrorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ private HttpResponse<?> renderExecption(HttpRequest<?> request, Exception e) {
public HttpResponse<?> error(HttpRequest<?> request, AuthorizationException e) throws URISyntaxException {
if (request.getUri().toString().startsWith("/api")) {
if (e.isForbidden()) {
if (request.getAttribute(HttpAttributes.ROUTE_INFO).isPresent() &&
((UriRouteMatch<?, ?>) request.getAttribute(HttpAttributes.ROUTE_INFO).get()).hasAnnotation(AKHQSecured.class)) {
if (request.getAttribute(HttpAttributes.ROUTE_MATCH).isPresent() &&
((UriRouteMatch<?, ?>) request.getAttribute(HttpAttributes.ROUTE_MATCH).get()).hasAnnotation(AKHQSecured.class)) {
AnnotationValue<AKHQSecured> annotation =
((UriRouteMatch<?, ?>) request.getAttribute(HttpAttributes.ROUTE_INFO).get()).getAnnotation(AKHQSecured.class);
((UriRouteMatch<?, ?>) request.getAttribute(HttpAttributes.ROUTE_MATCH).get()).getAnnotation(AKHQSecured.class);

return HttpResponse.status(HttpStatus.FORBIDDEN)
.body(new JsonError(String.format("Unauthorized: missing permission on resource %s and action %s",
Expand Down
Loading