aboutsummaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
Diffstat (limited to 'routers')
-rw-r--r--routers/api/packages/api.go19
-rw-r--r--routers/api/packages/cargo/cargo.go2
-rw-r--r--routers/api/packages/chef/chef.go2
-rw-r--r--routers/api/packages/composer/composer.go2
-rw-r--r--routers/api/packages/conan/conan.go13
-rw-r--r--routers/api/packages/conda/conda.go2
-rw-r--r--routers/api/packages/container/blob.go8
-rw-r--r--routers/api/packages/container/container.go4
-rw-r--r--routers/api/packages/debian/debian.go317
-rw-r--r--routers/api/packages/generic/generic.go2
-rw-r--r--routers/api/packages/helm/helm.go2
-rw-r--r--routers/api/packages/maven/maven.go2
-rw-r--r--routers/api/packages/npm/npm.go2
-rw-r--r--routers/api/packages/nuget/nuget.go6
-rw-r--r--routers/api/packages/pub/pub.go2
-rw-r--r--routers/api/packages/pypi/pypi.go2
-rw-r--r--routers/api/packages/rubygems/rubygems.go2
-rw-r--r--routers/api/packages/swift/swift.go2
-rw-r--r--routers/api/packages/vagrant/vagrant.go2
-rw-r--r--routers/api/v1/packages/package.go2
-rw-r--r--routers/web/user/package.go34
21 files changed, 39 insertions, 390 deletions
diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go
index 2ce233171c..d5acd3d261 100644
--- a/routers/api/packages/api.go
+++ b/routers/api/packages/api.go
@@ -21,7 +21,6 @@ import (
"code.gitea.io/gitea/routers/api/packages/conan"
"code.gitea.io/gitea/routers/api/packages/conda"
"code.gitea.io/gitea/routers/api/packages/container"
- "code.gitea.io/gitea/routers/api/packages/debian"
"code.gitea.io/gitea/routers/api/packages/generic"
"code.gitea.io/gitea/routers/api/packages/helm"
"code.gitea.io/gitea/routers/api/packages/maven"
@@ -273,24 +272,6 @@ func CommonRoutes(ctx gocontext.Context) *web.Route {
conda.UploadPackageFile(ctx)
})
}, reqPackageAccess(perm.AccessModeRead))
- r.Group("/debian", func() {
- r.Get("/repository.key", debian.GetRepositoryKey)
- r.Group("/dists/{distribution}", func() {
- r.Get("/{filename}", debian.GetRepositoryFile)
- r.Get("/by-hash/{algorithmn}/{hash}", debian.GetRepositoryFileByHash)
- r.Group("/{component}/{architecture}", func() {
- r.Get("/{filename}", debian.GetRepositoryFile)
- r.Get("/by-hash/{algorithmn}/{hash}", debian.GetRepositoryFileByHash)
- })
- })
- r.Group("/pool/{distribution}/{component}", func() {
- r.Get("/{name}_{version}_{architecture}.deb", debian.DownloadPackageFile)
- r.Group("", func() {
- r.Put("/upload", debian.UploadPackageFile)
- r.Delete("/{name}/{version}/{architecture}", debian.DeletePackageFile)
- }, reqPackageAccess(perm.AccessModeWrite))
- })
- }, reqPackageAccess(perm.AccessModeRead))
r.Group("/generic", func() {
r.Group("/{packagename}/{packageversion}", func() {
r.Delete("", reqPackageAccess(perm.AccessModeWrite), generic.DeletePackage)
diff --git a/routers/api/packages/cargo/cargo.go b/routers/api/packages/cargo/cargo.go
index 18c93d328a..e0bf5da13a 100644
--- a/routers/api/packages/cargo/cargo.go
+++ b/routers/api/packages/cargo/cargo.go
@@ -173,7 +173,7 @@ func UploadPackage(ctx *context.Context) {
return
}
- buf, err := packages_module.CreateHashedBufferFromReader(cp.Content)
+ buf, err := packages_module.CreateHashedBufferFromReader(cp.Content, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/chef/chef.go b/routers/api/packages/chef/chef.go
index b48b1778c4..28d07dea47 100644
--- a/routers/api/packages/chef/chef.go
+++ b/routers/api/packages/chef/chef.go
@@ -263,7 +263,7 @@ func UploadPackage(ctx *context.Context) {
}
defer file.Close()
- buf, err := packages_module.CreateHashedBufferFromReader(file)
+ buf, err := packages_module.CreateHashedBufferFromReader(file, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/composer/composer.go b/routers/api/packages/composer/composer.go
index d93b11efdf..a623952aa7 100644
--- a/routers/api/packages/composer/composer.go
+++ b/routers/api/packages/composer/composer.go
@@ -192,7 +192,7 @@ func DownloadPackageFile(ctx *context.Context) {
// UploadPackage creates a new package
func UploadPackage(ctx *context.Context) {
- buf, err := packages_module.CreateHashedBufferFromReader(ctx.Req.Body)
+ buf, err := packages_module.CreateHashedBufferFromReader(ctx.Req.Body, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go
index caeb8c11bc..d538cc7d39 100644
--- a/routers/api/packages/conan/conan.go
+++ b/routers/api/packages/conan/conan.go
@@ -318,7 +318,7 @@ func uploadFile(ctx *context.Context, fileFilter container.Set[string], fileKey
defer upload.Close()
}
- buf, err := packages_module.CreateHashedBufferFromReader(upload)
+ buf, err := packages_module.CreateHashedBufferFromReader(upload, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
@@ -648,7 +648,10 @@ func deleteRecipeOrPackage(apictx *context.Context, rref *conan_module.RecipeRef
}
for _, pf := range pfs {
- if err := packages_service.DeletePackageFile(ctx, pf); err != nil {
+ if err := packages_model.DeleteAllProperties(ctx, packages_model.PropertyTypeFile, pf.ID); err != nil {
+ return err
+ }
+ if err := packages_model.DeleteFileByID(ctx, pf.ID); err != nil {
return err
}
}
@@ -661,7 +664,11 @@ func deleteRecipeOrPackage(apictx *context.Context, rref *conan_module.RecipeRef
if !has {
versionDeleted = true
- if err := packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil {
+ if err := packages_model.DeleteAllProperties(ctx, packages_model.PropertyTypeVersion, pv.ID); err != nil {
+ return err
+ }
+
+ if err := packages_model.DeleteVersionByID(ctx, pv.ID); err != nil {
return err
}
}
diff --git a/routers/api/packages/conda/conda.go b/routers/api/packages/conda/conda.go
index f778690630..2ff619fed4 100644
--- a/routers/api/packages/conda/conda.go
+++ b/routers/api/packages/conda/conda.go
@@ -183,7 +183,7 @@ func UploadPackageFile(ctx *context.Context) {
defer upload.Close()
}
- buf, err := packages_module.CreateHashedBufferFromReader(upload)
+ buf, err := packages_module.CreateHashedBufferFromReader(upload, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go
index c8e8dd0545..f0457c55e1 100644
--- a/routers/api/packages/container/blob.go
+++ b/routers/api/packages/container/blob.go
@@ -27,6 +27,10 @@ var uploadVersionMutex sync.Mutex
// saveAsPackageBlob creates a package blob from an upload
// The uploaded blob gets stored in a special upload version to link them to the package/image
func saveAsPackageBlob(hsr packages_module.HashedSizeReader, pci *packages_service.PackageCreationInfo) (*packages_model.PackageBlob, error) {
+ if err := packages_service.CheckSizeQuotaExceeded(db.DefaultContext, pci.Creator, pci.Owner, packages_model.TypeContainer, hsr.Size()); err != nil {
+ return nil, err
+ }
+
pb := packages_service.NewPackageBlob(hsr)
exists := false
@@ -39,10 +43,6 @@ func saveAsPackageBlob(hsr packages_module.HashedSizeReader, pci *packages_servi
}
err = db.WithTx(db.DefaultContext, func(ctx context.Context) error {
- if err := packages_service.CheckSizeQuotaExceeded(ctx, pci.Creator, pci.Owner, packages_model.TypeContainer, hsr.Size()); err != nil {
- return err
- }
-
pb, exists, err = packages_model.GetOrInsertBlob(ctx, pb)
if err != nil {
log.Error("Error inserting package blob: %v", err)
diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go
index 63c49809a7..883fe73cbd 100644
--- a/routers/api/packages/container/container.go
+++ b/routers/api/packages/container/container.go
@@ -219,7 +219,7 @@ func InitiateUploadBlob(ctx *context.Context) {
digest := ctx.FormTrim("digest")
if digest != "" {
- buf, err := packages_module.CreateHashedBufferFromReader(ctx.Req.Body)
+ buf, err := packages_module.CreateHashedBufferFromReader(ctx.Req.Body, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
@@ -538,7 +538,7 @@ func UploadManifest(ctx *context.Context) {
}
maxSize := maxManifestSize + 1
- buf, err := packages_module.CreateHashedBufferFromReaderWithSize(&io.LimitedReader{R: ctx.Req.Body, N: int64(maxSize)}, maxSize)
+ buf, err := packages_module.CreateHashedBufferFromReader(&io.LimitedReader{R: ctx.Req.Body, N: int64(maxSize)}, maxSize)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/debian/debian.go b/routers/api/packages/debian/debian.go
deleted file mode 100644
index 3cda04f96f..0000000000
--- a/routers/api/packages/debian/debian.go
+++ /dev/null
@@ -1,317 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package debian
-
-import (
- stdctx "context"
- "errors"
- "fmt"
- "io"
- "net/http"
- "strings"
-
- "code.gitea.io/gitea/models/db"
- packages_model "code.gitea.io/gitea/models/packages"
- "code.gitea.io/gitea/modules/context"
- "code.gitea.io/gitea/modules/notification"
- packages_module "code.gitea.io/gitea/modules/packages"
- debian_module "code.gitea.io/gitea/modules/packages/debian"
- "code.gitea.io/gitea/modules/util"
- "code.gitea.io/gitea/routers/api/packages/helper"
- packages_service "code.gitea.io/gitea/services/packages"
- debian_service "code.gitea.io/gitea/services/packages/debian"
-)
-
-func apiError(ctx *context.Context, status int, obj interface{}) {
- helper.LogAndProcessError(ctx, status, obj, func(message string) {
- ctx.PlainText(status, message)
- })
-}
-
-func GetRepositoryKey(ctx *context.Context) {
- _, pub, err := debian_service.GetOrCreateKeyPair(ctx.Package.Owner.ID)
- if err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
-
- ctx.ServeContent(strings.NewReader(pub), &context.ServeHeaderOptions{
- ContentType: "application/pgp-keys",
- Filename: "repository.key",
- })
-}
-
-// https://wiki.debian.org/DebianRepository/Format#A.22Release.22_files
-// https://wiki.debian.org/DebianRepository/Format#A.22Packages.22_Indices
-func GetRepositoryFile(ctx *context.Context) {
- pv, err := debian_service.GetOrCreateRepositoryVersion(ctx.Package.Owner.ID)
- if err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
-
- key := ctx.Params("distribution")
-
- component := ctx.Params("component")
- architecture := strings.TrimPrefix(ctx.Params("architecture"), "binary-")
- if component != "" && architecture != "" {
- key += "|" + component + "|" + architecture
- }
-
- s, pf, err := packages_service.GetFileStreamByPackageVersion(
- ctx,
- pv,
- &packages_service.PackageFileInfo{
- Filename: ctx.Params("filename"),
- CompositeKey: key,
- },
- )
- if err != nil {
- if err == packages_model.ErrPackageNotExist || err == packages_model.ErrPackageFileNotExist {
- apiError(ctx, http.StatusNotFound, err)
- } else {
- apiError(ctx, http.StatusInternalServerError, err)
- }
- return
- }
- defer s.Close()
-
- ctx.ServeContent(s, &context.ServeHeaderOptions{
- Filename: pf.Name,
- LastModified: pf.CreatedUnix.AsLocalTime(),
- })
-}
-
-// https://wiki.debian.org/DebianRepository/Format#indices_acquisition_via_hashsums_.28by-hash.29
-func GetRepositoryFileByHash(ctx *context.Context) {
- pv, err := debian_service.GetOrCreateRepositoryVersion(ctx.Package.Owner.ID)
- if err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
-
- algorithmn := strings.ToLower(ctx.Params("algorithmn"))
- if algorithmn == "md5sum" {
- algorithmn = "md5"
- }
-
- pfs, _, err := packages_model.SearchFiles(ctx, &packages_model.PackageFileSearchOptions{
- VersionID: pv.ID,
- Hash: strings.ToLower(ctx.Params("hash")),
- HashAlgorithmn: algorithmn,
- })
- if err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
- if len(pfs) != 1 {
- apiError(ctx, http.StatusNotFound, nil)
- return
- }
-
- s, pf, err := packages_service.GetPackageFileStream(ctx, pfs[0])
- if err != nil {
- if errors.Is(err, util.ErrNotExist) {
- apiError(ctx, http.StatusNotFound, err)
- } else {
- apiError(ctx, http.StatusInternalServerError, err)
- }
- return
- }
- defer s.Close()
-
- ctx.ServeContent(s, &context.ServeHeaderOptions{
- Filename: pf.Name,
- LastModified: pf.CreatedUnix.AsLocalTime(),
- })
-}
-
-func UploadPackageFile(ctx *context.Context) {
- distribution := strings.TrimSpace(ctx.Params("distribution"))
- component := strings.TrimSpace(ctx.Params("component"))
- if distribution == "" || component == "" {
- apiError(ctx, http.StatusBadRequest, "invalid distribution or component")
- return
- }
-
- upload, close, err := ctx.UploadStream()
- if err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
- if close {
- defer upload.Close()
- }
-
- buf, err := packages_module.CreateHashedBufferFromReader(upload)
- if err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
- defer buf.Close()
-
- pck, err := debian_module.ParsePackage(buf)
- if err != nil {
- if errors.Is(err, util.ErrInvalidArgument) {
- apiError(ctx, http.StatusBadRequest, err)
- } else {
- apiError(ctx, http.StatusInternalServerError, err)
- }
- return
- }
-
- if _, err := buf.Seek(0, io.SeekStart); err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
-
- _, _, err = packages_service.CreatePackageOrAddFileToExisting(
- &packages_service.PackageCreationInfo{
- PackageInfo: packages_service.PackageInfo{
- Owner: ctx.Package.Owner,
- PackageType: packages_model.TypeDebian,
- Name: pck.Name,
- Version: pck.Version,
- },
- Creator: ctx.Doer,
- Metadata: pck.Metadata,
- },
- &packages_service.PackageFileCreationInfo{
- PackageFileInfo: packages_service.PackageFileInfo{
- Filename: fmt.Sprintf("%s_%s_%s.deb", pck.Name, pck.Version, pck.Architecture),
- CompositeKey: fmt.Sprintf("%s|%s", distribution, component),
- },
- Creator: ctx.Doer,
- Data: buf,
- IsLead: true,
- Properties: map[string]string{
- debian_module.PropertyDistribution: distribution,
- debian_module.PropertyComponent: component,
- debian_module.PropertyArchitecture: pck.Architecture,
- debian_module.PropertyControl: pck.Control,
- },
- },
- )
- if err != nil {
- switch err {
- case packages_model.ErrDuplicatePackageVersion:
- apiError(ctx, http.StatusBadRequest, err)
- case packages_service.ErrQuotaTotalCount, packages_service.ErrQuotaTypeSize, packages_service.ErrQuotaTotalSize:
- apiError(ctx, http.StatusForbidden, err)
- default:
- apiError(ctx, http.StatusInternalServerError, err)
- }
- return
- }
-
- if err := debian_service.BuildSpecificRepositoryFiles(ctx, ctx.Package.Owner.ID, distribution, component, pck.Architecture); err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
-
- ctx.Status(http.StatusCreated)
-}
-
-func DownloadPackageFile(ctx *context.Context) {
- name := ctx.Params("name")
- version := ctx.Params("version")
-
- s, pf, err := packages_service.GetFileStreamByPackageNameAndVersion(
- ctx,
- &packages_service.PackageInfo{
- Owner: ctx.Package.Owner,
- PackageType: packages_model.TypeDebian,
- Name: name,
- Version: version,
- },
- &packages_service.PackageFileInfo{
- Filename: fmt.Sprintf("%s_%s_%s.deb", name, version, ctx.Params("architecture")),
- CompositeKey: fmt.Sprintf("%s|%s", ctx.Params("distribution"), ctx.Params("component")),
- },
- )
- if err != nil {
- if err == packages_model.ErrPackageNotExist || err == packages_model.ErrPackageFileNotExist {
- apiError(ctx, http.StatusNotFound, err)
- } else {
- apiError(ctx, http.StatusInternalServerError, err)
- }
- return
- }
- defer s.Close()
-
- ctx.ServeContent(s, &context.ServeHeaderOptions{
- ContentType: "application/vnd.debian.binary-package",
- Filename: pf.Name,
- LastModified: pf.CreatedUnix.AsLocalTime(),
- })
-}
-
-func DeletePackageFile(ctx *context.Context) {
- distribution := ctx.Params("distribution")
- component := ctx.Params("component")
- name := ctx.Params("name")
- version := ctx.Params("version")
- architecture := ctx.Params("architecture")
-
- owner := ctx.Package.Owner
-
- var pd *packages_model.PackageDescriptor
-
- err := db.WithTx(ctx, func(ctx stdctx.Context) error {
- pv, err := packages_model.GetVersionByNameAndVersion(ctx, owner.ID, packages_model.TypeDebian, name, version)
- if err != nil {
- return err
- }
-
- pf, err := packages_model.GetFileForVersionByName(
- ctx,
- pv.ID,
- fmt.Sprintf("%s_%s_%s.deb", name, version, architecture),
- fmt.Sprintf("%s|%s", distribution, component),
- )
- if err != nil {
- return err
- }
-
- if err := packages_service.DeletePackageFile(ctx, pf); err != nil {
- return err
- }
-
- has, err := packages_model.HasVersionFileReferences(ctx, pv.ID)
- if err != nil {
- return err
- }
- if !has {
- pd, err = packages_model.GetPackageDescriptor(ctx, pv)
- if err != nil {
- return err
- }
-
- if err := packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil {
- return err
- }
- }
-
- return nil
- })
- if err != nil {
- if errors.Is(err, util.ErrNotExist) {
- apiError(ctx, http.StatusNotFound, err)
- } else {
- apiError(ctx, http.StatusInternalServerError, err)
- }
- return
- }
-
- if pd != nil {
- notification.NotifyPackageDelete(ctx, ctx.Doer, pd)
- }
-
- if err := debian_service.BuildSpecificRepositoryFiles(ctx, ctx.Package.Owner.ID, distribution, component, architecture); err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
-
- ctx.Status(http.StatusNoContent)
-}
diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go
index 0c873119ef..5fba02cacd 100644
--- a/routers/api/packages/generic/generic.go
+++ b/routers/api/packages/generic/generic.go
@@ -84,7 +84,7 @@ func UploadPackage(ctx *context.Context) {
defer upload.Close()
}
- buf, err := packages_module.CreateHashedBufferFromReader(upload)
+ buf, err := packages_module.CreateHashedBufferFromReader(upload, 32*1024*1024)
if err != nil {
log.Error("Error creating hashed buffer: %v", err)
apiError(ctx, http.StatusInternalServerError, err)
diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go
index b7edc8b7fe..3bcce6bdf5 100644
--- a/routers/api/packages/helm/helm.go
+++ b/routers/api/packages/helm/helm.go
@@ -155,7 +155,7 @@ func UploadPackage(ctx *context.Context) {
defer upload.Close()
}
- buf, err := packages_module.CreateHashedBufferFromReader(upload)
+ buf, err := packages_module.CreateHashedBufferFromReader(upload, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go
index dd270ff0ed..a3a23ecfa8 100644
--- a/routers/api/packages/maven/maven.go
+++ b/routers/api/packages/maven/maven.go
@@ -245,7 +245,7 @@ func UploadPackageFile(ctx *context.Context) {
packageName := params.GroupID + "-" + params.ArtifactID
- buf, err := packages_module.CreateHashedBufferFromReader(ctx.Req.Body)
+ buf, err := packages_module.CreateHashedBufferFromReader(ctx.Req.Body, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go
index 89476a776a..51b34d3e27 100644
--- a/routers/api/packages/npm/npm.go
+++ b/routers/api/packages/npm/npm.go
@@ -189,7 +189,7 @@ func UploadPackage(ctx *context.Context) {
}
}
- buf, err := packages_module.CreateHashedBufferFromReader(bytes.NewReader(npmPackage.Data))
+ buf, err := packages_module.CreateHashedBufferFromReader(bytes.NewReader(npmPackage.Data), 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go
index f6143ce291..3418bf9959 100644
--- a/routers/api/packages/nuget/nuget.go
+++ b/routers/api/packages/nuget/nuget.go
@@ -475,7 +475,7 @@ func UploadSymbolPackage(ctx *context.Context) {
Version: np.Version,
}
- _, err = packages_service.AddFileToExistingPackage(
+ _, _, err = packages_service.AddFileToExistingPackage(
pi,
&packages_service.PackageFileCreationInfo{
PackageFileInfo: packages_service.PackageFileInfo{
@@ -501,7 +501,7 @@ func UploadSymbolPackage(ctx *context.Context) {
}
for _, pdb := range pdbs {
- _, err := packages_service.AddFileToExistingPackage(
+ _, _, err := packages_service.AddFileToExistingPackage(
pi,
&packages_service.PackageFileCreationInfo{
PackageFileInfo: packages_service.PackageFileInfo{
@@ -545,7 +545,7 @@ func processUploadedFile(ctx *context.Context, expectedType nuget_module.Package
closables = append(closables, upload)
}
- buf, err := packages_module.CreateHashedBufferFromReader(upload)
+ buf, err := packages_module.CreateHashedBufferFromReader(upload, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return nil, nil, closables
diff --git a/routers/api/packages/pub/pub.go b/routers/api/packages/pub/pub.go
index ae0c6e7859..1ece4e18ed 100644
--- a/routers/api/packages/pub/pub.go
+++ b/routers/api/packages/pub/pub.go
@@ -166,7 +166,7 @@ func UploadPackageFile(ctx *context.Context) {
}
defer file.Close()
- buf, err := packages_module.CreateHashedBufferFromReader(file)
+ buf, err := packages_module.CreateHashedBufferFromReader(file, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/pypi/pypi.go b/routers/api/packages/pypi/pypi.go
index 90a37ec2a8..2f71801a8f 100644
--- a/routers/api/packages/pypi/pypi.go
+++ b/routers/api/packages/pypi/pypi.go
@@ -117,7 +117,7 @@ func UploadPackageFile(ctx *context.Context) {
}
defer file.Close()
- buf, err := packages_module.CreateHashedBufferFromReader(file)
+ buf, err := packages_module.CreateHashedBufferFromReader(file, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go
index 740efa9bab..af358fb82f 100644
--- a/routers/api/packages/rubygems/rubygems.go
+++ b/routers/api/packages/rubygems/rubygems.go
@@ -209,7 +209,7 @@ func UploadPackageFile(ctx *context.Context) {
defer upload.Close()
}
- buf, err := packages_module.CreateHashedBufferFromReader(upload)
+ buf, err := packages_module.CreateHashedBufferFromReader(upload, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/swift/swift.go b/routers/api/packages/swift/swift.go
index 06f592dd64..f78f703778 100644
--- a/routers/api/packages/swift/swift.go
+++ b/routers/api/packages/swift/swift.go
@@ -300,7 +300,7 @@ func UploadPackageFile(ctx *context.Context) {
}
defer file.Close()
- buf, err := packages_module.CreateHashedBufferFromReader(file)
+ buf, err := packages_module.CreateHashedBufferFromReader(file, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/packages/vagrant/vagrant.go b/routers/api/packages/vagrant/vagrant.go
index cefdc45b10..7b76ab79b0 100644
--- a/routers/api/packages/vagrant/vagrant.go
+++ b/routers/api/packages/vagrant/vagrant.go
@@ -158,7 +158,7 @@ func UploadPackageFile(ctx *context.Context) {
defer upload.Close()
}
- buf, err := packages_module.CreateHashedBufferFromReader(upload)
+ buf, err := packages_module.CreateHashedBufferFromReader(upload, 32*1024*1024)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
diff --git a/routers/api/v1/packages/package.go b/routers/api/v1/packages/package.go
index ac48eb8a53..200dc5aaf1 100644
--- a/routers/api/v1/packages/package.go
+++ b/routers/api/v1/packages/package.go
@@ -40,7 +40,7 @@ func ListPackages(ctx *context.APIContext) {
// in: query
// description: package type filter
// type: string
- // enum: [cargo, chef, composer, conan, conda, container, debian, generic, helm, maven, npm, nuget, pub, pypi, rubygems, swift, vagrant]
+ // enum: [cargo, chef, composer, conan, conda, container, generic, helm, maven, npm, nuget, pub, pypi, rubygems, swift, vagrant]
// - name: q
// in: query
// description: name filter
diff --git a/routers/web/user/package.go b/routers/web/user/package.go
index 37ee0b8631..a9acc5281f 100644
--- a/routers/web/user/package.go
+++ b/routers/web/user/package.go
@@ -14,10 +14,8 @@ import (
access_model "code.gitea.io/gitea/models/perm/access"
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/modules/base"
- "code.gitea.io/gitea/modules/container"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
- debian_module "code.gitea.io/gitea/modules/packages/debian"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web"
@@ -165,32 +163,6 @@ func ViewPackageVersion(ctx *context.Context) {
ctx.Data["IsPackagesPage"] = true
ctx.Data["PackageDescriptor"] = pd
- switch pd.Package.Type {
- case packages_model.TypeContainer:
- ctx.Data["RegistryHost"] = setting.Packages.RegistryHost
- case packages_model.TypeDebian:
- distributions := make(container.Set[string])
- components := make(container.Set[string])
- architectures := make(container.Set[string])
-
- for _, f := range pd.Files {
- for _, pp := range f.Properties {
- switch pp.Name {
- case debian_module.PropertyDistribution:
- distributions.Add(pp.Value)
- case debian_module.PropertyComponent:
- components.Add(pp.Value)
- case debian_module.PropertyArchitecture:
- architectures.Add(pp.Value)
- }
- }
- }
-
- ctx.Data["Distributions"] = distributions.Values()
- ctx.Data["Components"] = components.Values()
- ctx.Data["Architectures"] = architectures.Values()
- }
-
var (
total int64
pvs []*packages_model.PackageVersion
@@ -198,6 +170,8 @@ func ViewPackageVersion(ctx *context.Context) {
)
switch pd.Package.Type {
case packages_model.TypeContainer:
+ ctx.Data["RegistryHost"] = setting.Packages.RegistryHost
+
pvs, total, err = container_model.SearchImageTags(ctx, &container_model.ImageTagsSearchOptions{
Paginator: db.NewAbsoluteListOptions(0, 5),
PackageID: pd.Package.ID,
@@ -209,6 +183,10 @@ func ViewPackageVersion(ctx *context.Context) {
PackageID: pd.Package.ID,
IsInternal: util.OptionalBoolFalse,
})
+ if err != nil {
+ ctx.ServerError("SearchVersions", err)
+ return
+ }
}
if err != nil {
ctx.ServerError("", err)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 13:21:22 +0000