Skip to content

The Unified and Autonomous Development Platform

fix(pack): prevent package redeploys from replacing blobs

Chief Work Horsef77ce25ece03
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java
index f12d1cbf01..f9f503222b 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java
@@ -10,6 +10,7 @@ import static io.onedev.server.model.Pack.PROP_VERSION;
import static io.onedev.server.model.Pack.SORT_FIELDS;
import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
import static java.lang.Math.min;
+import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
import java.io.Serializable;
import java.util.ArrayList;
@@ -47,6 +48,7 @@ import io.onedev.server.service.ProjectService;
import io.onedev.server.service.UserService;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pack.PackPublished;
+import io.onedev.server.exception.HttpResponseAwareException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
@@ -435,6 +437,15 @@ public class DefaultPackService extends BaseEntityService<Pack>
@Transactional
@Override
public void createOrUpdate(Pack pack, Collection<PackBlob> packBlobs, boolean postPublishEvent) {
+ if (!pack.isNew() && packBlobs != null) {
+ var sha256Hashes = packBlobs.stream().map(PackBlob::getSha256Hash).collect(Collectors.toSet());
+ for (var blobReference: pack.getBlobReferences()) {
+ if (!sha256Hashes.contains(blobReference.getPackBlob().getSha256Hash())) {
+ throw new HttpResponseAwareException(SC_CONFLICT, "Can not redeploy package: "
+ + pack.getName() + ":" + pack.getVersion());
+ }
+ }
+ }
dao.persist(pack);
if (packBlobs != null) {
packBlobs = new HashSet<>(packBlobs);
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java
index 4a931b84f9..c8fdd52e41 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java
@@ -9,6 +9,7 @@ import static io.onedev.server.util.IOUtils.copyWithMaxSize;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.stream.Collectors.toList;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
import static javax.servlet.http.HttpServletResponse.SC_CREATED;
import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
@@ -388,6 +389,7 @@ public class MavenPackHandler implements PackHandler {
pack.setType(TYPE);
pack.setName(getName(groupId, artifactId));
pack.setVersion(version != null? version: NONE);
+ pack.setPrerelease(version != null && version.endsWith(VERSION_SUFFIX_SNAPSHOT));
pack.setData(new MavenData());
}
@@ -398,7 +400,15 @@ public class MavenPackHandler implements PackHandler {
pack.setUser(SecurityUtils.getUser());
pack.setPublishDate(new Date());
MavenData data = (MavenData) pack.getData();
- var prevSha256BlobHash = data.getSha256BlobHashes().put(blobName, sha256BlobHash);
+ var prevSha256BlobHash = data.getSha256BlobHashes().get(blobName);
+ if (version != null
+ && !version.endsWith(VERSION_SUFFIX_SNAPSHOT)
+ && prevSha256BlobHash != null
+ && !prevSha256BlobHash.equals(sha256BlobHash)) {
+ throw new HttpResponseAwareException(SC_CONFLICT, "Can not redeploy package: "
+ + pack.getName() + ":" + pack.getVersion());
+ }
+ data.getSha256BlobHashes().put(blobName, sha256BlobHash);
packService.createOrUpdate(pack, null, false);
if (prevSha256BlobHash != null) {
for (var blobReference: pack.getBlobReferences()) {