Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,14 @@ public ResponseEntity<ApiResponder<Empty>> enrollSchool(
})
@GetMapping("/school/verify")
public RedirectView verifySchoolEmail(final HttpServletRequest request) {
String referer = request.getHeader("Referer");
String allowedDomain = serverUrlUtils.getUrl();
boolean validOrigin = (referer == null || referer.startsWith(allowedDomain));

if (!validOrigin) {
return new RedirectView("/settings?success=false&message=Invalid request origin");
}

AuthenticationObject authenticationObject;
Session session;
User user;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,8 @@ void enrollSchoolHappyPath() throws Exception {
void verifySchoolEmailNotAuthenticated() {
HttpServletRequest request = mock(HttpServletRequest.class);

when(request.getHeader("Referer")).thenReturn("http://localhost:8080/settings");
when(serverUrlUtils.getUrl()).thenReturn("http://localhost:8080");
when(protector.validateSession(request)).thenThrow(new RuntimeException("Not authenticated"));

RedirectView redirectView = authController.verifySchoolEmail(request);
Expand All @@ -351,6 +353,8 @@ void verifySchoolEmailInvalidToken() throws Exception {

HttpServletRequest request = mock(HttpServletRequest.class);

when(request.getHeader("Referer")).thenReturn("http://localhost:8080/settings");
when(serverUrlUtils.getUrl()).thenReturn("http://localhost:8080");
when(protector.validateSession(request)).thenReturn(authObj);
when(request.getParameter("state")).thenReturn("invalid-token");
when(jwtClient.decode("invalid-token", MagicLink.class)).thenThrow(new RuntimeException("Invalid token"));
Expand All @@ -374,6 +378,8 @@ void verifySchoolEmailUserIdMismatch() throws Exception {
HttpServletRequest request = mock(HttpServletRequest.class);
MagicLink magicLink = new MagicLink("test@myhunter.cuny.edu", "different-user-id");

when(request.getHeader("Referer")).thenReturn("http://localhost:8080/settings");
when(serverUrlUtils.getUrl()).thenReturn("http://localhost:8080");
when(protector.validateSession(request)).thenReturn(authObj);
when(request.getParameter("state")).thenReturn("valid-token");
when(jwtClient.decode("valid-token", MagicLink.class)).thenReturn(magicLink);
Expand All @@ -399,6 +405,8 @@ void verifySchoolEmailHappyPath() throws Exception {

when(protector.validateSession(request)).thenReturn(authObj);
when(request.getParameter("state")).thenReturn("valid-token");
when(request.getHeader("Referer")).thenReturn("http://localhost:8080/settings");
when(serverUrlUtils.getUrl()).thenReturn("http://localhost:8080");
when(jwtClient.decode("valid-token", MagicLink.class)).thenReturn(magicLink);
when(userRepository.updateUser(any(User.class))).thenReturn(true);

Expand All @@ -412,4 +420,25 @@ void verifySchoolEmailHappyPath() throws Exception {
verify(userRepository, times(1)).updateUser(any(User.class));
verify(userTagRepository, times(1)).createTag(any());
}

@Test
@DisplayName("Verify school email - invalid origin")
void verifySchoolEmailInvalidOrigin() {
User user = createRandomUser();
Session session = createRandomSession(user.getId());
AuthenticationObject authObj = createAuthenticationObject(user, session);

HttpServletRequest request = mock(HttpServletRequest.class);

when(protector.validateSession(request)).thenReturn(authObj);
when(request.getHeader("Referer")).thenReturn("http://wrong-host.com/settings");
when(serverUrlUtils.getUrl()).thenReturn("http://localhost:8080");

RedirectView redirectView = authController.verifySchoolEmail(request);

assertNotNull(redirectView);
assertEquals("/settings?success=false&message=Invalid request origin", redirectView.getUrl());

verify(protector, times(0)).validateSession(request);
}
}