Skip to content

Fix missing return statements causing security and error reporting issue #402

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

Merged
mariusmarin-dev merged 1 commit into from
Feb 18, 2026
Merged

Fix missing return statements causing security and error reporting issue #402

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
4 changes: 2 additions & 2 deletions src/main/java/uk/ac/cam/cl/dtg/isaac/api/EventsFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public final Response getEvents(@Context final HttpServletRequest request,
if (null != currentUser) {
findByFieldNames = getEventsBookedByUser(request, fieldsToMatch.get(TAGS_FIELDNAME), currentUser);
} else {
SegueErrorResponse.getNotLoggedInResponse();
return SegueErrorResponse.getNotLoggedInResponse();
}
} else if (null != showReservationsOnly && showReservationsOnly) {
RegisteredUserDTO currentUser = null;
Expand All @@ -311,7 +311,7 @@ public final Response getEvents(@Context final HttpServletRequest request,
if (null != currentUser) {
findByFieldNames = getEventsReservedByUser(request, currentUser);
} else {
SegueErrorResponse.getNotLoggedInResponse();
return SegueErrorResponse.getNotLoggedInResponse();
}
} else {
if (filterInstructions == null) {
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/uk/ac/cam/cl/dtg/segue/api/EmailFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,12 @@ public final Response sendEmails(@Context final HttpServletRequest request,
SegueErrorResponse error = new SegueErrorResponse(Status.BAD_REQUEST,
"An unknown type of role was supplied.");
log.debug(error.getErrorMessage());
return error.toResponse();
} catch (ContentManagerException e) {
SegueErrorResponse error = new SegueErrorResponse(Status.INTERNAL_SERVER_ERROR,
"There was an error retrieving content.");
log.debug(error.getErrorMessage());
return error.toResponse();
} catch (NoUserLoggedInException e2) {
return SegueErrorResponse.getNotLoggedInResponse();
}
Expand Down Expand Up @@ -461,10 +463,12 @@ public final Response sendEmailsToUserIds(@Context final HttpServletRequest requ
SegueErrorResponse error = new SegueErrorResponse(Status.BAD_REQUEST,
"An unknown type of user was supplied.");
log.debug(error.getErrorMessage());
return error.toResponse();
} catch (ContentManagerException e) {
SegueErrorResponse error = new SegueErrorResponse(Status.INTERNAL_SERVER_ERROR,
"There was an error retrieving content.");
log.debug(error.getErrorMessage());
return error.toResponse();
} catch (NoUserLoggedInException e2) {
return SegueErrorResponse.getNotLoggedInResponse();
} catch (SegueResourceMisuseException e) {
Expand Down Expand Up @@ -565,10 +569,12 @@ public final Response sendProvidedEmailWithUserIds(@Context final HttpServletReq
SegueErrorResponse error = new SegueErrorResponse(Status.BAD_REQUEST,
"An unknown type of user was supplied.");
log.debug(error.getErrorMessage());
return error.toResponse();
} catch (ContentManagerException e) {
SegueErrorResponse error = new SegueErrorResponse(Status.INTERNAL_SERVER_ERROR,
"There was an error retrieving content.");
log.debug(error.getErrorMessage());
return error.toResponse();
} catch (NoUserLoggedInException e2) {
return SegueErrorResponse.getNotLoggedInResponse();
} catch (SegueResourceMisuseException e) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/uk/ac/cam/cl/dtg/segue/api/GroupsFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public Response getGroupsForGivenUser(@Context final HttpServletRequest request,
}

if (!isUserAnAdmin(userManager, request)) {
SegueErrorResponse.getIncorrectRoleResponse();
return SegueErrorResponse.getIncorrectRoleResponse();
}

RegisteredUserDTO userOfInterest = userManager.getUserDTOById(userId);
Expand Down
Loading