174213530d
The old code generates `structs.Repository.Permissions` with only `access.Permission.AccessMode`, however, it should check the units too, or the value could be incorrect. For example, `structs.Repository.Permissions.Push` could be false even the doer has write access to code unit. Should fix https://github.com/renovatebot/renovate/issues/14059#issuecomment-1047961128 (Not reported by it, I just found it when I was looking into this bug) --- Review tips: The major changes are - `modules/structs/repo.go` https://github.com/go-gitea/gitea/pull/25388/files#diff-870406f6857117f8b03611c43fca0ab9ed6d6e76a2d0069a7c1f17e8fa9092f7 - `services/convert/repository.go` https://github.com/go-gitea/gitea/pull/25388/files#diff-7736f6d2ae894c9edb7729a80ab89aa183b888a26a811a0c1fdebd18726a7101 And other changes are passive.
52 lines
1.4 KiB
Go
52 lines
1.4 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package convert
|
|
|
|
import (
|
|
"context"
|
|
|
|
"code.gitea.io/gitea/models/packages"
|
|
access_model "code.gitea.io/gitea/models/perm/access"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
api "code.gitea.io/gitea/modules/structs"
|
|
)
|
|
|
|
// ToPackage convert a packages.PackageDescriptor to api.Package
|
|
func ToPackage(ctx context.Context, pd *packages.PackageDescriptor, doer *user_model.User) (*api.Package, error) {
|
|
var repo *api.Repository
|
|
if pd.Repository != nil {
|
|
permission, err := access_model.GetUserRepoPermission(ctx, pd.Repository, doer)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if permission.HasAccess() {
|
|
repo = ToRepo(ctx, pd.Repository, permission)
|
|
}
|
|
}
|
|
|
|
return &api.Package{
|
|
ID: pd.Version.ID,
|
|
Owner: ToUser(ctx, pd.Owner, doer),
|
|
Repository: repo,
|
|
Creator: ToUser(ctx, pd.Creator, doer),
|
|
Type: string(pd.Package.Type),
|
|
Name: pd.Package.Name,
|
|
Version: pd.Version.Version,
|
|
CreatedAt: pd.Version.CreatedUnix.AsTime(),
|
|
}, nil
|
|
}
|
|
|
|
// ToPackageFile converts packages.PackageFileDescriptor to api.PackageFile
|
|
func ToPackageFile(pfd *packages.PackageFileDescriptor) *api.PackageFile {
|
|
return &api.PackageFile{
|
|
ID: pfd.File.ID,
|
|
Size: pfd.Blob.Size,
|
|
Name: pfd.File.Name,
|
|
HashMD5: pfd.Blob.HashMD5,
|
|
HashSHA1: pfd.Blob.HashSHA1,
|
|
HashSHA256: pfd.Blob.HashSHA256,
|
|
HashSHA512: pfd.Blob.HashSHA512,
|
|
}
|
|
}
|