Add uploading packages through the Web UI

routers/web/repo/packages.go

@@ -4,6 +4,7 @@
 package repo
 
 import (
+	"fmt"
 	"net/http"
 
 	"code.gitea.io/gitea/models/db"
@@ -64,6 +65,9 @@ func Packages(ctx *context.Context) {
 	ctx.Data["HasPackages"] = hasPackages
 	if ctx.Repo != nil {
 		ctx.Data["CanWritePackages"] = ctx.IsUserRepoWriter([]unit.Type{unit.TypePackages}) || ctx.IsUserSiteAdmin()
+		ctx.Data["ShowPackageUploadButton"] = ctx.Data["CanWritePackages"]
+		ctx.Data["PackageUploadUrl"] = fmt.Sprintf("%s/-/packages/upload", ctx.Repo.Owner.HTMLURL())
+		ctx.Data["PackageUploadRepo"] = ctx.Repo.Repository.Name
 	}
 	ctx.Data["PackageDescriptors"] = pds
 	ctx.Data["Total"] = total

routers/web/shared/packages/upload.go

@@ -0,0 +1,209 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package packages
+
+import (
+	"errors"
+	"fmt"
+	"io"
+
+	packages_model "code.gitea.io/gitea/models/packages"
+	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/modules/context"
+	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/modules/web"
+	"code.gitea.io/gitea/services/forms"
+	packages_service "code.gitea.io/gitea/services/packages"
+	debian_service "code.gitea.io/gitea/services/packages/debian"
+)
+
+func servePackageUploadError(ctx *context.Context, err error, packageType, repo string) {
+	ctx.Flash.Error(err.Error())
+
+	if repo == "" {
+		ctx.Redirect(fmt.Sprintf("%s/-/packages/upload/%s", ctx.ContextUser.HTMLURL(), packageType))
+	} else {
+		ctx.Redirect(fmt.Sprintf("%s/-/packages/upload/%s?repo=%s", ctx.ContextUser.HTMLURL(), packageType, repo))
+	}
+}
+
+func addRepoToUploadedPackage(ctx *context.Context, packageType, repoName string, packageID int64) bool {
+	repo, err := repo_model.GetRepositoryByOwnerAndName(ctx, ctx.ContextUser.Name, repoName)
+	if err != nil {
+		if repo_model.IsErrRepoNotExist(err) {
+			servePackageUploadError(ctx, fmt.Errorf("repo not found"), packageType, repoName)
+			return false
+		}
+
+		ctx.ServerError("GetRepositoryByOwnerAndName", err)
+		return false
+	}
+
+	err = packages_model.SetRepositoryLink(ctx, packageID, repo.ID)
+	if err != nil {
+		ctx.ServerError("SetRepositoryLink", err)
+		return false
+	}
+
+	return true
+}
+
+func UploadGenericPackagePost(ctx *context.Context) {
+	form := web.GetForm(ctx).(*forms.PackageUploadGenericForm)
+	upload, err := form.PackageFile.Open()
+	if err != nil {
+		ctx.ServerError("GetPackageFile", err)
+		return
+	}
+
+	buf, err := packages_module.CreateHashedBufferFromReader(upload)
+	if err != nil {
+		ctx.ServerError("CreateHashedBufferFromReader", err)
+		return
+	}
+	defer buf.Close()
+
+	var filename string
+	if form.PackageFilename == "" {
+		filename = form.PackageFile.Filename
+	} else {
+		filename = form.PackageFilename
+	}
+
+	pv, _, err := packages_service.CreatePackageOrAddFileToExisting(
+		&packages_service.PackageCreationInfo{
+			PackageInfo: packages_service.PackageInfo{
+				Owner:       ctx.Package.Owner,
+				PackageType: packages_model.TypeGeneric,
+				Name:        form.PackageName,
+				Version:     form.PackageVersion,
+			},
+			Creator: ctx.Doer,
+		},
+		&packages_service.PackageFileCreationInfo{
+			PackageFileInfo: packages_service.PackageFileInfo{
+				Filename: filename,
+			},
+			Creator: ctx.Doer,
+			Data:    buf,
+			IsLead:  true,
+		},
+	)
+	if err != nil {
+		switch err {
+		case packages_model.ErrDuplicatePackageFile:
+			servePackageUploadError(ctx, err, "generic", form.PackageRepo)
+		case packages_service.ErrQuotaTotalCount, packages_service.ErrQuotaTypeSize, packages_service.ErrQuotaTotalSize:
+			servePackageUploadError(ctx, err, "generic", form.PackageRepo)
+		default:
+			ctx.ServerError("CreatePackageOrAddFileToExisting", err)
+		}
+		return
+	}
+
+	if form.PackageRepo != "" {
+		if !addRepoToUploadedPackage(ctx, "generic", form.PackageRepo, pv.PackageID) {
+			return
+		}
+	}
+
+	pd, err := packages_model.GetPackageDescriptor(ctx, pv)
+	if err != nil {
+		ctx.ServerError("GetPackageDescriptor", err)
+		return
+	}
+
+	ctx.Redirect(pd.FullWebLink())
+}
+
+func UploadDebianPackagePost(ctx *context.Context) {
+	form := web.GetForm(ctx).(*forms.PackageUploadDebianForm)
+	upload, err := form.PackageFile.Open()
+	if err != nil {
+		ctx.ServerError("GetPackageFile", err)
+		return
+	}
+
+	buf, err := packages_module.CreateHashedBufferFromReader(upload)
+	if err != nil {
+		ctx.ServerError("GetGenericPackageFile", err)
+		return
+	}
+	defer buf.Close()
+
+	pck, err := debian_module.ParsePackage(buf)
+	if err != nil {
+		if errors.Is(err, util.ErrInvalidArgument) {
+			servePackageUploadError(ctx, err, "debian", form.PackageRepo)
+		} else {
+			ctx.ServerError("ParsePackage", err)
+		}
+		return
+	}
+
+	if _, err := buf.Seek(0, io.SeekStart); err != nil {
+		ctx.ServerError("SeekBuffer", err)
+		return
+	}
+
+	pv, _, 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", form.PackageDistribution, form.PackageComponent),
+			},
+			Creator: ctx.Doer,
+			Data:    buf,
+			IsLead:  true,
+			Properties: map[string]string{
+				debian_module.PropertyDistribution: form.PackageDistribution,
+				debian_module.PropertyComponent:    form.PackageComponent,
+				debian_module.PropertyArchitecture: pck.Architecture,
+				debian_module.PropertyControl:      pck.Control,
+			},
+		},
+	)
+	if err != nil {
+		switch err {
+		case packages_model.ErrDuplicatePackageVersion, packages_model.ErrDuplicatePackageFile:
+			servePackageUploadError(ctx, err, "debian", form.PackageRepo)
+		case packages_service.ErrQuotaTotalCount, packages_service.ErrQuotaTypeSize, packages_service.ErrQuotaTotalSize:
+			servePackageUploadError(ctx, err, "debian", form.PackageRepo)
+		default:
+			ctx.ServerError("CreatePackageOrAddFileToExisting", err)
+		}
+		return
+	}
+
+	if err := debian_service.BuildSpecificRepositoryFiles(ctx, ctx.Package.Owner.ID, form.PackageDistribution, form.PackageComponent, pck.Architecture); err != nil {
+		ctx.ServerError("BuildSpecificRepositoryFiles", err)
+		return
+	}
+
+	if form.PackageRepo != "" {
+		if !addRepoToUploadedPackage(ctx, "debian", form.PackageRepo, pv.PackageID) {
+			return
+		}
+	}
+
+	pd, err := packages_model.GetPackageDescriptor(ctx, pv)
+	if err != nil {
+		ctx.ServerError("GetPackageDescriptor", err)
+		return
+	}
+
+	ctx.Redirect(pd.FullWebLink())
+}

