The Unified and Autonomous Development Platform
fix: Running a job from a stale branch file view silently submits an outdated commit
Robin Shen5326509ca555
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.javaindex 747fba769f..6fbb162999 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.java@@ -1,5 +1,19 @@package io.onedev.server.web.component.commit.info;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevObject;+import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;@@ -14,19 +28,6 @@ import io.onedev.server.web.component.user.contributoravatars.ContributorAvatarsimport io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.overview.ProjectOverviewPage;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevObject;-public abstract class CommitInfoPanel extends GenericPanel<ProjectScopedCommit> {public CommitInfoPanel(String id, IModel<ProjectScopedCommit> model) {@@ -99,6 +100,11 @@ public abstract class CommitInfoPanel extends GenericPanel<ProjectScopedCommit>return null;}+ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return null;+ }+});CommitDetailPage.State commitState = new CommitDetailPage.State();diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 0e21d634f9..63991b7381 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -197,6 +197,8 @@ public abstract class CommitListPanel extends Panel {}};++ private final Map<String, ObjectId> seenBranchTips = new HashMap<>();private final IModel<Map<String, List<String>>> labelsModel = new LoadableDetachableModel<Map<String, List<String>>>() {@@ -204,6 +206,8 @@ public abstract class CommitListPanel extends Panel {protected Map<String, List<String>> load() {Map<String, List<String>> labels = new HashMap<>();List<RefFacade> refInfos = getProject().getBranchRefs();+ for (RefFacade ref: refInfos)+ seenBranchTips.put(GitUtils.ref2branch(ref.getName()), ref.getPeeledObj().copy());refInfos.addAll(getProject().getTagRefs());for (RefFacade ref: refInfos) {if (ref.getPeeledObj() instanceof RevCommit) {@@ -657,6 +661,11 @@ public abstract class CommitListPanel extends Panel {return null;}+ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return seenBranchTips.get(branch);+ }+});} else {item.add(new WebMarkupContainer("buildStatus").setVisible(false));diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.javaindex 6b11f28634..6b295c38de 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java@@ -149,6 +149,11 @@ public abstract class CommitStatusLink extends DropdownLink {return CommitStatusLink.this.getPullRequest();}+ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return CommitStatusLink.this.getSeenBranchTip(branch);+ }+};}@@ -175,5 +180,8 @@ public abstract class CommitStatusLink extends DropdownLink {super.renderHead(response);response.render(CssHeaderItem.forReference(new CommitStatusCssResourceReference()));}-++ @Nullable+ protected abstract ObjectId getSeenBranchTip(String branch);+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex 1e16138d5f..d39ab6496d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -28,6 +28,8 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.param.ParamUtils;import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.git.GitUtils;+import io.onedev.server.git.service.GitService;import io.onedev.server.git.service.RefFacade;import io.onedev.server.job.JobAuthorizationContext;import io.onedev.server.job.JobAuthorizationContextAware;@@ -51,6 +53,9 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat@Injectprivate JobService jobService;+ @Inject+ private GitService gitService;+private final String refName;private final ObjectId commitId;@@ -69,6 +74,28 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat@Nullableprotected abstract PullRequest getPullRequest();++ @Nullable+ protected abstract ObjectId getSeenBranchTip(String branch);++ private boolean isBranchUpdated(Collection<String> refNames) {+ for (var refName : refNames) {+ var branch = GitUtils.ref2branch(refName);+ if (branch == null)+ continue;+ var seenBranchTip = getSeenBranchTip(branch);+ if (seenBranchTip != null) {+ var branchRef = gitService.getRef(getProject(), refName);+ if (branchRef == null || !seenBranchTip.equals(branchRef.getPeeledObj()))+ return true;+ }+ }+ return false;+ }++ private void warnBranchUpdated() {+ getSession().warn(_T("Branch is updated. Please refresh the page and resubmit the job"));+ }@Overridepublic void onClick(AjaxRequestTarget target) {@@ -117,6 +144,11 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat@Overrideprotected void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,Serializable populatedParamBean) {+ if (isBranchUpdated(selectedRefNames)) {+ warnBranchUpdated();+ close();+ return;+ }Map<String, List<String>> paramMap = ParamUtils.getParamMap(job, populatedParamBean, job.getParamSpecMap().keySet());List<Build> builds = new ArrayList<>();@@ -153,6 +185,10 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat};} else {+ if (isBranchUpdated(refNames)) {+ warnBranchUpdated();+ return;+ }Build build = jobService.submit(user, getProject(), commitId, job.getName(),new HashMap<>(), refNames.iterator().next(), getPullRequest(), null,_T("Submitted manually"));diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.javaindex 03cf8e9e80..a8c2bcddcd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java@@ -149,7 +149,12 @@ public abstract class JobInfoButton extends Panel {protected PullRequest getPullRequest() {return null;}-++ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return JobInfoButton.this.getSeenBranchTip(branch);+ }+});}@@ -164,6 +169,9 @@ public abstract class JobInfoButton extends Panel {protected abstract ObjectId getCommitId();protected abstract String getJobName();++ @Nullable+ protected abstract ObjectId getSeenBranchTip(String branch);@Nullableprotected Build getActiveBuild() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.javaindex 4d7dea8294..5128bc244f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java@@ -132,6 +132,11 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitAreturn JobListPanel.this.getPullRequest();}+ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return JobListPanel.this.getSeenBranchTip(branch);+ }+});jobItem.add(new BookmarkablePageLink<Void>("showInList", ProjectBuildsPage.class,@@ -233,4 +238,7 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitAreturn new ProjectScopedCommit(getProject(), commitId);}+ @Nullable+ protected abstract ObjectId getSeenBranchTip(String branch);+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.javaindex 6cda349906..5fc372c317 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java@@ -170,6 +170,11 @@ public abstract class JobRunSelector extends Panel {return null;}+ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return branchRef.getPeeledObj().copy();+ }+};jobLink.add(new Label("label", jobName));item.add(jobLink);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex ed8bec98a4..f50139ec8c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -916,6 +916,15 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,protected PullRequest getPullRequest() {return null;}++ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ var refName = getRefName();+ if (refName != null && GitUtils.ref2branch(refName) != null)+ return resolvedRevision;+ else+ return null;+ }};} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javaindex 516b3f0a31..b37845761f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java@@ -35,6 +35,7 @@ import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;import org.unbescape.html.HtmlEscape;import com.google.common.base.Throwables;@@ -49,6 +50,7 @@ import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.step.StepTemplate;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.build.JobProperty;@@ -250,6 +252,15 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {protected PullRequest getPullRequest() {return null;}++ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ var refName = context.getRefName();+ if (refName != null && GitUtils.ref2branch(refName) != null)+ return context.getCommit().copy();+ else+ return null;+ }});jobNav.add(AttributeAppender.append("class", "nav btn-group flex-nowrap"));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 5ed1adb2e1..bc271ab511 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -464,6 +464,7 @@ public class ProjectBranchesPage extends ProjectPage {link.add(new Label("name", branch));fragment.add(link);+ var seenBranchTip = ref.getPeeledObj().copy();fragment.add(new CommitStatusLink("buildStatus", ref.getObjectId(), ref.getName()) {@Override@@ -475,7 +476,12 @@ public class ProjectBranchesPage extends ProjectPage {protected PullRequest getPullRequest() {return null;}-++ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return seenBranchTip;+ }+});fragment.add(new DropdownLink("workspaces") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex dcff0c9f61..bf824f26af 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -37,6 +37,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;import com.google.common.collect.Sets;@@ -370,6 +371,11 @@ public abstract class BuildDetailPage extends ProjectPagereturn getBuild().getRequest();}+ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return null;+ }+};}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.javaindex 1f99a00d8a..ba54dd011e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java@@ -1,5 +1,11 @@package io.onedev.server.web.page.project.builds.detail.pipeline;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.buildspec.job.Job;import io.onedev.server.model.Build;import io.onedev.server.model.Project;@@ -7,11 +13,6 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.job.jobinfo.JobInfoButton;import io.onedev.server.web.component.pipeline.PipelinePanel;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;-import org.apache.wicket.Component;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.ObjectId;--import java.util.List;public class BuildPipelinePage extends BuildDetailPage {@@ -68,6 +69,11 @@ public class BuildPipelinePage extends BuildDetailPage {return getBuild();}+ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return null;+ }+};}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex b3e01576ed..0452a48dcf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -140,12 +140,16 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationSprivate List<String> operateBranches;+ private final Map<String, ObjectId> seenBranchTips = new HashMap<>();+private final IModel<List<RefFacade>> refsModel = new LoadableDetachableModel<List<RefFacade>>() {@Overrideprotected List<RefFacade> load() {Collection<ObjectId> descendants = getDescendants();List<RefFacade> refs = new ArrayList<>();refs.addAll(getProject().getBranchRefs());+ for (RefFacade ref: refs)+ seenBranchTips.put(GitUtils.ref2branch(ref.getName()), ref.getPeeledObj().copy());refs.addAll(getProject().getTagRefs());return refs.stream().filter(ref -> descendants.contains(ref.getPeeledObj())).collect(toList());}@@ -515,6 +519,11 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationSreturn job.getName();}+ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return seenBranchTips.get(branch);+ }+});}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 b55ccee3c8..c78120ea94 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@@ -835,6 +835,12 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR&& buildSpec.getJobMap().containsKey(jobName)&& (SecurityUtils.canRunJob(getProject(), jobName) || SecurityUtils.canModifyPullRequest(getPullRequest())));}++ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return null;+ }+});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 6bc5eeb073..02a9f8ca74 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -335,7 +335,12 @@ public class ProjectTagsPage extends ProjectPage {protected PullRequest getPullRequest() {return null;}-++ @Override+ protected ObjectId getSeenBranchTip(String branch) {+ return null;+ }+});fragment.add(new DropdownLink("workspaces") {