The Unified and Autonomous Development Platform
feat: Projects should "not exist" for users w/o access (OD-2373)
Robin Shen8abfc6557aed
diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex 1ccfb6db3c..bf3a0899fb 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -93,8 +93,7 @@ public class GitFilter implements Filter {return StringUtils.stripStart(pathInfo, "/");}- private Long getProjectId(String projectInfo, boolean clusterAccess, boolean upload) {- var projectPath = decodeFullRepoNameAsPath(strip(projectInfo, "/"));+ private Long getProjectId(String projectPath, boolean clusterAccess, boolean upload) {var facade = projectManager.findFacadeByPath(projectPath);if (facade == null && projectPath.endsWith(".git")) {projectPath = StringUtils.substringBeforeLast(projectPath, ".");@@ -103,10 +102,17 @@ public class GitFilter implements Filter {if (StringUtils.isBlank(projectPath))throw new ExplicitException("Project not specified");if (facade == null)- throw new ExplicitException(String.format("Unable to find project '%s'", projectPath));+ reportProjectNotFoundOrInaccessible(projectPath);return facade.getId();}-++ private void reportProjectNotFoundOrInaccessible(String projectPath) {+ if (SecurityUtils.getUser() != null)+ throw new ExplicitException("Project not found or inaccessible: " + projectPath);+ else+ throw new UnauthorizedException("Authentication required");+ }+private void doNotCache(HttpServletResponse response) {response.setHeader("Expires", "Fri, 01 Jan 1980 00:00:00 GMT");response.setHeader("Pragma", "no-cache");@@ -125,7 +131,8 @@ public class GitFilter implements Filter {String service = StringUtils.substringAfterLast(pathInfo, "/");String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");- Long projectId = getProjectId(projectInfo, clusterAccess, upload);+ var projectPath = decodeFullRepoNameAsPath(strip(projectInfo, "/"));+ Long projectId = getProjectId(projectPath, clusterAccess, upload);doNotCache(response);response.setHeader("Content-Type", "application/x-" + service + "-result");@@ -153,6 +160,8 @@ public class GitFilter implements Filter {sessionManager.openSession();try {Project project = projectManager.load(projectId);+ if (!SecurityUtils.canAccessProject(project))+ reportProjectNotFoundOrInaccessible(projectPath);if (upload) {checkPullPermission(request, project);} else {@@ -278,12 +287,15 @@ public class GitFilter implements Filter {pathInfo = StringUtils.stripStart(pathInfo, "/");String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());- Long projectId = getProjectId(projectInfo, clusterAccess, upload);-+ var projectPath = decodeFullRepoNameAsPath(strip(projectInfo, "/"));+ Long projectId = getProjectId(projectPath, clusterAccess, upload);+if (!clusterAccess) {sessionManager.openSession();try {Project project = projectManager.load(projectId);+ if (!SecurityUtils.canAccessProject(project))+ reportProjectNotFoundOrInaccessible(projectPath);if (upload) {checkPullPermission(request, project);writeInitial(response, service);diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.javaindex 74343acb38..c943de05dc 100644--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java@@ -145,6 +145,15 @@ public class GitLfsFilter implements Filter {throw new ExplicitException("Project not specified");return decodeFullRepoNameAsPath(projectPath);}++ private void reportProjectNotFoundOrInaccessible(HttpServletResponse response, String projectPath) {+ if (SecurityUtils.getUser() != null) {+ sendBatchError(response, SC_NOT_FOUND, "Project not found or inaccessible: " + projectPath);+ } else {+ response.addHeader("LFS-Authenticate", "Basic realm=\"OneDev\"");+ sendBatchError(response, SC_UNAUTHORIZED, "Authentication required");+ }+ }@Overridepublic void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)@@ -168,7 +177,9 @@ public class GitLfsFilter implements Filter {sessionManager.openSession();try {Project project = projectManager.findByPath(projectPath);- if (canReadCode(httpRequest, project))+ if (project == null || !SecurityUtils.canAccessProject(project))+ reportProjectNotFoundOrInaccessible(httpResponse, projectPath);+ else if (canReadCode(httpRequest, project))lfsObject = new LfsObject(project.getId(), objectId);elsesendAuthorizationError(httpResponse);@@ -217,7 +228,9 @@ public class GitLfsFilter implements Filter {sessionManager.openSession();try {Project project = projectManager.findByPath(getProjectPath(pathInfo));- if (SecurityUtils.canWriteCode(project))+ if (project == null || !SecurityUtils.canAccessProject(project))+ reportProjectNotFoundOrInaccessible(httpResponse, projectPath);+ else if (SecurityUtils.canWriteCode(project))lfsObject = new LfsObject(project.getId(), objectId);elsesendAuthorizationError(httpResponse);@@ -285,8 +298,7 @@ public class GitLfsFilter implements Filter {if (clusterAccess) {ProjectFacade project = projectManager.findFacadeByPath(projectPath);if (project == null) {- sendBatchError(httpResponse, SC_NOT_FOUND,- "Project not found: " + projectPath);+ sendBatchError(httpResponse, SC_NOT_FOUND, "Project not found: " + projectPath);} else {httpResponse.setContentType(CONTENT_TYPE);if (pathInfo.endsWith("/batch")) {@@ -306,9 +318,8 @@ public class GitLfsFilter implements Filter {sessionManager.openSession();try {Project project = projectManager.findByPath(projectPath);- if (project == null) {- sendBatchError(httpResponse, SC_NOT_FOUND,- "Project not found: " + projectPath);+ if (project == null || !SecurityUtils.canAccessProject(project)) {+ reportProjectNotFoundOrInaccessible(httpResponse, projectPath);} else {httpResponse.setContentType(CONTENT_TYPE);if (pathInfo.endsWith("/batch")) {diff --git a/server-core/src/main/java/io/onedev/server/git/SshCommand.java b/server-core/src/main/java/io/onedev/server/git/SshCommand.javaindex 7a6a4c3bc5..5c4ea25a23 100644--- a/server-core/src/main/java/io/onedev/server/git/SshCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/SshCommand.java@@ -67,6 +67,10 @@ class SshCommand implements Command, ServerSessionAware {this.commandString = commandString;this.environments = environments;}++ private void reportProjectNotFoundOrInaccessible(String projectPath) {+ onExit(-1, "Project not found or inaccessible: " + projectPath);+ }@Overridepublic void start(ChannelSession channel, Environment env) throws IOException {@@ -90,7 +94,7 @@ class SshCommand implements Command, ServerSessionAware {if (StringUtils.isBlank(projectPath))throw new ExplicitException("Project not specified");if (projectFacade == null) {- onExit(-1, "Unable to find project '" + projectPath + "'");+ reportProjectNotFoundOrInaccessible(projectPath);return;}@@ -107,14 +111,18 @@ class SshCommand implements Command, ServerSessionAware {sessionManager.openSession();try {Project project = projectManager.load(projectFacade.getId());+ if (!SecurityUtils.canAccessProject(project)) {+ reportProjectNotFoundOrInaccessible(projectPath);+ return;+ }if (upload) {if (!SecurityUtils.canReadCode(project)) {- onExit(-1, "You are not allowed to pull from the project");+ onExit(-1, "You do not have permission to pull from the project");return;}} else {if (!SecurityUtils.canWriteCode(project)) {- onExit(-1, "You are not allowed to push to the project");+ onExit(-1, "You do not have permission to push to the project");return;}}diff --git a/server-core/src/main/java/io/onedev/server/persistence/exception/EntityNotFoundExceptionHandler.java b/server-core/src/main/java/io/onedev/server/persistence/exception/EntityNotFoundExceptionHandler.javaindex 5bae99d45b..5f26f732a6 100644--- a/server-core/src/main/java/io/onedev/server/persistence/exception/EntityNotFoundExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/persistence/exception/EntityNotFoundExceptionHandler.java@@ -14,7 +14,7 @@ public class EntityNotFoundExceptionHandler extends AbstractExceptionHandler<Entpublic HttpResponse getResponse(EntityNotFoundException exception) {var errorMessage = exception.getMessage();if (errorMessage == null)- errorMessage = "Database entity not found";+ errorMessage = "Not found";return new HttpResponse(HttpServletResponse.SC_NOT_FOUND, errorMessage);}diff --git a/server-core/src/main/java/io/onedev/server/persistence/exception/FileNotFoundExceptionHandler.java b/server-core/src/main/java/io/onedev/server/persistence/exception/FileNotFoundExceptionHandler.javaindex a4b5f52832..dafec55e61 100644--- a/server-core/src/main/java/io/onedev/server/persistence/exception/FileNotFoundExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/persistence/exception/FileNotFoundExceptionHandler.java@@ -15,7 +15,7 @@ public class FileNotFoundExceptionHandler extends AbstractExceptionHandler<FileNpublic HttpResponse getResponse(FileNotFoundException exception) {var errorMessage = exception.getMessage();if (errorMessage == null)- errorMessage = "File not found";+ errorMessage = "Not found";return new HttpResponse(HttpServletResponse.SC_NOT_FOUND, errorMessage);}diff --git a/server-core/src/main/java/io/onedev/server/persistence/exception/ObjectNotFoundExceptionHandler.java b/server-core/src/main/java/io/onedev/server/persistence/exception/ObjectNotFoundExceptionHandler.javaindex 01c548dc13..a0a85906e6 100644--- a/server-core/src/main/java/io/onedev/server/persistence/exception/ObjectNotFoundExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/persistence/exception/ObjectNotFoundExceptionHandler.java@@ -14,7 +14,7 @@ public class ObjectNotFoundExceptionHandler extends AbstractExceptionHandler<Objpublic HttpResponse getResponse(ObjectNotFoundException exception) {var errorMessage = exception.getMessage();if (errorMessage == null)- errorMessage = "Database entity not found";+ errorMessage = "Not found";return new HttpResponse(HttpServletResponse.SC_NOT_FOUND, errorMessage);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex dd0c0e390b..59551c8d2d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -120,8 +120,6 @@ public abstract class BuildListPanel extends Panel {private final boolean showDuration;- private final int expectedCount;-private final IModel<BuildQuery> queryModel = new LoadableDetachableModel<BuildQuery>() {@Override@@ -150,12 +148,11 @@ public abstract class BuildListPanel extends Panel {private boolean querySubmitted = true;public BuildListPanel(String id, IModel<String> queryModel, boolean showRef,- boolean showDuration, int expectedCount) {+ boolean showDuration) {super(id);this.queryStringModel = queryModel;this.showRef = showRef;this.showDuration = showDuration;- this.expectedCount = expectedCount;}private BuildManager getBuildManager() {@@ -1039,10 +1036,7 @@ public abstract class BuildListPanel extends Panel {}};-- if (expectedCount != 0 && expectedCount != dataProvider.size())- warn("Some builds might be hidden due to permission policy");-+body = new WebMarkupContainer("body");add(body.setOutputMarkupId(true));diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 20ff7f5576..dff21d89ac 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -421,7 +421,7 @@ public abstract class BuildSidePanel extends Panel {String query = "depends on " + Criteria.quote(getBuild().getProject().getPath() + "#" + getBuild().getNumber());Link<Void> dependentsLink = new BookmarkablePageLink<Void>("dependents", BuildListPage.class,- BuildListPage.paramsOf(query, 0, getBuild().getDependents().size()));+ BuildListPage.paramsOf(query, 0));dependentsLink.setVisible(!getBuild().getDependents().isEmpty());dependentsLink.add(new Label("label", getBuild().getDependents().size() + " build(s)"));@@ -429,7 +429,7 @@ public abstract class BuildSidePanel extends Panel {query = "dependencies of " + Criteria.quote(getBuild().getProject().getPath() + "#" + getBuild().getNumber());Link<Void> dependenciesLink = new BookmarkablePageLink<Void>("dependencies", BuildListPage.class,- BuildListPage.paramsOf(query, 0, getBuild().getDependencies().size()));+ BuildListPage.paramsOf(query, 0));dependenciesLink.setVisible(!getBuild().getDependencies().isEmpty());dependenciesLink.add(new Label("label", getBuild().getDependencies().size() + " build(s)"));dependencesContainer.add(dependenciesLink);diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.javaindex af8684ee87..cc315a3537 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java@@ -156,7 +156,7 @@ class BuildQueryWatchesPanel extends GenericPanel<User> {link.add(new Label("label", name));fragment.add(link);} else {- var link = new BookmarkablePageLink<Void>("link", BuildListPage.class, BuildListPage.paramsOf(rowModel.getObject().query, 1, 0));+ var link = new BookmarkablePageLink<Void>("link", BuildListPage.class, BuildListPage.paramsOf(rowModel.getObject().query, 1));link.add(new Label("label", name));fragment.add(link);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.javaindex 25c6b309a3..4e8036e2aa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java@@ -58,7 +58,7 @@ public class AgentBuildsPage extends AgentDetailPage {pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);}- }, true, true, 0) {+ }, true, true) {@Overrideprotected BuildQuery getBaseQuery() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex ecd0532083..f4ffce2981 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -142,7 +142,7 @@ public abstract class BasePage extends WebPage {throw new RedirectToUrlException(redirectUrl);}}-+if (!isPermitted())unauthorized();diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.javaindex d17fc9b734..2498ce2b58 100644--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java@@ -41,13 +41,9 @@ public class BuildListPage extends LayoutPage {private static final String PARAM_PAGE = "page";private static final String PARAM_QUERY = "query";-- private static final String PARAM_EXPECTED_COUNT = "expectedCount";-+private String query;-- private final int expectedCount;-+private SavedQueriesPanel<NamedBuildQuery> savedQueries;private BuildListPanel buildList;@@ -55,8 +51,6 @@ public class BuildListPage extends LayoutPage {public BuildListPage(PageParameters params) {super(params);query = params.get(PARAM_QUERY).toOptionalString();- expectedCount = params.get(PARAM_EXPECTED_COUNT).toInt(0);- params.remove(PARAM_EXPECTED_COUNT);}private static GlobalBuildSetting getBuildSetting() {@@ -77,7 +71,7 @@ public class BuildListPage extends LayoutPage {@Overrideprotected Link<Void> newQueryLink(String componentId, NamedBuildQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, BuildListPage.class,- BuildListPage.paramsOf(namedQuery.getQuery(), 0, 0));+ BuildListPage.paramsOf(namedQuery.getQuery(), 0));}@Override@@ -119,7 +113,7 @@ public class BuildListPage extends LayoutPage {pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);}- }, true, true, expectedCount) {+ }, true, true) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {@@ -127,7 +121,7 @@ public class BuildListPage extends LayoutPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- return paramsOf(query, currentPage+1, 0);+ return paramsOf(query, currentPage+1);}@Override@@ -217,26 +211,24 @@ public class BuildListPage extends LayoutPage {target.add(buildList);}- public static PageParameters paramsOf(@Nullable String query, int page, int expectedCount) {+ public static PageParameters paramsOf(@Nullable String query, int page) {PageParameters params = new PageParameters();if (query != null)params.add(PARAM_QUERY, query);if (page != 0)params.add(PARAM_PAGE, page);- if (expectedCount != 0)- params.add(PARAM_EXPECTED_COUNT, expectedCount);return params;}- public static PageParameters paramsOf(int page, int expectedCount) {+ public static PageParameters paramsOf(int page) {String query = null;User user = SecurityUtils.getAuthUser();if (user != null && !user.getBuildQueryPersonalization().getQueries().isEmpty())query = user.getBuildQueryPersonalization().getQueries().iterator().next().getQuery();else if (!getBuildSetting().getNamedQueries().isEmpty())query = getBuildSetting().getNamedQueries().iterator().next().getQuery();-- return paramsOf(query, page, expectedCount);++ return paramsOf(query, page);}@Overridediff --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 cf7785c7b1..3207fbdeb8 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@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;@@ -106,6 +107,7 @@ import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;import io.onedev.server.web.page.project.stats.code.CodeContribsPage;import io.onedev.server.web.page.project.stats.code.SourceLinesPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;+import io.onedev.server.web.page.simple.security.LoginPage;import io.onedev.server.web.util.ProjectAware;public abstract class ProjectPage extends LayoutPage implements ProjectAware {@@ -138,8 +140,12 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {projectPath = StringUtils.strip(projectPath, "/");Project project = getProjectManager().findByPath(projectPath);- if (project == null)- throw new EntityNotFoundException();+ if (project == null || !SecurityUtils.canAccessProject(project)) {+ if (getLoginUser() != null)+ throw new EntityNotFoundException("Project not found or inaccessible");+ else+ throw new RestartResponseAtInterceptPageException(LoginPage.class);+ }Long projectId = project.getId();projectModel = new LoadableDetachableModel<Project>() {@@ -178,11 +184,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {protected void onInitialize() {super.onInitialize();}-- @Override- protected boolean isPermitted() {- return SecurityUtils.canAccessProject(getProject());- }@Overridepublic Project getProject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.javaindex 6917e37832..eff15306dd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java@@ -126,7 +126,7 @@ public class ProjectBuildsPage extends ProjectPage {pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);}- }, true, true, 0) {+ }, true, true) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 97d622e919..94951913ae 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -172,7 +172,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), true, true, 0) {+ Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), true, true) {@Overrideprotected BuildQuery getBaseQuery() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.javaindex 25740b786c..aedf335e43 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java@@ -57,7 +57,7 @@ public class IssueBuildsPage extends IssueDetailPage {pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);}- }, true, true, 0) {+ }, true, true) {@Overrideprotected BuildQuery getBaseQuery() {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 fb30565d2a..c736b4b877 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@@ -741,8 +741,9 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRelsecommitHash = request.getBuildCommitHash();- item.add(new RunJobLink("runJob",- ObjectId.fromString(commitHash), jobName, request.getMergeRef()) {+ var commitId = ObjectId.fromString(commitHash);+ var buildSpec = getProject().getBuildSpec(commitId);+ item.add(new RunJobLink("runJob", commitId, jobName, request.getMergeRef()) {@Overrideprotected Project getProject() {@@ -757,10 +758,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected void onConfigure() {- setVisible(SecurityUtils.canRunJob(getProject(), jobName)- || SecurityUtils.canModifyPullRequest(getPullRequest()));+ setVisible(buildSpec != null+ && buildSpec.getJobMap().containsKey(jobName)+ && (SecurityUtils.canRunJob(getProject(), jobName) || SecurityUtils.canModifyPullRequest(getPullRequest())));}- });+ });}@Overridediff --git a/server-ee b/server-eeindex 11b35411ec..a292fc480e 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 11b35411ecf6c0a7fe09b6fb37f4e9a6991e3bb0+Subproject commit a292fc480e92cafa5cc747b8ec2a157eafaff4d9