routers/web/user/package.go

@@ -4,7 +4,9 @@
 package user
 
 import (
+	"fmt"
 	"net/http"
+	"slices"
 
 	"code.gitea.io/gitea/models/db"
 	org_model "code.gitea.io/gitea/models/organization"
@@ -33,6 +35,7 @@ const (
 	tplPackagesView       base.TplName = "package/view"
 	tplPackageVersionList base.TplName = "user/overview/package_versions"
 	tplPackagesSettings   base.TplName = "package/settings"
+	tplPackageUpload      base.TplName = "user/overview/package_upload"
 )
 
 // ListPackages displays a list of all packages of the context user
@@ -100,6 +103,7 @@ func ListPackages(ctx *context.Context) {
 	ctx.Data["PackageDescriptors"] = pds
 	ctx.Data["Total"] = total
 	ctx.Data["RepositoryAccessMap"] = repositoryAccessMap
+	ctx.Data["PackageUploadUrl"] = fmt.Sprintf("%s/-/packages/upload", ctx.ContextUser.HTMLURL())
 
 	err = shared_user.LoadHeaderCount(ctx)
 	if err != nil {
@@ -116,10 +120,16 @@ func ListPackages(ctx *context.Context) {
 		if ctx.Doer != nil {
 			ctx.Data["IsOrganizationMember"], _ = org_model.IsOrganizationMember(ctx, org.ID, ctx.Doer.ID)
 			ctx.Data["IsOrganizationOwner"], _ = org_model.IsOrganizationOwner(ctx, org.ID, ctx.Doer.ID)
+			ctx.Data["ShowPackageUploadButton"] = ctx.Data["IsOrganizationMember"]
 		} else {
 			ctx.Data["IsOrganizationMember"] = false
 			ctx.Data["IsOrganizationOwner"] = false
+			ctx.Data["ShowPackageUploadButton"] = false
 		}
+	} else if ctx.Doer != nil {
+		ctx.Data["ShowPackageUploadButton"] = ctx.Doer.ID == ctx.ContextUser.ID
+	} else {
+		ctx.Data["ShowPackageUploadButton"] = false
 	}
 
 	pager := context.NewPagination(int(total), setting.UI.PackagesPagingNum, page, 5)
@@ -478,3 +488,44 @@ func DownloadPackageFile(ctx *context.Context) {
 
 	packages_helper.ServePackageFile(ctx, s, u, pf)
 }
+
+func UploadPackageChoose(ctx *context.Context) {
+	shared_user.PrepareContextForProfileBigAvatar(ctx)
+
+	ctx.Data["IsPackagesPage"] = true
+	ctx.Data["PackageUploadPage"] = "choose"
+	ctx.Data["PackageUploadRepo"] = ctx.FormString("repo")
+
+	err := shared_user.LoadHeaderCount(ctx)
+	if err != nil {
+		ctx.ServerError("LoadHeaderCount", err)
+		return
+	}
+
+	ctx.HTML(http.StatusOK, tplPackageUpload)
+}
+
+func UploadPackagePage(ctx *context.Context) {
+	shared_user.PrepareContextForProfileBigAvatar(ctx)
+
+	packageType := ctx.Params("upload_type")
+
+	allowdTypes := []string{"generic", "debian"}
+
+	if !slices.Contains(allowdTypes, packageType) {
+		ctx.NotFound("", nil)
+		return
+	}
+
+	ctx.Data["IsPackagesPage"] = true
+	ctx.Data["PackageUploadPage"] = packageType
+	ctx.Data["PackageUploadRepo"] = ctx.FormString("repo")
+
+	err := shared_user.LoadHeaderCount(ctx)
+	if err != nil {
+		ctx.ServerError("LoadHeaderCount", err)
+		return
+	}
+
+	ctx.HTML(http.StatusOK, tplPackageUpload)
+}

routers/web/web.go

@@ -34,6 +34,7 @@ import (
 	"code.gitea.io/gitea/routers/web/repo"
 	"code.gitea.io/gitea/routers/web/repo/actions"
 	repo_setting "code.gitea.io/gitea/routers/web/repo/setting"
+	"code.gitea.io/gitea/routers/web/shared/packages"
 	"code.gitea.io/gitea/routers/web/user"
 	user_setting "code.gitea.io/gitea/routers/web/user/setting"
 	"code.gitea.io/gitea/routers/web/user/setting/security"
@@ -828,6 +829,12 @@ func registerRoutes(m *web.Route) {
 						}, reqPackageAccess(perm.AccessModeWrite))
 					})
 				})
