The Unified and Autonomous Development Platform
fix: Scope Git LFS file locks per repository
Work Horseae46f1728b51
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex ef06634616..1a6e95cd98 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -9129,4 +9129,12 @@ public class DataMigrator {}}+ private void migrate233(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("GitLfsLocks.xml")) {+ FileUtils.deleteFile(file);+ }+ }+ }+}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 d65ddf1f4a..751c142337 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@@ -340,9 +340,10 @@ public class GitLfsFilter implements Filter {lockRequestNode = objectMapper.readTree(is);}String path = lockRequestNode.get("path").asText();- GitLfsLock lock = lockService.find(path);+ GitLfsLock lock = lockService.find(project, path);if (lock == null) {lock = new GitLfsLock();+ lock.setProject(project);lock.setPath(path);lock.setOwner(SecurityUtils.getUser());lockService.create(lock);@@ -379,6 +380,7 @@ public class GitLfsFilter implements Filter {limit = MAX_PAGE_SIZE;EntityCriteria<GitLfsLock> criteria = EntityCriteria.of(GitLfsLock.class);+ criteria.add(Restrictions.eq(GitLfsLock.PROP_PROJECT, project));if (path != null)criteria.add(Restrictions.eq(GitLfsLock.PROP_PATH, path));if (id != null)@@ -425,6 +427,7 @@ public class GitLfsFilter implements Filter {limit = MAX_PAGE_SIZE;EntityCriteria<GitLfsLock> criteria = EntityCriteria.of(GitLfsLock.class);+ criteria.add(Restrictions.eq(GitLfsLock.PROP_PROJECT, project));if (path != null)criteria.add(Restrictions.eq(GitLfsLock.PROP_PATH, path));if (id != null)@@ -463,8 +466,10 @@ public class GitLfsFilter implements Filter {if (forceNode != null)force = forceNode.asBoolean();- GitLfsLock lock = lockService.load(id);- if (lock.getOwner().equals(SecurityUtils.getUser())) {+ GitLfsLock lock = lockService.get(id);+ if (lock == null || !lock.getProject().equals(project)) {+ sendBatchError(httpResponse, SC_NOT_FOUND, "Lock not found");+ } else if (lock.getOwner().equals(SecurityUtils.getUser())) {lockService.delete(lock);writeTo(httpResponse, newHashMap("lock", toMap(lock)));} else if (force) {diff --git a/server-core/src/main/java/io/onedev/server/model/GitLfsLock.java b/server-core/src/main/java/io/onedev/server/model/GitLfsLock.javaindex 61ab6c4d13..f4d00aad42 100644--- a/server-core/src/main/java/io/onedev/server/model/GitLfsLock.java+++ b/server-core/src/main/java/io/onedev/server/model/GitLfsLock.java@@ -11,6 +11,7 @@ import javax.persistence.Index;import javax.persistence.JoinColumn;import javax.persistence.ManyToOne;import javax.persistence.Table;+import javax.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -23,25 +24,40 @@ import io.onedev.server.annotation.Editable;*/@Entity@Table(- indexes={@Index(columnList="o_owner_id"), @Index(columnList=PROP_PATH)})+ indexes={@Index(columnList="o_owner_id"), @Index(columnList="o_project_id"), @Index(columnList=PROP_PATH)},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", PROP_PATH})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editablepublic class GitLfsLock extends AbstractEntity {private static final long serialVersionUID = 1L;+ public static final String PROP_PROJECT = "project";+public static final String PROP_PATH = "path";+ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private User owner;- @Column(nullable=false, unique=true)+ @Column(nullable=false)private String path;@Column(nullable=false)private Date date = new Date();+ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }+public User getOwner() {return owner;}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex a97efd2649..69c703beba 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -286,6 +286,10 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Pack> packs = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<GitLfsLock> gitLfsLocks = new ArrayList<>();@Lob@Column(nullable=false, length=65535)diff --git a/server-core/src/main/java/io/onedev/server/service/GitLfsLockService.java b/server-core/src/main/java/io/onedev/server/service/GitLfsLockService.javaindex b1010a7ce2..07533a8962 100644--- a/server-core/src/main/java/io/onedev/server/service/GitLfsLockService.java+++ b/server-core/src/main/java/io/onedev/server/service/GitLfsLockService.java@@ -1,10 +1,11 @@package io.onedev.server.service;import io.onedev.server.model.GitLfsLock;+import io.onedev.server.model.Project;public interface GitLfsLockService extends EntityService<GitLfsLock> {- GitLfsLock find(String path);+ GitLfsLock find(Project project, String path);void create(GitLfsLock lock);diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGitLfsLockService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGitLfsLockService.javaindex b6608fcfc6..99aeb4b36f 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGitLfsLockService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGitLfsLockService.java@@ -7,6 +7,7 @@ import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;import io.onedev.server.model.GitLfsLock;+import io.onedev.server.model.Project;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.service.GitLfsLockService;@@ -15,8 +16,9 @@ import io.onedev.server.service.GitLfsLockService;public class DefaultGitLfsLockService extends BaseEntityService<GitLfsLock> implements GitLfsLockService {@Override- public GitLfsLock find(String path) {+ public GitLfsLock find(Project project, String path) {EntityCriteria<GitLfsLock> criteria = newCriteria();+ criteria.add(Restrictions.eq(GitLfsLock.PROP_PROJECT, project));criteria.add(Restrictions.ilike(GitLfsLock.PROP_PATH, path));criteria.setCacheable(true);return find(criteria);diff --git a/server-product/system/incompatibilities/incompatibilities.md b/server-product/system/incompatibilities/incompatibilities.mdindex b1b0581e48..398b4d1b92 100644--- a/server-product/system/incompatibilities/incompatibilities.md+++ b/server-product/system/incompatibilities/incompatibilities.md@@ -1,3 +1,9 @@+# 16.1.1++### Git LFS++Existing Git LFS file locks will be removed during upgrade. Previously locks were not scoped per repository and cannot be migrated reliably. Recreate locks after upgrade as needed.+# 16.1.0### CI/CD