Skip to content

fix(rest): guard attachment checkStatus approval behind CLEARING_ADMIN role #4047

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
Aman-Cool wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −0
Open

fix(rest): guard attachment checkStatus approval behind CLEARING_ADMIN role #4047

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
13 changes: 13 additions & 0 deletions ...rc/main/java/org/eclipse/sw360/rest/resourceserver/attachment/Sw360AttachmentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.eclipse.sw360.datahandler.common.Duration;
import org.eclipse.sw360.datahandler.common.SW360Utils;
import org.eclipse.sw360.datahandler.couchdb.AttachmentConnector;
import org.eclipse.sw360.datahandler.permissions.PermissionUtils;
import org.eclipse.sw360.datahandler.thrift.SW360Exception;
import org.eclipse.sw360.datahandler.thrift.Source;
import org.eclipse.sw360.datahandler.thrift.ThriftClients;
Expand All @@ -41,6 +42,8 @@
import org.eclipse.sw360.datahandler.thrift.projects.ProjectService;
import org.eclipse.sw360.datahandler.thrift.spdx.spdxdocument.SPDXDocumentService;
import org.eclipse.sw360.datahandler.thrift.users.User;
import org.eclipse.sw360.datahandler.thrift.users.UserGroup;
import org.springframework.security.access.AccessDeniedException;
import org.eclipse.sw360.rest.resourceserver.core.RestControllerHelper;
import org.eclipse.sw360.rest.resourceserver.core.ThriftServiceProvider;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -266,6 +269,11 @@ public Attachment uploadAttachment(MultipartFile file, Attachment newAttachment,

CheckStatus checkStatus = newAttachment.getCheckStatus();
if (checkStatus != null) {
if ((checkStatus == CheckStatus.ACCEPTED || checkStatus == CheckStatus.REJECTED)
&& !PermissionUtils.isUserAtLeast(UserGroup.CLEARING_ADMIN, sw360User)) {
throw new AccessDeniedException(
"Setting checkStatus to ACCEPTED or REJECTED requires CLEARING_ADMIN role");
}
attachment.setCheckStatus(checkStatus);
}

Expand Down Expand Up @@ -398,6 +406,11 @@ private void updateAttachment(Attachment attachmentToUpdate, Attachment reqBodyA
attachmentToUpdate.setCreatedComment(createdComment);
}
if (checkStatus != null) {
if ((checkStatus == CheckStatus.ACCEPTED || checkStatus == CheckStatus.REJECTED)
&& !PermissionUtils.isUserAtLeast(UserGroup.CLEARING_ADMIN, user)) {
throw new AccessDeniedException(
"Setting checkStatus to ACCEPTED or REJECTED requires CLEARING_ADMIN role");
}
attachmentToUpdate.setCheckStatus(checkStatus);
String checkedComment = reqBodyAttachment.getCheckedComment();
if (checkStatus != CheckStatus.NOTCHECKED) {
Expand Down
Loading