+				m.Group("/upload", func() {
+					m.Get("", user.UploadPackageChoose)
+					m.Get("/{upload_type}", user.UploadPackagePage)
+					m.Post("/generic/upload", web.Bind(forms.PackageUploadGenericForm{}), packages.UploadGenericPackagePost)
+					m.Post("/debian/upload", web.Bind(forms.PackageUploadDebianForm{}), packages.UploadDebianPackagePost)
+				}, reqPackageAccess(perm.AccessModeWrite))
 			}, context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
 		}
 

services/forms/package_form.go

@@ -4,6 +4,7 @@
 package forms
 
 import (
+	"mime/multipart"
 	"net/http"
 
 	"code.gitea.io/gitea/modules/context"
@@ -28,3 +29,18 @@ func (f *PackageCleanupRuleForm) Validate(req *http.Request, errs binding.Errors
 	ctx := context.GetValidateContext(req)
 	return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
 }
+
+type PackageUploadGenericForm struct {
+	PackageRepo     string
+	PackageName     string
+	PackageVersion  string
+	PackageFilename string
+	PackageFile     *multipart.FileHeader
+}
+
+type PackageUploadDebianForm struct {
+	PackageRepo         string
+	PackageDistribution string
+	PackageComponent    string
+	PackageFile         *multipart.FileHeader
+}

templates/package/shared/list.tmpl

@@ -10,6 +10,9 @@
 			{{end}}
 		</select>
 		<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+		{{if .ShowPackageUploadButton}}
+			<a class="ui green button" href="{{.PackageUploadUrl}}{{if .PackageUploadRepo}}?repo={{.PackageUploadRepo}}{{end}}">Upload</a>
+		{{end}}
 	</div>
 </form>
 <div>

templates/package/upload/base.tmpl

@@ -0,0 +1,7 @@
+{{if eq $.PackageUploadPage "choose"}}
+  {{template "package/upload/choose" .}}
+{{else if eq $.PackageUploadPage "generic"}}
+  {{template "package/upload/generic" .}}
+{{else if eq $.PackageUploadPage "debian"}}
+  {{template "package/upload/debian" .}}
+{{end}}

templates/package/upload/choose.tmpl

@@ -0,0 +1,12 @@
+<table class="ui very basic table gt-mt-0 gt-px-4">
+	<tbody>
+		<tr>
+			<td>Generic</td>
+			<td class="text right"><a class="ui green button" href="{{.Link}}/generic{{if .PackageUploadRepo}}?repo={{.PackageUploadRepo}}{{end}}">Upload</a></td>
+		</tr>
+		<tr>
+			<td>Debian</td>
+			<td class="text right"><a class="ui green button" href="{{.Link}}/debian{{if .PackageUploadRepo}}?repo={{.PackageUploadRepo}}{{end}}">Upload</a></td>
+		</tr>
+	</tbody>
+</table>