Allow empty repository name.

Change delete endpoint.

Author: KN4CK3R

routers/api/packages/api.go

@@ -155,24 +155,25 @@ func CommonRoutes() *web.Router {
 				pathFields := strings.Split(path, "/")
 				pathFieldsLen := len(pathFields)
 
-				if pathFieldsLen >= 2 {
+				if (ctx.Req.Method == "HEAD" || ctx.Req.Method == "GET") && pathFieldsLen >= 2 {
 					ctx.SetPathParam("repository", strings.Join(pathFields[:pathFieldsLen-2], "/"))
 					ctx.SetPathParam("architecture", pathFields[pathFieldsLen-2])
 					ctx.SetPathParam("filename", pathFields[pathFieldsLen-1])
+					arch.GetPackageOrRepositoryFile(ctx)
+					return
+				}
 
-					if ctx.Req.Method == "HEAD" || ctx.Req.Method == "GET" {
-						arch.GetPackageOrRepositoryFile(ctx)
-						return
-					}
-
-					if ctx.Req.Method == "DELETE" {
-						reqPackageAccess(perm.AccessModeWrite)(ctx)
-						if ctx.Written() {
-							return
-						}
-						arch.DeletePackageFile(ctx)
+				if ctx.Req.Method == "DELETE" && pathFieldsLen >= 3 {
+					reqPackageAccess(perm.AccessModeWrite)(ctx)
+					if ctx.Written() {
 						return
 					}
+					ctx.SetPathParam("repository", strings.Join(pathFields[:pathFieldsLen-3], "/"))
+					ctx.SetPathParam("architecture", pathFields[pathFieldsLen-3])
+					ctx.SetPathParam("name", pathFields[pathFieldsLen-2])
+					ctx.SetPathParam("version", pathFields[pathFieldsLen-1])
+					arch.DeletePackageVersion(ctx)
+					return
 				}
 
 				ctx.Status(http.StatusNotFound)

routers/api/packages/arch/arch.go

@@ -43,10 +43,6 @@ func GetRepositoryKey(ctx *context.Context) {
 
 func UploadPackageFile(ctx *context.Context) {
 	repository := strings.TrimSpace(ctx.PathParam("repository"))
-	if repository == "" {
-		apiError(ctx, http.StatusBadRequest, "invalid repository")
-		return
-	}
 
 	upload, needToClose, err := ctx.UploadStream()
 	if err != nil {
@@ -256,8 +252,11 @@ func GetPackageOrRepositoryFile(ctx *context.Context) {
 	helper.ServePackageFile(ctx, s, u, pf)
 }
 
-func DeletePackageFile(ctx *context.Context) {
-	repository, architecture := ctx.PathParam("repository"), ctx.PathParam("architecture")
+func DeletePackageVersion(ctx *context.Context) {
+	repository := ctx.PathParam("repository")
+	architecture := ctx.PathParam("architecture")
+	name := ctx.PathParam("name")
+	version := ctx.PathParam("version")
 
 	release, err := arch_service.AquireRegistryLock(ctx, ctx.Package.Owner.ID)
 	if err != nil {
@@ -266,10 +265,18 @@ func DeletePackageFile(ctx *context.Context) {
 	}
 	defer release()
 
+	pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeArch, name, version)
+	if err != nil {
+		if errors.Is(err, util.ErrNotExist) {
+			apiError(ctx, http.StatusNotFound, err)
+		} else {
+			apiError(ctx, http.StatusInternalServerError, err)
+		}
+		return
+	}
+
 	pfs, _, err := packages_model.SearchFiles(ctx, &packages_model.PackageFileSearchOptions{
-		OwnerID:      ctx.Package.Owner.ID,
-		PackageType:  packages_model.TypeArch,
-		Query:        ctx.PathParam("filename"),
+		VersionID:    pv.ID,
 		CompositeKey: fmt.Sprintf("%s|%s", repository, architecture),
 	})
 	if err != nil {

tests/integration/api_packages_arch_test.go

@@ -81,7 +81,7 @@ license = MIT`)
 	}
 
 	compressions := []string{"gz", "xz", "zst"}
-	repositories := []string{"main", "testing", "with/slash"}
+	repositories := []string{"main", "testing", "with/slash", ""}
 
 	rootURL := fmt.Sprintf("/api/packages/%s/arch", user.Name)
 
@@ -277,18 +277,18 @@ license = MIT`)
 						MakeRequest(t, req, http.StatusOK)
 					}
 
-					req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/any/%s-%s-any.pkg.tar.%s", rootURL, repository, packageName+"_"+arch_module.AnyArch, packageVersion, compression)).
+					req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/any/%s/%s", rootURL, repository, packageName+"_"+arch_module.AnyArch, packageVersion)).
 						AddBasicAuth(user.Name)
 					MakeRequest(t, req, http.StatusNoContent)
 				})
 
 				t.Run("Delete", func(t *testing.T) {
 					defer tests.PrintCurrentTest(t)()
 
-					req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/aarch64/%s-%s-aarch64.pkg.tar.%s", rootURL, repository, packageName, packageVersion, compression))
+					req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/aarch64/%s/%s", rootURL, repository, packageName, packageVersion))
 					MakeRequest(t, req, http.StatusUnauthorized)
 
-					req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/aarch64/%s-%s-aarch64.pkg.tar.%s", rootURL, repository, packageName, packageVersion, compression)).
+					req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/aarch64/%s/%s", rootURL, repository, packageName, packageVersion)).
 						AddBasicAuth(user.Name)
 					MakeRequest(t, req, http.StatusNoContent)