Skip to content

fix(Authoring): Reject request if project is not valid JSON #342

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
eastagiletracker wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(Authoring): Reject request if project is not valid JSON #342

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
15 changes: 15 additions & 0 deletions ...java/org/wise/portal/presentation/web/controllers/author/project/AuthorAPIController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ protected SimpleResponse saveProject(Authentication auth,
throws JSONException, ObjectNotFoundException {
User user = userService.retrieveUserByUsername(auth.getName());
if (projectService.canAuthorProject(project, user)) {
if (!isValidProjectJSONString(projectJSONString)) {
return new ErrorResponse("errorSavingProject");
}
try {
projectService.evictProjectContentCache(project.getId());
projectService.saveProjectContentToDisk(projectJSONString, project);
Expand All @@ -265,6 +268,18 @@ protected SimpleResponse saveProject(Authentication auth,
}
}

private boolean isValidProjectJSONString(String projectJSONString) {
if (projectJSONString == null) {
return false;
}
try {
new JSONObject(projectJSONString);
return true;
} catch (JSONException e) {
return false;
}
}

@GetMapping("/config")
@ResponseBody
@SuppressWarnings("unchecked")
Expand Down
56 changes: 56 additions & 0 deletions .../org/wise/portal/presentation/web/controllers/author/project/AuthorAPIControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,4 +305,60 @@ public void getAssetFileNames_withASpace_shouldReturnFileNames() throws Exceptio
assertTrue(fileNames.contains("carbon dioxide.png"));
assertTrue(fileNames.contains("carbon monoxide.png"));
}

@Test
public void saveProject_whenProjectJSONIsMalformed_shouldNotSaveAndReturnErrorSavingProject()
throws Exception {
expect(userService.retrieveUserByUsername(TEACHER_USERNAME)).andReturn(teacher1);
replay(userService);
expect(projectService.canAuthorProject(project1, teacher1)).andReturn(true);
replay(projectService);
String malformedProjectJSONString = "{\"metadata\":{\"title\":\"New Title\"}";
SimpleResponse response = authorAPIController.saveProject(teacherAuth, project1,
malformedProjectJSONString);
assertEquals("error", response.getStatus());
assertEquals("errorSavingProject", response.getMessageCode());
verify(userService, projectService);
}

@Test
public void saveProject_whenProjectJSONIsNotAnObject_shouldNotSaveAndReturnErrorSavingProject()
throws Exception {
expect(userService.retrieveUserByUsername(TEACHER_USERNAME)).andReturn(teacher1);
replay(userService);
expect(projectService.canAuthorProject(project1, teacher1)).andReturn(true);
replay(projectService);
String projectJSONArrayString = "[{\"metadata\":{\"title\":\"New Title\"}}]";
SimpleResponse response = authorAPIController.saveProject(teacherAuth, project1,
projectJSONArrayString);
assertEquals("error", response.getStatus());
assertEquals("errorSavingProject", response.getMessageCode());
verify(userService, projectService);
}

@Test
public void saveProject_whenProjectJSONIsEmpty_shouldNotSaveAndReturnErrorSavingProject()
throws Exception {
expect(userService.retrieveUserByUsername(TEACHER_USERNAME)).andReturn(teacher1);
replay(userService);
expect(projectService.canAuthorProject(project1, teacher1)).andReturn(true);
replay(projectService);
SimpleResponse response = authorAPIController.saveProject(teacherAuth, project1, "");
assertEquals("error", response.getStatus());
assertEquals("errorSavingProject", response.getMessageCode());
verify(userService, projectService);
}

@Test
public void saveProject_whenProjectJSONIsNull_shouldNotSaveAndReturnErrorSavingProject()
throws Exception {
expect(userService.retrieveUserByUsername(TEACHER_USERNAME)).andReturn(teacher1);
replay(userService);
expect(projectService.canAuthorProject(project1, teacher1)).andReturn(true);
replay(projectService);
SimpleResponse response = authorAPIController.saveProject(teacherAuth, project1, null);
assertEquals("error", response.getStatus());
assertEquals("errorSavingProject", response.getMessageCode());
verify(userService, projectService);
}
}