Skip to content

Commit e27a5cd

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent bbee652 commit e27a5cd

File tree

9 files changed

+144
-91
lines changed

9 files changed

+144
-91
lines changed

‎models/packages/container/search.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,33 +70,34 @@ func (opts *BlobSearchOptions) toConds() builder.Cond {
7070
// GetContainerBlob gets the container blob matching the blob search options
7171
// If multiple matching blobs are found (manifests with the same digest) the first (according to the database) is selected.
7272
func GetContainerBlob(ctx context.Context, opts *BlobSearchOptions) (*packages.PackageFileDescriptor, error) {
73-
pfds, err := getContainerBlobsLimit(ctx, opts, 1)
73+
pfds, err := GetContainerBlobs(ctx, opts)
7474
if err != nil {
7575
return nil, err
7676
}
77-
if len(pfds) != 1 {
77+
if len(pfds) == 0 {
7878
return nil, ErrContainerBlobNotExist
7979
}
80-
81-
return pfds[0], nil
80+
pfd := pfds[0]
81+
if opts.IsManifest && opts.Digest == "" {
82+
// FIXME: old data doesn't have IsLead set, so we try to find the lead manifest, otherwise we just return the first one
83+
for _, v := range pfds {
84+
if v.File.IsLead {
85+
pfd = v
86+
break
87+
}
88+
}
89+
}
90+
return pfd, nil
8291
}
8392

8493
// GetContainerBlobs gets the container blobs matching the blob search options
8594
func GetContainerBlobs(ctx context.Context, opts *BlobSearchOptions) ([]*packages.PackageFileDescriptor, error) {
86-
return getContainerBlobsLimit(ctx, opts, 0)
87-
}
88-
89-
func getContainerBlobsLimit(ctx context.Context, opts *BlobSearchOptions, limit int) ([]*packages.PackageFileDescriptor, error) {
90-
pfs := make([]*packages.PackageFile, 0, limit)
95+
pfs := make([]*packages.PackageFile, 0)
9196
sess := db.GetEngine(ctx).
9297
Join("INNER", "package_version", "package_version.id = package_file.version_id").
9398
Join("INNER", "package", "package.id = package_version.package_id").
9499
Where(opts.toConds())
95100

96-
if limit > 0 {
97-
sess = sess.Limit(limit)
98-
}
99-
100101
if err := sess.Find(&pfs); err != nil {
101102
return nil, err
102103
}

‎models/packages/package_file.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ func DeleteFileByID(ctx context.Context, fileID int64) error {
115115
return err
116116
}
117117

118+
func UpdateFile(ctx context.Context, pf *PackageFile, cols []string) error {
119+
_, err := db.GetEngine(ctx).ID(pf.ID).Cols(cols...).Update(pf)
120+
return err
121+
}
122+
118123
// PackageFileSearchOptions are options for SearchXXX methods
119124
type PackageFileSearchOptions struct {
120125
OwnerID int64

‎models/packages/package_property.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,20 @@ func UpdateProperty(ctx context.Context, pp *PackageProperty) error {
6666
return err
6767
}
6868

69+
func InsertOrUpdateProperty(ctx context.Context, refType PropertyType, refID int64, name, value string) error {
70+
pp := PackageProperty{RefType: refType, RefID: refID, Name: name}
71+
ok, err := db.GetEngine(ctx).Get(&pp)
72+
if err != nil {
73+
return err
74+
}
75+
if ok {
76+
_, err = db.GetEngine(ctx).Where("ref_type=? AND ref_id=? AND name=?", refType, refID, name).Cols("value").Update(&PackageProperty{Value: value})
77+
return err
78+
}
79+
_, err = InsertProperty(ctx, refType, refID, name, value)
80+
return err
81+
}
82+
6983
// DeleteAllProperties deletes all properties of a ref
7084
func DeleteAllProperties(ctx context.Context, refType PropertyType, refID int64) error {
7185
_, err := db.GetEngine(ctx).Where("ref_type = ? AND ref_id = ?", refType, refID).Delete(&PackageProperty{})

‎routers/api/packages/api.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -701,18 +701,18 @@ func ContainerRoutes() *web.Router {
701701
r.Get("/_catalog", container.ReqContainerAccess, container.GetRepositoryList)
702702
r.Group("/{username}", func() {
703703
r.PathGroup("/*", func(g *web.RouterPathGroup) {
704-
g.MatchPath("POST", "/<image:*>/blobs/uploads", reqPackageAccess(perm.AccessModeWrite), container.VerifyImageName, container.InitiateUploadBlob)
705-
g.MatchPath("GET", "/<image:*>/tags/list", container.VerifyImageName, container.GetTagList)
704+
g.MatchPath("POST", "/<image:*>/blobs/uploads", reqPackageAccess(perm.AccessModeWrite), container.VerifyImageName, container.PostBlobsUploads)
705+
g.MatchPath("GET", "/<image:*>/tags/list", container.VerifyImageName, container.GetTagsList)
706706
g.MatchPath("GET,PATCH,PUT,DELETE", `/<image:*>/blobs/uploads/<uuid:[-.=\w]+>`, reqPackageAccess(perm.AccessModeWrite), container.VerifyImageName, func(ctx *context.Context) {
707707
switch ctx.Req.Method {
708708
case http.MethodGet:
709-
container.GetUploadBlob(ctx)
709+
container.GetBlobsUpload(ctx)
710710
case http.MethodPatch:
711-
container.UploadBlob(ctx)
711+
container.PatchBlobsUpload(ctx)
712712
case http.MethodPut:
713-
container.EndUploadBlob(ctx)
713+
container.PutBlobsUpload(ctx)
714714
default: /* DELETE */
715-
container.CancelUploadBlob(ctx)
715+
container.DeleteBlobsUpload(ctx)
716716
}
717717
})
718718
g.MatchPath("HEAD", `/<image:*>/blobs/<digest>`, container.VerifyImageName, container.HeadBlob)
@@ -721,7 +721,7 @@ func ContainerRoutes() *web.Router {
721721

722722
g.MatchPath("HEAD", `/<image:*>/manifests/<reference>`, container.VerifyImageName, container.HeadManifest)
723723
g.MatchPath("GET", `/<image:*>/manifests/<reference>`, container.VerifyImageName, container.GetManifest)
724-
g.MatchPath("PUT", `/<image:*>/manifests/<reference>`, container.VerifyImageName, reqPackageAccess(perm.AccessModeWrite), container.UploadManifest)
724+
g.MatchPath("PUT", `/<image:*>/manifests/<reference>`, container.VerifyImageName, reqPackageAccess(perm.AccessModeWrite), container.PutManifest)
725725
g.MatchPath("DELETE", `/<image:*>/manifests/<reference>`, container.VerifyImageName, reqPackageAccess(perm.AccessModeWrite), container.DeleteManifest)
726726
})
727727
}, container.ReqContainerAccess, context.UserAssignmentWeb(), context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))

‎routers/api/packages/container/blob.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
container_module "code.gitea.io/gitea/modules/packages/container"
2121
"code.gitea.io/gitea/modules/util"
2222
packages_service "code.gitea.io/gitea/services/packages"
23+
24+
"github.com/opencontainers/go-digest"
2325
)
2426

2527
// saveAsPackageBlob creates a package blob from an upload
@@ -175,7 +177,7 @@ func createFileForBlob(ctx context.Context, pv *packages_model.PackageVersion, p
175177
return nil
176178
}
177179

178-
func deleteBlob(ctx context.Context, ownerID int64, image, digest string) error {
180+
func deleteBlob(ctx context.Context, ownerID int64, image string, digest digest.Digest) error {
179181
releaser, err := globallock.Lock(ctx, containerPkgName(ownerID, image))
180182
if err != nil {
181183
return err
@@ -186,7 +188,7 @@ func deleteBlob(ctx context.Context, ownerID int64, image, digest string) error
186188
pfds, err := container_model.GetContainerBlobs(ctx, &container_model.BlobSearchOptions{
187189
OwnerID: ownerID,
188190
Image: image,
189-
Digest: digest,
191+
Digest: string(digest),
190192
})
191193
if err != nil {
192194
return err

‎routers/api/packages/container/container.go

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func GetRepositoryList(ctx *context.Context) {
231231
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#mounting-a-blob-from-another-repository
232232
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#single-post
233233
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-a-blob-in-chunks
234-
func InitiateUploadBlob(ctx *context.Context) {
234+
func PostBlobsUploads(ctx *context.Context) {
235235
image := ctx.PathParam("image")
236236

237237
mount := ctx.FormTrim("mount")
@@ -319,7 +319,7 @@ func InitiateUploadBlob(ctx *context.Context) {
319319
}
320320

321321
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-a-blob-in-chunks
322-
func GetUploadBlob(ctx *context.Context) {
322+
func GetBlobsUpload(ctx *context.Context) {
323323
uuid := ctx.PathParam("uuid")
324324

325325
upload, err := packages_model.GetBlobUploadByID(ctx, uuid)
@@ -345,7 +345,7 @@ func GetUploadBlob(ctx *context.Context) {
345345

346346
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#single-post
347347
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-a-blob-in-chunks
348-
func UploadBlob(ctx *context.Context) {
348+
func PatchBlobsUpload(ctx *context.Context) {
349349
image := ctx.PathParam("image")
350350

351351
uploader, err := container_service.NewBlobUploader(ctx, ctx.PathParam("uuid"))
@@ -393,7 +393,7 @@ func UploadBlob(ctx *context.Context) {
393393
}
394394

395395
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-a-blob-in-chunks
396-
func EndUploadBlob(ctx *context.Context) {
396+
func PutBlobsUpload(ctx *context.Context) {
397397
image := ctx.PathParam("image")
398398

399399
digest := ctx.FormTrim("digest")
@@ -462,7 +462,7 @@ func EndUploadBlob(ctx *context.Context) {
462462
}
463463

464464
// https://docs.docker.com/registry/spec/api/#delete-blob-upload
465-
func CancelUploadBlob(ctx *context.Context) {
465+
func DeleteBlobsUpload(ctx *context.Context) {
466466
uuid := ctx.PathParam("uuid")
467467

468468
_, err := packages_model.GetBlobUploadByID(ctx, uuid)
@@ -486,16 +486,15 @@ func CancelUploadBlob(ctx *context.Context) {
486486
}
487487

488488
func getBlobFromContext(ctx *context.Context) (*packages_model.PackageFileDescriptor, error) {
489-
d := ctx.PathParam("digest")
490-
491-
if digest.Digest(d).Validate() != nil {
489+
d := digest.Digest(ctx.PathParam("digest"))
490+
if d.Validate() != nil {
492491
return nil, container_model.ErrContainerBlobNotExist
493492
}
494493

495494
return workaroundGetContainerBlob(ctx, &container_model.BlobSearchOptions{
496495
OwnerID: ctx.Package.Owner.ID,
497496
Image: ctx.PathParam("image"),
498-
Digest: d,
497+
Digest: string(d),
499498
})
500499
}
501500

@@ -535,9 +534,8 @@ func GetBlob(ctx *context.Context) {
535534

536535
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#deleting-blobs
537536
func DeleteBlob(ctx *context.Context) {
538-
d := ctx.PathParam("digest")
539-
540-
if digest.Digest(d).Validate() != nil {
537+
d := digest.Digest(ctx.PathParam("digest"))
538+
if d.Validate() != nil {
541539
apiErrorDefined(ctx, errBlobUnknown)
542540
return
543541
}
@@ -553,7 +551,7 @@ func DeleteBlob(ctx *context.Context) {
553551
}
554552

555553
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-manifests
556-
func UploadManifest(ctx *context.Context) {
554+
func PutManifest(ctx *context.Context) {
557555
reference := ctx.PathParam("reference")
558556

559557
mci := &manifestCreationInfo{
@@ -609,16 +607,15 @@ func UploadManifest(ctx *context.Context) {
609607
}
610608

611609
func getBlobSearchOptionsFromContext(ctx *context.Context) (*container_model.BlobSearchOptions, error) {
612-
reference := ctx.PathParam("reference")
613-
614610
opts := &container_model.BlobSearchOptions{
615611
OwnerID: ctx.Package.Owner.ID,
616612
Image: ctx.PathParam("image"),
617613
IsManifest: true,
618614
}
619615

620-
if digest.Digest(reference).Validate() == nil {
621-
opts.Digest = reference
616+
reference := ctx.PathParam("reference")
617+
if d := digest.Digest(reference); d.Validate() == nil {
618+
opts.Digest = string(d)
622619
} else if referencePattern.MatchString(reference) {
623620
opts.Tag = reference
624621
} else {
@@ -737,7 +734,7 @@ func serveBlob(ctx *context.Context, pfd *packages_model.PackageFileDescriptor)
737734
}
738735

739736
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#content-discovery
740-
func GetTagList(ctx *context.Context) {
737+
func GetTagsList(ctx *context.Context) {
741738
image := ctx.PathParam("image")
742739

743740
if _, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.TypeContainer, image); err != nil {

0 commit comments

Comments
 (0)