Skip to content

The Unified and Autonomous Development Platform

feat: Do not share package blobs between projects (OD-2289)

Robin Shen9eddf07fe40f
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index f554f64cc5..44904c6301 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -138,7 +138,6 @@ import io.onedev.server.entitymanager.LabelSpecManager;
import io.onedev.server.entitymanager.LinkAuthorizationManager;
import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.MembershipManager;
-import io.onedev.server.entitymanager.PackBlobAuthorizationManager;
import io.onedev.server.entitymanager.PackBlobManager;
import io.onedev.server.entitymanager.PackBlobReferenceManager;
import io.onedev.server.entitymanager.PackLabelManager;
@@ -220,7 +219,6 @@ import io.onedev.server.entitymanager.impl.DefaultLabelSpecManager;
import io.onedev.server.entitymanager.impl.DefaultLinkAuthorizationManager;
import io.onedev.server.entitymanager.impl.DefaultLinkSpecManager;
import io.onedev.server.entitymanager.impl.DefaultMembershipManager;
-import io.onedev.server.entitymanager.impl.DefaultPackBlobAuthorizationManager;
import io.onedev.server.entitymanager.impl.DefaultPackBlobManager;
import io.onedev.server.entitymanager.impl.DefaultPackBlobReferenceManager;
import io.onedev.server.entitymanager.impl.DefaultPackLabelManager;
@@ -396,7 +394,6 @@ import io.onedev.server.web.websocket.CodeCommentEventBroadcaster;
import io.onedev.server.web.websocket.CommitIndexedBroadcaster;
import io.onedev.server.web.websocket.DefaultWebSocketManager;
import io.onedev.server.web.websocket.IssueEventBroadcaster;
-import io.onedev.server.web.websocket.ProjectDeleteEventBroadcaster;
import io.onedev.server.web.websocket.PullRequestEventBroadcaster;
import io.onedev.server.web.websocket.WebSocketManager;
import io.onedev.server.xodus.CommitInfoManager;
@@ -543,7 +540,6 @@ public class CoreModule extends AbstractPluginModule {
bind(PackManager.class).to(DefaultPackManager.class);
bind(PackBlobManager.class).to(DefaultPackBlobManager.class);
bind(PackBlobReferenceManager.class).to(DefaultPackBlobReferenceManager.class);
- bind(PackBlobAuthorizationManager.class).to(DefaultPackBlobAuthorizationManager.class);
bind(AccessTokenManager.class).to(DefaultAccessTokenManager.class);
bind(AccessTokenAuthorizationManager.class).to(DefaultAccessTokenAuthorizationManager.class);
bind(ReviewedDiffManager.class).to(DefaultReviewedDiffManager.class);
@@ -676,7 +672,6 @@ public class CoreModule extends AbstractPluginModule {
bind(IssueEventBroadcaster.class);
bind(BuildEventBroadcaster.class);
bind(AlertEventBroadcaster.class);
- bind(ProjectDeleteEventBroadcaster.class);
bind(UploadManager.class).to(DefaultUploadManager.class);
bind(TaskButton.TaskFutureManager.class);
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.java
index 05da04f142..a05e8a5f26 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
@@ -1,7 +1,54 @@
package io.onedev.server.data.migration;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.GeneralSecurityException;
+import java.security.PublicKey;
+import java.text.MessageFormat;
+import java.time.DayOfWeek;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+import javax.inject.Singleton;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.tuple.Triple;
+import org.apache.sshd.common.config.keys.KeyUtils;
+import org.apache.sshd.common.digest.BuiltinDigests;
+import org.dom4j.Element;
+import org.dom4j.Node;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.base.Preconditions;
import com.thoughtworks.xstream.core.JVM;
+
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
@@ -9,48 +56,22 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.markdown.MentionParser;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.IssueStateHistory;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.support.TimeGroups;
import io.onedev.server.ssh.SshKeyUtils;
import io.onedev.server.util.CryptoUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.DirectoryVersionUtils;
import io.onedev.server.util.Pair;
import io.onedev.server.util.ParsedEmailAddress;
import io.onedev.server.util.patternset.PatternSet;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.tuple.Triple;
-import org.apache.sshd.common.config.keys.KeyUtils;
-import org.apache.sshd.common.digest.BuiltinDigests;
-import org.dom4j.Element;
-import org.dom4j.Node;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import oshi.SystemInfo;
import oshi.hardware.HardwareAbstractionLayer;
-import javax.annotation.Nullable;
-import javax.inject.Singleton;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.GeneralSecurityException;
-import java.security.PublicKey;
-import java.text.MessageFormat;
-import java.time.*;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAdjusters;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Comparator.comparing;
-import static java.util.Comparator.naturalOrder;
-
@Singleton
@SuppressWarnings("unused")
@@ -7374,6 +7395,11 @@ public class DataMigrator {
private void migrate189(File dataDir, Stack<Integer> versions) {
Map<String, String> pullRequestIdToProjectId = new HashMap<>();
Map<String, String> codeCommentIdToProjectId = new HashMap<>();
+ Map<String, Set<String>> packBlobIdToAuthorizedProjectIds = new HashMap<>();
+ Map<String, Pair<String, String>> packBlobIdToProjectAndHash = new HashMap<>();
+ Map<String, String> packIdToProjectId = new HashMap<>();
+ int nextPackBlobId = 1;
+ String packStorePath = null;
for (File file : dataDir.listFiles()) {
if (file.getName().startsWith("PullRequests.xml")) {
var dom = VersionedXmlDoc.fromFile(file);
@@ -7393,9 +7419,130 @@ public class DataMigrator {
element.element("noSpaceTitle").detach();
}
dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Projects.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ var pendingDeleteElement = element.element("pendingDelete");
+ if (pendingDeleteElement != null)
+ pendingDeleteElement.detach();
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("PackBlobAuthorizations.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ var projectId = element.elementTextTrim("project");
+ var packBlobId = element.elementTextTrim("packBlob");
+ packBlobIdToAuthorizedProjectIds.computeIfAbsent(packBlobId, k -> new HashSet<>()).add(projectId);
+ }
+ FileUtils.deleteFile(file);
+ } else if (file.getName().startsWith("PackBlobs.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ var packBlobId = element.elementTextTrim("id");
+ nextPackBlobId = Math.max(nextPackBlobId, Integer.parseInt(packBlobId) + 1);
+ packBlobIdToProjectAndHash.put(packBlobId, new Pair<>(element.elementTextTrim("project"), element.elementTextTrim("sha256Hash")));
+ }
+ } else if (file.getName().startsWith("Packs.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ packIdToProjectId.put(element.elementTextTrim("id"), element.elementTextTrim("project"));
+ }
+ } else if (file.getName().startsWith("Settings.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ if (element.elementTextTrim("key").equals("CONTRIBUTED_SETTINGS")) {
+ var valueElement = element.element("value");
+ if (valueElement != null) {
+ for (var entryElement: valueElement.elements()) {
+ var storageSettingElement = entryElement.element("io.onedev.server.ee.storage.StorageSetting");
+ if (storageSettingElement != null) {
+ var packStoreElement = storageSettingElement.element("packStore");
+ if (packStoreElement != null)
+ packStorePath = packStoreElement.getText().trim();
+ }
+ }
+ }
+ }
+ }
+ dom.writeToFile(file, false);
}
}
+ Map<String, Map<String, String>> projectIdToPackBlobIdMapping = new HashMap<>();
+ var packBlobsFile = new File(dataDir, "PackBlobs.xml");
+ var packBlobsDom = VersionedXmlDoc.fromFile(packBlobsFile);
+ var projectsDir = new File(dataDir.getParentFile().getParentFile().getParentFile(), "site/projects");
+ for (var entry: packBlobIdToAuthorizedProjectIds.entrySet()) {
+ var packBlobProjectAndHash = packBlobIdToProjectAndHash.get(entry.getKey());
+ var projectDir = new File(projectsDir, packBlobProjectAndHash.getLeft());
+ var hash = packBlobProjectAndHash.getRight();
+ var relativeBlobFilePath = hash.substring(0, 2) + "/" + hash.substring(2, 4) + "/" + hash;
+ var packBlobFile = new File(projectDir, "packages/" + relativeBlobFilePath);
+ if (!packBlobFile.exists()) {
+ var errorMessage = String.format(
+ "Unable to find pack blob file for migration (blob file: %s, target projects: %s)",
+ packBlobFile.getAbsolutePath(), String.join(" ", entry.getValue()));
+ throw new ExplicitException(errorMessage);
+ }
+ for (var authorizedProjectId: entry.getValue()) {
+ if (authorizedProjectId.equals(packBlobProjectAndHash.getLeft()))
+ continue;
+ var targetProjectDir = new File(projectsDir, authorizedProjectId);
+ var targetPackagesDir = new File(targetProjectDir, "packages");
+ if (!targetPackagesDir.exists() && packStorePath != null) {
+ var symlinkTargetDir = new File(packStorePath, authorizedProjectId);
+ FileUtils.createDir(symlinkTargetDir);
+ try {
+ Files.createSymbolicLink(targetPackagesDir.toPath(), symlinkTargetDir.toPath());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ var targetPackBlobFile = new File(targetPackagesDir, relativeBlobFilePath);
+ FileUtils.createDir(targetPackBlobFile.getParentFile());
+ try {
+ FileUtils.copyFile(packBlobFile, targetPackBlobFile);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ var targetProjectPath = targetProjectDir.toPath();
+ var currentPath = targetPackBlobFile.getParentFile().toPath();
+ while (currentPath.startsWith(targetProjectPath)) {
+ var currentDir = currentPath.toFile();
+ DirectoryVersionUtils.increaseVersion(currentDir);
+ currentPath = currentPath.getParent();
+ }
+
+ var targetPackBlobElement = packBlobsDom.getRootElement().addElement("io.onedev.server.model.PackBlob");
+ targetPackBlobElement.addAttribute("revision", "0.0");
+ var targetPackBlobId = String.valueOf(nextPackBlobId++);
+ targetPackBlobElement.addElement("id").setText(targetPackBlobId);
+ targetPackBlobElement.addElement("project").setText(authorizedProjectId);
+ targetPackBlobElement.addElement("sha256Hash").setText(hash);
+ targetPackBlobElement.addElement("size").setText(String.valueOf(packBlobFile.length()));
+ targetPackBlobElement.addElement("createDate").addAttribute("class", "sql-timestamp").setText(formatDate(new Date()));
+ projectIdToPackBlobIdMapping.computeIfAbsent(authorizedProjectId, k -> new HashMap<>()).put(entry.getKey(), targetPackBlobId);
+ }
+ }
+ packBlobsDom.writeToFile(packBlobsFile, false);
+
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("PackBlobReferences.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ var packId = element.elementTextTrim("id");
+ var packBlobElement = element.element("packBlob");
+ var packBlobId = packBlobElement.elementTextTrim("id");
+ var projectId = packIdToProjectId.get(packId);
+ var packBlobIdMapping = projectIdToPackBlobIdMapping.get(projectId);
+ if (packBlobIdMapping != null && packBlobIdMapping.containsKey(packBlobId))
+ packBlobElement.setText(packBlobIdMapping.get(packBlobId));
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+
VersionedXmlDoc pullRequestTouchsDom;
File pullRequestTouchsDomFile = new File(dataDir, "PullRequestTouchs.xml");
pullRequestTouchsDom = new VersionedXmlDoc();
@@ -7425,7 +7572,6 @@ public class DataMigrator {
codeCommentTouchElement.addElement("id").setText(String.valueOf(touchId++));
}
codeCommentTouchsDom.writeToFile(codeCommentTouchsDomFile, true);
-
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobAuthorizationManager.java
deleted file mode 100644
index 1ad57322e4..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobAuthorizationManager.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.onedev.server.entitymanager;
-
-import io.onedev.server.model.PackBlob;
-import io.onedev.server.model.PackBlobAuthorization;
-import io.onedev.server.model.Project;
-import io.onedev.server.persistence.dao.EntityManager;
-
-public interface PackBlobAuthorizationManager extends EntityManager<PackBlobAuthorization> {
-
- void authorize(Project project, PackBlob packBlob);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobManager.java
index 39d87dc23c..13413e30b3 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobManager.java
@@ -1,20 +1,20 @@
package io.onedev.server.entitymanager;
-import io.onedev.server.model.Pack;
-import io.onedev.server.model.PackBlob;
-import io.onedev.server.model.Project;
-import io.onedev.server.persistence.dao.EntityManager;
-
-import javax.annotation.Nullable;
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Collection;
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.Pack;
+import io.onedev.server.model.PackBlob;
+import io.onedev.server.persistence.dao.EntityManager;
+
public interface PackBlobManager extends EntityManager<PackBlob> {
@Nullable
- PackBlob findBySha256Hash(String sha256Hash);
+ PackBlob findBySha256Hash(Long projectId, String sha256Hash);
String getSha512Hash(PackBlob packBlob);
@@ -25,7 +25,7 @@ public interface PackBlobManager extends EntityManager<PackBlob> {
boolean checkPackBlobFile(Long projectId, String sha256Hash, long size);
@Nullable
- PackBlob checkPackBlob(String sha256Hash);
+ PackBlob checkPackBlob(Long projectId, String sha256Hash);
void initUpload(Long projectId, String uuid);
@@ -48,10 +48,8 @@ public interface PackBlobManager extends EntityManager<PackBlob> {
void downloadBlob(Long projectId, String sha256Hash, OutputStream os);
- byte[] readBlob(String sha256Hash);
+ byte[] readBlob(Long projectId, String sha256Hash);
- void onDeleteProject(Project project);
-
void syncPacks(Long projectId, String activeServer);
File getPackBlobFile(Long projectId, String sha256Hash);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobReferenceManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobReferenceManager.java
index c8425aedc6..2706b16cd4 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobReferenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobReferenceManager.java
@@ -5,15 +5,10 @@ import io.onedev.server.model.PackBlob;
import io.onedev.server.model.PackBlobReference;
import io.onedev.server.persistence.dao.EntityManager;
-import javax.annotation.Nullable;
-
public interface PackBlobReferenceManager extends EntityManager<PackBlobReference> {
void create(PackBlobReference blobReference);
void createIfNotExist(Pack pack, PackBlob packBlob);
-
- @Nullable
- PackBlobReference findNotPendingDelete(PackBlob packBlob);
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
index f1e6a79ed8..701a4cf343 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
@@ -77,9 +77,9 @@ public interface ProjectManager extends EntityManager<Project> {
List<ProjectFacade> getChildren(Long projectId);
void move(Collection<Project> projects, @Nullable Project parent);
-
- void requestToDelete(Collection<Project> projects);
-
+
+ void delete(Collection<Project> projects);
+
Collection<Long> getIds();
Collection<Long> getSubtreeIds(Long projectId);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index a07d1e1953..b87bb2525d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -322,7 +322,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
@Override
public Map<Long, Long> queryUnfinished() {
Query<?> query = getSession().createQuery("select id, project.id from Build where "
- + "project.pendingDelete = false and (status=:waiting or status=:pending or status=:running)");
+ + "status=:waiting or status=:pending or status=:running");
query.setParameter("waiting", Build.Status.WAITING);
query.setParameter("pending", Build.Status.PENDING);
query.setParameter("running", Build.Status.RUNNING);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobAuthorizationManager.java
deleted file mode 100644
index 48ebad1718..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobAuthorizationManager.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package io.onedev.server.entitymanager.impl;
-
-import io.onedev.commons.loader.ManagedSerializedForm;
-import io.onedev.server.entitymanager.PackBlobAuthorizationManager;
-import io.onedev.server.model.PackBlob;
-import io.onedev.server.model.PackBlobAuthorization;
-import io.onedev.server.model.Project;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import org.hibernate.criterion.Restrictions;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-
-import static io.onedev.server.model.PackBlobAuthorization.PROP_PACK_BLOB;
-import static io.onedev.server.model.PackBlobAuthorization.PROP_PROJECT;
-
-@Singleton
-public class DefaultPackBlobAuthorizationManager extends BaseEntityManager<PackBlobAuthorization>
- implements PackBlobAuthorizationManager, Serializable {
-
- @Inject
- public DefaultPackBlobAuthorizationManager(Dao dao) {
- super(dao);
- }
-
- @Transactional
- @Override
- public void authorize(Project project, PackBlob packBlob) {
- var criteria = newCriteria();
- criteria.add(Restrictions.eq(PROP_PROJECT, project));
- criteria.add(Restrictions.eq(PROP_PACK_BLOB, packBlob));
- if (find(criteria) == null) {
- var authorization = new PackBlobAuthorization();
- authorization.setProject(project);
- authorization.setPackBlob(packBlob);
- dao.persist(authorization);
- }
- }
-
- public Object writeReplace() throws ObjectStreamException {
- return new ManagedSerializedForm(PackBlobAuthorizationManager.class);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java
index 9b23a2cc62..c4e807232e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java
@@ -1,5 +1,58 @@
package io.onedev.server.entitymanager.impl;
+import static io.onedev.commons.utils.LockUtils.read;
+import static io.onedev.commons.utils.LockUtils.write;
+import static io.onedev.k8shelper.KubernetesHelper.BEARER;
+import static io.onedev.k8shelper.KubernetesHelper.checkStatus;
+import static io.onedev.server.model.PackBlob.PACKS_DIR;
+import static io.onedev.server.model.PackBlob.PROP_CREATE_DATE;
+import static io.onedev.server.model.PackBlob.PROP_PROJECT;
+import static io.onedev.server.model.PackBlob.PROP_SHA256_HASH;
+import static io.onedev.server.model.PackBlob.getFileLockName;
+import static io.onedev.server.model.PackBlob.getPacksRelativeDirPath;
+import static io.onedev.server.model.PackBlobReference.PROP_PACK_BLOB;
+import static io.onedev.server.util.Digest.SHA256;
+import static io.onedev.server.util.IOUtils.BUFFER_SIZE;
+import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
+import static org.apache.commons.io.IOUtils.copy;
+
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectStreamException;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.UUID;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Root;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
+
+import org.glassfish.jersey.client.ClientProperties;
+import org.hibernate.criterion.Restrictions;
+import org.joda.time.DateTime;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.ScheduleBuilder;
+
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
@@ -7,9 +60,7 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.StorageManager;
import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.PackBlobAuthorizationManager;
import io.onedev.server.entitymanager.PackBlobManager;
-import io.onedev.server.entitymanager.PackBlobReferenceManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.system.SystemStarted;
@@ -23,45 +74,10 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.taskschedule.SchedulableTask;
import io.onedev.server.taskschedule.TaskScheduler;
import io.onedev.server.util.Digest;
import io.onedev.server.util.Pair;
-import org.glassfish.jersey.client.ClientProperties;
-import org.hibernate.criterion.Restrictions;
-import org.joda.time.DateTime;
-import org.quartz.CronScheduleBuilder;
-import org.quartz.ScheduleBuilder;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Root;
-import javax.ws.rs.client.*;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.UUID;
-
-import static io.onedev.commons.utils.LockUtils.read;
-import static io.onedev.commons.utils.LockUtils.write;
-import static io.onedev.k8shelper.KubernetesHelper.BEARER;
-import static io.onedev.k8shelper.KubernetesHelper.checkStatus;
-import static io.onedev.server.model.PackBlob.*;
-import static io.onedev.server.model.PackBlobReference.PROP_PACK_BLOB;
-import static io.onedev.server.model.Project.PROP_PENDING_DELETE;
-import static io.onedev.server.util.Digest.SHA256;
-import static io.onedev.server.util.IOUtils.BUFFER_SIZE;
-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
-import static org.apache.commons.io.IOUtils.copy;
@Singleton
public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
@@ -78,11 +94,7 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
private final ProjectManager projectManager;
private final TransactionManager transactionManager;
-
- private final PackBlobAuthorizationManager authorizationManager;
-
- private final PackBlobReferenceManager referenceManager;
-
+
private final TaskScheduler taskScheduler;
private final StorageManager storageManager;
@@ -92,15 +104,12 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
@Inject
public DefaultPackBlobManager(Dao dao, ClusterManager clusterManager, ProjectManager projectManager,
TransactionManager transactionManager, TaskScheduler taskScheduler,
- PackBlobAuthorizationManager authorizationManager,
- PackBlobReferenceManager referenceManager, StorageManager storageManager) {
+ StorageManager storageManager) {
super(dao);
this.clusterManager = clusterManager;
this.projectManager = projectManager;
this.taskScheduler = taskScheduler;
this.transactionManager = transactionManager;
- this.authorizationManager = authorizationManager;
- this.referenceManager = referenceManager;
this.storageManager = storageManager;
}
@@ -117,8 +126,9 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
@Sessional
@Override
- public PackBlob findBySha256Hash(String sha256Hash) {
+ public PackBlob findBySha256Hash(Long projectId, String sha256Hash) {
var criteria = newCriteria();
+ criteria.add(Restrictions.eq(PROP_PROJECT + "." + Project.PROP_ID, projectId));
criteria.add(Restrictions.eq(PROP_SHA256_HASH, sha256Hash));
return find(criteria);
}
@@ -184,10 +194,10 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
}
@Override
- public PackBlob checkPackBlob(String sha256Hash) {
- var packBlob = findBySha256Hash(sha256Hash);
- if (packBlob != null && SecurityUtils.canReadPackBlob(packBlob)) {
- if (checkPackBlobFile(packBlob.getProject().getId(), sha256Hash, packBlob.getSize())) {
+ public PackBlob checkPackBlob(Long projectId, String sha256Hash) {
+ var packBlob = findBySha256Hash(projectId, sha256Hash);
+ if (packBlob != null) {
+ if (checkPackBlobFile(projectId, sha256Hash, packBlob.getSize())) {
return packBlob;
} else {
delete(packBlob);
@@ -415,7 +425,7 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
private Pair<Long, Boolean> createBlob(Long projectId, String sha256Hash, long blobSize) {
return transactionManager.call(() -> {
var project = projectManager.load(projectId);
- var packBlob = findBySha256Hash(sha256Hash);
+ var packBlob = findBySha256Hash(projectId, sha256Hash);
if (packBlob == null) {
packBlob = new PackBlob();
packBlob.setProject(project);
@@ -424,24 +434,20 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
packBlob.setCreateDate(new Date());
dao.persist(packBlob);
return new Pair<>(packBlob.getId(), true);
- } else if (checkPackBlobFile(packBlob.getProject().getId(), sha256Hash, blobSize)) {
- authorizationManager.authorize(project, packBlob);
+ } else if (checkPackBlobFile(projectId, sha256Hash, blobSize)) {
return new Pair<>(packBlob.getId(), false);
} else {
- authorizationManager.authorize(packBlob.getProject(), packBlob);
- packBlob.setProject(project);
- dao.persist(packBlob);
return new Pair<>(packBlob.getId(), true);
}
});
}
@Override
- public byte[] readBlob(String sha256Hash) {
- var packBlob = findBySha256Hash(sha256Hash);
- if (packBlob != null && SecurityUtils.canReadPackBlob(packBlob)) {
+ public byte[] readBlob(Long projectId, String sha256Hash) {
+ var packBlob = findBySha256Hash(projectId, sha256Hash);
+ if (packBlob != null) {
var baos = new ByteArrayOutputStream();
- downloadBlob(packBlob.getProject().getId(), sha256Hash, baos);
+ downloadBlob(projectId, sha256Hash, baos);
var bytes = baos.toByteArray();
if (bytes.length != packBlob.getSize())
throw new ExplicitException("Invalid blob size: " + sha256Hash);
@@ -485,75 +491,6 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
}
}
- @Transactional
- @Override
- public void onDeleteProject(Project project) {
- var projectId = project.getId();
- for (var packBlob: project.getPackBlobs()) {
- var hash = packBlob.getSha256Hash();
- if (!checkPackBlobFile(projectId, hash, packBlob.getSize())) {
- delete(packBlob);
- continue;
- }
- var reference = referenceManager.findNotPendingDelete(packBlob);
- if (reference == null) {
- delete(packBlob);
- continue;
- }
-
- packBlob.setProject(reference.getPack().getProject());
- var newProjectId = reference.getPack().getProject().getId();
- if (!projectManager.getActiveServer(projectId, true)
- .equals(projectManager.getActiveServer(newProjectId, true))) {
- projectManager.runOnActiveServer(newProjectId, () -> {
- var newBlobFile = getPackBlobFile(newProjectId, hash);
- FileUtils.createDir(newBlobFile.getParentFile());
- var tempFile = new File(newBlobFile.getParentFile(), UUID.randomUUID().toString() + TEMP_BLOB_SUFFIX);
- try {
- try (var os = new BufferedOutputStream(new FileOutputStream(tempFile), BUFFER_SIZE)) {
- downloadBlob(projectId, hash, os);
- }
- write(getFileLockName(newProjectId, hash), () -> {
- if (newBlobFile.exists())
- FileUtils.deleteFile(newBlobFile);
- FileUtils.moveFile(tempFile, newBlobFile);
- return null;
- });
- projectManager.directoryModified(newProjectId, newBlobFile.getParentFile());
- } finally {
- if (tempFile.exists())
- FileUtils.deleteFile(tempFile);
- }
- return null;
- });
- } else {
- projectManager.runOnActiveServer(projectId, () -> {
- var blobFile = getPackBlobFile(projectId, hash);
- var newBlobFile = getPackBlobFile(newProjectId, hash);
- FileUtils.createDir(newBlobFile.getParentFile());
- var tempFile = new File(newBlobFile.getParentFile(), UUID.randomUUID().toString() + TEMP_BLOB_SUFFIX);
- try {
- read(getFileLockName(projectId, hash), () -> {
- FileUtils.moveFile(blobFile, tempFile);
- return null;
- });
- write(getFileLockName(newProjectId, hash), () -> {
- if (newBlobFile.exists())
- FileUtils.deleteFile(newBlobFile);
- FileUtils.moveFile(tempFile, newBlobFile);
- return null;
- });
- projectManager.directoryModified(newProjectId, newBlobFile.getParentFile());
- } finally {
- if (tempFile.exists())
- FileUtils.deleteFile(tempFile);
- }
- return null;
- });
- }
- }
- }
-
@Override
public void syncPacks(Long projectId, String activeServer) {
if (clusterManager.runOnServer(activeServer, () -> projectManager.getSubDir(projectId, PACKS_DIR, false).exists())) {
@@ -581,7 +518,7 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
var now = new Date();
for (var projectId: projectManager.getActiveIds()) {
var project = projectManager.findFacadeById(projectId);
- if (project != null && !project.isPendingDelete()) {
+ if (project != null) {
for (var uploadFile: projectManager.getSubDir(projectId, UPLOADS_DIR).listFiles()) {
if (now.getTime() - uploadFile.lastModified() > EXPIRE_MILLIS)
FileUtils.deleteFile(uploadFile);
@@ -602,7 +539,6 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
var expireTime = new DateTime(now).minusMillis(EXPIRE_MILLIS).toDate();
criteriaQuery.where(
- builder.equal(root.join(PROP_PROJECT).get(PROP_PENDING_DELETE),false),
builder.not(builder.exists(referenceQuery)),
builder.lessThan(root.get(PROP_CREATE_DATE), expireTime));
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobReferenceManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobReferenceManager.java
index c01b6b62bd..acb34a90c8 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobReferenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobReferenceManager.java
@@ -1,9 +1,7 @@
package io.onedev.server.entitymanager.impl;
-import static io.onedev.server.model.Pack.PROP_PROJECT;
import static io.onedev.server.model.PackBlobReference.PROP_PACK;
import static io.onedev.server.model.PackBlobReference.PROP_PACK_BLOB;
-import static io.onedev.server.model.Project.PROP_PENDING_DELETE;
import java.io.ObjectStreamException;
import java.io.Serializable;
@@ -54,14 +52,6 @@ public class DefaultPackBlobReferenceManager extends BaseEntityManager<PackBlobR
}
}
- @Override
- public PackBlobReference findNotPendingDelete(PackBlob packBlob) {
- var criteria = newCriteria();
- criteria.add(Restrictions.eq(PROP_PACK_BLOB, packBlob));
- criteria.createCriteria(PROP_PACK).createCriteria(PROP_PROJECT).add(Restrictions.eq(PROP_PENDING_DELETE, false));
- return find(criteria);
- }
-
public Object writeReplace() throws ObjectStreamException {
return new ManagedSerializedForm(PackBlobReferenceManager.class);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java
index 9c37a7190d..e98fb0e8b5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java
@@ -40,7 +40,6 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import io.onedev.commons.loader.ManagedSerializedForm;
-import io.onedev.server.entitymanager.PackBlobAuthorizationManager;
import io.onedev.server.entitymanager.PackBlobManager;
import io.onedev.server.entitymanager.PackBlobReferenceManager;
import io.onedev.server.entitymanager.PackLabelManager;
@@ -69,8 +68,6 @@ import io.onedev.server.util.criteria.Criteria;
public class DefaultPackManager extends BaseEntityManager<Pack>
implements PackManager, Serializable {
- private final PackBlobAuthorizationManager blobAuthorizationManager;
-
private final PackBlobReferenceManager blobReferenceManager;
private final PackBlobManager blobManager;
@@ -82,12 +79,10 @@ public class DefaultPackManager extends BaseEntityManager<Pack>
private final ListenerRegistry listenerRegistry;
@Inject
- public DefaultPackManager(Dao dao, PackBlobAuthorizationManager blobAuthorizationManager,
- PackBlobReferenceManager blobReferenceManager,
+ public DefaultPackManager(Dao dao, PackBlobReferenceManager blobReferenceManager,
PackBlobManager blobManager, ProjectManager projectManager,
PackLabelManager labelManager, ListenerRegistry listenerRegistry) {
super(dao);
- this.blobAuthorizationManager = blobAuthorizationManager;
this.blobReferenceManager = blobReferenceManager;
this.blobManager = blobManager;
this.projectManager = projectManager;
@@ -444,7 +439,6 @@ public class DefaultPackManager extends BaseEntityManager<Pack>
if (packBlobs != null) {
packBlobs = new HashSet<>(packBlobs);
for (var packBlob: packBlobs) {
- blobAuthorizationManager.authorize(pack.getProject(), packBlob);
if (pack.getBlobReferences().stream().noneMatch(it -> it.getPackBlob().equals(packBlob))) {
var blobReference = new PackBlobReference();
blobReference.setPack(pack);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 48c23d7f90..2097217f85 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -1,13 +1,111 @@
package io.onedev.server.entitymanager.impl;
+import static io.onedev.commons.utils.FileUtils.cleanDir;
+import static io.onedev.commons.utils.LockUtils.read;
+import static io.onedev.k8shelper.KubernetesHelper.BEARER;
+import static io.onedev.server.git.CommandUtils.callWithClusterCredential;
+import static io.onedev.server.git.GitUtils.getDefaultBranch;
+import static io.onedev.server.git.GitUtils.getLastCommit;
+import static io.onedev.server.git.GitUtils.getReachableCommits;
+import static io.onedev.server.git.GitUtils.isValid;
+import static io.onedev.server.git.GitUtils.setDefaultBranch;
+import static io.onedev.server.model.Project.ATTACHMENT_DIR;
+import static io.onedev.server.model.Project.SHARE_TEST_DIR;
+import static io.onedev.server.model.Project.SITE_DIR;
+import static io.onedev.server.model.Project.SORT_FIELDS;
+import static io.onedev.server.model.Project.getSiteLockName;
+import static io.onedev.server.replica.ProjectReplica.Type.BACKUP;
+import static io.onedev.server.replica.ProjectReplica.Type.PRIMARY;
+import static io.onedev.server.replica.ProjectReplica.Type.REDUNDANT;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static io.onedev.server.util.DirectoryVersionUtils.FILE_VERSION;
+import static io.onedev.server.util.DirectoryVersionUtils.increaseVersion;
+import static io.onedev.server.util.DirectoryVersionUtils.isVersionFile;
+import static io.onedev.server.util.DirectoryVersionUtils.readVersion;
+import static io.onedev.server.util.DirectoryVersionUtils.writeVersion;
+import static io.onedev.server.util.IOUtils.BUFFER_SIZE;
+import static io.onedev.server.util.criteria.Criteria.forManyValues;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Comparator.naturalOrder;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
+import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
+import static javax.ws.rs.core.Response.Status.NO_CONTENT;
+import static org.eclipse.jgit.lib.Constants.R_HEADS;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
+import java.util.concurrent.locks.Lock;
+import java.util.function.Consumer;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.lib.AnyObjectId;
+import org.eclipse.jgit.lib.ConfigConstants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.ScheduleBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Sets;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.map.IMap;
+
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.ManagedSerializedForm;
-import io.onedev.commons.utils.*;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TarUtils;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.k8shelper.KubernetesHelper;
@@ -15,13 +113,28 @@ import io.onedev.server.StorageManager;
import io.onedev.server.attachment.AttachmentManager;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.cluster.ClusterTask;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.entitymanager.PackBlobManager;
+import io.onedev.server.entitymanager.PackManager;
+import io.onedev.server.entitymanager.ProjectLabelManager;
+import io.onedev.server.entitymanager.ProjectLastEventDateManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.RoleManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserAuthorizationManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.cluster.ConnectionEvent;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.project.*;
+import io.onedev.server.event.project.ActiveServerChanged;
+import io.onedev.server.event.project.DefaultBranchChanged;
+import io.onedev.server.event.project.ProjectCreated;
+import io.onedev.server.event.project.ProjectDeleted;
+import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.event.system.SystemStopped;
@@ -34,7 +147,17 @@ import io.onedev.server.git.command.LfsFetchAllCommand;
import io.onedev.server.git.command.LfsFetchCommand;
import io.onedev.server.git.hook.HookUtils;
import io.onedev.server.git.service.GitService;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Iteration;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.model.Pack;
+import io.onedev.server.model.PackBlob;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.ProjectLastEventDate;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.model.UserAuthorization;
import io.onedev.server.model.support.administration.GlobalProjectSetting;
import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.model.support.code.GitPackConfig;
@@ -71,57 +194,6 @@ import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.xodus.CommitInfoManager;
import io.onedev.server.xodus.VisitInfoManager;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
-import org.eclipse.jgit.internal.storage.file.FileRepository;
-import org.eclipse.jgit.lib.*;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.hibernate.Session;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.query.Query;
-import org.quartz.CronScheduleBuilder;
-import org.quartz.ScheduleBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.*;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.*;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Future;
-import java.util.concurrent.locks.Lock;
-import java.util.function.Consumer;
-
-import static io.onedev.commons.utils.FileUtils.cleanDir;
-import static io.onedev.commons.utils.LockUtils.read;
-import static io.onedev.k8shelper.KubernetesHelper.BEARER;
-import static io.onedev.server.git.CommandUtils.callWithClusterCredential;
-import static io.onedev.server.git.GitUtils.*;
-import static io.onedev.server.model.Project.*;
-import static io.onedev.server.replica.ProjectReplica.Type.*;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.util.DirectoryVersionUtils.*;
-import static io.onedev.server.util.IOUtils.BUFFER_SIZE;
-import static io.onedev.server.util.criteria.Criteria.forManyValues;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Comparator.naturalOrder;
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toSet;
-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
-import static javax.ws.rs.core.Response.Status.NO_CONTENT;
-import static org.eclipse.jgit.lib.Constants.R_HEADS;
@Singleton
public class DefaultProjectManager extends BaseEntityManager<Project>
@@ -175,6 +247,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
private final StorageManager storageManager;
+ private final PackManager packManager;
+
private final PackBlobManager packBlobManager;
private final ProjectLabelManager labelManager;
@@ -203,8 +277,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
ProjectLastEventDateManager lastEventDateManager, PullRequestManager pullRequestManager,
AttachmentManager attachmentManager, BatchWorkManager batchWorkManager,
VisitInfoManager visitInfoManager, StorageManager storageManager,
- PackBlobManager packBlobManager, ProjectLabelManager labelManager,
- Set<ProjectNameReservation> nameReservations) {
+ PackManager packManager, PackBlobManager packBlobManager,
+ ProjectLabelManager labelManager, Set<ProjectNameReservation> nameReservations) {
super(dao);
this.commitInfoManager = commitInfoManager;
@@ -227,6 +301,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
this.batchWorkManager = batchWorkManager;
this.visitInfoManager = visitInfoManager;
this.storageManager = storageManager;
+ this.packManager = packManager;
this.packBlobManager = packBlobManager;
this.labelManager = labelManager;
@@ -358,78 +433,97 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
}
}
- @Sessional
+ @Transactional
+ @Override
+ public void delete(Collection<Project> projects) {
+ Collection<Project> independents = new HashSet<>(projects);
+ for (Iterator<Project> it = independents.iterator(); it.hasNext(); ) {
+ Project independent = it.next();
+ for (Project each : independents) {
+ if (!each.equals(independent) && each.isSelfOrAncestorOf(independent)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+ for (Project independent : independents)
+ delete(independent);
+ }
+
+ @Transactional
@Override
public void delete(Project project) {
for (Project child : project.getChildren())
delete(child);
- transactionManager.run(() -> {
- Usage usage = new Usage();
- usage.add(settingManager.onDeleteProject(project.getPath()));
-
- for (LinkSpec link : linkSpecManager.query()) {
- for (IssueQueryUpdater updater : link.getQueryUpdaters())
- usage.add(updater.onDeleteProject(project.getPath()).prefix("issue setting").prefix("administration"));
- }
-
- usage.checkInUse("Project '" + project.getPath() + "'");
-
- for (Project fork : project.getForks()) {
- Collection<Project> forkChildren = fork.getForkDescendants();
- forkChildren.add(fork);
- for (Project forkChild : forkChildren) {
- Query<?> query = getSession().createQuery(String.format("update Issue set %s=:fork where %s=:descendant",
- Issue.PROP_NUMBER_SCOPE, Issue.PROP_PROJECT));
- query.setParameter("fork", fork);
- query.setParameter("descendant", forkChild);
- query.executeUpdate();
-
- query = getSession().createQuery(String.format("update Build set %s=:fork where %s=:descendant",
- Build.PROP_NUMBER_SCOPE, Build.PROP_PROJECT));
- query.setParameter("fork", fork);
- query.setParameter("descendant", forkChild);
- query.executeUpdate();
-
- query = getSession().createQuery(String.format("update PullRequest set %s=:fork where %s=:descendant",
- PullRequest.PROP_NUMBER_SCOPE, PullRequest.PROP_TARGET_PROJECT));
- query.setParameter("fork", fork);
- query.setParameter("descendant", forkChild);
- query.executeUpdate();
- }
- }
+ Usage usage = new Usage();
+ usage.add(settingManager.onDeleteProject(project.getPath()));
- Query<?> query = getSession().createQuery(String.format("update Project set %s=null where %s=:forkedFrom",
- Project.PROP_FORKED_FROM, Project.PROP_FORKED_FROM));
- query.setParameter("forkedFrom", project);
- query.executeUpdate();
+ for (LinkSpec link : linkSpecManager.query()) {
+ for (IssueQueryUpdater updater : link.getQueryUpdaters())
+ usage.add(updater.onDeleteProject(project.getPath()).prefix("issue setting").prefix("administration"));
+ }
- for (PullRequest request: project.getOutgoingRequests()) {
- if (!request.getTargetProject().equals(project) && request.isOpen())
- pullRequestManager.discard(request, "Source project is deleted.");
+ usage.checkInUse("Project '" + project.getPath() + "'");
+
+ for (Project fork : project.getForks()) {
+ Collection<Project> forkChildren = fork.getForkDescendants();
+ forkChildren.add(fork);
+ for (Project forkChild : forkChildren) {
+ Query<?> query = getSession().createQuery(String.format("update Issue set %s=:fork where %s=:descendant",
+ Issue.PROP_NUMBER_SCOPE, Issue.PROP_PROJECT));
+ query.setParameter("fork", fork);
+ query.setParameter("descendant", forkChild);
+ query.executeUpdate();
+
+ query = getSession().createQuery(String.format("update Build set %s=:fork where %s=:descendant",
+ Build.PROP_NUMBER_SCOPE, Build.PROP_PROJECT));
+ query.setParameter("fork", fork);
+ query.setParameter("descendant", forkChild);
+ query.executeUpdate();
+
+ query = getSession().createQuery(String.format("update PullRequest set %s=:fork where %s=:descendant",
+ PullRequest.PROP_NUMBER_SCOPE, PullRequest.PROP_TARGET_PROJECT));
+ query.setParameter("fork", fork);
+ query.setParameter("descendant", forkChild);
+ query.executeUpdate();
}
+ }
- query = getSession().createQuery(String.format("update PullRequest set %s=null where %s=:sourceProject",
- PullRequest.PROP_SOURCE_PROJECT, PullRequest.PROP_SOURCE_PROJECT));
- query.setParameter("sourceProject", project);
- query.executeUpdate();
+ Query<?> query = getSession().createQuery(String.format("update Project set %s=null where %s=:forkedFrom",
+ Project.PROP_FORKED_FROM, Project.PROP_FORKED_FROM));
+ query.setParameter("forkedFrom", project);
+ query.executeUpdate();
- packBlobManager.onDeleteProject(project);
+ for (PullRequest request: project.getOutgoingRequests()) {
+ if (!request.getTargetProject().equals(project) && request.isOpen())
+ pullRequestManager.discard(request, "Source project is deleted.");
+ }
- for (Build build : project.getBuilds())
- buildManager.delete(build);
+ query = getSession().createQuery(String.format("update PullRequest set %s=null where %s=:sourceProject",
+ PullRequest.PROP_SOURCE_PROJECT, PullRequest.PROP_SOURCE_PROJECT));
+ query.setParameter("sourceProject", project);
+ query.executeUpdate();
- dao.remove(project);
- lastEventDateManager.delete(project.getLastEventDate());
+ for (Build build : project.getBuilds())
+ buildManager.delete(build);
- synchronized (repositoryCache) {
- Repository repository = repositoryCache.remove(project.getId());
- if (repository != null)
- repository.close();
- }
+ for (Pack pack : project.getPacks())
+ packManager.delete(pack);
- listenerRegistry.post(new ProjectDeleted(project));
- });
+ for (PackBlob packBlob : project.getPackBlobs())
+ packBlobManager.delete(packBlob);
+
+ dao.remove(project);
+ lastEventDateManager.delete(project.getLastEventDate());
+
+ synchronized (repositoryCache) {
+ Repository repository = repositoryCache.remove(project.getId());
+ if (repository != null)
+ repository.close();
+ }
+
+ listenerRegistry.post(new ProjectDeleted(project));
}
@Override
@@ -1036,50 +1130,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
update(project);
}
}
-
- @Transactional
- @Override
- public void requestToDelete(Collection<Project> projects) {
- var pendingDeleteProjects = new HashSet<>(projects);
- for (Project project: projects) {
- pendingDeleteProjects.add(project);
- pendingDeleteProjects.addAll(project.getDescendants());
- }
- for (var project: pendingDeleteProjects) {
- project.setPendingDelete(true);
- dao.persist(project);
- }
- transactionManager.runAfterCommit(() -> clusterManager.submitToServer(clusterManager.getLeaderServerAddress(), () -> {
- processPendingDeletes();
- return null;
- }));
- listenerRegistry.post(new ProjectsPendingDelete(pendingDeleteProjects));
- }
- private synchronized void processPendingDeletes() {
- try {
- sessionManager.run(() -> {
- var criteria = newCriteria();
- criteria.add(Restrictions.eq(PROP_PENDING_DELETE, true));
-
- Collection<Project> independents = new HashSet<>(query(criteria, 0, Integer.MAX_VALUE));
- for (Iterator<Project> it = independents.iterator(); it.hasNext(); ) {
- Project independent = it.next();
- for (Project each : independents) {
- if (!each.equals(independent) && each.isSelfOrAncestorOf(independent)) {
- it.remove();
- break;
- }
- }
- }
- for (Project independent : independents)
- delete(independent);
- });
- } catch(Exception e) {
- logger.error("Error processing pending deletes", e);
- }
- }
-
@Override
public List<ProjectFacade> getChildren(Long projectId) {
return cache.getChildren(projectId);
diff --git a/server-core/src/main/java/io/onedev/server/event/project/ProjectsPendingDelete.java b/server-core/src/main/java/io/onedev/server/event/project/ProjectsPendingDelete.java
deleted file mode 100644
index d697a83d97..0000000000
--- a/server-core/src/main/java/io/onedev/server/event/project/ProjectsPendingDelete.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.onedev.server.event.project;
-
-import io.onedev.server.event.Event;
-import io.onedev.server.model.Project;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-import static java.util.stream.Collectors.toList;
-
-public class ProjectsPendingDelete extends Event implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final Collection<Long> projectIds;
-
- public ProjectsPendingDelete(Collection<Project> projects) {
- projectIds = projects.stream().map(Project::getId).collect(toList());
- }
-
- public Collection<Long> getProjectIds() {
- return projectIds;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/PackBlob.java b/server-core/src/main/java/io/onedev/server/model/PackBlob.java
index e987d4c529..9b7e53cb48 100644
--- a/server-core/src/main/java/io/onedev/server/model/PackBlob.java
+++ b/server-core/src/main/java/io/onedev/server/model/PackBlob.java
@@ -1,15 +1,27 @@
package io.onedev.server.model;
-import javax.annotation.Nullable;
-import javax.persistence.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
+import javax.annotation.Nullable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
@Entity
-@Table(indexes={
+@Table(
+ indexes={
@Index(columnList="o_project_id"), @Index(columnList= PackBlob.PROP_SHA256_HASH),
- @Index(columnList= PackBlob.PROP_CREATE_DATE)})
+ @Index(columnList= PackBlob.PROP_CREATE_DATE)},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", PackBlob.PROP_SHA256_HASH})})
public class PackBlob extends AbstractEntity {
private static final long serialVersionUID = 1L;
@@ -28,7 +40,7 @@ public class PackBlob extends AbstractEntity {
@JoinColumn(nullable=false)
private Project project;
- @Column(nullable=false, unique = true)
+ @Column(nullable=false)
private String sha256Hash;
private String sha512Hash;
@@ -44,9 +56,6 @@ public class PackBlob extends AbstractEntity {
@OneToMany(mappedBy="packBlob", cascade=CascadeType.REMOVE)
private Collection<PackBlobReference> references = new ArrayList<>();
-
- @OneToMany(mappedBy="packBlob", cascade=CascadeType.REMOVE)
- private Collection<PackBlobAuthorization> authorizations = new ArrayList<>();
public Project getProject() {
return project;
@@ -107,14 +116,6 @@ public class PackBlob extends AbstractEntity {
this.createDate = createDate;
}
- public Collection<PackBlobAuthorization> getAuthorizations() {
- return authorizations;
- }
-
- public void setAuthorizations(Collection<PackBlobAuthorization> authorizations) {
- this.authorizations = authorizations;
- }
-
public static String getFileLockName(Long projectId, String sha256Hash) {
return "pack-blob:" + projectId + ":" + sha256Hash;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PackBlobAuthorization.java b/server-core/src/main/java/io/onedev/server/model/PackBlobAuthorization.java
deleted file mode 100644
index 1b4b598390..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/PackBlobAuthorization.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.onedev.server.model;
-
-import javax.persistence.*;
-
-@Entity
-@Table(
- indexes={@Index(columnList="o_project_id"), @Index(columnList = "o_packBlob_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_packBlob_id"})})
-public class PackBlobAuthorization extends AbstractEntity {
-
- private static final long serialVersionUID = 1L;
-
- public static final String PROP_PROJECT = "project";
-
- public static final String PROP_PACK_BLOB = "packBlob";
-
- @ManyToOne(fetch=FetchType.LAZY)
- @JoinColumn(nullable=false)
- private Project project;
-
- @ManyToOne(fetch=FetchType.LAZY)
- @JoinColumn(nullable=false)
- private PackBlob packBlob;
-
- public Project getProject() {
- return project;
- }
-
- public void setProject(Project project) {
- this.project = project;
- }
-
- public PackBlob getPackBlob() {
- return packBlob;
- }
-
- public void setPackBlob(PackBlob packBlob) {
- this.packBlob = packBlob;
- }
-
-}
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.java
index c6c4dcd4c2..1ebaee5871 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
@@ -215,8 +215,6 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
public static final String PROP_SERVICE_DESK_EMAIL_ADDRESS = "serviceDeskEmailAddress";
- public static final String PROP_PENDING_DELETE = "pendingDelete";
-
private static final String FAKED_GITHUB_REPO_PATH_SEPARATOR = "-path.separator.of.onedev.project-";
private static final String FAKED_GITHUB_REPO_OWNER = "faked-owner-of-onedev-project";
@@ -298,10 +296,7 @@ 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)
- private Collection<PackBlobAuthorization> packBlobAuthorizations = new ArrayList<>();
-
+
@JsonIgnore
@Lob
@Column(nullable=false, length=65535)
@@ -401,9 +396,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
private boolean issueManagement = true;
private boolean timeTracking = false;
-
- private boolean pendingDelete;
-
+
@Lob
@Column(length=65535)
private GitPackConfig gitPackConfig = new GitPackConfig();
@@ -787,7 +780,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
public ProjectFacade getFacade() {
return new ProjectFacade(getId(), getName(), getKey(), getPath(), getServiceDeskEmailAddress(),
isCodeManagement(), isIssueManagement(), getGitPackConfig(),
- lastEventDate.getId(), idOf(getDefaultRole()), isPendingDelete(), idOf(getParent()));
+ lastEventDate.getId(), idOf(getDefaultRole()), idOf(getParent()));
}
/**
@@ -1095,14 +1088,6 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
this.packManagement = packManagement;
}
- public boolean isPendingDelete() {
- return pendingDelete;
- }
-
- public void setPendingDelete(boolean pendingDelete) {
- this.pendingDelete = pendingDelete;
- }
-
@Editable(order=500, placeholder="Default", description="Specify an email address sharing same inbox as " +
"the system email address in mail setting definition. Emails sent to this address will be " +
"created as issues in this project. The default value takes form of "
@@ -1334,14 +1319,6 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
this.packs = packs;
}
- public Collection<PackBlobAuthorization> getPackBlobAuthorizations() {
- return packBlobAuthorizations;
- }
-
- public void setPackBlobAuthorizations(Collection<PackBlobAuthorization> packBlobAuthorizations) {
- this.packBlobAuthorizations = packBlobAuthorizations;
- }
-
public List<BlobIdent> getBlobChildren(BlobIdent blobIdent, BlobIdentFilter filter) {
return getBlobChildren(blobIdent, filter, getObjectId(blobIdent.revision, true));
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java
index 5f9f2b3808..0351d4ad7e 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java
@@ -1,18 +1,24 @@
package io.onedev.server.rest.resource;
-import io.onedev.server.entitymanager.PackBlobManager;
-import io.onedev.server.model.PackBlob;
-import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.security.SecurityUtils;
-import org.apache.shiro.authz.UnauthorizedException;
+import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
import javax.inject.Inject;
import javax.inject.Singleton;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.StreamingOutput;
-import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
+import org.apache.shiro.authz.UnauthorizedException;
+
+import io.onedev.server.entitymanager.PackBlobManager;
+import io.onedev.server.model.PackBlob;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
@Api(order=4400, name="Package Blob")
@Path("/package-blobs")
@@ -28,11 +34,11 @@ public class PackBlobResource {
this.packBlobManager = packBlobManager;
}
- @Api(order=100, description = "Find package blob by hash")
+ @Api(order=100, description = "Find package blob by project id and hash")
@GET
- public PackBlob findByHash(@QueryParam("hash") String hash) {
- var packBlob = packBlobManager.findBySha256Hash(hash);
- if (packBlob != null && SecurityUtils.canReadPackBlob(packBlob))
+ public PackBlob findByHash(@QueryParam("projectId") Long projectId, @QueryParam("hash") String hash) {
+ var packBlob = packBlobManager.findBySha256Hash(projectId, hash);
+ if (packBlob != null)
return packBlob;
else
return null;
@@ -44,7 +50,7 @@ public class PackBlobResource {
@Produces(APPLICATION_OCTET_STREAM)
public StreamingOutput downloadBlob(@PathParam("packBlobId") Long packBlobId) {
var packBlob = packBlobManager.load(packBlobId);
- if (!SecurityUtils.canReadPackBlob(packBlob))
+ if (!SecurityUtils.canReadPack(packBlob.getProject()))
throw new UnauthorizedException();
var projectId = packBlob.getProject().getId();
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
index 3290014fa4..3cd3aa31e5 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
@@ -1,12 +1,44 @@
package io.onedev.server.rest.resource;
-import com.google.common.collect.Sets;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.shiro.authz.UnauthorizedException;
+import org.hibernate.criterion.Restrictions;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.entitymanager.IterationManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.git.GitContribution;
import io.onedev.server.git.GitContributor;
-import io.onedev.server.model.*;
+import io.onedev.server.model.GroupAuthorization;
+import io.onedev.server.model.Iteration;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.ProjectLabel;
+import io.onedev.server.model.UserAuthorization;
import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.NamedCommitQuery;
import io.onedev.server.model.support.WebHook;
@@ -27,21 +59,6 @@ import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.web.UrlManager;
import io.onedev.server.web.page.project.setting.ContributedProjectSetting;
import io.onedev.server.xodus.CommitInfoManager;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.hibernate.criterion.Restrictions;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.util.*;
@Api(order=1000)
@Path("/projects")
@@ -330,7 +347,7 @@ public class ProjectResource {
Project project = projectManager.load(projectId);
if (!SecurityUtils.canManageProject(project))
throw new UnauthorizedException();
- projectManager.requestToDelete(Sets.newHashSet(project));
+ projectManager.delete(project);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java
deleted file mode 100644
index 1b8ad572bc..0000000000
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.onedev.server.search.entity.project;
-
-import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-
-public class PendingDeleteCriteria extends Criteria<Project> {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
- Path<String> attribute = from.get(Project.PROP_PENDING_DELETE);
- return builder.equal(attribute, true);
- }
-
- @Override
- public boolean matches(Project project) {
- return project.isPendingDelete();
- }
-
- @Override
- public String toStringWithoutParens() {
- return ProjectQuery.getRuleName(ProjectQueryLexer.PendingDelete);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
index 244ddff933..ecba260f2e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
@@ -7,7 +7,7 @@ query
;
criteria
- : operator=(Roots|Leafs|ForkRoots|OwnedByMe|OwnedByNone|HasOutdatedReplicas|WithoutEnoughReplicas|MissingStorage|PendingDelete) #OperatorCriteria
+ : operator=(Roots|Leafs|ForkRoots|OwnedByMe|OwnedByNone|HasOutdatedReplicas|WithoutEnoughReplicas|MissingStorage) #OperatorCriteria
| operator=(OwnedBy|ForksOf|ChildrenOf) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=(Is|IsNot|Contains|IsUntil|IsSince) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
@@ -89,10 +89,6 @@ MissingStorage
: 'missing' WS+ 'storage'
;
-PendingDelete
- : 'pending' WS+ 'delete'
- ;
-
ChildrenOf
: 'children' WS+ 'of'
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index 47778c26ba..8a8f05c732 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
@@ -98,8 +98,6 @@ public class ProjectQuery extends EntityQuery<Project> {
return new HasOutdatedReplicasCriteria();
case MissingStorage:
return new MissingStorageCriteria();
- case PendingDelete:
- return new PendingDeleteCriteria();
default:
throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());
}
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index 98e6a1b3b0..0cb042f0ab 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -1,31 +1,92 @@
package io.onedev.server.security;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.HttpHeaders;
+
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadContext;
+import org.apache.shiro.web.mgt.WebSecurityManager;
+
import com.google.common.collect.Sets;
+
import io.onedev.commons.loader.AppLoader;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.*;
-import io.onedev.server.model.*;
-import io.onedev.server.security.permission.*;
+import io.onedev.server.entitymanager.AccessTokenManager;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.RoleManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.AccessToken;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.GroupAuthorization;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueAuthorization;
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.IssueVote;
+import io.onedev.server.model.IssueWatch;
+import io.onedev.server.model.IssueWork;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.PullRequestWatch;
+import io.onedev.server.model.Role;
+import io.onedev.server.model.User;
+import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.security.permission.AccessBuild;
+import io.onedev.server.security.permission.AccessBuildLog;
+import io.onedev.server.security.permission.AccessBuildPipeline;
+import io.onedev.server.security.permission.AccessBuildReports;
+import io.onedev.server.security.permission.AccessConfidentialIssues;
+import io.onedev.server.security.permission.AccessProject;
+import io.onedev.server.security.permission.AccessTimeTracking;
+import io.onedev.server.security.permission.BasePermission;
+import io.onedev.server.security.permission.ConfidentialIssuePermission;
+import io.onedev.server.security.permission.CreateChildren;
+import io.onedev.server.security.permission.CreateRootProjects;
+import io.onedev.server.security.permission.EditIssueField;
+import io.onedev.server.security.permission.EditIssueLink;
+import io.onedev.server.security.permission.JobPermission;
+import io.onedev.server.security.permission.ManageBuilds;
+import io.onedev.server.security.permission.ManageCodeComments;
+import io.onedev.server.security.permission.ManageIssues;
+import io.onedev.server.security.permission.ManageJob;
+import io.onedev.server.security.permission.ManageProject;
+import io.onedev.server.security.permission.ManagePullRequests;
+import io.onedev.server.security.permission.ProjectPermission;
+import io.onedev.server.security.permission.ReadCode;
+import io.onedev.server.security.permission.ReadPack;
+import io.onedev.server.security.permission.RunJob;
+import io.onedev.server.security.permission.ScheduleIssues;
+import io.onedev.server.security.permission.SystemAdministration;
+import io.onedev.server.security.permission.UploadCache;
+import io.onedev.server.security.permission.WriteCode;
+import io.onedev.server.security.permission.WritePack;
import io.onedev.server.util.concurrent.PrioritizedCallable;
import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.util.facade.UserFacade;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.subject.PrincipalCollection;
-import org.apache.shiro.subject.SimplePrincipalCollection;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.ThreadContext;
-import org.apache.shiro.web.mgt.WebSecurityManager;
-
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.HttpHeaders;
-import java.util.*;
-
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toSet;
public class SecurityUtils extends org.apache.shiro.SecurityUtils {
@@ -413,17 +474,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static boolean canReadPack(Project project) {
return getSubject().isPermitted(new ProjectPermission(project, new ReadPack()));
}
-
- public static boolean canReadPackBlob(PackBlob packBlob) {
- if (canReadPack(packBlob.getProject()))
- return true;
- for (var authorization: packBlob.getAuthorizations()) {
- if (canReadPack(authorization.getProject()))
- return true;
- }
- return false;
- }
-
+
public static boolean canAccessReport(Build build, String reportName) {
return getSubject().isPermitted(new ProjectPermission(build.getProject(),
new JobPermission(build.getJobName(), new AccessBuildReports(reportName))));
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
index 94fcd8c018..cb40260697 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
@@ -1,9 +1,9 @@
package io.onedev.server.util.facade;
-import io.onedev.server.model.support.code.GitPackConfig;
-
import javax.annotation.Nullable;
+import io.onedev.server.model.support.code.GitPackConfig;
+
public class ProjectFacade extends EntityFacade {
private static final long serialVersionUID = 1L;
@@ -26,15 +26,13 @@ public class ProjectFacade extends EntityFacade {
private final Long defaultRoleId;
- private final boolean pendingDelete;
-
private final Long parentId;
public ProjectFacade(Long id, String name, @Nullable String key, String path,
@Nullable String serviceDeskEmailAddress, boolean codeManagement,
boolean issueManagement, GitPackConfig gitPackConfig,
Long lastEventDateId, @Nullable Long defaultRoleId,
- boolean pendingDelete, @Nullable Long parentId) {
+ @Nullable Long parentId) {
super(id);
this.name = name;
this.key = key;
@@ -45,7 +43,6 @@ public class ProjectFacade extends EntityFacade {
this.gitPackConfig = gitPackConfig;
this.lastEventDateId = lastEventDateId;
this.defaultRoleId = defaultRoleId;
- this.pendingDelete = pendingDelete;
this.parentId = parentId;
}
@@ -70,10 +67,6 @@ public class ProjectFacade extends EntityFacade {
return issueManagement;
}
- public boolean isPendingDelete() {
- return pendingDelete;
- }
-
@Nullable
public String getServiceDeskEmailAddress() {
return serviceDeskEmailAddress;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteModal.java b/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteModal.java
index 54671a34e6..f5ea4dc724 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteModal.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteModal.java
@@ -1,11 +1,11 @@
package io.onedev.server.web.component.project;
-import com.google.common.collect.Sets;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
-import org.apache.wicket.ajax.AjaxRequestTarget;
public abstract class ConfirmDeleteModal extends ConfirmModalPanel {
@@ -17,7 +17,7 @@ public abstract class ConfirmDeleteModal extends ConfirmModalPanel {
protected void onConfirm(AjaxRequestTarget target) {
Project project = getProject();
- OneDev.getInstance(ProjectManager.class).requestToDelete(Sets.newHashSet(project));
+ OneDev.getInstance(ProjectManager.class).delete(project);
getSession().success("Project '" + project.getPath() + "' deleted");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/DeleteStatusLabel.java b/server-core/src/main/java/io/onedev/server/web/component/project/DeleteStatusLabel.java
deleted file mode 100644
index ed93cf0f64..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/DeleteStatusLabel.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package io.onedev.server.web.component.project;
-
-import com.google.common.collect.Sets;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.util.facade.ProjectFacade;
-import io.onedev.server.web.behavior.ChangeObserver;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.html.WebComponent;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-
-public class DeleteStatusLabel extends WebComponent {
-
- private final Long projectId;
-
- public DeleteStatusLabel(String id, Long projectId) {
- super(id);
- this.projectId = projectId;
- }
-
- @Override
- public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) {
- String label;
- var project = getProject();
- if (project != null) {
- if (project.isPendingDelete())
- label = "(pending delete)";
- else
- label = "";
- } else {
- label = "(deleted)";
- }
- replaceComponentTagBody(markupStream, openTag, label);
- }
-
- @Nullable
- private ProjectFacade getProject() {
- return OneDev.getInstance(ProjectManager.class).findFacadeById(projectId);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new ChangeObserver() {
- @Override
- protected Collection<String> findObservables() {
- return Sets.newHashSet(Project.getDeleteChangeObservable(projectId));
- }
-
- });
- add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
- @Override
- protected String load() {
- var project = getProject();
- if (project != null && !project.isPendingDelete())
- return "d-none";
- else
- return "";
- }
- }));
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
index cb625bb032..4f2ca966d3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
@@ -41,7 +41,6 @@
<a wicket:id="path" class="mr-2">
<img wicket:id="avatar">
<span wicket:id="text"></span>
- <span wicket:id="deleteStatus" class="text-danger"></span>
</a>
<span wicket:id="labels" class="mr-2"></span>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 437d3f7afb..01c8d385a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -1,8 +1,61 @@
package io.onedev.server.web.component.project.list;
+import static io.onedev.server.model.Project.SORT_FIELDS;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.PackManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.imports.ProjectImporter;
import io.onedev.server.imports.ProjectImporterContribution;
import io.onedev.server.model.Build;
@@ -35,7 +88,6 @@ import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.orderedit.SortEditPanel;
-import io.onedev.server.web.component.project.DeleteStatusLabel;
import io.onedev.server.web.component.project.ProjectAvatar;
import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;
import io.onedev.server.web.component.project.selector.ProjectSelector;
@@ -52,46 +104,8 @@ import io.onedev.server.web.page.project.children.ProjectChildrenPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
import io.onedev.server.web.page.project.imports.ProjectImportPage;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
-import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-import static io.onedev.server.model.Project.SORT_FIELDS;
+import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
public class ProjectListPanel extends Panel {
@@ -555,11 +569,11 @@ public class ProjectListPanel extends Panel {
projects.add(project);
observables.add(project.getDeleteChangeObservable());
}
- getProjectManager().requestToDelete(projects);
+ getProjectManager().delete(projects);
selectionColumn.getSelections().clear();
target.add(countLabel);
target.add(body);
- Session.get().success("Requested to delete projects");
+ Session.get().success("Projects deleted");
var page = (BasePage) getPage();
page.notifyObservablesChange(target, observables);
}
@@ -830,12 +844,12 @@ public class ProjectListPanel extends Panel {
projects.add(project);
observables.add(project.getDeleteChangeObservable());
}
- getProjectManager().requestToDelete(projects);
+ getProjectManager().delete(projects);
dataProvider.detach();
selectionColumn.getSelections().clear();
target.add(countLabel);
target.add(body);
- Session.get().success("Requested to delete projects");
+ Session.get().success("Projects deleted");
var page = (BasePage) getPage();
page.notifyObservablesChange(target, observables);
}
@@ -1089,7 +1103,6 @@ public class ProjectListPanel extends Panel {
projectLink.add(new Label("text", project.getPath().substring(getParentProject().getPath().length()+1)));
else
projectLink.add(new Label("text", project.getPath()));
- projectLink.add(new DeleteStatusLabel("deleteStatus", projectId));
fragment.add(projectLink);
fragment.add(new EntityLabelsPanel<>("labels", rowModel));
@@ -1099,7 +1112,7 @@ public class ProjectListPanel extends Panel {
fragment.add(new WebMarkupContainer("description").setVisible(false));
}
- if (!project.isPendingDelete() && project.getActiveServer(false) != null) {
+ if (project.getActiveServer(false) != null) {
if (project.isCodeManagement() && SecurityUtils.canReadCode(project)) {
fragment.add(new CodeStatsPanel("codeStats", rowModel));
fragment.add(new PullRequestStatsPanel("pullRequestStats", rowModel,
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
index d96d909e95..1d8c16afa5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
@@ -13,7 +13,6 @@
<wicket:container wicket:id="pathSegments">
<a wicket:id="link" class="text-truncate">
<span wicket:id="label"></span>
- <span wicket:id="deleteStatus" class="text-danger"></span>
</a>
<a wicket:id="children" class="dropdown-triangle-indicator mx-1 d-inline-flex flex-shrink-0 align-items-center justify-content-center"><span></span></a>
<span wicket:id="dot" class="flex-shrink-0"></span>
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.java
index a271b269f9..cf7785c7b1 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
@@ -1,6 +1,39 @@
package io.onedev.server.web.page.project;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityNotFoundException;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.list.ListItem;
+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.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.cycle.RequestCycle;
+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.Lists;
+
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
@@ -16,7 +49,6 @@ import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.project.DeleteStatusLabel;
import io.onedev.server.web.component.project.ProjectAvatar;
import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;
import io.onedev.server.web.component.project.info.ProjectInfoPanel;
@@ -57,7 +89,11 @@ import io.onedev.server.web.page.project.setting.ProjectSettingPage;
import io.onedev.server.web.page.project.setting.authorization.GroupAuthorizationsPage;
import io.onedev.server.web.page.project.setting.authorization.UserAuthorizationsPage;
import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;
-import io.onedev.server.web.page.project.setting.build.*;
+import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;
+import io.onedev.server.web.page.project.setting.build.CacheManagementPage;
+import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;
+import io.onedev.server.web.page.project.setting.build.JobPropertiesPage;
+import io.onedev.server.web.page.project.setting.build.JobSecretsPage;
import io.onedev.server.web.page.project.setting.code.analysis.CodeAnalysisSettingPage;
import io.onedev.server.web.page.project.setting.code.branchprotection.BranchProtectionsPage;
import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;
@@ -71,32 +107,6 @@ 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.util.ProjectAware;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.list.ListItem;
-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.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.Request;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.ObjectId;
-
-import javax.persistence.EntityNotFoundException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@@ -459,10 +469,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
if (SecurityUtils.canAccessProject(project)) {
WebMarkupContainer link = navToProject("link", project);
link.add(new Label("label", project.getName()));
- if (project.equals(getProject()))
- link.add(new DeleteStatusLabel("deleteStatus", project.getId()));
- else
- link.add(new WebMarkupContainer("deleteStatus").setVisible(false));
item.add(link);
List<ProjectFacade> children = getProjectManager().getChildren(project.getId());
@@ -499,10 +505,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
};
link.add(new Label("label", project.getName()));
- if (project.equals(getProject()))
- link.add(new DeleteStatusLabel("deleteStatus", project.getId()));
- else
- link.add(new WebMarkupContainer("deleteStatus").setVisible(false));
item.add(link);
item.add(new WebMarkupContainer("children").setVisible(false));
item.add(new Label("dot").add(AttributeAppender.append("class", "dot")));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
index bb3e674ad2..9c770feb26 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
@@ -1,7 +1,30 @@
package io.onedev.server.web.page.project.setting.general;
+import static io.onedev.server.model.Project.PROP_CODE_MANAGEMENT;
+import static io.onedev.server.model.Project.PROP_DESCRIPTION;
+import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT;
+import static io.onedev.server.model.Project.PROP_KEY;
+import static io.onedev.server.model.Project.PROP_NAME;
+import static io.onedev.server.model.Project.PROP_PACK_MANAGEMENT;
+import static io.onedev.server.model.Project.PROP_TIME_TRACKING;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.flow.RedirectToUrlException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectLabelManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -17,21 +40,6 @@ import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
import io.onedev.server.web.util.editbean.LabelsBean;
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-import static io.onedev.server.model.Project.*;
public class GeneralProjectSettingPage extends ProjectSettingPage {
@@ -165,7 +173,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {
@Override
protected void onConfirm(AjaxRequestTarget target) {
Project project = getProject();
- OneDev.getInstance(ProjectManager.class).requestToDelete(Sets.newHashSet(project));
+ OneDev.getInstance(ProjectManager.class).delete(project);
getSession().success("Requested to delete project");
String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(Project.class);
if (redirectUrlAfterDelete != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/ProjectDeleteEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/ProjectDeleteEventBroadcaster.java
deleted file mode 100644
index c39f15855b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/websocket/ProjectDeleteEventBroadcaster.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.onedev.server.web.websocket;
-
-import io.onedev.server.event.Listen;
-import io.onedev.server.event.project.ProjectDeleted;
-import io.onedev.server.event.project.ProjectsPendingDelete;
-import io.onedev.server.model.Project;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.Collection;
-import java.util.HashSet;
-
-import static com.google.common.collect.Sets.newHashSet;
-
-@Singleton
-public class ProjectDeleteEventBroadcaster {
-
- private final WebSocketManager webSocketManager;
-
- @Inject
- public ProjectDeleteEventBroadcaster(WebSocketManager webSocketManager) {
- this.webSocketManager = webSocketManager;
- }
-
- @Listen
- public void on(ProjectsPendingDelete event) {
- Collection<String> observables = new HashSet<>();
- for (var projectId: event.getProjectIds())
- observables.add(Project.getDeleteChangeObservable(projectId));
- webSocketManager.notifyObservablesChange(observables, event.getSourcePage());
- }
-
- @Listen
- public void on(ProjectDeleted event) {
- webSocketManager.notifyObservablesChange(
- newHashSet(Project.getDeleteChangeObservable(event.getProjectId())),
- event.getSourcePage());
- }
-
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/server-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
index d6bfd3ff85..6923b4f13c 100644
--- a/server-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
+++ b/server-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
@@ -544,6 +544,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme
* @see #add(IValidator)
* @return form component for chaining
*/
+ @SuppressWarnings("unlikely-arg-type")
public final FormComponent<T> remove(final IValidator<? super T> validator)
{
Args.notNull(validator, "validator");
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java
index 2ca9d4985a..d989f71941 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java
@@ -32,6 +32,8 @@ import static org.apache.commons.lang3.StringUtils.substringAfter;
public class ContainerPackPanel extends Panel {
+ private final Long projectId;
+
private final String namespace;
private final String tag;
@@ -41,13 +43,14 @@ public class ContainerPackPanel extends Panel {
private final IModel<ContainerManifest> manifestIModel = new LoadableDetachableModel<>() {
@Override
protected ContainerManifest load() {
- return new ContainerManifest(getPackBlobManager().readBlob(manifestSha256Hash));
+ return new ContainerManifest(getPackBlobManager().readBlob(projectId, manifestSha256Hash));
}
};
- public ContainerPackPanel(String id, String namespace, String tag, String manifestSha256Hash) {
+ public ContainerPackPanel(String id, Long projectId, String namespace, String tag, String manifestSha256Hash) {
super(id);
+ this.projectId = projectId;
this.namespace = namespace;
this.tag = tag;
this.manifestSha256Hash = manifestSha256Hash;
@@ -117,7 +120,7 @@ public class ContainerPackPanel extends Panel {
add(fragment);
} else if (archDigests.size() == 1) {
var archHash = substringAfter(archDigests.values().iterator().next(), ":");
- var archManifestBytes = getPackBlobManager().readBlob(archHash);
+ var archManifestBytes = getPackBlobManager().readBlob(projectId, archHash);
add(newImagePanel("content", readJson(archManifestBytes), null));
} else {
boolean cache = false;
@@ -152,7 +155,7 @@ public class ContainerPackPanel extends Panel {
private Component newArchImagePanel(String componentId, String archDigest) {
var archHash = substringAfter(archDigest, ":");
- var archManifestBytes = getPackBlobManager().readBlob(archHash);
+ var archManifestBytes = getPackBlobManager().readBlob(projectId, archHash);
return newImagePanel(componentId, readJson(archManifestBytes), archDigest);
}
@@ -163,7 +166,7 @@ public class ContainerPackPanel extends Panel {
fragment.add(new CopyToClipboardLink("copyPullCommand", Model.of(pullCommand)));
var configHash = substringAfter(manifest.get("config").get("digest").asText(), ":");
- var config = readJson(getPackBlobManager().readBlob(configHash));
+ var config = readJson(getPackBlobManager().readBlob(projectId, configHash));
if (archDigest != null) {
fragment.add(new WebMarkupContainer("osArch").setVisible(false));
var pullArchCommand = "docker pull " + namespace + "@" + archDigest;
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackSupport.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackSupport.java
index 9a45ecbb7c..901b284693 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackSupport.java
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackSupport.java
@@ -39,7 +39,7 @@ public class ContainerPackSupport implements PackSupport {
public Component renderContent(String componentId, Pack pack) {
var serverUrl = OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl();
var server = UrlUtils.getServer(serverUrl);
- return new ContainerPackPanel(componentId, server + "/" + pack.getProject().getPath().toLowerCase() + "/" + pack.getName(),
+ return new ContainerPackPanel(componentId, pack.getProject().getId(), server + "/" + pack.getProject().getPath().toLowerCase() + "/" + pack.getName(),
pack.getVersion(), (String) pack.getData());
}
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java
index 85c445fb68..c5cfda3b3c 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java
@@ -127,7 +127,7 @@ public class ContainerServlet extends HttpServlet {
var project = checkProject(projectPath, true);
if (digestString != null) {
var hash = parseDigest(digestString).getHash();
- if (packBlobManager.checkPackBlob(hash) != null) {
+ if (packBlobManager.checkPackBlob(project.getId(), hash) != null) {
response.setStatus(SC_CREATED);
response.setHeader("Location", getBlobUrl(projectPath, repository, digestString));
}
@@ -229,12 +229,12 @@ public class ContainerServlet extends HttpServlet {
var digestString = matcher.group(3);
if (method.equals("GET") || method.equals("HEAD")) {
var packBlobInfo = sessionManager.call(() -> {
- checkProject(projectPath, false);
+ var project = checkProject(projectPath, false);
var digest = parseDigest(digestString);
var hash = digest.getHash();
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(hash)) != null) {
- response.setStatus(SC_OK);
+ if ((packBlob = packBlobManager.checkPackBlob(project.getId(), hash)) != null) {
+ response.setStatus(SC_OK);
response.setHeader("Content-Length", String.valueOf(packBlob.getSize()));
response.setHeader("Docker-Content-Digest", digestString);
return new Pair<>(packBlob.getProject().getId(), packBlob.getSha256Hash());
@@ -269,7 +269,7 @@ public class ContainerServlet extends HttpServlet {
String hash;
if (isTag(reference)) {
var packBlobId = packBlobManager.uploadBlob(projectId, bytes, null);
- // DO not use lamda here as it may cause compilation error on terminal
+ // Do not use lamda here as it may cause compilation error on terminal
hash = LockUtils.call(getLockName(projectId, repository), new Callable<String>() {
@Override
public String call() {
@@ -278,8 +278,8 @@ public class ContainerServlet extends HttpServlet {
private PackBlob loadPackBlob(Map<String, PackBlob> packBlobs, String hash, long size) {
var packBlob = packBlobs.get(hash);
if (packBlob == null) {
- packBlob = packBlobManager.findBySha256Hash(hash);
- if (packBlob != null && SecurityUtils.canReadPackBlob(packBlob)) {
+ packBlob = packBlobManager.findBySha256Hash(projectId, hash);
+ if (packBlob != null) {
if (packBlob.getSize() == size)
packBlobs.put(hash, packBlob);
else
@@ -372,14 +372,13 @@ public class ContainerServlet extends HttpServlet {
if (isTag(reference)) {
var pack = packManager.findByNameAndVersion(project, TYPE, repository, reference);
if (pack != null)
- packBlob = packBlobManager.findBySha256Hash((String)pack.getData());
+ packBlob = packBlobManager.findBySha256Hash(project.getId(), (String)pack.getData());
else
packBlob = null;
} else {
- packBlob = packBlobManager.findBySha256Hash(parseDigest(reference).getHash());
+ packBlob = packBlobManager.findBySha256Hash(project.getId(), parseDigest(reference).getHash());
}
if (packBlob != null && packBlob.getSize() < MAX_MANIFEST_SIZE
- && SecurityUtils.canReadPackBlob(packBlob)
&& packBlobManager.checkPackBlobFile(packBlob.getProject().getId(), packBlob.getSha256Hash(), packBlob.getSize())) {
response.setHeader("Docker-Content-Digest", "sha256:" + packBlob.getSha256Hash());
response.setContentLengthLong(packBlob.getSize());
diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackService.java b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackService.java
index cca2b6f8ab..5754aba90c 100644
--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackService.java
+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackService.java
@@ -212,7 +212,7 @@ public class GemPackService implements PackService {
data.getSha256BlobHashes().put(fileName, packBlob.getSha256Hash());
var packBlobs = data.getSha256BlobHashes().values().stream()
- .map(packBlobManager::findBySha256Hash)
+ .map(hash -> packBlobManager.findBySha256Hash(projectId, hash))
.filter(Objects::nonNull)
.collect(toList());
packManager.createOrUpdate(pack, packBlobs, data.getSha256BlobHashes().size() == 1);
@@ -388,7 +388,7 @@ public class GemPackService implements PackService {
var sha256BlobHash = data.getSha256BlobHashes().get(fileName);
if (sha256BlobHash != null) {
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(sha256BlobHash)) != null) {
+ if ((packBlob = packBlobManager.findBySha256Hash(projectId, sha256BlobHash)) != null) {
response.setContentType(MediaType.APPLICATION_OCTET_STREAM);
try {
packBlobManager.downloadBlob(packBlob.getProject().getId(),
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackService.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackService.java
index ea368f2e71..0d142f0257 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackService.java
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackService.java
@@ -276,7 +276,7 @@ public class MavenPackService implements PackService {
} else {
blobHash = sessionManager.call(() -> {
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(sha256BlobHash)) != null)
+ if ((packBlob = packBlobManager.checkPackBlob(projectId, sha256BlobHash)) != null)
return getNonSha256Hash(packBlob, fileName);
else
throw new HttpResponseAwareException(SC_NOT_FOUND);
@@ -288,7 +288,7 @@ public class MavenPackService implements PackService {
} else {
var packBlobInfo = sessionManager.call(() -> {
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(sha256BlobHash)) != null)
+ if ((packBlob = packBlobManager.checkPackBlob(projectId, sha256BlobHash)) != null)
return new Pair<>(packBlob.getProject().getId(), packBlob.getSize());
else
throw new HttpResponseAwareException(SC_NOT_FOUND);
@@ -344,7 +344,7 @@ public class MavenPackService implements PackService {
var sha256BlobHash = data.getSha256BlobHashes().get(blobName);
if (sha256BlobHash != null) {
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(sha256BlobHash)) != null) {
+ if ((packBlob = packBlobManager.checkPackBlob(projectId, sha256BlobHash)) != null) {
String blobHash;
if (fileName.endsWith(EXT_SHA256))
blobHash = sha256BlobHash;
diff --git a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackService.java b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackService.java
index 5289be2148..960671f144 100644
--- a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackService.java
+++ b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackService.java
@@ -301,7 +301,7 @@ public class NpmPackService implements PackService {
distTagsNode.put(distTag, pack.getVersion());
ObjectNode versionMetadata = readJson(packData.getMetadata());
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(packData.getFileSha256BlobHash())) != null) {
+ if ((packBlob = packBlobManager.checkPackBlob(projectId, packData.getFileSha256BlobHash())) != null) {
latestPackData = packData;
var distNode = versionMetadata.putObject("dist");
distNode.put("shasum", packBlobManager.getSha1Hash(packBlob));
@@ -380,7 +380,7 @@ public class NpmPackService implements PackService {
var pack = packManager.findByNameAndVersion(project, TYPE, name, version);
if (pack != null) {
var packData = (NpmData) pack.getData();
- if (packBlobManager.checkPackBlob(packData.getFileSha256BlobHash()) != null) {
+ if (packBlobManager.checkPackBlob(projectId, packData.getFileSha256BlobHash()) != null) {
var errorMessage = String.format("Package already exists (name: %s, version: %s)",
name, version);
throw new ClientException(SC_CONFLICT, errorMessage);
@@ -485,7 +485,7 @@ public class NpmPackService implements PackService {
if (pack != null) {
var packData = (NpmData) pack.getData();
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(packData.getFileSha256BlobHash())) != null) {
+ if ((packBlob = packBlobManager.checkPackBlob(projectId, packData.getFileSha256BlobHash())) != null) {
try {
response.setContentType(MediaType.APPLICATION_OCTET_STREAM);
packBlobManager.downloadBlob(packBlob.getProject().getId(), packBlob.getSha256Hash(), response.getOutputStream());
@@ -513,7 +513,7 @@ public class NpmPackService implements PackService {
if (!packData.getFileName().equals(fileName))
throw new ClientException(SC_BAD_REQUEST, "Incorrect file name requested");
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(packData.getFileSha256BlobHash())) != null) {
+ if ((packBlob = packBlobManager.checkPackBlob(projectId, packData.getFileSha256BlobHash())) != null) {
try {
response.setContentType(MediaType.APPLICATION_OCTET_STREAM);
packBlobManager.downloadBlob(packBlob.getProject().getId(), packData.getFileSha256BlobHash(), response.getOutputStream());
diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackService.java b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackService.java
index 2adb5e63c9..4250d3ce31 100644
--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackService.java
+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackService.java
@@ -308,7 +308,7 @@ public class NugetPackService implements PackService {
List<PackBlob> packBlobs = Lists.newArrayList(snupkgBlob);
var data = (NugetData) pack.getData();
- var nupkgBlob = packBlobManager.findBySha256Hash(data.getNupkgBlobSha256Hash());
+ var nupkgBlob = packBlobManager.findBySha256Hash(projectId, data.getNupkgBlobSha256Hash());
if (nupkgBlob != null)
packBlobs.add(nupkgBlob);
@@ -500,7 +500,7 @@ public class NugetPackService implements PackService {
}
} else {
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(data.getNupkgBlobSha256Hash())) != null) {
+ if ((packBlob = packBlobManager.checkPackBlob(projectId, data.getNupkgBlobSha256Hash())) != null) {
try {
packBlobManager.downloadBlob(packBlob.getProject().getId(),
packBlob.getSha256Hash(), response.getOutputStream());
diff --git a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackService.java b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackService.java
index d5f4ef7f6a..e889468dc2 100644
--- a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackService.java
+++ b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackService.java
@@ -174,7 +174,7 @@ public class PypiPackService implements PackService {
data.getSha256BlobHashes().put(fileName, sha256Hash);
var packBlobs = data.getSha256BlobHashes().values().stream()
- .map(packBlobManager::findBySha256Hash)
+ .map(hash -> packBlobManager.findBySha256Hash(projectId, hash))
.filter(Objects::nonNull)
.collect(toList());
packManager.createOrUpdate(pack, packBlobs, data.getSha256BlobHashes().size() == 1);
@@ -257,7 +257,7 @@ public class PypiPackService implements PackService {
var sha256BlobHash = data.getSha256BlobHashes().get(fileName);
if (sha256BlobHash != null) {
PackBlob packBlob;
- if ((packBlob = packBlobManager.checkPackBlob(sha256BlobHash)) != null) {
+ if ((packBlob = packBlobManager.checkPackBlob(projectId, sha256BlobHash)) != null) {
response.setContentType(MediaType.APPLICATION_OCTET_STREAM);
try {
packBlobManager.downloadBlob(packBlob.getProject().getId(),
diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.java
index 6daeba527d..c30cb89e40 100644
--- a/server-product/src/test/java/io/onedev/server/product/Test.java
+++ b/server-product/src/test/java/io/onedev/server/product/Test.java
@@ -6,4 +6,4 @@ public class Test {
public void test() {
}
-}
\ No newline at end of file
+}
\ No newline at end of file