Skip to content

The Unified and Autonomous Development Platform

chore: Refactor various pull request service methods

Robin Shenc22cfa0be437
diff --git a/server-core/src/main/java/io/onedev/server/ai/TodResource.java b/server-core/src/main/java/io/onedev/server/ai/TodResource.java
index 7d03073bb8..b5d321268f 100644
--- a/server-core/src/main/java/io/onedev/server/ai/TodResource.java
+++ b/server-core/src/main/java/io/onedev/server/ai/TodResource.java
@@ -634,7 +634,8 @@ public class TodResource {
@QueryParam("currentProject") @NotNull String currentProjectPath,
@QueryParam("project") String projectPath,
@NotNull @Valid Map<String, Serializable> data) {
- if (SecurityUtils.getUser() == null)
+ var subject = SecurityUtils.getSubject();
+ if (SecurityUtils.getUser(subject) == null)
throw new UnauthenticatedException();
var projectContext = getProjectContext(projectPath, currentProjectPath);
@@ -686,7 +687,7 @@ public class TodResource {
issue.setSubmitter(SecurityUtils.getUser());
issue.setState(issueSetting.getInitialStateSpec().getName());
- issue.setFieldValues(FieldUtils.getFieldValues(issue.getProject(), data));
+ issue.setFieldValues(FieldUtils.getFieldValues(subject, issue.getProject(), data));
issueService.open(issue);
@@ -759,7 +760,7 @@ public class TodResource {
throw new UnauthorizedException("No permission to update issue fields");
}
- issueChangeService.changeFields(user, issue, FieldUtils.getFieldValues(issue.getProject(), data));
+ issueChangeService.changeFields(user, issue, FieldUtils.getFieldValues(subject, issue.getProject(), data));
}
return "Edited issue " + issueReference;
@@ -792,7 +793,7 @@ public class TodResource {
throw new NotAcceptableException(message);
}
- var fieldValues = FieldUtils.getFieldValues(issue.getProject(), data);
+ var fieldValues = FieldUtils.getFieldValues(subject, issue.getProject(), data);
issueChangeService.changeState(user, issue, state, fieldValues, transition.getPromptFields(),
transition.getRemoveFields(), comment);
var feedback = "Issue " + issueReference + " transited to state \"" + state + "\"";
@@ -1383,13 +1384,6 @@ public class TodResource {
commitMessage = StringUtils.trimToNull(commitMessage);
- var errorMessage = pullRequest.checkMergeCondition();
- if (errorMessage != null)
- throw new NotAcceptableException(errorMessage);
- errorMessage = pullRequest.checkMergeCommitMessage(user, commitMessage);
- if (errorMessage != null)
- throw new NotAcceptableException("Error validating merge commit message: " + errorMessage);
-
pullRequestService.merge(user, pullRequest, commitMessage);
return "Merged pull request " + pullRequestReference;
@@ -1411,8 +1405,6 @@ public class TodResource {
if (!SecurityUtils.canModifyPullRequest(pullRequest))
throw new UnauthorizedException();
- if (!pullRequest.isOpen())
- throw new NotAcceptableException("Pull request already closed");
pullRequestService.discard(user, pullRequest, StringUtils.trimToNull(comment));
return "Discarded pull request " + pullRequestReference;
@@ -1434,9 +1426,6 @@ public class TodResource {
if (!SecurityUtils.canModifyPullRequest(pullRequest))
throw new UnauthorizedException();
- var errorMessage = pullRequest.checkReopenCondition();
- if (errorMessage != null)
- throw new NotAcceptableException(errorMessage);
pullRequestService.reopen(user, pullRequest, StringUtils.trimToNull(comment));
return "Reopened pull request " + pullRequestReference;
@@ -1461,10 +1450,6 @@ public class TodResource {
throw new UnauthorizedException();
}
- var errorMessage = pullRequest.checkDeleteSourceBranchCondition();
- if (errorMessage != null)
- throw new NotAcceptableException(errorMessage);
-
pullRequestService.deleteSourceBranch(user, pullRequest, StringUtils.trimToNull(comment));
return "Deleted source branch of pull request " + pullRequestReference;
}
@@ -1488,10 +1473,6 @@ public class TodResource {
throw new UnauthorizedException();
}
- var errorMessage = pullRequest.checkRestoreSourceBranchCondition();
- if (errorMessage != null)
- throw new NotAcceptableException(errorMessage);
-
pullRequestService.restoreSourceBranch(user, pullRequest, StringUtils.trimToNull(comment));
return "Restored source branch of pull request " + pullRequestReference;
}
diff --git a/server-core/src/main/java/io/onedev/server/exception/DataTooLargeException.java b/server-core/src/main/java/io/onedev/server/exception/DataTooLargeException.java
deleted file mode 100644
index 33f30ba509..0000000000
--- a/server-core/src/main/java/io/onedev/server/exception/DataTooLargeException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.onedev.server.exception;
-
-import io.onedev.commons.utils.ExplicitException;
-
-public class DataTooLargeException extends ExplicitException {
- public DataTooLargeException(long maxSize) {
- super("Data exceeds maximum size: " + maxSize);
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/exception/DigestNotMatchException.java b/server-core/src/main/java/io/onedev/server/exception/DigestNotMatchException.java
deleted file mode 100644
index 9c0f5218e1..0000000000
--- a/server-core/src/main/java/io/onedev/server/exception/DigestNotMatchException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.onedev.server.exception;
-
-import io.onedev.commons.utils.ExplicitException;
-
-public class DigestNotMatchException extends ExplicitException {
-
- public DigestNotMatchException() {
- super("Digest not matching");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/DataTooLargeExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/DataTooLargeExceptionHandler.java
deleted file mode 100644
index 306bb5d29d..0000000000
--- a/server-core/src/main/java/io/onedev/server/exception/handler/DataTooLargeExceptionHandler.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.onedev.server.exception.handler;
-
-import io.onedev.server.exception.DataTooLargeException;
-import io.onedev.server.exception.HttpResponse;
-
-import javax.servlet.http.HttpServletResponse;
-
-public class DataTooLargeExceptionHandler extends AbstractExceptionHandler<DataTooLargeException> {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public HttpResponse getResponse(DataTooLargeException exception) {
- return new HttpResponse(HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE, exception.getMessage());
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
index 61c08f8423..38d0a32787 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
@@ -8,15 +8,15 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
-import javax.ws.rs.BadRequestException;
import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.shiro.subject.Subject;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +26,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.buildspecmodel.inputspec.SecretInput;
-import io.onedev.server.service.SettingService;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.field.instance.FieldInstance;
@@ -34,6 +34,7 @@ import io.onedev.server.model.support.issue.field.instance.SpecifiedValue;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.SecretField;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.SettingService;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.BeanDescriptor;
@@ -178,7 +179,7 @@ public class FieldUtils {
}
@SuppressWarnings("unchecked")
- public static Map<String, Object> getFieldValues(Project project, Map<String, Serializable> fieldEdits) {
+ public static Map<String, Object> getFieldValues(Subject subject, Project project, Map<String, Serializable> fieldEdits) {
var settingService = OneDev.getInstance(SettingService.class);
var issueSetting = settingService.getIssueSetting();
Map<String, Object> fieldValues = new HashMap<>();
@@ -186,8 +187,8 @@ public class FieldUtils {
var fieldName = entry.getKey();
var fieldSpec = issueSetting.getFieldSpec(fieldName);
if (fieldSpec == null)
- throw new BadRequestException("Undefined field: " + fieldName);
- if (!SecurityUtils.canEditIssueField(project, fieldName))
+ throw new NotAcceptableException("Undefined field: " + fieldName);
+ if (!SecurityUtils.canEditIssueField(subject, project, fieldName))
throw new UnauthorizedException("No permission to edit field: " + fieldName);
List<String> values = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
index a790de672a..8063a43a0a 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
@@ -40,13 +40,6 @@ import io.onedev.server.OneDev;
import io.onedev.server.SubscriptionService;
import io.onedev.server.attachment.AttachmentService;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.service.AuditService;
-import io.onedev.server.service.IssueChangeService;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.service.IterationService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.UrlService;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
@@ -58,7 +51,6 @@ import io.onedev.server.model.IssueWork;
import io.onedev.server.model.Iteration;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.field.FieldUtils;
import io.onedev.server.model.support.issue.transitionspec.ManualSpec;
import io.onedev.server.rest.annotation.Api;
@@ -67,6 +59,13 @@ import io.onedev.server.rest.resource.support.RestConstants;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.AuditService;
+import io.onedev.server.service.IssueChangeService;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.IterationService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.service.UrlService;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.web.page.help.ApiHelpUtils;
import io.onedev.server.web.page.help.ValueInfo;
@@ -306,7 +305,8 @@ public class IssueResource {
@Api(order=1000)
@POST
public Long createIssue(@NotNull @Valid IssueOpenData data) {
- User user = SecurityUtils.getUser();
+ var subject = SecurityUtils.getSubject();
+ var user = SecurityUtils.getUser(subject);
Project project = projectService.load(data.getProjectId());
if (!SecurityUtils.canAccessProject(project))
@@ -349,7 +349,7 @@ public class IssueResource {
}
}
- issue.setFieldValues(FieldUtils.getFieldValues(project, data.fields));
+ issue.setFieldValues(FieldUtils.getFieldValues(subject, project, data.fields));
issueService.open(issue);
return issue.getId();
@@ -449,7 +449,7 @@ public class IssueResource {
throw new UnauthorizedException();
}
- issueChangeService.changeFields(user, issue, FieldUtils.getFieldValues(issue.getProject(), fields));
+ issueChangeService.changeFields(user, issue, FieldUtils.getFieldValues(subject, issue.getProject(), fields));
return Response.ok().build();
}
@@ -475,7 +475,7 @@ public class IssueResource {
throw new NotAcceptableException(message);
}
- var fieldValues = FieldUtils.getFieldValues(issue.getProject(), data.getFields());
+ var fieldValues = FieldUtils.getFieldValues(subject, issue.getProject(), data.getFields());
issueChangeService.changeState(user, issue, data.getState(), fieldValues,
transition.getPromptFields(), transition.getRemoveFields(), data.getComment());
return Response.ok().build();
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
index 95ca3171aa..bd45753ec4 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
@@ -9,7 +9,6 @@ import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
-import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.constraints.NotEmpty;
@@ -27,14 +26,10 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.shiro.authz.UnauthorizedException;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.attachment.AttachmentService;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.service.AuditService;
-import io.onedev.server.service.PullRequestChangeService;
-import io.onedev.server.service.PullRequestService;
-import io.onedev.server.service.UrlService;
-import io.onedev.server.service.UserService;
import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestAssignment;
@@ -54,6 +49,11 @@ import io.onedev.server.rest.annotation.EntityCreate;
import io.onedev.server.rest.resource.support.RestConstants;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.AuditService;
+import io.onedev.server.service.PullRequestChangeService;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.UrlService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.ProjectAndBranch;
@Api(name="Pull Request", description="In most cases, pull request resource is operated with pull request id, which is different from pull request number. "
@@ -354,9 +354,6 @@ public class PullRequestResource {
var user = SecurityUtils.getUser(subject);
if (!SecurityUtils.canModifyPullRequest(subject, request))
throw new UnauthorizedException();
- String errorMessage = request.checkReopenCondition();
- if (errorMessage != null)
- throw new NotAcceptableException(errorMessage);
pullRequestService.reopen(user, request, note);
return Response.ok().build();
@@ -371,8 +368,6 @@ public class PullRequestResource {
var user = SecurityUtils.getUser(subject);
if (!SecurityUtils.canModifyPullRequest(subject, request))
throw new UnauthorizedException();
- if (!request.isOpen())
- throw new NotAcceptableException("Pull request already closed");
pullRequestService.discard(user, request, note);
return Response.ok().build();
@@ -386,13 +381,6 @@ public class PullRequestResource {
var user = SecurityUtils.getUser();
if (!SecurityUtils.canWriteCode(user.asSubject(), request.getProject()))
throw new UnauthorizedException();
- String errorMessage = request.checkMergeCondition();
- if (errorMessage != null)
- throw new NotAcceptableException(errorMessage);
-
- errorMessage = request.checkMergeCommitMessage(user, note);
- if (errorMessage != null)
- throw new NotAcceptableException("Error validating merge commit message: " + errorMessage);
pullRequestService.merge(user, request, note);
return Response.ok().build();
@@ -409,11 +397,7 @@ public class PullRequestResource {
|| !SecurityUtils.canDeleteBranch(subject, request.getSourceProject(), request.getSourceBranch())) {
throw new UnauthorizedException();
}
-
- String errorMessage = request.checkDeleteSourceBranchCondition();
- if (errorMessage != null)
- throw new NotAcceptableException(errorMessage);
-
+
pullRequestService.deleteSourceBranch(user, request, note);
return Response.ok().build();
}
@@ -430,10 +414,6 @@ public class PullRequestResource {
throw new UnauthorizedException();
}
- String errorMessage = request.checkRestoreSourceBranchCondition();
- if (errorMessage != null)
- throw new NotAcceptableException(errorMessage);
-
pullRequestService.restoreSourceBranch(user, request, note);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index 2641e4bb41..6c807432f4 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -325,7 +325,11 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canEditIssueField(Project project, String fieldName) {
- return getSubject().isPermitted(new ProjectPermission(project, new EditIssueField(Sets.newHashSet(fieldName))));
+ return canEditIssueField(getSubject(), project, fieldName);
+ }
+
+ public static boolean canEditIssueField(Subject subject, Project project, String fieldName) {
+ return subject.isPermitted(new ProjectPermission(project, new EditIssueField(Sets.newHashSet(fieldName))));
}
public static boolean canEditIssueLink(Project project, LinkSpec link) {
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
index 96d81822bb..8870192591 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
@@ -41,7 +41,6 @@ import javax.persistence.criteria.Order;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import javax.ws.rs.NotAcceptableException;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
@@ -91,6 +90,7 @@ import io.onedev.server.event.project.pullrequest.PullRequestOpened;
import io.onedev.server.event.project.pullrequest.PullRequestReviewerRemoved;
import io.onedev.server.event.project.pullrequest.PullRequestUpdated;
import io.onedev.server.event.project.pullrequest.PullRequestsDeleted;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.GitService;
import io.onedev.server.model.Build;
@@ -261,7 +261,10 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
@Transactional
@Override
public void restoreSourceBranch(User user, PullRequest request, String note) {
- Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);
+ var errorMessage = request.checkRestoreSourceBranchCondition();
+ if (errorMessage != null)
+ throw new NotAcceptableException(errorMessage);
+
if (request.getSource().getObjectName(false) == null) {
getGitService().createBranch(request.getSourceProject(), request.getSourceBranch(),
request.getLatestUpdate().getHeadCommitHash());
@@ -278,7 +281,9 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
@Transactional
@Override
public void deleteSourceBranch(User user, PullRequest request, String note) {
- Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);
+ var errorMessage = request.checkDeleteSourceBranchCondition();
+ if (errorMessage != null)
+ throw new NotAcceptableException(errorMessage);
if (request.getSource().getObjectName(false) != null) {
projectService.deleteBranch(request.getSourceProject(), request.getSourceBranch());
@@ -294,6 +299,10 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
@Transactional
@Override
public void reopen(User user, PullRequest request, String note) {
+ var errorMessage = request.checkReopenCondition();
+ if (errorMessage != null)
+ throw new NotAcceptableException(errorMessage);
+
request.setStatus(OPEN);
PullRequestChange change = new PullRequestChange();
@@ -312,6 +321,9 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
@Transactional
@Override
public void discard(User user, PullRequest request, String note) {
+ if (!request.isOpen())
+ throw new NotAcceptableException("Pull request already closed");
+
request.setStatus(Status.DISCARDED);
request.setCloseDate(new Date());
@@ -327,6 +339,13 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
@Transactional
@Override
public void merge(User user, PullRequest request, @Nullable String commitMessage) {
+ var errorMessage = request.checkMergeCondition();
+ if (errorMessage != null)
+ throw new NotAcceptableException(errorMessage);
+ errorMessage = request.checkMergeCommitMessage(user, commitMessage);
+ if (errorMessage != null)
+ throw new NotAcceptableException("Error checking merge commit message: " + errorMessage);
+
MergePreview mergePreview = checkNotNull(request.checkMergePreview());
ObjectId mergeCommitId = ObjectId.fromString(checkNotNull(mergePreview.getMergeCommitHash()));
PersonIdent person = user.asPerson();
diff --git a/server-core/src/main/java/io/onedev/server/util/IOUtils.java b/server-core/src/main/java/io/onedev/server/util/IOUtils.java
index 1f291c1a07..04e8644dff 100644
--- a/server-core/src/main/java/io/onedev/server/util/IOUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/IOUtils.java
@@ -4,7 +4,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import io.onedev.server.exception.DataTooLargeException;
+import io.onedev.server.exception.NotAcceptableException;
@SuppressWarnings("deprecation")
public class IOUtils extends org.apache.commons.io.IOUtils {
@@ -44,7 +44,7 @@ public class IOUtils extends org.apache.commons.io.IOUtils {
try {
long copied = copyLarge(is, os, 0, maxSize + 1, new byte[BUFFER_SIZE]);
if (copied >= maxSize + 1)
- throw new DataTooLargeException(maxSize);
+ throw new NotAcceptableException("Data exceeds maximum size: " + maxSize);
else
return copied;
} catch (IOException e) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 9fcae20d14..1f790b4855 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -13,6 +13,9 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+
+import javax.inject.Inject;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
@@ -56,7 +59,6 @@ import org.jspecify.annotations.Nullable;
import com.google.common.collect.Sets;
import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.OneDev;
import io.onedev.server.data.migration.VersionedXmlDoc;
import io.onedev.server.entityreference.LinkTransformer;
import io.onedev.server.model.Project;
@@ -116,6 +118,30 @@ import io.onedev.server.xodus.VisitInfoService;
public abstract class PullRequestListPanel extends Panel {
+ @Inject
+ private PullRequestService pullRequestService;
+
+ @Inject
+ private TransactionService transactionService;
+
+ @Inject
+ private VisitInfoService visitInfoService;
+
+ @Inject
+ private ProjectService projectService;
+
+ @Inject
+ private PullRequestReviewService pullRequestReviewService;
+
+ @Inject
+ private PullRequestWatchService pullRequestWatchService;
+
+ @Inject
+ private AuditService auditService;
+
+ @Inject
+ private Set<PullRequestListActionRenderer> pullRequestListActionRenderers;
+
private final IModel<String> queryStringModel;
private final IModel<PullRequestQuery> queryModel = new LoadableDetachableModel<>() {
@@ -147,14 +173,6 @@ public abstract class PullRequestListPanel extends Panel {
super(id);
this.queryStringModel = queryModel;
}
-
- private PullRequestService getPullRequestService() {
- return OneDev.getInstance(PullRequestService.class);
- }
-
- private TransactionService getTransactionService() {
- return OneDev.getInstance(TransactionService.class);
- }
@Nullable
protected PagingHistorySupport getPagingHistorySupport() {
@@ -299,7 +317,7 @@ public abstract class PullRequestListPanel extends Panel {
var requests = selectionColumn.getSelections().stream()
.map(it->it.getObject()).collect(toList());
- getWatchService().setWatchStatus(SecurityUtils.getAuthUser(), requests, watchStatus);
+ pullRequestWatchService.setWatchStatus(SecurityUtils.getAuthUser(), requests, watchStatus);
selectionColumn.getSelections().clear();
Session.get().success(_T("Watch status changed"));
}
@@ -344,42 +362,32 @@ public abstract class PullRequestListPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
dropdown.close();
- String errorMessage = null;
- for (IModel<PullRequest> each : selectionColumn.getSelections()) {
- PullRequest request = each.getObject();
- if (!request.isOpen()) {
- errorMessage = MessageFormat.format(_T("Pull request #{0} already closed"), request.getNumber());
- break;
- }
- }
-
- if (errorMessage != null) {
- getSession().error(errorMessage);
- } else {
- new ConfirmModalPanel(target) {
+ new ConfirmModalPanel(target) {
- @Override
- protected void onConfirm(AjaxRequestTarget target) {
- var user = SecurityUtils.getUser();
- for (IModel<PullRequest> each : selectionColumn.getSelections())
- OneDev.getInstance(PullRequestService.class).discard(user, each.getObject(), null);
- target.add(countLabel);
- target.add(body);
- selectionColumn.getSelections().clear();
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ var user = SecurityUtils.getUser();
+ for (IModel<PullRequest> selection : selectionColumn.getSelections()) {
+ var pullRequest = selection.getObject();
+ if (pullRequest.isOpen())
+ pullRequestService.discard(user, pullRequest, null);
}
+ target.add(countLabel);
+ target.add(body);
+ selectionColumn.getSelections().clear();
+ }
- @Override
- protected String getConfirmMessage() {
- return _T("Type <code>yes</code> below to discard selected pull requests");
- }
+ @Override
+ protected String getConfirmMessage() {
+ return _T("Type <code>yes</code> below to discard selected pull requests");
+ }
- @Override
- protected String getConfirmInput() {
- return "yes";
- }
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
- };
- }
+ };
}
@@ -423,14 +431,14 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
- getTransactionService().run(()-> {
+ transactionService.run(()-> {
Collection<PullRequest> requests = new ArrayList<>();
for (IModel<PullRequest> each : selectionColumn.getSelections())
requests.add(each.getObject());
- getPullRequestService().delete(requests, getProject());
+ pullRequestService.delete(requests, getProject());
for (var request: requests) {
var oldAuditContent = VersionedXmlDoc.fromBean(request).toXML();
- getAuditService().audit(request.getProject(), "deleted pull request \"" + request.getReference().toString(request.getProject()) + "\"", oldAuditContent, null);
+ auditService.audit(request.getProject(), "deleted pull request \"" + request.getReference().toString(request.getProject()) + "\"", oldAuditContent, null);
}
});
target.add(countLabel);
@@ -503,7 +511,7 @@ public abstract class PullRequestListPanel extends Panel {
Collection<PullRequest> requests = new ArrayList<>();
for (@SuppressWarnings("unchecked") var it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); )
requests.add(it.next());
- getWatchService().setWatchStatus(SecurityUtils.getAuthUser(), requests, watchStatus);
+ pullRequestWatchService.setWatchStatus(SecurityUtils.getAuthUser(), requests, watchStatus);
Session.get().success(_T("Watch status changed"));
}
@@ -548,43 +556,33 @@ public abstract class PullRequestListPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
dropdown.close();
- String errorMessage = null;
- for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); ) {
- PullRequest request = it.next();
- if (!request.isOpen()) {
- errorMessage = MessageFormat.format(_T("Pull request #{0} already closed"), request.getNumber());
- break;
- }
- }
-
- if (errorMessage != null) {
- getSession().error(errorMessage);
- } else {
- new ConfirmModalPanel(target) {
+ new ConfirmModalPanel(target) {
- @Override
- protected void onConfirm(AjaxRequestTarget target) {
- var user = SecurityUtils.getUser();
- for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); )
- OneDev.getInstance(PullRequestService.class).discard(user, it.next(), null);
- dataProvider.detach();
- target.add(countLabel);
- target.add(body);
- selectionColumn.getSelections().clear();
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ var user = SecurityUtils.getUser();
+ for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext();) {
+ var pullRequest = it.next();
+ if (pullRequest.isOpen())
+ pullRequestService.discard(user, pullRequest, null);
}
+ dataProvider.detach();
+ target.add(countLabel);
+ target.add(body);
+ selectionColumn.getSelections().clear();
+ }
- @Override
- protected String getConfirmMessage() {
- return _T("Type <code>yes</code> below to discard all queried pull requests");
- }
+ @Override
+ protected String getConfirmMessage() {
+ return _T("Type <code>yes</code> below to discard all queried pull requests");
+ }
- @Override
- protected String getConfirmInput() {
- return "yes";
- }
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
- };
- }
+ };
}
@@ -629,14 +627,14 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
- getTransactionService().run(()-> {
+ transactionService.run(()-> {
Collection<PullRequest> requests = new ArrayList<>();
for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); )
requests.add(it.next());
- getPullRequestService().delete(requests, getProject());
+ pullRequestService.delete(requests, getProject());
for (var request: requests) {
var oldAuditContent = VersionedXmlDoc.fromBean(request).toXML();
- getAuditService().audit(request.getProject(), "deleted pull request \"" + request.getReference().toString(request.getProject()) + "\"", oldAuditContent, null);
+ auditService.audit(request.getProject(), "deleted pull request \"" + request.getReference().toString(request.getProject()) + "\"", oldAuditContent, null);
}
});
dataProvider.detach();
@@ -711,7 +709,6 @@ public abstract class PullRequestListPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
dropdown.close();
- var visitInfoService = OneDev.getInstance(VisitInfoService.class);
for (@SuppressWarnings("unchecked") var it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); )
visitInfoService.visitPullRequest(SecurityUtils.getAuthUser(), it.next());
target.add(body);
@@ -799,7 +796,7 @@ public abstract class PullRequestListPanel extends Panel {
var extraActionsView = new RepeatingView("extraActions");
add(extraActionsView);
- for (var renderer: OneDev.getExtensions(PullRequestListActionRenderer.class))
+ for (var renderer: pullRequestListActionRenderers)
extraActionsView.add(renderer.render(extraActionsView.newChildId()));
queryInput = new TextField<String>("input", queryStringModel);
@@ -858,7 +855,6 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected List<Project> load() {
- ProjectService projectService = OneDev.getInstance(ProjectService.class);
List<Project> projects = new ArrayList<>(SecurityUtils.getAuthorizedProjects(new ReadCode()));
projects.sort(projectService.cloneCache().comparingPath());
return projects;
@@ -974,7 +970,7 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected PullRequestReview getReview() {
- return OneDev.getInstance(PullRequestReviewService.class).load(reviewId);
+ return pullRequestReviewService.load(reviewId);
}
});
@@ -1051,7 +1047,7 @@ public abstract class PullRequestListPanel extends Panel {
try {
var query = queryModel.getObject();
if (query != null)
- return getPullRequestService().query(SecurityUtils.getSubject(), getProject(), query, true, (int) first, (int) count).iterator();
+ return pullRequestService.query(SecurityUtils.getSubject(), getProject(), query, true, (int) first, (int) count).iterator();
} catch (ExplicitException e) {
error(e.getMessage());
}
@@ -1063,7 +1059,7 @@ public abstract class PullRequestListPanel extends Panel {
try {
var query = queryModel.getObject();
if (query != null)
- return getPullRequestService().count(SecurityUtils.getSubject(), getProject(), query.getCriteria());
+ return pullRequestService.count(SecurityUtils.getSubject(), getProject(), query.getCriteria());
} catch (ExplicitException e) {
error(e.getMessage());
}
@@ -1077,7 +1073,7 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected PullRequest load() {
- return getPullRequestService().load(requestId);
+ return pullRequestService.load(requestId);
}
};
@@ -1128,14 +1124,6 @@ public abstract class PullRequestListPanel extends Panel {
setOutputMarkupId(true);
}
- private PullRequestWatchService getWatchService() {
- return OneDev.getInstance(PullRequestWatchService.class);
- }
-
- private AuditService getAuditService() {
- return OneDev.getInstance(AuditService.class);
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index d78c4bc396..76304458e8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -76,6 +76,7 @@ import io.onedev.server.attachment.ProjectAttachmentSupport;
import io.onedev.server.data.migration.VersionedXmlDoc;
import io.onedev.server.entityreference.EntityReference;
import io.onedev.server.entityreference.LinkTransformer;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.GitService;
import io.onedev.server.git.service.RefFacade;
@@ -2128,16 +2129,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected String operate(AjaxRequestTarget target) {
if (canOperate()) {
- var request = getPullRequest();
- var branchProtection = getProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());
- var commitMessage = getCommitMessage();
- if (commitMessage != null) {
- var errorMessage = branchProtection.checkCommitMessage(commitMessage,
- request.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);
- if (errorMessage != null)
- return errorMessage;
+ try {
+ pullRequestService.merge(SecurityUtils.getUser(), getPullRequest(), getCommitMessage());
+ } catch (NotAcceptableException exception) {
+ return exception.getMessage();
}
- pullRequestService.merge(SecurityUtils.getUser(), getPullRequest(), commitMessage);
notifyPullRequestChange(target);
return null;
} else {
diff --git a/server-ee b/server-ee
index 47517ed4f8..2a77b08e12 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 47517ed4f812e6221a9be305036f058673241e3c
+Subproject commit 2a77b08e12c904d53e709c4a074980a9d22636a5
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java
index dff9e6f4a3..857c1320c1 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java
@@ -1,47 +1,67 @@
package io.onedev.server.plugin.pack.container;
+import static io.onedev.server.plugin.pack.container.ContainerAuthenticationFilter.ATTR_BUILD_ID;
+import static io.onedev.server.plugin.pack.container.ContainerManifest.isImageIndex;
+import static io.onedev.server.plugin.pack.container.ContainerManifest.isImageManifest;
+import static io.onedev.server.plugin.pack.container.ContainerPackSupport.TYPE;
+import static io.onedev.server.util.Digest.SHA256;
+import static io.onedev.server.util.IOUtils.copyWithMaxSize;
+import static java.lang.Long.parseLong;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.regex.Pattern.compile;
+import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
+import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static javax.servlet.http.HttpServletResponse.SC_CREATED;
+import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
+import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;
+import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static javax.servlet.http.HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE;
+import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
+import static org.apache.commons.lang3.StringUtils.substringBefore;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.regex.Matcher;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.UnauthorizedException;
+import org.eclipse.jetty.http.HttpStatus;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.service.*;
-import io.onedev.server.exception.DataTooLargeException;
import io.onedev.server.exception.ExceptionUtils;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.PackBlobService;
+import io.onedev.server.service.PackService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.SettingService;
import io.onedev.server.util.CryptoUtils;
import io.onedev.server.util.Digest;
import io.onedev.server.util.HttpUtils;
import io.onedev.server.util.Pair;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.eclipse.jetty.http.HttpStatus;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.regex.Matcher;
-
-import static io.onedev.server.plugin.pack.container.ContainerAuthenticationFilter.ATTR_BUILD_ID;
-import static io.onedev.server.plugin.pack.container.ContainerManifest.isImageIndex;
-import static io.onedev.server.plugin.pack.container.ContainerManifest.isImageManifest;
-import static io.onedev.server.plugin.pack.container.ContainerPackSupport.TYPE;
-import static io.onedev.server.util.Digest.SHA256;
-import static io.onedev.server.util.IOUtils.copyWithMaxSize;
-import static java.lang.Long.parseLong;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.regex.Pattern.compile;
-import static javax.servlet.http.HttpServletResponse.*;
-import static org.apache.commons.lang3.StringUtils.substringBefore;
@Singleton
public class ContainerServlet extends HttpServlet {
@@ -261,8 +281,8 @@ public class ContainerServlet extends HttpServlet {
var baos = new ByteArrayOutputStream();
try (var is = request.getInputStream()) {
copyWithMaxSize(is, baos, MAX_MANIFEST_SIZE);
- } catch (DataTooLargeException e) {
- throw new ClientException(SC_BAD_REQUEST, ErrorCode.SIZE_INVALID, "Manifest is too large");
+ } catch (NotAcceptableException e) {
+ throw new ClientException(SC_NOT_ACCEPTABLE, ErrorCode.DENIED, "Error copying manifest: " + e.getMessage());
}
var bytes = baos.toByteArray();
diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java
index 73b997bde0..609954bfee 100644
--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java
+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java
@@ -1,18 +1,69 @@
package io.onedev.server.plugin.pack.gem;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.Lists.newArrayList;
+import static io.onedev.server.plugin.pack.gem.GemPackSupport.TYPE;
+import static io.onedev.server.util.IOUtils.BUFFER_SIZE;
+import static io.onedev.server.util.IOUtils.copyWithMaxSize;
+import static java.lang.Boolean.parseBoolean;
+import static java.lang.Integer.MAX_VALUE;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.stream.Collectors.toList;
+import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
+import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.zip.DeflaterOutputStream;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpUtils;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.fileupload.util.Streams;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.jspecify.annotations.Nullable;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.nodes.MappingNode;
+import org.yaml.snakeyaml.nodes.ScalarNode;
+import org.yaml.snakeyaml.nodes.SequenceNode;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.pack.PackHandler;
-import io.onedev.server.service.BuildService;
-import io.onedev.server.service.PackBlobService;
-import io.onedev.server.service.PackService;
-import io.onedev.server.service.ProjectService;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
import io.onedev.server.model.Project;
+import io.onedev.server.pack.PackHandler;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.plugin.pack.gem.marshal.Marshaller;
@@ -20,41 +71,12 @@ import io.onedev.server.plugin.pack.gem.marshal.RubyObject;
import io.onedev.server.plugin.pack.gem.marshal.UserDefined;
import io.onedev.server.plugin.pack.gem.marshal.UserMarshal;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.PackBlobService;
+import io.onedev.server.service.PackService;
+import io.onedev.server.service.ProjectService;
import io.onedev.server.util.IOUtils;
import io.onedev.server.util.UrlUtils;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.fileupload.util.Streams;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.MappingNode;
-import org.yaml.snakeyaml.nodes.ScalarNode;
-import org.yaml.snakeyaml.nodes.SequenceNode;
-
-import org.jspecify.annotations.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpUtils;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.io.*;
-import java.util.*;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.Lists.newArrayList;
-import static io.onedev.server.plugin.pack.gem.GemPackSupport.TYPE;
-import static io.onedev.server.util.IOUtils.BUFFER_SIZE;
-import static io.onedev.server.util.IOUtils.copyWithMaxSize;
-import static java.lang.Boolean.parseBoolean;
-import static java.lang.Integer.MAX_VALUE;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.stream.Collectors.toList;
-import static javax.servlet.http.HttpServletResponse.*;
@Singleton
public class GemPackHandler implements PackHandler {
@@ -133,6 +155,8 @@ public class GemPackHandler implements PackHandler {
}
} catch (IOException e) {
throw new RuntimeException(e);
+ } catch (NotAcceptableException e) {
+ throw new ClientException(SC_NOT_ACCEPTABLE, "Error copying metadata: " + e.getMessage());
}
if (metadataBytes == null)
throw new ClientException(SC_BAD_REQUEST, "Metadata not found");
diff --git a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java
index eb843a2295..949ad16f22 100644
--- a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java
+++ b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java
@@ -32,7 +32,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.exception.DataTooLargeException;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
@@ -164,8 +164,8 @@ public class HelmPackHandler implements PackHandler {
var item = items.next();
try (var is = item.openStream()) {
IOUtils.copyWithMaxSize(is, baos, MAX_FILE_SIZE);
- } catch (DataTooLargeException e) {
- throw new ClientException(SC_BAD_REQUEST, "Chart archive is too large");
+ } catch (NotAcceptableException e) {
+ throw new ClientException(SC_NOT_ACCEPTABLE, "Error copying chart archive: " + e.getMessage());
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -178,8 +178,8 @@ public class HelmPackHandler implements PackHandler {
} else {
try (var is = request.getInputStream()) {
IOUtils.copyWithMaxSize(is, baos, MAX_FILE_SIZE);
- } catch (DataTooLargeException e) {
- throw new ClientException(SC_BAD_REQUEST, "Chart archive is too large");
+ } catch (NotAcceptableException e) {
+ throw new ClientException(SC_NOT_ACCEPTABLE, "Error copying chart archive: " + e.getMessage());
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java
index 78f735e883..c4f54321c1 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java
@@ -6,8 +6,8 @@ import io.onedev.server.pack.PackHandler;
import io.onedev.server.service.*;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pack.PackPublished;
-import io.onedev.server.exception.DataTooLargeException;
import io.onedev.server.exception.HttpResponseAwareException;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
@@ -332,8 +332,8 @@ public class MavenPackHandler implements PackHandler {
var baos = new ByteArrayOutputStream();
try {
copyWithMaxSize(is, baos, MAX_CHECKSUM_LEN);
- } catch (DataTooLargeException e) {
- throw new HttpResponseAwareException(SC_REQUEST_ENTITY_TOO_LARGE, "Checksum is too large");
+ } catch (NotAcceptableException e) {
+ throw new HttpResponseAwareException(SC_NOT_ACCEPTABLE, "Error copying checksum: " + e.getMessage());
}
var checksum = new String(baos.toByteArray(), UTF_8);
LockUtils.run(lockName, () -> transactionService.run(() -> {
diff --git a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackHandler.java b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackHandler.java
index 433674217a..c81b735dd7 100644
--- a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackHandler.java
+++ b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackHandler.java
@@ -1,53 +1,67 @@
package io.onedev.server.plugin.pack.npm;
+import static com.google.common.collect.Lists.newArrayList;
+import static io.onedev.server.plugin.pack.npm.NpmPackSupport.TYPE;
+import static io.onedev.server.util.IOUtils.copyWithMaxSize;
+import static io.onedev.server.util.UrlUtils.decodePath;
+import static io.onedev.server.util.UrlUtils.encodePath;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
+import static javax.servlet.http.HttpServletResponse.SC_CREATED;
+import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static org.apache.commons.codec.binary.Base64.encodeBase64String;
+import static org.apache.commons.lang3.StringUtils.substringAfter;
+import static org.apache.commons.lang3.StringUtils.substringAfterLast;
+import static org.apache.commons.lang3.StringUtils.substringBefore;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.time.ZoneId;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.shiro.authz.UnauthorizedException;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
+
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.pack.PackHandler;
-import io.onedev.server.service.BuildService;
-import io.onedev.server.service.PackBlobService;
-import io.onedev.server.service.PackService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.UrlService;
-import io.onedev.server.exception.DataTooLargeException;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
import io.onedev.server.model.Project;
+import io.onedev.server.pack.PackHandler;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.PackBlobService;
+import io.onedev.server.service.PackService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.UrlService;
import io.onedev.server.util.Digest;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.shiro.authz.UnauthorizedException;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.time.ZoneId;
-import java.util.*;
-
-import static com.google.common.collect.Lists.newArrayList;
-import static io.onedev.server.plugin.pack.npm.NpmPackSupport.TYPE;
-import static io.onedev.server.util.IOUtils.copyWithMaxSize;
-import static io.onedev.server.util.UrlUtils.decodePath;
-import static io.onedev.server.util.UrlUtils.encodePath;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
-import static javax.servlet.http.HttpServletResponse.*;
-import static org.apache.commons.codec.binary.Base64.encodeBase64String;
-import static org.apache.commons.lang3.StringUtils.*;
-
@Singleton
public class NpmPackHandler implements PackHandler {
@@ -178,8 +192,8 @@ public class NpmPackHandler implements PackHandler {
var baos = new ByteArrayOutputStream();
try (var is = request.getInputStream()) {
copyWithMaxSize(is, baos, MAX_TAG_BODY_LEN);
- } catch (DataTooLargeException e) {
- throw new ClientException(SC_REQUEST_ENTITY_TOO_LARGE, "Tag body is too large");
+ } catch (NotAcceptableException e) {
+ throw new ClientException(SC_NOT_ACCEPTABLE, "Error copying tag body: " + e.getMessage());
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -442,8 +456,8 @@ public class NpmPackHandler implements PackHandler {
});
}
}
- } catch (DataTooLargeException e) {
- throw new ClientException(SC_REQUEST_ENTITY_TOO_LARGE, "Package metadata is too large");
+ } catch (NotAcceptableException e) {
+ throw new ClientException(SC_NOT_ACCEPTABLE, "Error copying package metadata: " + e.getMessage());
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java
index 01b40514a4..0e78bd7047 100644
--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java
+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java
@@ -17,7 +17,6 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
-import static javax.servlet.http.HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -43,7 +42,6 @@ import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import io.onedev.server.pack.PackHandler;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.io.IOUtils;
@@ -62,18 +60,19 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.service.BuildService;
-import io.onedev.server.service.PackBlobService;
-import io.onedev.server.service.PackService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.UrlService;
-import io.onedev.server.exception.DataTooLargeException;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
import io.onedev.server.model.Project;
+import io.onedev.server.pack.PackHandler;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.PackBlobService;
+import io.onedev.server.service.PackService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.UrlService;
import io.onedev.server.util.SemanticVersion;
import io.onedev.server.util.XmlUtils;
@@ -232,9 +231,9 @@ public class NugetPackHandler implements PackHandler {
break;
}
}
- } catch (DataTooLargeException e) {
- logger.warn("Package metadata is too large");
- throw new ClientException(SC_REQUEST_ENTITY_TOO_LARGE);
+ } catch (NotAcceptableException e) {
+ logger.warn("Error copying package metadata: " + e.getMessage());
+ throw new ClientException(SC_NOT_ACCEPTABLE);
}
if (metadataBytes == null) {
logger.warn("Package metadata not found");