The Unified and Autonomous Development Platform
Return http code 400 instead of 500 for invalid project ids
Robin Shenfb85bc6cf2ba
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 34ac62ac60..fadbf489a0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -7,6 +7,9 @@ import java.util.HashMap;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;++import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -94,10 +97,17 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {public ProjectPage(PageParameters params) {super(params);-- Long projectId = params.get(PARAM_PROJECT).toOptionalLong();- if (projectId == null)++ String projectIdString = params.get(PARAM_PROJECT).toOptionalString();+ if (StringUtils.isBlank(projectIdString))throw new RestartResponseException(ProjectListPage.class);++ Long projectId;+ try {+ projectId = Long.valueOf(projectIdString);+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid project id: " + projectIdString);+ }Project project = OneDev.getInstance(ProjectManager.class).load(projectId);projectModel = new LoadableDetachableModel<Project>() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 4b09abd234..f372033744 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -3,6 +3,8 @@ package io.onedev.server.web.page.project.issues.detail;import java.util.ArrayList;import java.util.List;+import javax.validation.ValidationException;+import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.Page;@@ -76,7 +78,12 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input@Overrideprotected Issue load() {- Long issueNumber = Long.valueOf(issueNumberString);+ Long issueNumber;+ try {+ issueNumber = Long.valueOf(issueNumberString);+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid issue number: " + issueNumberString);+ }Issue issue = getIssueManager().find(getProject(), issueNumber);OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);if (!issue.getProject().equals(getProject()))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.javaindex df81824fd1..8b27a8558a 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@@ -14,6 +14,7 @@ import java.util.stream.Collectors;import java.util.stream.Stream;import javax.persistence.EntityNotFoundException;+import javax.validation.ValidationException;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -145,7 +146,13 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected PullRequest load() {- Long requestNumber = Long.valueOf(requestNumberString);+ Long requestNumber;+ try {+ requestNumber = Long.valueOf(requestNumberString);+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid pull request number: " + requestNumberString);+ }+PullRequest request = getPullRequestManager().find(getProject(), requestNumber);if (request == null) {throw new EntityNotFoundException("Unable to find pull request #"