The Unified and Autonomous Development Platform
chore: Prevent git branch delete via push if there are workspaces on it
Robin Shen1ec478a307b2
diff --git a/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.javaindex e8fef2a8f7..f9a0b8910d 100644--- a/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.java@@ -1,17 +1,19 @@package io.onedev.server.git.hook;-import com.google.common.base.Preconditions;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.service.ProjectService;-import io.onedev.server.service.UrlService;-import io.onedev.server.service.UserService;-import io.onedev.server.event.ListenerRegistry;-import io.onedev.server.event.project.RefUpdated;-import io.onedev.server.git.GitUtils;-import io.onedev.server.model.Project;-import io.onedev.server.persistence.SessionService;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.security.SecurityUtils;+import static io.onedev.server.security.SecurityUtils.asPrincipals;+import static io.onedev.server.security.SecurityUtils.asSubject;++import java.io.IOException;+import java.util.ArrayList;+import java.util.Enumeration;+import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.servlet.ServletException;+import javax.servlet.http.HttpServlet;+import javax.servlet.http.HttpServletRequest;+import javax.servlet.http.HttpServletResponse;import org.apache.commons.lang3.tuple.ImmutableTriple;import org.apache.commons.lang3.tuple.Triple;@@ -23,19 +25,19 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import java.io.IOException;-import java.util.ArrayList;-import java.util.Enumeration;-import java.util.List;+import com.google.common.base.Preconditions;-import static io.onedev.server.security.SecurityUtils.asPrincipals;-import static io.onedev.server.security.SecurityUtils.asSubject;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.event.ListenerRegistry;+import io.onedev.server.event.project.RefUpdated;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.SessionService;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.ProjectService;+import io.onedev.server.service.UrlService;+import io.onedev.server.service.UserService;@Singletonpublic class GitPostReceiveCallback extends HttpServlet {@@ -44,26 +46,21 @@ public class GitPostReceiveCallback extends HttpServlet {public static final String PATH = "/git-postreceive-callback";- private final ProjectService projectService;+ @Inject+ private ProjectService projectService;- private final UserService userService;+ @Inject+ private UserService userService;- private final UrlService urlService;+ @Inject+ private UrlService urlService;- private final SessionService sessionService;-- private final ListenerRegistry listenerRegistry;+ @Inject+ private SessionService sessionService;@Inject- public GitPostReceiveCallback(ProjectService projectService, UrlService urlService,- SessionService sessionService, ListenerRegistry listenerRegistry, UserService userService) {- this.projectService = projectService;- this.urlService = urlService;- this.sessionService = sessionService;- this.listenerRegistry = listenerRegistry;- this.userService = userService;- }-+ private ListenerRegistry listenerRegistry;+@Sessional@Overrideprotected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {@@ -124,7 +121,7 @@ public class GitPostReceiveCallback extends HttpServlet {}if (branch != null && defaultBranch != null && !branch.equals(defaultBranch)- && !SecurityUtils.isSystem(principal)) {+ && !SecurityUtils.isSystem(principal) && !newObjectId.equals(ObjectId.zeroId())) {showPullRequestLink(output, projectId, branch, defaultBranch);}@@ -145,7 +142,6 @@ public class GitPostReceiveCallback extends HttpServlet {}var userId = SecurityUtils.getUser().getId();-sessionService.runAsyncAfterCommit(() -> {Project project = projectService.load(projectId);try {diff --git a/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.javaindex e5ef8b2182..444ec3984f 100644--- a/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java@@ -1,11 +1,37 @@package io.onedev.server.git.hook;+import static io.onedev.server.security.SecurityUtils.asPrincipals;+import static io.onedev.server.security.SecurityUtils.asSubject;+import static io.onedev.server.security.SecurityUtils.canManageProject;+import static io.onedev.server.security.SecurityUtils.getUser;+import static io.onedev.server.security.SecurityUtils.isSystem;++import java.io.IOException;+import java.util.ArrayList;+import java.util.Enumeration;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.servlet.ServletException;+import javax.servlet.http.HttpServlet;+import javax.servlet.http.HttpServletRequest;+import javax.servlet.http.HttpServletResponse;++import org.apache.shiro.util.ThreadContext;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.ObjectId;+import org.jspecify.annotations.Nullable;+import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import com.google.common.collect.Lists;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.service.ProjectService;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;@@ -14,36 +40,22 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.code.BranchProtection;import io.onedev.server.model.support.code.TagProtection;import io.onedev.server.persistence.annotation.Sessional;-import org.apache.shiro.util.ThreadContext;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.ObjectId;--import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import java.io.IOException;-import java.util.*;--import static io.onedev.server.security.SecurityUtils.*;+import io.onedev.server.service.ProjectService;+import io.onedev.server.workspace.WorkspaceService;@Singletonpublic class GitPreReceiveCallback extends HttpServlet {public static final String PATH = "/git-prereceive-callback";- private final ProjectService projectService;-- private final Set<GitPreReceiveChecker> preReceiveCheckers;+ @Inject+ private ProjectService projectService;++ @Inject+ private WorkspaceService workspaceService;@Inject- public GitPreReceiveCallback(ProjectService projectService, Set<GitPreReceiveChecker> preReceiveCheckers) {- this.projectService = projectService;- this.preReceiveCheckers = preReceiveCheckers;- }+ private Set<GitPreReceiveChecker> preReceiveCheckers;private void error(Output output, @Nullable String refName, List<String> messages) {output.markError();@@ -177,6 +189,10 @@ public class GitPreReceiveCallback extends HttpServlet {errorMessages.add(errorMessage);}}+ if (errorMessages.isEmpty() && newObjectId.equals(ObjectId.zeroId())) {+ if (workspaceService.count(project, branchName) > 0)+ errorMessages.add("There are workspaces on this branch. Please delete them first");+ }if (errorMessages.isEmpty() && newObjectId.equals(ObjectId.zeroId())) {try {projectService.onDeleteBranch(project, branchName);