aboutsummaryrefslogtreecommitdiffstats
path: root/routers/api/packages/generic
diff options
context:
space:
mode:
authorGergely Nagy <algernon@users.noreply.github.com>2022-07-29 00:09:54 +0200
committerGitHub <noreply@github.com>2022-07-29 00:09:54 +0200
commit99f2f826ce27bb3b9f64c8c989e3ae1f453b1634 (patch)
treeee8361f6454e630d53179fa878e327eb2b1981da /routers/api/packages/generic
parentc9c5bd88beb30b06cf52444e6515ef4c7d75993f (diff)
downloadgitea-99f2f826ce27bb3b9f64c8c989e3ae1f453b1634.tar.gz
gitea-99f2f826ce27bb3b9f64c8c989e3ae1f453b1634.zip
packages/generic: Do not restrict package versions to SemVer (#20414)
There are existing packages out there whose version do not conform to SemVer, yet, one would like to have them available in a generic package repository. To this end, remove the SemVer restriction on package versions when using the Generic package registry, and replace it with a check that simply makes sure the version isn't empty. Signed-off-by: Gergely Nagy <me@gergo.csillger.hu> Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'routers/api/packages/generic')
-rw-r--r--routers/api/packages/generic/generic.go14
1 files changed, 6 insertions, 8 deletions
diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go
index d862f77259..9a3a185d9d 100644
--- a/routers/api/packages/generic/generic.go
+++ b/routers/api/packages/generic/generic.go
@@ -8,6 +8,7 @@ import (
"errors"
"net/http"
"regexp"
+ "strings"
packages_model "code.gitea.io/gitea/models/packages"
"code.gitea.io/gitea/modules/context"
@@ -15,8 +16,6 @@ import (
packages_module "code.gitea.io/gitea/modules/packages"
"code.gitea.io/gitea/routers/api/packages/helper"
packages_service "code.gitea.io/gitea/services/packages"
-
- "github.com/hashicorp/go-version"
)
var (
@@ -97,8 +96,7 @@ func UploadPackage(ctx *context.Context) {
Name: packageName,
Version: packageVersion,
},
- SemverCompatible: true,
- Creator: ctx.Doer,
+ Creator: ctx.Doer,
},
&packages_service.PackageFileCreationInfo{
PackageFileInfo: packages_service.PackageFileInfo{
@@ -157,10 +155,10 @@ func sanitizeParameters(ctx *context.Context) (string, string, string, error) {
return "", "", "", errors.New("Invalid package name or filename")
}
- v, err := version.NewSemver(ctx.Params("packageversion"))
- if err != nil {
- return "", "", "", err
+ packageVersion := strings.TrimSpace(ctx.Params("packageversion"))
+ if packageVersion == "" {
+ return "", "", "", errors.New("Invalid package version")
}
- return packageName, v.String(), filename, nil
+ return packageName, packageVersion, filename, nil
}