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

An invalid ORCID iD should return a 404 #3867

Merged
merged 3 commits into from Jul 12, 2017
Merged

An invalid ORCID iD should return a 404 #3867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fdc216
a invalid ORCID iD should return a 404
rcpeters Jul 12, 2017
8f26527
Merge branch 'master' into badId404
rcpeters Jul 12, 2017
1efacd3
fix test
rcpeters Jul 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicProfileController.java
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -176,7 +177,7 @@ public ModelAndView publicPreviewRedir(HttpServletRequest request, @RequestParam


@RequestMapping(value = {"/{orcid:(?:\\d{4}-){3,}\\d{3}[\\dX]}", "/{orcid:(?:\\d{4}-){3,}\\d{3}[\\dX]}/print"})
public ModelAndView publicPreview(HttpServletRequest request, @RequestParam(value = "page", defaultValue = "1") int pageNo,
public ModelAndView publicPreview(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "page", defaultValue = "1") int pageNo,
@RequestParam(value = "v", defaultValue = "0") int v, @RequestParam(value = "maxResults", defaultValue = "15") int maxResults,
@PathVariable("orcid") String orcid) {

Expand All @@ -185,6 +186,7 @@ public ModelAndView publicPreview(HttpServletRequest request, @RequestParam(valu
try {
profile = profileEntityCacheManager.retrieve(orcid);
} catch(Exception e) {
response.setStatus(HttpStatus.NOT_FOUND.value());
return new ModelAndView("error-404");
}

Expand Down
14 changes: 9 additions & 5 deletions orcid-web/src/test/java/org/orcid/frontend/web/controllers/PublicProfileControllerTest.java
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang.time.DateUtils;
import org.junit.AfterClass;
Expand Down Expand Up @@ -96,6 +97,9 @@ public class PublicProfileControllerTest extends DBUnitTest {
//private HttpServletRequest request;
private HttpServletRequest request = Mockito.mock(HttpServletRequest.class);

@Mock
//private HttpServletRequest request;
private HttpServletResponse response = Mockito.mock(HttpServletResponse.class);

@Before
public void before() {
Expand All @@ -118,7 +122,7 @@ public static void afterClass() throws Exception {
@SuppressWarnings("unchecked")
@Test
public void testViewValidUser() {
ModelAndView mav = publicProfileController.publicPreview(request, 1, 0, 15, userOrcid);
ModelAndView mav = publicProfileController.publicPreview(request, response, 1, 0, 15, userOrcid);
assertEquals("public_profile_v3", mav.getViewName());
Map<String, Object> model = mav.getModel();
assertNotNull(model);
Expand Down Expand Up @@ -223,7 +227,7 @@ public void testViewValidUser() {
@Test
public void testViewLockedUser() {
String displayName = localeManager.resolveMessage("public_profile.deactivated.given_names") + " " + localeManager.resolveMessage("public_profile.deactivated.family_name");
ModelAndView mav = publicProfileController.publicPreview(request, 1, 0, 15, lockedUserOrcid);
ModelAndView mav = publicProfileController.publicPreview(request, response, 1, 0, 15, lockedUserOrcid);
Map<String, Object> model = mav.getModel();
assertUnavailableProfileBasicData(mav, lockedUserOrcid, displayName);
assertTrue(model.containsKey("locked"));
Expand All @@ -232,7 +236,7 @@ public void testViewLockedUser() {

@Test
public void testViewDeprecatedUser() {
ModelAndView mav = publicProfileController.publicPreview(request, 1, 0, 15, deprecatedUserOrcid);
ModelAndView mav = publicProfileController.publicPreview(request, response, 1, 0, 15, deprecatedUserOrcid);
Map<String, Object> model = mav.getModel();
assertUnavailableProfileBasicData(mav, deprecatedUserOrcid, null);
assertTrue(model.containsKey("deprecated"));
Expand All @@ -248,7 +252,7 @@ public void testViewClaimedUserBeforeIsLongEnough() {
profileDao.merge(profile);
profileDao.flush();
String displayName = localeManager.resolveMessage("orcid.reserved_for_claim");
ModelAndView mav = publicProfileController.publicPreview(request, 1, 0, 15, unclaimedUserOrcid);
ModelAndView mav = publicProfileController.publicPreview(request, response, 1, 0, 15, unclaimedUserOrcid);
assertUnavailableProfileBasicData(mav, unclaimedUserOrcid, displayName);
}

Expand All @@ -259,7 +263,7 @@ public void testViewClaimedUserWhenIsLongEnough() {
profileEntity.setSubmissionDate(DateUtils.addDays(new Date(), -10));
profileDao.merge(profileEntity);
profileDao.flush();
ModelAndView mav = publicProfileController.publicPreview(request, 1, 0, 15, unclaimedUserOrcid);
ModelAndView mav = publicProfileController.publicPreview(request, response, 1, 0, 15, unclaimedUserOrcid);
assertEquals("public_profile_v3", mav.getViewName());
Map<String, Object> model = mav.getModel();
assertNotNull(model);
Expand Down