diff --git a/pom.xml b/pom.xml
index 83b2e3f3aa..607d7b6c62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,6 +164,33 @@
2.3.1
26.0.5
6.3.3
+ 4.0.1
+
+
+ ${session.executionRootDirectory}/deploy
+
+
+ ${base.deploy.dir}/tomcat
+
+ ${base.deploy.dir}/tomcat
+
+ ${base.deploy.dir}/tomcat
+
+ ${base.deploy.dir}/jars
+
+
+ -Dcatalina.home=${project.build.directory}/home -Xms128m -Xmx256m -XX:MaxMetaspaceSize=512m
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentController.java
index 772b631d34..3a7c760da6 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentController.java
@@ -40,6 +40,7 @@
import org.eclipse.sw360.datahandler.thrift.components.Release;
import org.eclipse.sw360.datahandler.thrift.components.ReleaseLink;
import org.eclipse.sw360.datahandler.thrift.projects.Project;
+import org.eclipse.sw360.datahandler.thrift.users.RequestedAction;
import org.eclipse.sw360.datahandler.thrift.users.User;
import org.eclipse.sw360.datahandler.thrift.vendors.Vendor;
import org.eclipse.sw360.datahandler.thrift.vulnerabilities.VulnerabilityDTO;
@@ -96,6 +97,7 @@
import java.util.function.Consumer;
import java.util.stream.Collectors;
+import static org.eclipse.sw360.datahandler.permissions.PermissionUtils.makePermission;
import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
@BasePathAwareController
@@ -109,6 +111,8 @@ public class ComponentController implements RepresentationModelProcessor RESPONSE_BODY_FOR_MODERATION_REQUEST = ImmutableMap.builder()
.put("message", "Moderation request is created").build();
+ private static final ImmutableMap RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT = ImmutableMap.builder()
+ .put("message", "Unauthorized user or empty commit message passed.").build();
@NonNull
private final Sw360ComponentService componentService;
@@ -346,25 +350,31 @@ public ResponseEntity> patchComponent(
@Parameter(description = "The id of the component to be updated.")
@PathVariable("id") String id,
@Parameter(description = "The component with updated fields.")
- @RequestBody ComponentDTO updateComponentDto
+ @RequestBody ComponentDTO updateComponentDto,
+ @RequestParam(value = "comment", required = false) String comment
) throws TException {
User user = restControllerHelper.getSw360UserFromAuthentication();
Component sw360Component = componentService.getComponentForUserById(id, user);
sw360Component = this.restControllerHelper.updateComponent(sw360Component, updateComponentDto);
+ user.setCommentMadeDuringModerationRequest(comment);
Set attachmentDTOS = updateComponentDto.getAttachmentDTOs();
if (!CommonUtils.isNullOrEmptyCollection(attachmentDTOS)) {
Set attachments = new HashSet<>();
- for (AttachmentDTO attachmentDTO: attachmentDTOS) {
+ for (AttachmentDTO attachmentDTO : attachmentDTOS) {
attachments.add(restControllerHelper.convertToAttachment(attachmentDTO, user));
}
sw360Component.setAttachments(attachments);
}
- RequestStatus updateComponentStatus = componentService.updateComponent(sw360Component, user);
- HalResource userHalResource = createHalComponent(sw360Component, user);
- if (updateComponentStatus == RequestStatus.SENT_TO_MODERATOR) {
- return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
+ if (!restControllerHelper.isWriteActionAllowed(sw360Component, user) && comment == null) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT, HttpStatus.FORBIDDEN);
+ } else {
+ RequestStatus updateComponentStatus = componentService.updateComponent(sw360Component, user);
+ HalResource userHalResource = createHalComponent(sw360Component, user);
+ if (updateComponentStatus == RequestStatus.SENT_TO_MODERATOR) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
+ }
+ return new ResponseEntity<>(userHalResource, HttpStatus.OK);
}
- return new ResponseEntity<>(userHalResource, HttpStatus.OK);
}
@PreAuthorize("hasAuthority('WRITE')")
@@ -484,18 +494,26 @@ public ResponseEntity> patchComponentAttachmentInfo(
@Parameter(description = "The id of the attachment.")
@PathVariable("attachmentId") String attachmentId,
@Parameter(description = "The attachment info to be updated.")
- @RequestBody Attachment attachmentData
+ @RequestBody Attachment attachmentData,
+ @RequestParam(value = "comment", required = false) String comment
+
) throws TException {
final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
final Component sw360Component = componentService.getComponentForUserById(id, sw360User);
Set attachments = sw360Component.getAttachments();
- Attachment updatedAttachment = attachmentService.updateAttachment(attachments, attachmentData, attachmentId, sw360User);
+ sw360User.setCommentMadeDuringModerationRequest(comment);
+ Attachment updatedAttachment = attachmentService.updateAttachment(attachments, attachmentData, attachmentId,
+ sw360User);
RequestStatus updateComponentStatus = componentService.updateComponent(sw360Component, sw360User);
- if (updateComponentStatus == RequestStatus.SENT_TO_MODERATOR) {
- return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
+ if (!restControllerHelper.isWriteActionAllowed(sw360Component, sw360User) && comment == null) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT, HttpStatus.FORBIDDEN);
+ } else {
+ if (updateComponentStatus == RequestStatus.SENT_TO_MODERATOR) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
+ }
+ EntityModel attachmentResource = EntityModel.of(updatedAttachment);
+ return new ResponseEntity<>(attachmentResource, HttpStatus.OK);
}
- EntityModel attachmentResource = EntityModel.of(updatedAttachment);
- return new ResponseEntity<>(attachmentResource, HttpStatus.OK);
}
@Operation(
@@ -531,10 +549,15 @@ public ResponseEntity addAttachmentToComponent(
@Parameter(description = "The file to be uploaded.")
@RequestPart("file") MultipartFile file,
@Parameter(description = "The attachment info to be created.")
- @RequestPart("attachment") Attachment newAttachment
+ @RequestPart("attachment") Attachment newAttachment,
+ @RequestParam(value = "comment", required = false) String comment
) throws TException {
final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
final Component component = componentService.getComponentForUserById(componentId, sw360User);
+ sw360User.setCommentMadeDuringModerationRequest(comment);
+ if (!restControllerHelper.isWriteActionAllowed(component, sw360User) && comment == null) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT, HttpStatus.ACCEPTED);
+ }
Attachment attachment = null;
try {
attachment = attachmentService.uploadAttachment(file, newAttachment, sw360User);
@@ -609,10 +632,13 @@ public void downloadAttachmentBundleFromComponent(
@DeleteMapping(COMPONENTS_URL + "/{componentId}/attachments/{attachmentIds}")
public ResponseEntity> deleteAttachmentsFromComponent(
@PathVariable("componentId") String componentId,
- @PathVariable("attachmentIds") List attachmentIds) throws TException {
+ @PathVariable("attachmentIds") List attachmentIds, @RequestParam(value = "comment", required = false) String comment) throws TException {
User user = restControllerHelper.getSw360UserFromAuthentication();
Component component = componentService.getComponentForUserById(componentId, user);
-
+ user.setCommentMadeDuringModerationRequest(comment);
+ if (!restControllerHelper.isWriteActionAllowed(component, user) && comment == null) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT, HttpStatus.FORBIDDEN);
+ }
Set attachmentsToDelete = attachmentService.filterAttachmentsToRemove(Source.componentId(componentId),
component.getAttachments(), attachmentIds);
if (attachmentsToDelete.isEmpty()) {
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
index 14c51ca90c..ebee517c08 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
@@ -51,6 +51,7 @@
import org.eclipse.sw360.datahandler.thrift.projects.Project;
import org.eclipse.sw360.datahandler.thrift.projects.ProjectService;
import org.eclipse.sw360.datahandler.thrift.projects.ProjectDTO;
+import org.eclipse.sw360.datahandler.thrift.users.RequestedAction;
import org.eclipse.sw360.datahandler.thrift.users.User;
import org.eclipse.sw360.datahandler.thrift.vendors.Vendor;
import org.eclipse.sw360.datahandler.thrift.vulnerabilities.*;
@@ -115,6 +116,7 @@
import java.util.stream.Collectors;
import static org.eclipse.sw360.datahandler.common.CommonUtils.isNullEmptyOrWhitespace;
+import static org.eclipse.sw360.datahandler.permissions.PermissionUtils.makePermission;
import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
@Service
@@ -1655,4 +1657,8 @@ public ClearingRequest updateCRSize(ClearingRequest clearingRequest, Project pro
}
return clearingRequestService.getClearingRequestById(clearingRequest.getId(), sw360User);
}
+
+ public boolean isWriteActionAllowed(Object object, User user) {
+ return makePermission(object, user).isActionAllowed(RequestedAction.WRITE);
+ }
}
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java
index 58a96a36d2..17917a7201 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java
@@ -167,6 +167,7 @@
import static org.eclipse.sw360.datahandler.common.CommonUtils.wrapThriftOptionalReplacement;
import static org.eclipse.sw360.datahandler.common.WrappedException.wrapTException;
+import static org.eclipse.sw360.datahandler.permissions.PermissionUtils.makePermission;
import static org.eclipse.sw360.rest.resourceserver.Sw360ResourceServer.REPORT_FILENAME_MAPPING;
import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
@@ -184,23 +185,20 @@ public class ProjectController implements RepresentationModelProcessor mapOfFieldsTobeEmbedded = ImmutableMap.builder()
- .put(Project._Fields.CLEARING_TEAM, "clearingTeam")
- .put(Project._Fields.EXTERNAL_URLS, "externalUrls")
- .put(Project._Fields.MODERATORS, "sw360:moderators")
- .put(Project._Fields.CONTRIBUTORS,"sw360:contributors")
- .put(Project._Fields.ATTACHMENTS,"sw360:attachments").build();
+ .put(Project._Fields.CLEARING_TEAM, "clearingTeam").put(Project._Fields.EXTERNAL_URLS, "externalUrls")
+ .put(Project._Fields.MODERATORS, "sw360:moderators").put(Project._Fields.CONTRIBUTORS, "sw360:contributors")
+ .put(Project._Fields.ATTACHMENTS, "sw360:attachments").build();
private static final ImmutableMap mapOfProjectFieldsToRequestBody = ImmutableMap.builder()
- .put(Project._Fields.VISBILITY, "visibility")
- .put(Project._Fields.RELEASE_ID_TO_USAGE, "linkedReleases")
+ .put(Project._Fields.VISBILITY, "visibility").put(Project._Fields.RELEASE_ID_TO_USAGE, "linkedReleases")
.put(Project._Fields.RELEASE_RELATION_NETWORK, "dependencyNetwork").build();
- private static final ImmutableMap RESPONSE_BODY_FOR_MODERATION_REQUEST = ImmutableMap.builder()
- .put("message", "Moderation request is created").build();
+ private static final ImmutableMap RESPONSE_BODY_FOR_MODERATION_REQUEST = ImmutableMap
+ .builder().put("message", "Moderation request is created").build();
+ private static final ImmutableMap RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT = ImmutableMap
+ .builder().put("message", "Unauthorized user or empty commit message passed.").build();
private static final List enumReleaseRelationshipValues = Stream.of(ReleaseRelationship.values())
- .map(ReleaseRelationship::name)
- .collect(Collectors.toList());
+ .map(ReleaseRelationship::name).collect(Collectors.toList());
private static final List enumMainlineStateValues = Stream.of(MainlineState.values())
- .map(MainlineState::name)
- .collect(Collectors.toList());
+ .map(MainlineState::name).collect(Collectors.toList());
@NonNull
private final Sw360ProjectService projectService;
@@ -238,27 +236,18 @@ public class ProjectController implements RepresentationModelProcessor>> getProjectsForUser(
- Pageable pageable,
- @Parameter(description = "The name of the project")
- @RequestParam(value = "name", required = false) String name,
- @Parameter(description = "The type of the project")
- @RequestParam(value = "type", required = false) String projectType,
- @Parameter(description = "The group of the project")
- @RequestParam(value = "group", required = false) String group,
- @Parameter(description = "The tag of the project")
- @RequestParam(value = "tag", required = false) String tag,
- @Parameter(description = "Flag to get projects with all details.")
- @RequestParam(value = "allDetails", required = false) boolean allDetails,
- @Parameter(description = "List project by lucene search")
- @RequestParam(value = "luceneSearch", required = false) boolean luceneSearch,
- HttpServletRequest request) throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
+ public ResponseEntity>> getProjectsForUser(Pageable pageable,
+ @Parameter(description = "The name of the project") @RequestParam(value = "name", required = false) String name,
+ @Parameter(description = "The type of the project") @RequestParam(value = "type", required = false) String projectType,
+ @Parameter(description = "The group of the project") @RequestParam(value = "group", required = false) String group,
+ @Parameter(description = "The tag of the project") @RequestParam(value = "tag", required = false) String tag,
+ @Parameter(description = "Flag to get projects with all details.") @RequestParam(value = "allDetails", required = false) boolean allDetails,
+ @Parameter(description = "List project by lucene search") @RequestParam(value = "luceneSearch", required = false) boolean luceneSearch,
+ HttpServletRequest request)
+ throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
User sw360User = restControllerHelper.getSw360UserFromAuthentication();
Map mapOfProjects = new HashMap<>();
boolean isSearchByName = name != null && !name.isEmpty();
@@ -312,18 +301,19 @@ public ResponseEntity>> getProjectsForUser(
@NotNull
private ResponseEntity>> getProjectResponse(Pageable pageable,
- String projectType, String group, String tag, boolean allDetails, boolean luceneSearch,
- HttpServletRequest request, User sw360User, Map mapOfProjects, boolean isSearchByName,
- List sw360Projects, boolean isNoFilter) throws ResourceClassNotFoundException, PaginationParameterException, URISyntaxException, TException {
+ String projectType, String group, String tag, boolean allDetails, boolean luceneSearch,
+ HttpServletRequest request, User sw360User, Map mapOfProjects, boolean isSearchByName,
+ List sw360Projects, boolean isNoFilter)
+ throws ResourceClassNotFoundException, PaginationParameterException, URISyntaxException, TException {
sw360Projects.stream().forEach(prj -> mapOfProjects.put(prj.getId(), prj));
PaginationResult paginationResult;
if (isNoFilter) {
int totalCount = projectService.getMyAccessibleProjectCounts(sw360User);
- paginationResult = restControllerHelper.paginationResultFromPaginatedList(request, pageable,
- sw360Projects, SW360Constants.TYPE_PROJECT, totalCount);
+ paginationResult = restControllerHelper.paginationResultFromPaginatedList(request, pageable, sw360Projects,
+ SW360Constants.TYPE_PROJECT, totalCount);
} else {
- paginationResult = restControllerHelper.createPaginationResult(request, pageable,
- sw360Projects, SW360Constants.TYPE_PROJECT);
+ paginationResult = restControllerHelper.createPaginationResult(request, pageable, sw360Projects,
+ SW360Constants.TYPE_PROJECT);
}
List> projectResources = new ArrayList<>();
@@ -360,36 +350,22 @@ private ResponseEntity>> getProjectResponse
return new ResponseEntity<>(resources, status);
}
- @Operation(
- description = "List all projects associated to the user.",
- tags = {"Projects"}
- )
+ @Operation(description = "List all projects associated to the user.", tags = { "Projects" })
@RequestMapping(value = PROJECTS_URL + "/myprojects", method = RequestMethod.GET)
- public ResponseEntity>> getProjectsFilteredForUser(
- Pageable pageable,
- @Parameter(description = "Projects with current user as creator.")
- @RequestParam(value = CREATED_BY, required = false, defaultValue = "true") boolean createdBy,
- @Parameter(description = "Projects with current user as moderator.")
- @RequestParam(value = "moderator", required = false, defaultValue = "true") boolean moderator,
- @Parameter(description = "Projects with current user as contributor.")
- @RequestParam(value = "contributor", required = false, defaultValue = "true") boolean contributor,
- @Parameter(description = "Projects with current user as owner.")
- @RequestParam(value = "projectOwner", required = false, defaultValue = "true") boolean projectOwner,
- @Parameter(description = "Projects with current user as lead architect.")
- @RequestParam(value = "leadArchitect", required = false, defaultValue = "true") boolean leadArchitect,
- @Parameter(description = "Projects with current user as project responsible.")
- @RequestParam(value = "projectResponsible", required = false, defaultValue = "true") boolean projectResponsible,
- @Parameter(description = "Projects with current user as security responsible.")
- @RequestParam(value = "securityResponsible", required = false, defaultValue = "true") boolean securityResponsible,
- @Parameter(description = "Projects with state as open.")
- @RequestParam(value = "stateOpen", required = false, defaultValue = "true") boolean stateOpen,
- @Parameter(description = "Projects with state as closed.")
- @RequestParam(value = "stateClosed", required = false, defaultValue = "true") boolean stateClosed,
- @Parameter(description = "Projects with state as in progress.")
- @RequestParam(value = "stateInProgress", required = false, defaultValue = "true") boolean stateInProgress,
- @Parameter(description = "Flag to get projects with all details.")
- @RequestParam(value = "allDetails", required = false) boolean allDetails,
- HttpServletRequest request) throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
+ public ResponseEntity>> getProjectsFilteredForUser(Pageable pageable,
+ @Parameter(description = "Projects with current user as creator.") @RequestParam(value = CREATED_BY, required = false, defaultValue = "true") boolean createdBy,
+ @Parameter(description = "Projects with current user as moderator.") @RequestParam(value = "moderator", required = false, defaultValue = "true") boolean moderator,
+ @Parameter(description = "Projects with current user as contributor.") @RequestParam(value = "contributor", required = false, defaultValue = "true") boolean contributor,
+ @Parameter(description = "Projects with current user as owner.") @RequestParam(value = "projectOwner", required = false, defaultValue = "true") boolean projectOwner,
+ @Parameter(description = "Projects with current user as lead architect.") @RequestParam(value = "leadArchitect", required = false, defaultValue = "true") boolean leadArchitect,
+ @Parameter(description = "Projects with current user as project responsible.") @RequestParam(value = "projectResponsible", required = false, defaultValue = "true") boolean projectResponsible,
+ @Parameter(description = "Projects with current user as security responsible.") @RequestParam(value = "securityResponsible", required = false, defaultValue = "true") boolean securityResponsible,
+ @Parameter(description = "Projects with state as open.") @RequestParam(value = "stateOpen", required = false, defaultValue = "true") boolean stateOpen,
+ @Parameter(description = "Projects with state as closed.") @RequestParam(value = "stateClosed", required = false, defaultValue = "true") boolean stateClosed,
+ @Parameter(description = "Projects with state as in progress.") @RequestParam(value = "stateInProgress", required = false, defaultValue = "true") boolean stateInProgress,
+ @Parameter(description = "Flag to get projects with all details.") @RequestParam(value = "allDetails", required = false) boolean allDetails,
+ HttpServletRequest request)
+ throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
User sw360User = restControllerHelper.getSw360UserFromAuthentication();
Map mapOfProjects = new HashMap<>();
@@ -400,124 +376,108 @@ public ResponseEntity>> getProjectsFiltered
.put(Project._Fields.PROJECT_OWNER.toString(), projectOwner)
.put(Project._Fields.LEAD_ARCHITECT.toString(), leadArchitect)
.put(Project._Fields.PROJECT_RESPONSIBLE.toString(), projectResponsible)
- .put(Project._Fields.SECURITY_RESPONSIBLES.toString(), securityResponsible)
- .build();
+ .put(Project._Fields.SECURITY_RESPONSIBLES.toString(), securityResponsible).build();
ImmutableMap clearingState = ImmutableMap.builder()
.put(ProjectClearingState.OPEN.toString(), stateOpen)
.put(ProjectClearingState.CLOSED.toString(), stateClosed)
- .put(ProjectClearingState.IN_PROGRESS.toString(), stateInProgress)
- .build();
+ .put(ProjectClearingState.IN_PROGRESS.toString(), stateInProgress).build();
List sw360Projects = projectService.getMyProjects(sw360User, userRoles);
sw360Projects = projectService.getWithFilledClearingStatus(sw360Projects, clearingState);
- return getProjectResponse(pageable, null, null, null, allDetails, true, request, sw360User,
- mapOfProjects, true, sw360Projects, false);
+ return getProjectResponse(pageable, null, null, null, allDetails, true, request, sw360User, mapOfProjects, true,
+ sw360Projects, false);
}
- @Operation(
- description = "Get all releases of license clearing.",
- tags = {"Projects"}
- )
+ @Operation(description = "Get all releases of license clearing.", tags = { "Projects" })
@RequestMapping(value = PROJECTS_URL + "/{id}/licenseClearing", method = RequestMethod.GET)
public ResponseEntity licenseClearing(
- @Parameter(description = "Project ID", example = "376576")
- @PathVariable("id") String id,
- @Parameter(description = "Get the transitive releases.")
- @RequestParam(value = "transitive", required = true) boolean transitive,
- HttpServletRequest request
- ) throws TException {
+ @Parameter(description = "Project ID", example = "376576") @PathVariable("id") String id,
+ @Parameter(description = "Get the transitive releases.") @RequestParam(value = "transitive", required = true) boolean transitive,
+ HttpServletRequest request) throws TException {
- final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
- Project sw360Project = projectService.getProjectForUserById(id, sw360User);
+ final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
+ Project sw360Project = projectService.getProjectForUserById(id, sw360User);
- final Set releaseIds = projectService.getReleaseIds(id, sw360User, transitive);
- List releases = releaseIds.stream().map(relId -> wrapTException(() -> {
- final Release sw360Release = releaseService.getReleaseForUserById(relId, sw360User);
- releaseService.setComponentDependentFieldsInRelease(sw360Release, sw360User);
- return sw360Release;
- })).collect(Collectors.toList());
+ final Set releaseIds = projectService.getReleaseIds(id, sw360User, transitive);
+ List releases = releaseIds.stream().map(relId -> wrapTException(() -> {
+ final Release sw360Release = releaseService.getReleaseForUserById(relId, sw360User);
+ releaseService.setComponentDependentFieldsInRelease(sw360Release, sw360User);
+ return sw360Release;
+ })).collect(Collectors.toList());
- List> releaseList = releases.stream().map(sw360Release -> wrapTException(() -> {
- final Release embeddedRelease = restControllerHelper.convertToEmbeddedLinkedRelease(sw360Release);
- final HalResource releaseResource = restControllerHelper.addEmbeddedReleaseLinks(embeddedRelease);
- return releaseResource;
- })).collect(Collectors.toList());
+ List> releaseList = releases.stream().map(sw360Release -> wrapTException(() -> {
+ final Release embeddedRelease = restControllerHelper.convertToEmbeddedLinkedRelease(sw360Release);
+ final HalResource releaseResource = restControllerHelper.addEmbeddedReleaseLinks(embeddedRelease);
+ return releaseResource;
+ })).collect(Collectors.toList());
- HalResource userHalResource = createHalLicenseClearing(sw360Project, releaseList);
- return new ResponseEntity<>(userHalResource, HttpStatus.OK);
- }
+ HalResource userHalResource = createHalLicenseClearing(sw360Project, releaseList);
+ return new ResponseEntity<>(userHalResource, HttpStatus.OK);
+ }
- @Operation(
- description = "Get a single project.",
- tags = {"Projects"}
- )
+ @Operation(description = "Get a single project.", tags = { "Projects" })
@RequestMapping(value = PROJECTS_URL + "/{id}", method = RequestMethod.GET)
public ResponseEntity> getProject(
- @Parameter(description = "Project ID", example = "376576")
- @PathVariable("id") String id) throws TException {
+ @Parameter(description = "Project ID", example = "376576") @PathVariable("id") String id)
+ throws TException {
User sw360User = restControllerHelper.getSw360UserFromAuthentication();
Project sw360Project = projectService.getProjectForUserById(id, sw360User);
HalResource userHalResource = createHalProject(sw360Project, sw360User);
return new ResponseEntity<>(userHalResource, HttpStatus.OK);
}
- @Operation(
- description = "Get linked projects of a single project.",
- tags = {"Projects"}
- )
+ @Operation(description = "Get linked projects of a single project.", tags = { "Projects" })
@RequestMapping(value = PROJECTS_URL + "/{id}/linkedProjects", method = RequestMethod.GET)
- public ResponseEntity> getLinkedProject(Pageable pageable,
- @Parameter(description = "Project ID", example = "376576")
- @PathVariable("id") String id,@RequestParam(value = "transitive", required = false) String transitive, HttpServletRequest request)
- throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
+ public ResponseEntity> getLinkedProject(Pageable pageable,
+ @Parameter(description = "Project ID", example = "376576") @PathVariable("id") String id,
+ @RequestParam(value = "transitive", required = false) String transitive, HttpServletRequest request)
+ throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
- User sw360User = restControllerHelper.getSw360UserFromAuthentication();
- Project sw360Proj = projectService.getProjectForUserById(id, sw360User);
- final Set projectIdsInBranch = new HashSet<>();
- boolean isTransitive = Boolean.parseBoolean(transitive);
+ User sw360User = restControllerHelper.getSw360UserFromAuthentication();
+ Project sw360Proj = projectService.getProjectForUserById(id, sw360User);
+ final Set projectIdsInBranch = new HashSet<>();
+ boolean isTransitive = Boolean.parseBoolean(transitive);
- Map linkedProjects = sw360Proj.getLinkedProjects();
+ Map linkedProjects = sw360Proj.getLinkedProjects();
List keys = linkedProjects != null ? new ArrayList<>(linkedProjects.keySet()) : new ArrayList<>();
- List projects = keys.stream().map(projId -> wrapTException(() -> {
- final Project sw360Project = projectService.getProjectForUserById(projId, sw360User);
- return sw360Project;
- })).collect(Collectors.toList());
-
- PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable,
- projects, SW360Constants.TYPE_PROJECT);
-
- final List> projectResources = paginationResult.getResources().stream()
- .map(sw360Project -> wrapTException(() -> {
- final Project embeddedProject = restControllerHelper.convertToEmbeddedLinkedProject(sw360Project);
- final HalResource projectResource = new HalResource<>(embeddedProject);
- if (isTransitive) {
- projectService.addEmbeddedLinkedProject(sw360Project, sw360User, projectResource,
- projectIdsInBranch);
- }
- return projectResource;
- })).collect(Collectors.toList());
-
- CollectionModel resources;
- if (projectResources.size() == 0) {
- resources = restControllerHelper.emptyPageResource(Project.class, paginationResult);
- } else {
- resources = restControllerHelper.generatePagesResource(paginationResult, projectResources);
- }
-
- HttpStatus status = resources == null ? HttpStatus.NO_CONTENT : HttpStatus.OK;
- return new ResponseEntity<>(resources, status);
- }
+ List projects = keys.stream().map(projId -> wrapTException(() -> {
+ final Project sw360Project = projectService.getProjectForUserById(projId, sw360User);
+ return sw360Project;
+ })).collect(Collectors.toList());
- @Operation(
- description = "Get releases of linked projects of a single project.",
- tags = {"Projects"}
- )
+ PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable,
+ projects, SW360Constants.TYPE_PROJECT);
+
+ final List> projectResources = paginationResult.getResources().stream()
+ .map(sw360Project -> wrapTException(() -> {
+ final Project embeddedProject = restControllerHelper.convertToEmbeddedLinkedProject(sw360Project);
+ final HalResource projectResource = new HalResource<>(embeddedProject);
+ if (isTransitive) {
+ projectService.addEmbeddedLinkedProject(sw360Project, sw360User, projectResource,
+ projectIdsInBranch);
+ }
+ return projectResource;
+ })).collect(Collectors.toList());
+
+ CollectionModel resources;
+ if (projectResources.size() == 0) {
+ resources = restControllerHelper.emptyPageResource(Project.class, paginationResult);
+ } else {
+ resources = restControllerHelper.generatePagesResource(paginationResult, projectResources);
+ }
+
+ HttpStatus status = resources == null ? HttpStatus.NO_CONTENT : HttpStatus.OK;
+ return new ResponseEntity<>(resources, status);
+ }
+
+ @Operation(description = "Get releases of linked projects of a single project.", tags = { "Projects" })
@RequestMapping(value = PROJECTS_URL + "/{id}/linkedProjects/releases", method = RequestMethod.GET)
- public ResponseEntity>> getReleasesOfLinkedProject(@Parameter(description = "Project ID", example = "376576")
- @PathVariable("id") String id, HttpServletRequest request, Pageable pageable)
- throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
+ public ResponseEntity>> getReleasesOfLinkedProject(
+ @Parameter(description = "Project ID", example = "376576") @PathVariable("id") String id,
+ HttpServletRequest request, Pageable pageable)
+ throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
User sw360User = restControllerHelper.getSw360UserFromAuthentication();
List> result = new ArrayList<>();
@@ -534,51 +494,37 @@ public ResponseEntity>> getReleasesOfLinked
CollectionModel> emptyModel = CollectionModel.empty();
return ResponseEntity.status(HttpStatus.NO_CONTENT).body(emptyModel);
}
- PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable, releases, SW360Constants.TYPE_RELEASE);
+ PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable,
+ releases, SW360Constants.TYPE_RELEASE);
final List> releaseResources = paginationResult.getResources().stream()
- .map(sw360Release -> wrapTException(() -> {
- final Release embeddedRelease = restControllerHelper.convertToEmbeddedLinkedProjectsReleases(sw360Release);
- final HalResource releaseResource = new HalResource<>(embeddedRelease);
- return releaseResource;
- })).collect(Collectors.toList());
+ .map(sw360Release -> wrapTException(() -> {
+ final Release embeddedRelease = restControllerHelper
+ .convertToEmbeddedLinkedProjectsReleases(sw360Release);
+ final HalResource releaseResource = new HalResource<>(embeddedRelease);
+ return releaseResource;
+ })).collect(Collectors.toList());
- CollectionModel resources = restControllerHelper.generatePagesResource(paginationResult, releaseResources);;
+ CollectionModel resources = restControllerHelper.generatePagesResource(paginationResult, releaseResources);
+ ;
HttpStatus status = resources == null ? HttpStatus.NO_CONTENT : HttpStatus.OK;
return new ResponseEntity<>(resources, status);
}
- @Operation(
- description = "Delete a single project.",
- tags = {"Projects"},
- responses = {
- @ApiResponse(
- responseCode = "200", description = "Project deleted."
- ),
- @ApiResponse(
- responseCode = "202", description = "Request sent for moderation.",
- content = {
- @Content(mediaType = "application/json",
- examples = @ExampleObject(
- value = "{\"message\": \"Moderation request is created\"}"
- ))
- }
- ),
- @ApiResponse(
- responseCode = "409",
- description = "The project is used as a linked project. Cannot delete it."
- ),
- @ApiResponse(
- responseCode = "500", description = "Failed to delete project."
- )
- }
- )
+ @Operation(description = "Delete a single project.", tags = { "Projects" }, responses = {
+ @ApiResponse(responseCode = "200", description = "Project deleted."),
+ @ApiResponse(responseCode = "202", description = "Request sent for moderation.", content = {
+ @Content(mediaType = "application/json", examples = @ExampleObject(value = "{\"message\": \"Moderation request is created\"}")) }),
+ @ApiResponse(responseCode = "409", description = "The project is used as a linked project. Cannot delete it."),
+ @ApiResponse(responseCode = "500", description = "Failed to delete project.") })
@RequestMapping(value = PROJECTS_URL + "/{id}", method = RequestMethod.DELETE)
- public ResponseEntity deleteProject(
- @Parameter(description = "Project ID")
- @PathVariable("id") String id
- ) throws TException {
+ public ResponseEntity deleteProject(@Parameter(description = "Project ID") @PathVariable("id") String id, @RequestParam(value = "comment", required = false) String comment)
+ throws TException {
User sw360User = restControllerHelper.getSw360UserFromAuthentication();
+ sw360User.setCommentMadeDuringModerationRequest(comment);
+ if (!restControllerHelper.isWriteActionAllowed(projectService.getProjectForUserById(id, sw360User), sw360User) && comment == null) {
+ return new ResponseEntity<>(RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT, HttpStatus.ACCEPTED);
+ }
RequestStatus requestStatus = projectService.deleteProject(id, sw360User);
if (requestStatus == RequestStatus.SUCCESS) {
return new ResponseEntity<>(HttpStatus.OK);
@@ -591,16 +537,13 @@ public ResponseEntity deleteProject(
}
}
+
@PreAuthorize("hasAuthority('WRITE')")
- @Operation(
- description = "Create a project.",
- tags = {"Projects"}
- )
+ @Operation(description = "Create a project.", tags = { "Projects" })
@RequestMapping(value = PROJECTS_URL, method = RequestMethod.POST)
public ResponseEntity createProject(
- @Parameter(schema = @Schema(implementation = Project.class))
- @RequestBody Map reqBodyMap
- ) throws URISyntaxException, TException {
+ @Parameter(schema = @Schema(implementation = Project.class)) @RequestBody Map reqBodyMap)
+ throws URISyntaxException, TException {
Project project = convertToProject(reqBodyMap);
if (project.getReleaseIdToUsage() != null) {
@@ -623,26 +566,20 @@ public ResponseEntity createProject(
}
project = projectService.createProject(project, sw360User);
- URI location = ServletUriComponentsBuilder
- .fromCurrentRequest().path("/{id}")
- .buildAndExpand(project.getId()).toUri();
+ URI location = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(project.getId())
+ .toUri();
HalResource halResource = createHalProject(project, sw360User);
return ResponseEntity.created(location).body(halResource);
}
@PreAuthorize("hasAuthority('WRITE')")
- @Operation(
- description = "Create a duplicate project.",
- tags = {"Projects"}
- )
+ @Operation(description = "Create a duplicate project.", tags = { "Projects" })
@RequestMapping(value = PROJECTS_URL + "/duplicate/{id}", method = RequestMethod.POST)
public ResponseEntity> createDuplicateProject(
- @Parameter(description = "Project ID to copy.")
- @PathVariable("id") String id,
- @Parameter(schema = @Schema(implementation = Project.class))
- @RequestBody Map reqBodyMap
- ) throws TException {
+ @Parameter(description = "Project ID to copy.") @PathVariable("id") String id,
+ @Parameter(schema = @Schema(implementation = Project.class)) @RequestBody Map reqBodyMap)
+ throws TException {
if (!reqBodyMap.containsKey("name") && !reqBodyMap.containsKey("version")) {
throw new HttpMessageNotReadableException(
"Field name or version should be present in request body to create duplicate of a project");
@@ -672,11 +609,8 @@ public ResponseEntity> createDuplicateProject(
}
@PreAuthorize("hasAuthority('WRITE')")
- @Operation(
- summary = "Link releases to the project.",
- description = "Pass an array of release ids to be linked as request body.",
- tags = {"Projects"}
- )
+ @Operation(summary = "Link releases to the project.", description = "Pass an array of release ids to be linked as request body.", tags = {
+ "Projects" })
@RequestMapping(value = PROJECTS_URL + "/{id}/releases", method = RequestMethod.POST)
public ResponseEntity linkReleases(
@Parameter(description = "Project ID.")
@@ -688,8 +622,15 @@ public ResponseEntity linkReleases(
// TODO: Add example for MAP value
}
)
- @RequestBody Object releasesInRequestBody
+ @RequestBody Object releasesInRequestBody,
+ @RequestParam(value = "comment", required = false) String comment
) throws URISyntaxException, TException {
+ User user = restControllerHelper.getSw360UserFromAuthentication();
+ Project updateProject = projectService.getProjectForUserById(id, user);
+ if (!restControllerHelper.isWriteActionAllowed(updateProject, user) && comment == null) {
+ return new ResponseEntity<>(RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT, HttpStatus.ACCEPTED);
+ }
+ user.setCommentMadeDuringModerationRequest(comment);
RequestStatus linkReleasesStatus = addOrPatchReleasesToProject(id, releasesInRequestBody, false);
HttpStatus status = HttpStatus.CREATED;
if (linkReleasesStatus == RequestStatus.SENT_TO_MODERATOR) {
@@ -698,6 +639,7 @@ public ResponseEntity linkReleases(
return new ResponseEntity<>(HttpStatus.CREATED);
}
+
@PreAuthorize("hasAuthority('WRITE')")
@Operation(
summary = "Link project to an array of projects.",
@@ -705,7 +647,7 @@ public ResponseEntity linkReleases(
tags = {"Projects"}
)
@RequestMapping(value = PROJECTS_URL + "/{id}/linkProjects", method = RequestMethod.POST)
- public ResponseEntity linkToProjects(
+ public ResponseEntity linkToProjects(
@Parameter(description = "Project ID.")
@PathVariable("id") String id,
@Parameter(description = "Array of project IDs",
@@ -714,235 +656,128 @@ public ResponseEntity linkToProjects(
// TODO: Add example for MAP value
}
)
- @RequestBody List projectIdsInRequestBody
+ @RequestBody List projectIdsInRequestBody,
+ @RequestParam(value = "comment", required = false) String comment
) throws URISyntaxException, TException {
- User sw360User = restControllerHelper.getSw360UserFromAuthentication();
- Project sourceProj = projectService.getProjectForUserById(id, sw360User);
- Map responseMap = new HashMap<>();
- HttpStatus status = null;
- Set alreadyLinkedIds= new HashSet<>();
- Set idsSentToModerator = new HashSet<>();
- Set idsWithCyclicPath = new HashSet<>();
- Set linkedProjectIds = new HashSet<>();
- int count = 0;
+ User sw360User = restControllerHelper.getSw360UserFromAuthentication();
+ Project sourceProj = projectService.getProjectForUserById(id, sw360User);
+ Map responseMap = new HashMap<>();
+ HttpStatus status = null;
+ Set alreadyLinkedIds = new HashSet<>();
+ Set idsSentToModerator = new HashSet<>();
+ Set idsWithCyclicPath = new HashSet<>();
+ Set linkedProjectIds = new HashSet<>();
+ int count = 0;
- try {
+ try {
+ for (String projId : projectIdsInRequestBody) {
+ Project proj = projectService.getProjectForUserById(projId, sw360User);
+ Map linkedProject = Optional.ofNullable(proj.getLinkedProjects()).orElse(new HashMap<>());
- for(String projId: projectIdsInRequestBody) {
- Project proj = projectService.getProjectForUserById(projId, sw360User);
- Map linkedProject = Optional.ofNullable(proj.getLinkedProjects()).orElse(new HashMap<>());
+ if (linkedProject.keySet().contains(id)) {
+ alreadyLinkedIds.add(projId);
+ continue;
+ }
- if (linkedProject.keySet().contains(id)) {
- alreadyLinkedIds.add(projId);
- continue;
- }
+ sw360User.setCommentMadeDuringModerationRequest(comment);
+ if (!restControllerHelper.isWriteActionAllowed(proj, sw360User) && comment == null) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT, HttpStatus.ACCEPTED);
+ } else {
+ linkedProject.put(id, new ProjectProjectRelationship(ProjectRelationship.CONTAINED).setEnableSvm(sourceProj.isEnableSvm()));
+ proj.setLinkedProjects(linkedProject);
+ String cyclicLinkedProjectPath = projectService.getCyclicLinkedProjectPath(proj, sw360User);
+ if (!CommonUtils.isNullEmptyOrWhitespace(cyclicLinkedProjectPath)) {
+ idsWithCyclicPath.add(cyclicLinkedProjectPath);
+ continue;
+ }
- linkedProject.put(id, new ProjectProjectRelationship(ProjectRelationship.CONTAINED).setEnableSvm(sourceProj.isEnableSvm()));
- proj.setLinkedProjects(linkedProject);
- String cyclicLinkedProjectPath = projectService.getCyclicLinkedProjectPath(proj, sw360User);
- if (!CommonUtils.isNullEmptyOrWhitespace(cyclicLinkedProjectPath)) {
- idsWithCyclicPath.add(cyclicLinkedProjectPath);
- continue;
- }
+ RequestStatus updatedStatus = projectService.updateProject(proj, sw360User);
+ if (updatedStatus == RequestStatus.SUCCESS) {
+ linkedProjectIds.add(projId);
+ }
- RequestStatus updatedstatus = projectService.updateProject(proj, sw360User);
- if (updatedstatus == RequestStatus.SUCCESS) {
- linkedProjectIds.add(projId);
+ if (updatedStatus == RequestStatus.SENT_TO_MODERATOR) {
+ idsSentToModerator.add(projId);
+ }
+ }
}
- if (updatedstatus == RequestStatus.SENT_TO_MODERATOR) {
- idsSentToModerator.add(projId);
+ if (!alreadyLinkedIds.isEmpty()) {
+ responseMap.put("Message regarding already linked project(s)", "Project ids are: " + alreadyLinkedIds);
+ status = HttpStatus.CONFLICT;
+ count++;
+ }
+ if (!idsWithCyclicPath.isEmpty()) {
+ responseMap.put("Message regarding project(s) having cyclic path", "Cyclic linked project path: " + idsWithCyclicPath);
+ status = HttpStatus.CONFLICT;
+ count++;
+ }
+ if (!idsSentToModerator.isEmpty()) {
+ responseMap.put("Message regarding project(s) sent to Moderator", "Project ids are: " + idsSentToModerator);
+ status = HttpStatus.ACCEPTED;
+ count++;
+ }
+ if (!linkedProjectIds.isEmpty()) {
+ responseMap.put("Message regarding successfully linked project(s)", "Project ids are: " + linkedProjectIds);
+ status = HttpStatus.CREATED;
+ count++;
+ }
+ if (count > 1) {
+ status = HttpStatus.CONFLICT;
}
- }
- if (!alreadyLinkedIds.isEmpty()) {
- responseMap.put("Message regarding already linked project(s)", "Project ids are: " + alreadyLinkedIds);
- status = HttpStatus.CONFLICT;
- count ++;
- }
- if (!idsWithCyclicPath.isEmpty()) {
- responseMap.put("Message regarding project(s) having cyclic path", "Cyclic linked project path: " + idsWithCyclicPath);
- status = HttpStatus.CONFLICT;
- count ++;
- }
- if (!idsSentToModerator.isEmpty()) {
- responseMap.put("Message regarding project(s) sent to Moderator", "Project ids are: " + idsSentToModerator);
- status = HttpStatus.ACCEPTED;
- count ++;
- }
- if (!linkedProjectIds.isEmpty()) {
- responseMap.put("Message regarding successfully linked project(s)", "Project ids are: " + linkedProjectIds);
- status = HttpStatus.CREATED;
- count ++;
- }
- if (count > 1) {
- status = HttpStatus.CONFLICT;
+ } catch (TException e) {
+ responseMap.put("ErrorMsg: ", "Error fetching project");
+ status = HttpStatus.INTERNAL_SERVER_ERROR;
+ log.error("Error: ", e);
}
- } catch (TException e) {
- responseMap.put("ErrorMsg: ", "Error fetching project");
- status = HttpStatus.INTERNAL_SERVER_ERROR;
- log.error("Error: ", e);
- }
-
- HalResource responseResource = new HalResource(responseMap);
- return new ResponseEntity<>(responseResource, status);
+ HalResource responseResource = new HalResource(responseMap);
+ return new ResponseEntity<>(responseResource, status);
}
@PreAuthorize("hasAuthority('WRITE')")
- @Operation(
- summary = "Append new releases to existing releases in a project.",
- description = "Pass an array of release ids or a map of release id to usage to be linked as request body.",
- tags = {"Projects"}
- )
+ @Operation(summary = "Append new releases to existing releases in a project.", description = "Pass an array of release ids or a map of release id to usage to be linked as request body.", tags = {
+ "Projects" })
@RequestMapping(value = PROJECTS_URL + "/{id}/releases", method = RequestMethod.PATCH)
- public ResponseEntity patchReleases(
- @Parameter(description = "Project ID.")
- @PathVariable("id") String id,
- @Parameter(description = "Array of release IDs to be linked.",
- examples = {
- @ExampleObject(value = "[\"3765276512\",\"5578999\",\"3765276513\"]"),
- @ExampleObject(value = "[\"/releases/5578999\"]")
- // TODO: Add example for MAP value
- }
- )
- @RequestBody Object releaseURIs
- ) throws URISyntaxException, TException {
- RequestStatus patchReleasesStatus = addOrPatchReleasesToProject(id, releaseURIs, true);
- if (patchReleasesStatus == RequestStatus.SENT_TO_MODERATOR) {
- return new ResponseEntity<>(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
- }
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PreAuthorize("hasAuthority('WRITE')")
- @Operation(
- summary = "Add/link packages to the project.",
- description = "Pass a set of package ids to be linked as request body.",
- responses = {
- @ApiResponse(responseCode = "201", description = "Packages are linked to the project."),
- @ApiResponse(responseCode = "202", description = "Moderation request is created.")
- },
- tags = {"Projects"}
- )
- @RequestMapping(value = PROJECTS_URL + "/{id}/link/packages", method = RequestMethod.PATCH)
- public ResponseEntity linkPackages(
- @Parameter(description = "Project ID.", example = "376576")
- @PathVariable("id") String id,
- @Parameter(description = "Set of package IDs to be linked.",
- example = "[\"3765276512\",\"5578999\",\"3765276513\"]"
- )
- @RequestBody Set packagesInRequestBody
- ) throws URISyntaxException, TException {
- if(!packageService.validatePackageIds(packagesInRequestBody)){
- return new ResponseEntity<>("Package ID invalid! ", HttpStatus.NOT_FOUND);
- }
- RequestStatus linkPackageStatus = linkOrUnlinkPackages(id, packagesInRequestBody, true);
- if (linkPackageStatus == RequestStatus.SENT_TO_MODERATOR) {
- return new ResponseEntity<>(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
- }
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PreAuthorize("hasAuthority('WRITE')")
- @Operation(
- summary = "Remove/unlink packages from the project.",
- description = "Pass a set of package ids to be unlinked as request body.",
- responses = {
- @ApiResponse(responseCode = "201", description = "Packages are unlinked from the project."),
- @ApiResponse(responseCode = "202", description = "Moderation request is created.")
- },
- tags = {"Projects"}
- )
- @RequestMapping(value = PROJECTS_URL + "/{id}/unlink/packages", method = RequestMethod.PATCH)
- public ResponseEntity patchPackages(
- @Parameter(description = "Project ID.", example = "376576")
- @PathVariable("id") String id,
- @Parameter(description = "Set of package IDs to be linked.",
- example = "[\"3765276512\",\"5578999\",\"3765276513\"]"
- )
- @RequestBody Set packagesInRequestBody
- ) throws URISyntaxException, TException {
- if(!packageService.validatePackageIds(packagesInRequestBody)){
- return new ResponseEntity<>("Package ID invalid! ", HttpStatus.NOT_FOUND);
- }
- RequestStatus patchPackageStatus = linkOrUnlinkPackages(id, packagesInRequestBody, false);
- if (patchPackageStatus == RequestStatus.SENT_TO_MODERATOR) {
- return new ResponseEntity<>(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
- }
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @Operation(
- description = "Get releases of a single project.",
- tags = {"Projects"}
- )
- @RequestMapping(value = PROJECTS_URL + "/{id}/releases", method = RequestMethod.GET)
- public ResponseEntity>> getProjectReleases(
- Pageable pageable,
- @Parameter(description = "Project ID.")
- @PathVariable("id") String id,
- @Parameter(description = "Get the transitive releases?")
- @RequestParam(value = "transitive", required = false, defaultValue = "false") boolean transitive,
- HttpServletRequest request
- ) throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
-
+ public ResponseEntity patchReleases(@Parameter(description = "Project ID.") @PathVariable("id") String id,
+ @Parameter(description = "Array of release IDs to be linked.", examples = {
+ @ExampleObject(value = "[\"3765276512\",\"5578999\",\"3765276513\"]"),
+ @ExampleObject(value = "[\"/releases/5578999\"]")
+ // TODO: Add example for MAP value
+ }) @RequestBody Object releaseURIs,
+ @RequestParam(value = "comment", required = false) String comment)
+ throws URISyntaxException, TException {
final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
- final Set releaseIds = projectService.getReleaseIds(id, sw360User, transitive);
- final Set releaseIdsInBranch = new HashSet<>();
-
- List releases = releaseIds.stream().map(relId -> wrapTException(() -> {
- final Release sw360Release = releaseService.getReleaseForUserById(relId, sw360User);
- return sw360Release;
- })).collect(Collectors.toList());
-
- PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable,
- releases, SW360Constants.TYPE_RELEASE);
-
- final List> releaseResources = paginationResult.getResources().stream()
- .map(sw360Release -> wrapTException(() -> {
- final Release embeddedRelease = restControllerHelper.convertToEmbeddedRelease(sw360Release);
- final HalResource releaseResource = new HalResource<>(embeddedRelease);
- if (transitive) {
- projectService.addEmbeddedlinkedRelease(sw360Release, sw360User, releaseResource,
- releaseService, releaseIdsInBranch);
- }
- return releaseResource;
- })).collect(Collectors.toList());
-
- CollectionModel resources;
- if (releaseResources.size() == 0) {
- resources = restControllerHelper.emptyPageResource(Project.class, paginationResult);
+ Project project = projectService.getProjectForUserById(id, sw360User);
+ sw360User.setCommentMadeDuringModerationRequest(comment);
+ if (!restControllerHelper.isWriteActionAllowed(project, sw360User) && comment == null) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT, HttpStatus.ACCEPTED);
} else {
- resources = restControllerHelper.generatePagesResource(paginationResult, releaseResources);
+ RequestStatus patchReleasesStatus = addOrPatchReleasesToProject(id, releaseURIs, true);
+ if (patchReleasesStatus == RequestStatus.SENT_TO_MODERATOR) {
+ return new ResponseEntity<>(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
+ }
+ return new ResponseEntity<>(HttpStatus.CREATED);
}
-
- HttpStatus status = resources == null ? HttpStatus.NO_CONTENT : HttpStatus.OK;
- return new ResponseEntity<>(resources, status);
}
- @Operation(
- description = "Get releases of multiple projects.",
- tags = {"Projects"}
- )
+
+ @Operation(description = "Get releases of multiple projects.", tags = { "Projects" })
@RequestMapping(value = PROJECTS_URL + "/releases", method = RequestMethod.GET)
- public ResponseEntity>> getProjectsReleases(
- Pageable pageable,
- @Parameter(description = "List of project IDs to get release for.", example = "[\"376576\",\"376570\"]")
- @RequestBody List projectIds,
- @Parameter(description = "Get the transitive releases")
- @RequestParam(value = "transitive", required = false) boolean transitive,
- @Parameter(description = "The clearing state of the release.",
- schema = @Schema(implementation = ClearingState.class))
- @RequestParam(value = "clearingState", required = false) String clState,
- HttpServletRequest request
- ) throws URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
+ public ResponseEntity>> getProjectsReleases(Pageable pageable,
+ @Parameter(description = "List of project IDs to get release for.", example = "[\"376576\",\"376570\"]") @RequestBody List projectIds,
+ @Parameter(description = "Get the transitive releases") @RequestParam(value = "transitive", required = false) boolean transitive,
+ @Parameter(description = "The clearing state of the release.", schema = @Schema(implementation = ClearingState.class)) @RequestParam(value = "clearingState", required = false) String clState,
+ HttpServletRequest request)
+ throws URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
final Set releaseIdsInBranch = new HashSet<>();
- Set releases = projectService.getReleasesFromProjectIds(projectIds, transitive, sw360User, releaseService);
+ Set releases = projectService.getReleasesFromProjectIds(projectIds, transitive, sw360User,
+ releaseService);
if (null != clState) {
ClearingState cls = ThriftEnumUtils.stringToEnum(clState, ClearingState.class);
@@ -951,7 +786,8 @@ public ResponseEntity>> getProjectsReleases
List relList = releases.stream().collect(Collectors.toList());
- PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable, relList, SW360Constants.TYPE_RELEASE);
+ PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable,
+ relList, SW360Constants.TYPE_RELEASE);
final List> releaseResources = paginationResult.getResources().stream()
.map(sw360Release -> wrapTException(() -> {
final Release embeddedRelease = restControllerHelper.convertToEmbeddedReleaseWithDet(sw360Release);
@@ -972,2070 +808,2258 @@ public ResponseEntity>> getProjectsReleases
return new ResponseEntity<>(resources, status);
}
- @Operation(
- description = "Get all releases with ECC information of a single project.",
- tags = {"Projects"}
- )
- @RequestMapping(value = PROJECTS_URL + "/{id}/releases/ecc", method = RequestMethod.GET)
- public ResponseEntity>> getECCsOfReleases(
- Pageable pageable,
- HttpServletRequest request,
- @Parameter(description = "Project ID.")
- @PathVariable("id") String id,
- @Parameter(description = "Get the transitive ECC")
- @RequestParam(value = "transitive", required = false) boolean transitive
- ) throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
+ @Operation(description = "Patch vulnerabilities of a single project.", tags = {"Projects"})
+ @RequestMapping(value = PROJECTS_URL
+ + "/{id}/vulnerabilities", method = RequestMethod.PATCH, consumes = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity>> updateVulnerabilitiesOfReleases(
+ @Parameter(description = "Project ID.") @PathVariable("id") String id,
+ @Parameter(description = "Vulnerability list") @RequestBody List vulnDTOs, @RequestParam(value = "comment", required = false) String comment) throws TException{
final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
- List releases = new ArrayList<>();
- final Set releaseIds = projectService.getReleaseIds(id, sw360User, transitive);
- for (final String releaseId : releaseIds) {
- Release sw360Release = releaseService.getReleaseForUserById(releaseId, sw360User);
- releases.add(sw360Release);
- }
-
- PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable, releases, SW360Constants.TYPE_RELEASE);
- final List> releaseResources = new ArrayList<>();
- for (Release rel : paginationResult.getResources()) {
- Release embeddedRelease = restControllerHelper.convertToEmbeddedRelease(rel);
- embeddedRelease.setEccInformation(rel.getEccInformation());
- final EntityModel releaseResource = EntityModel.of(embeddedRelease);
- releaseResources.add(releaseResource);
- }
-
- CollectionModel> resources;
- if (releaseIds.size() == 0) {
- resources = restControllerHelper.emptyPageResource(Release.class, paginationResult);
- } else {
- resources = restControllerHelper.generatePagesResource(paginationResult, releaseResources);
- }
- HttpStatus status = resources == null ? HttpStatus.NO_CONTENT : HttpStatus.OK;
- return new ResponseEntity<>(resources, status);
- }
+ // Fetch project object by ID
+ Project project = projectService.getProjectForUserById(id, sw360User);
- @Operation(
- description = "Get vulnerabilities of all projects including parent and directly linked projects.",
- tags = {"Projects"}
- )
+ // Fetch vulnerabilities of the project
+ List actualVDto = vulnerabilityService.getVulnerabilitiesByProjectId(id, sw360User);
+ Set actualExternalId = actualVDto.stream().map(VulnerabilityDTO::getExternalId)
+ .collect(Collectors.toSet());
+ Set externalIdsFromRequestDto = vulnDTOs.stream().map(VulnerabilityDTO::getExternalId)
+ .collect(Collectors.toSet());
+ Set commonExtIds = Sets.intersection(actualExternalId, externalIdsFromRequestDto);
- @RequestMapping(value = PROJECTS_URL + "/{id}/vulnerabilitySummary", method = RequestMethod.GET)
- public ResponseEntity>> getAllVulnerabilities(
- Pageable pageable,
- HttpServletRequest request,
- @PathVariable("id") String id)
- throws TException, PaginationParameterException, ResourceClassNotFoundException, URISyntaxException {
+ if (CommonUtils.isNullOrEmptyCollection(commonExtIds)
+ || commonExtIds.size() != externalIdsFromRequestDto.size()) {
+ throw new HttpMessageNotReadableException("External ID is not valid");
+ }
- User sw360User = restControllerHelper.getSw360UserFromAuthentication();
- Project sw360Project = projectService.getProjectForUserById(id, sw360User);
+ Set actualReleaseIds = actualVDto.stream().map(VulnerabilityDTO::getIntReleaseId)
+ .collect(Collectors.toSet());
+ Set releaseIdsFromRequestDto = vulnDTOs.stream().map(VulnerabilityDTO::getIntReleaseId)
+ .collect(Collectors.toSet());
+ Set commonRelIds = Sets.intersection(actualReleaseIds, releaseIdsFromRequestDto);
- List parentProjectVulnerabilities = vulnerabilityService.getVulnerabilitiesByProjectId(id, sw360User);
+ if (CommonUtils.isNullOrEmptyCollection(commonRelIds)
+ || commonRelIds.size() != releaseIdsFromRequestDto.size()) {
+ throw new HttpMessageNotReadableException("Release ID is not valid");
+ }
- Map> vulnerabilitiesMap = new HashMap<>();
- String parentProjectKey = sw360Project.getName() + " " + sw360Project.getVersion();
- vulnerabilitiesMap.put(parentProjectKey, parentProjectVulnerabilities);
+ Optional projectVulnerabilityRatings = wrapThriftOptionalReplacement(
+ vulnerabilityService.getProjectVulnerabilityRatingByProjectId(id, sw360User));
+ ProjectVulnerabilityRating link = updateProjectVulnerabilityRatingFromRequest(
+ projectVulnerabilityRatings, vulnDTOs, id, sw360User);
- if (!sw360Project.getLinkedProjects().isEmpty()) {
- for (String linkedProjectId : sw360Project.getLinkedProjects().keySet()) {
- Project linkedProject = projectService.getProjectForUserById(linkedProjectId, sw360User);
- List linkedProjectVulnerabilities = vulnerabilityService.getVulnerabilitiesByProjectId(linkedProjectId, sw360User);
- String linkedProjectKey = linkedProject.getName() + " " + linkedProject.getVersion();
- vulnerabilitiesMap.put(linkedProjectKey, linkedProjectVulnerabilities);
- }
+ if (!restControllerHelper.isWriteActionAllowed(project, sw360User) && comment == null) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST_WITH_COMMIT, HttpStatus.ACCEPTED);
}
- List newList = new ArrayList<>();
- Optional projectVulnerabilityRating = wrapThriftOptionalReplacement(vulnerabilityService.getProjectVulnerabilityRatingByProjectId(id, sw360User));
- Map>> vulnerabilityIdToStatusHistory = projectVulnerabilityRating
- .map(ProjectVulnerabilityRating::getVulnerabilityIdToReleaseIdToStatus).orElseGet(HashMap::new);
-
+ sw360User.setCommentMadeDuringModerationRequest(comment);
- for (Map.Entry> entry : vulnerabilitiesMap.entrySet()) {
- String projectName = entry.getKey();
- List vulnerabilities = entry.getValue();
+ final RequestStatus requestStatus = vulnerabilityService.updateProjectVulnerabilityRating(link, sw360User);
- for (VulnerabilityDTO vulnerability : vulnerabilities) {
- String comment = "", action = "new";
- Map> vulRatingProj = vulnerabilityService.fillVulnerabilityMetadata(vulnerability, projectVulnerabilityRating);
- vulnerability.setProjectRelevance(vulRatingProj.get(vulnerability.externalId).get(vulnerability.intReleaseId).toString());
- Map> relIdToCheckStatus = vulnerabilityIdToStatusHistory.get(vulnerability.externalId);
- if(null != relIdToCheckStatus && relIdToCheckStatus.containsKey(vulnerability.intReleaseId)) {
- List checkStatus = relIdToCheckStatus.get(vulnerability.intReleaseId);
- comment = checkStatus.get(checkStatus.size()-1).getComment();
- action = checkStatus.get(checkStatus.size()-1).getProjectAction();
- }
- vulnerability.setComment(comment);
- vulnerability.setAction(action);
- VulnerabilitySummary summ = new VulnerabilitySummary();
- summ.setProjectName(projectName);
- summ.setExternalId(vulnerability.getExternalId());
- summ.setDescription(vulnerability.getDescription());
- summ.setTitle(vulnerability.getTitle());
- summ.setPriority(vulnerability.getPriority());
- summ.setPriorityToolTip(vulnerability.getPriorityToolTip());
- summ.setAction(vulnerability.getAction());
- summ.setComment(vulnerability.getComment());
- summ.setMatchedBy(vulnerability.getMatchedBy());
- summ.setUsedNeedle(vulnerability.getUsedNeedle());
- summ.setProjectRelevance(vulnerability.getProjectRelevance());
- summ.setIntReleaseId(vulnerability.getIntReleaseId());
- summ.setIntReleaseName(vulnerability.getIntReleaseName());
- newList.add(summ);
- }
- }
-
- PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable, newList, SW360Constants.TYPE_VULNERABILITYSUMMARY);
-
- final List> vulResources = paginationResult.getResources().stream()
- .map(sw360Vul -> wrapTException(() -> {
- final VulnerabilitySummary embeddedVul = restControllerHelper.convertToEmbeddedVulnerabilitySumm(sw360Vul);
- final HalResource vulResource = new HalResource<>(embeddedVul);
- Link projectLink = linkTo(VulnerabilityController.class)
- .slash("api/vulnerabilities/" + sw360Vul.getExternalId()).withSelfRel();
- vulResource.add(projectLink);
- return vulResource;
- })).collect(Collectors.toList());
+ final List> vulnerabilityResources = new ArrayList<>();
+ vulnDTOs.forEach(dto -> {
+ final EntityModel vulnerabilityDTOEntityModel = EntityModel.of(dto);
+ vulnerabilityResources.add(vulnerabilityDTOEntityModel);
+ });
- CollectionModel resources;
- if (vulResources.size() == 0) {
- resources = restControllerHelper.emptyPageResource(Project.class, paginationResult);
- } else {
- resources = restControllerHelper.generatePagesResource(paginationResult, vulResources);
+ CollectionModel> resources = null;
+ if (RequestStatus.SUCCESS.equals(requestStatus)) {
+ resources = restControllerHelper.createResources(vulnerabilityResources);
}
HttpStatus status = resources == null ? HttpStatus.NO_CONTENT : HttpStatus.OK;
+
+ if (requestStatus == RequestStatus.SENT_TO_MODERATOR) {
+ return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
+ }
+
return new ResponseEntity<>(resources, status);
}
- @Operation(
- description = "Get vulnerabilities of a single project.",
- tags = {"Projects"}
- )
- @RequestMapping(value = PROJECTS_URL + "/{id}/vulnerabilities", method = RequestMethod.GET)
- public ResponseEntity>> getVulnerabilitiesOfReleases(
- Pageable pageable,
- @Parameter(description = "Project ID.")
- @PathVariable("id") String id,
- @Parameter(description = "The priority of vulnerability.",
- examples = {@ExampleObject(value = "1 - critical"), @ExampleObject(value = "2 - major")}
- )
- @RequestParam(value = "priority") Optional priority,
- @Parameter(description = "The relevance of project of the vulnerability.",
- schema = @Schema(implementation = VulnerabilityRatingForProject.class)
- )
- @RequestParam(value = "projectRelevance") Optional projectRelevance,
- @Parameter(description = "The release Id of vulnerability.")
- @RequestParam(value = "releaseId") Optional releaseId,
- @Parameter(description = "The external Id of vulnerability.")
- @RequestParam(value = "externalId") Optional externalId,
- HttpServletRequest request
- ) throws URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
- final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
- final List allVulnerabilityDTOs = vulnerabilityService.getVulnerabilitiesByProjectId(id, sw360User);
- Optional projectVulnerabilityRating = wrapThriftOptionalReplacement(vulnerabilityService.getProjectVulnerabilityRatingByProjectId(id, sw360User));
- Map>> vulnerabilityIdToStatusHistory = projectVulnerabilityRating
- .map(ProjectVulnerabilityRating::getVulnerabilityIdToReleaseIdToStatus).orElseGet(HashMap::new);
- final List> vulnerabilityResources = new ArrayList<>();
- for (final VulnerabilityDTO vulnerabilityDTO : allVulnerabilityDTOs) {
- String comment = "", action = "";
- Map> vulRatingProj = vulnerabilityService.fillVulnerabilityMetadata(vulnerabilityDTO, projectVulnerabilityRating);
- vulnerabilityDTO.setProjectRelevance(vulRatingProj.get(vulnerabilityDTO.externalId).get(vulnerabilityDTO.intReleaseId).toString());
- Map> relIdToCheckStatus = vulnerabilityIdToStatusHistory.get(vulnerabilityDTO.externalId);
- if(null != relIdToCheckStatus && relIdToCheckStatus.containsKey(vulnerabilityDTO.intReleaseId)) {
- List checkStatus = relIdToCheckStatus.get(vulnerabilityDTO.intReleaseId);
- comment = checkStatus.get(checkStatus.size()-1).getComment();
- action = checkStatus.get(checkStatus.size()-1).getProjectAction();
- }
- vulnerabilityDTO.setComment(comment);
- vulnerabilityDTO.setAction(action);
- final EntityModel vulnerabilityDTOEntityModel = EntityModel.of(vulnerabilityDTO);
- vulnerabilityResources.add(vulnerabilityDTOEntityModel);
- }
- List priorityList = priority.isPresent() ? Lists.newArrayList(priority.get().split(",")) : Lists.newArrayList();
- List projectRelevanceList = projectRelevance.isPresent() ? Lists.newArrayList(projectRelevance.get().split(",")) : Lists.newArrayList();
- final List> vulnResources = vulnerabilityResources.stream()
- .filter(vulRes -> projectRelevance.isEmpty() || projectRelevanceList.contains(vulRes.getContent().getProjectRelevance()))
- .filter(vulRes -> priority.isEmpty() || priorityList.contains(vulRes.getContent().getPriority()))
- .filter(vulRes -> !releaseId.isPresent() || vulRes.getContent().getIntReleaseId().equals(releaseId.get()))
- .filter(vulRes -> !externalId.isPresent() || vulRes.getContent().getExternalId().equals(externalId.get()))
- .collect(Collectors.toList());
- List vulDtos = vulnResources.stream().map(res -> res.getContent()).collect(Collectors.toList());
- PaginationResult paginationResult = restControllerHelper.createPaginationResult(request, pageable, vulDtos, SW360Constants.TYPE_VULNERABILITYDTO);
- List> paginatedVulnResources = Lists.newArrayList();
- for (VulnerabilityDTO vd: paginationResult.getResources()) {
- EntityModel vDTOEntityModel = EntityModel.of(vd);
- paginatedVulnResources.add(vDTOEntityModel);
- }
- CollectionModel resources;
- if (vulnResources.size() == 0) {
- resources = restControllerHelper.emptyPageResource(VulnerabilityDTO.class, paginationResult);
- } else {
- resources = restControllerHelper.generatePagesResource(paginationResult, paginatedVulnResources);
- }
+ private Set getExcludedLicenses(Set excludedLicenseIds,
+ List licenseInfoParsingResult) {
- HttpStatus status = resources == null ? HttpStatus.NO_CONTENT : HttpStatus.OK;
- return new ResponseEntity<>(resources, status);
+ Predicate filteredLicense = licenseNameWithText -> excludedLicenseIds
+ .contains(licenseNameWithText.getLicenseName());
+ Function> streamLicenseNameWithTexts = licenseInfo -> licenseInfo
+ .getLicenseNamesWithTexts().stream();
+ return licenseInfoParsingResult.stream().map(LicenseInfoParsingResult::getLicenseInfo)
+ .flatMap(streamLicenseNameWithTexts).filter(filteredLicense).collect(Collectors.toSet());
}
- @Operation(
- description = "Patch vulnerabilities of a single project.",
- tags = {"Projects"}
- )
- @RequestMapping(value = PROJECTS_URL + "/{id}/vulnerabilities", method = RequestMethod.PATCH, consumes = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity>> updateVulnerabilitiesOfReleases(
- @Parameter(description = "Project ID.")
- @PathVariable("id") String id,
- @Parameter(description = "Vulnerability list")
- @RequestBody List vulnDTOs
- ) {
- final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
-
- List actualVDto = vulnerabilityService.getVulnerabilitiesByProjectId(id, sw360User);
- Set actualExternalId = actualVDto.stream().map(VulnerabilityDTO::getExternalId).collect(Collectors.toSet());
- Set externalIdsFromRequestDto = vulnDTOs.stream().map(VulnerabilityDTO::getExternalId).collect(Collectors.toSet());
- Set commonExtIds = Sets.intersection(actualExternalId, externalIdsFromRequestDto);
-
- if (CommonUtils.isNullOrEmptyCollection(commonExtIds) || commonExtIds.size() != externalIdsFromRequestDto.size()) {
- throw new HttpMessageNotReadableException("External ID is not valid");
+ private List> getReleaseObjectMapper(List> releaseList) {
+ ObjectMapper oMapper = new ObjectMapper();
+ List> modifiedList = new ArrayList<>();
+ for (EntityModel rel : releaseList) {
+ Map relMap = oMapper.convertValue(rel, Map.class);
+ if (relMap.get(ATTACHMENTS) != null) {
+ for (Object attach : (ArrayList) relMap.get(ATTACHMENTS)) {
+ Map attachmentMap = (Map) attach;
+ AttachmentType type = AttachmentType.valueOf((String) attachmentMap.get(ATTACHMENT_TYPE));
+ attachmentMap.replace(ATTACHMENT_TYPE, attachmentMap.get(ATTACHMENT_TYPE),
+ ThriftEnumUtils.MAP_ATTACHMENT_TYPE_SHORT_STRING.get(type));
+ }
+ }
+ final ImmutableSet fieldsToKeep = ImmutableSet.of("name", "version", ATTACHMENTS);
+ Map valueToKeep = new LinkedHashMap<>();
+ Link releaseLink = null;
+ if (relMap != null) {
+ for (Map.Entry entry : relMap.entrySet()) {
+ if (entry != null && entry.getKey().equals("id")) {
+ releaseLink = linkTo(ReleaseController.class).slash("api/releases/" + entry.getValue())
+ .withSelfRel();
+ } else if (entry != null && fieldsToKeep.contains(entry.getKey())) {
+ if (entry.getKey().equals(ATTACHMENTS) && null != entry.getValue()) {
+ List> attList = new ArrayList<>();
+ for (LinkedHashMap att : ((List) entry.getValue())) {
+ Map map = new LinkedHashMap<>();
+ map.put("attachmentContentId", att.get("attachmentContentId"));
+ map.put("filename", att.get("filename"));
+ map.put("sha1", att.get("sha1"));
+ map.put(ATTACHMENT_TYPE, att.get(ATTACHMENT_TYPE));
+ map.put(CREATED_BY, att.get(CREATED_BY));
+ map.put("createdTeam", att.get("createdTeam"));
+ map.put("createdOn", att.get("createdOn"));
+ map.put("checkStatus", att.get("checkStatus"));
+ map.put("createdComment", att.get("createdComment"));
+ map.put("checkedBy", att.get("checkedBy"));
+ map.put("checkedTeam", att.get("checkedTeam"));
+ map.put("checkedComment", att.get("checkedComment"));
+ map.put("checkedOn", att.get("checkedOn"));
+ attList.add(map);
+ }
+ valueToKeep.put(entry.getKey(), attList);
+ } else {
+ valueToKeep.put(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+ }
+ Map linksValeToKeep = new LinkedHashMap<>();
+ linksValeToKeep.put("self", releaseLink);
+ valueToKeep.put("_links", linksValeToKeep);
+ modifiedList.add(valueToKeep);
}
+ return modifiedList;
+ }
- Set actualReleaseIds = actualVDto.stream().map(VulnerabilityDTO::getIntReleaseId).collect(Collectors.toSet());
- Set releaseIdsFromRequestDto = vulnDTOs.stream().map(VulnerabilityDTO::getIntReleaseId).collect(Collectors.toSet());
- Set commonRelIds = Sets.intersection(actualReleaseIds, releaseIdsFromRequestDto);
+ public List filterReleases(User sw360User, String filter, Set releaseIds) {
+ List releasesSrc = new ArrayList<>();
- if(CommonUtils.isNullOrEmptyCollection(commonRelIds) || commonRelIds.size() != releaseIdsFromRequestDto.size()) {
- throw new HttpMessageNotReadableException("Release ID is not valid");
+ switch (filter) {
+ case "withSourceAttachment":
+ releasesSrc = releaseIds.stream().map(relId -> wrapTException(() -> {
+ final Release sw360Release = releaseService.getReleaseForUserById(relId, sw360User);
+ releaseService.setComponentDependentFieldsInRelease(sw360Release, sw360User);
+ List sourceAttachments = sw360Release.getAttachments().stream()
+ .filter(attachment -> attachment.getAttachmentType() == AttachmentType.SOURCE
+ || attachment.getAttachmentType() == AttachmentType.SOURCE_SELF)
+ .collect(Collectors.toList());
+ Set sourceAttachmentsSet = new HashSet<>(sourceAttachments);
+ sw360Release.setAttachments(sourceAttachmentsSet);
+ return sourceAttachmentsSet.isEmpty() ? null : sw360Release;
+ })).filter(Objects::nonNull).collect(Collectors.toList());
+ break;
+ case "withoutSourceAttachment":
+ releasesSrc = releaseIds.stream().map(relId -> wrapTException(() -> {
+ final Release sw360Release = releaseService.getReleaseForUserById(relId, sw360User);
+ releaseService.setComponentDependentFieldsInRelease(sw360Release, sw360User);
+ List withoutSourceAttachments = sw360Release.getAttachments().stream()
+ .filter(attachment -> attachment.getAttachmentType() != AttachmentType.SOURCE
+ && attachment.getAttachmentType() != AttachmentType.SOURCE_SELF)
+ .collect(Collectors.toList());
+ Set withoutSourceAttachmentsSet = new HashSet<>(withoutSourceAttachments);
+ sw360Release.setAttachments(withoutSourceAttachmentsSet);
+ return withoutSourceAttachmentsSet.isEmpty() ? null : sw360Release;
+ })).filter(Objects::nonNull).collect(Collectors.toList());
+ break;
+ case "withoutAttachment":
+ releasesSrc = releaseIds.stream().map(relId -> wrapTException(() -> {
+ final Release sw360Release = releaseService.getReleaseForUserById(relId, sw360User);
+ releaseService.setComponentDependentFieldsInRelease(sw360Release, sw360User);
+ return sw360Release.getAttachments().isEmpty() ? sw360Release : null;
+ })).filter(Objects::nonNull).collect(Collectors.toList());
+ break;
+ case "withAttachment":
+ releasesSrc = releaseIds.stream().map(relId -> wrapTException(() -> {
+ final Release sw360Release = releaseService.getReleaseForUserById(relId, sw360User);
+ releaseService.setComponentDependentFieldsInRelease(sw360Release, sw360User);
+ return sw360Release.getAttachments().isEmpty() ? null : sw360Release;
+ })).filter(Objects::nonNull).collect(Collectors.toList());
+ break;
+ case "withCliAttachment":
+ releasesSrc = releaseIds.stream().map(relId -> wrapTException(() -> {
+ final Release sw360Release = releaseService.getReleaseForUserById(relId, sw360User);
+ releaseService.setComponentDependentFieldsInRelease(sw360Release, sw360User);
+ List cliAttachments = sw360Release.getAttachments().stream().filter(
+ attachment -> attachment.getAttachmentType() == AttachmentType.COMPONENT_LICENSE_INFO_XML)
+ .collect(Collectors.toList());
+ Set cliAttachmentsSet = new HashSet<>(cliAttachments);
+ sw360Release.setAttachments(cliAttachmentsSet);
+ return cliAttachmentsSet.isEmpty() ? null : sw360Release;
+ })).filter(Objects::nonNull).collect(Collectors.toList());
+ break;
+ default:
+ releasesSrc = releaseIds.stream().map(relId -> wrapTException(() -> {
+ final Release sw360Release = releaseService.getReleaseForUserById(relId, sw360User);
+ releaseService.setComponentDependentFieldsInRelease(sw360Release, sw360User);
+ return sw360Release;
+ })).collect(Collectors.toList());
+ break;
}
- Optional projectVulnerabilityRatings = wrapThriftOptionalReplacement(vulnerabilityService.getProjectVulnerabilityRatingByProjectId(id, sw360User));
- ProjectVulnerabilityRating link = updateProjectVulnerabilityRatingFromRequest(projectVulnerabilityRatings, vulnDTOs, id, sw360User);
- final RequestStatus requestStatus = vulnerabilityService.updateProjectVulnerabilityRating(link, sw360User);
- final List> vulnerabilityResources = new ArrayList<>();
- vulnDTOs.forEach(dto->{
- final EntityModel vulnerabilityDTOEntityModel = EntityModel.of(dto);
- vulnerabilityResources.add(vulnerabilityDTOEntityModel);
- });
+ return releasesSrc;
+ }
- CollectionModel> resources = null;
- if (RequestStatus.SUCCESS.equals(requestStatus)) {
- resources = restControllerHelper.createResources(vulnerabilityResources);
- }
- HttpStatus status = resources == null ? HttpStatus.NO_CONTENT : HttpStatus.OK;
- if (requestStatus == RequestStatus.SENT_TO_MODERATOR) {
- return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
+ private HalResource attachmentUsageReleases(Project sw360Project, List> releases,
+ List> attachmentUsageMap) throws TException {
+ ObjectMapper oMapper = new ObjectMapper();
+ Map releaseIdToUsages = sw360Project.getReleaseIdToUsage();
+ Map projectMap = oMapper.convertValue(sw360Project, Map.class);
+ Map resultMap = new HashMap<>();
+ resultMap.put("linkedProjects", projectMap.get("linkedProjects"));
+ resultMap.put("releaseIdToUsage", projectMap.get("releaseIdToUsage"));
+
+ Map releaseIdToUsage = (Map) resultMap.get("releaseIdToUsage");
+ final ImmutableSet fieldsToRemove = ImmutableSet.of("setCreatedBy", "setCreatedOn", "setComment",
+ "setReleaseRelation", "setMainlineState");
+ if (releaseIdToUsage != null) {
+ for (Map.Entry entry : releaseIdToUsage.entrySet()) {
+ Map originalValue = (Map) entry.getValue();
+ if (originalValue != null) {
+ for (String field : fieldsToRemove) {
+ originalValue.remove(field);
+ }
+ }
+ }
}
- return new ResponseEntity<>(resources, status);
- }
+ HalResource halProject = new HalResource(resultMap);
- @PreAuthorize("hasAuthority('WRITE')")
- @Operation(
- summary = "Link releases to the project with usage.",
- description = "Pass a map of release id to usage to be linked as request body.",
- tags = {"Projects"}
- )
- @RequestMapping(value = PROJECTS_URL + "/{id}/release/{releaseId}", method = RequestMethod.PATCH)
- public ResponseEntity> patchProjectReleaseUsage(
- @Parameter(description = "Project ID.")
- @PathVariable("id") String id,
- @Parameter(description = "Release ID.")
- @PathVariable("releaseId") String releaseId,
- @Parameter(description = "Map of release id to usage.")
- @RequestBody ProjectReleaseRelationship requestBodyProjectReleaseRelationship
- ) throws TException {
- final User sw360User = restControllerHelper.getSw360UserFromAuthentication();
- final Project sw360Project = projectService.getProjectForUserById(id, sw360User);
- Map releaseIdToUsage = sw360Project.getReleaseIdToUsage();
- ProjectReleaseRelationship updatedProjectReleaseRelationship = projectService
- .updateProjectReleaseRelationship(releaseIdToUsage, requestBodyProjectReleaseRelationship, releaseId);
- RequestStatus updateProjectStatus = projectService.updateProject(sw360Project, sw360User);
- if (updateProjectStatus == RequestStatus.SENT_TO_MODERATOR) {
- return new ResponseEntity(RESPONSE_BODY_FOR_MODERATION_REQUEST, HttpStatus.ACCEPTED);
+ if (releaseIdToUsages != null) {
+ restControllerHelper.addEmbeddedProjectAttachmentUsage(halProject, releases, attachmentUsageMap);
}
- EntityModel updatedProjectReleaseRelationshipResource = EntityModel.of(
- updatedProjectReleaseRelationship);
- return new ResponseEntity<>(updatedProjectReleaseRelationshipResource, HttpStatus.OK);
+ return halProject;
}
- public ProjectVulnerabilityRating updateProjectVulnerabilityRatingFromRequest(Optional projectVulnerabilityRatings, List vulDtoList, String projectId, User sw360User) {
- Function fillVulnerabilityCheckStatus = vulDto -> {
- return new VulnerabilityCheckStatus().setCheckedBy(sw360User.getEmail())
- .setCheckedOn(SW360Utils.getCreatedOn())
- .setVulnerabilityRating(ThriftEnumUtils.stringToEnum(vulDto.getProjectRelevance(), VulnerabilityRatingForProject.class))
- .setComment(vulDto.getComment() == null ? "" : vulDto.getComment()).setProjectAction(vulDto.getAction());
- };
-
- ProjectVulnerabilityRating projectVulnerabilityRating = projectVulnerabilityRatings.orElse(
- new ProjectVulnerabilityRating()
- .setProjectId(projectId)
- .setVulnerabilityIdToReleaseIdToStatus(new HashMap<>()));
+ private HalResource createHalProject(Project sw360Project, User sw360User) throws TException {
+ HalResource halProject = new HalResource<>(sw360Project);
+ User projectCreator = restControllerHelper.getUserByEmail(sw360Project.getCreatedBy());
+ restControllerHelper.addEmbeddedUser(halProject, projectCreator, CREATED_BY);
- if (!projectVulnerabilityRating.isSetVulnerabilityIdToReleaseIdToStatus()) {
- projectVulnerabilityRating.setVulnerabilityIdToReleaseIdToStatus(new HashMap<>());
+ Map releaseIdToUsage = sw360Project.getReleaseIdToUsage();
+ if (releaseIdToUsage != null) {
+ restControllerHelper.addEmbeddedReleases(halProject, releaseIdToUsage.keySet(), releaseService, sw360User);
}
- Map>> vulnerabilityIdToReleaseIdToStatus = projectVulnerabilityRating.getVulnerabilityIdToReleaseIdToStatus();
- String[] vulnerabilityIds = vulDtoList.stream().map(dto -> dto.getExternalId()).toArray(String[]::new);
- String[] releaseIds = vulDtoList.stream().map(dto -> dto.getIntReleaseId()).toArray(String[]::new);
- VulnerabilityCheckStatus[] vulStatusCheck = vulDtoList.stream().map(dt -> fillVulnerabilityCheckStatus.apply(dt)).toArray(VulnerabilityCheckStatus[]::new);
+ Map linkedProjects = sw360Project.getLinkedProjects();
+ if (linkedProjects != null) {
+ restControllerHelper.addEmbeddedProject(halProject, linkedProjects.keySet(), projectService, sw360User);
+ }
- for (int i = 0; i < vulnerabilityIds.length; i++) {
- String vulnerabilityId = vulnerabilityIds[i];
- String releaseId = releaseIds[i];
+ if (sw360Project.getModerators() != null) {
+ Set moderators = sw360Project.getModerators();
+ restControllerHelper.addEmbeddedModerators(halProject, moderators);
+ }
- Map> releaseIdToStatus = vulnerabilityIdToReleaseIdToStatus.computeIfAbsent(vulnerabilityId, k -> new HashMap<>());
- List vulnerabilityCheckStatusHistory = releaseIdToStatus.computeIfAbsent(releaseId, k -> new ArrayList<>());
- VulnerabilityCheckStatus statustoBeUpdated = vulStatusCheck[i];
- if (!vulnerabilityCheckStatusHistory.isEmpty()) {
- VulnerabilityCheckStatus latestStatusFromHistory = vulnerabilityCheckStatusHistory
- .get(vulnerabilityCheckStatusHistory.size() - 1);
- if (StringUtils.isEmpty(statustoBeUpdated.getComment())) {
- statustoBeUpdated.setComment(latestStatusFromHistory.getComment());
- }
- if (StringUtils.isEmpty(statustoBeUpdated.getProjectAction())) {
- statustoBeUpdated.setProjectAction(latestStatusFromHistory.getProjectAction());
- }
- if (Objects.isNull(statustoBeUpdated.getVulnerabilityRating())) {
- statustoBeUpdated.setVulnerabilityRating(latestStatusFromHistory.getVulnerabilityRating());
- }
- }
- vulnerabilityCheckStatusHistory.add(statustoBeUpdated);
+ if (sw360Project.getAttachments() != null) {
+ restControllerHelper.addEmbeddedAttachments(halProject, sw360Project.getAttachments());
}
- return projectVulnerabilityRating;
- }
+ if (sw360Project.getLeadArchitect() != null) {
+ restControllerHelper.addEmbeddedLeadArchitect(halProject, sw360Project.getLeadArchitect());
+ }
- @Operation(
- description = "Get license of releases of a single project.",
- tags = {"Projects"}
- )
- @RequestMapping(value = PROJECTS_URL + "/{id}/licenses", method = RequestMethod.GET)
- public ResponseEntity