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> Co-authored-by: Gergely Nagy <algernon@users.noreply.github.com>
This commit is contained in:
parent
4b53a5c3a1
commit
ae86a0bc9f
3 changed files with 7 additions and 10 deletions
|
@ -37,7 +37,7 @@ PUT https://gitea.example.com/api/packages/{owner}/generic/{package_name}/{packa
|
||||||
| ----------------- | ----------- |
|
| ----------------- | ----------- |
|
||||||
| `owner` | The owner of the package. |
|
| `owner` | The owner of the package. |
|
||||||
| `package_name` | The package name. It can contain only lowercase letters (`a-z`), uppercase letter (`A-Z`), numbers (`0-9`), dots (`.`), hyphens (`-`), or underscores (`_`). |
|
| `package_name` | The package name. It can contain only lowercase letters (`a-z`), uppercase letter (`A-Z`), numbers (`0-9`), dots (`.`), hyphens (`-`), or underscores (`_`). |
|
||||||
| `package_version` | The package version as described in the [SemVer](https://semver.org/) spec. |
|
| `package_version` | The package version, a non-empty string. |
|
||||||
| `file_name` | The filename. It can contain only lowercase letters (`a-z`), uppercase letter (`A-Z`), numbers (`0-9`), dots (`.`), hyphens (`-`), or underscores (`_`). |
|
| `file_name` | The filename. It can contain only lowercase letters (`a-z`), uppercase letter (`A-Z`), numbers (`0-9`), dots (`.`), hyphens (`-`), or underscores (`_`). |
|
||||||
|
|
||||||
Example request using HTTP Basic authentication:
|
Example request using HTTP Basic authentication:
|
||||||
|
|
|
@ -42,7 +42,6 @@ func TestPackageGeneric(t *testing.T) {
|
||||||
|
|
||||||
pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0])
|
pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0])
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.NotNil(t, pd.SemVer)
|
|
||||||
assert.Nil(t, pd.Metadata)
|
assert.Nil(t, pd.Metadata)
|
||||||
assert.Equal(t, packageName, pd.Package.Name)
|
assert.Equal(t, packageName, pd.Package.Name)
|
||||||
assert.Equal(t, packageVersion, pd.Version.Version)
|
assert.Equal(t, packageVersion, pd.Version.Version)
|
||||||
|
|
|
@ -8,6 +8,7 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
|
||||||
packages_model "code.gitea.io/gitea/models/packages"
|
packages_model "code.gitea.io/gitea/models/packages"
|
||||||
"code.gitea.io/gitea/modules/context"
|
"code.gitea.io/gitea/modules/context"
|
||||||
|
@ -15,8 +16,6 @@ import (
|
||||||
packages_module "code.gitea.io/gitea/modules/packages"
|
packages_module "code.gitea.io/gitea/modules/packages"
|
||||||
"code.gitea.io/gitea/routers/api/packages/helper"
|
"code.gitea.io/gitea/routers/api/packages/helper"
|
||||||
packages_service "code.gitea.io/gitea/services/packages"
|
packages_service "code.gitea.io/gitea/services/packages"
|
||||||
|
|
||||||
"github.com/hashicorp/go-version"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -97,7 +96,6 @@ func UploadPackage(ctx *context.Context) {
|
||||||
Name: packageName,
|
Name: packageName,
|
||||||
Version: packageVersion,
|
Version: packageVersion,
|
||||||
},
|
},
|
||||||
SemverCompatible: true,
|
|
||||||
Creator: ctx.Doer,
|
Creator: ctx.Doer,
|
||||||
},
|
},
|
||||||
&packages_service.PackageFileCreationInfo{
|
&packages_service.PackageFileCreationInfo{
|
||||||
|
@ -157,10 +155,10 @@ func sanitizeParameters(ctx *context.Context) (string, string, string, error) {
|
||||||
return "", "", "", errors.New("Invalid package name or filename")
|
return "", "", "", errors.New("Invalid package name or filename")
|
||||||
}
|
}
|
||||||
|
|
||||||
v, err := version.NewSemver(ctx.Params("packageversion"))
|
packageVersion := strings.TrimSpace(ctx.Params("packageversion"))
|
||||||
if err != nil {
|
if packageVersion == "" {
|
||||||
return "", "", "", err
|
return "", "", "", errors.New("Invalid package version")
|
||||||
}
|
}
|
||||||
|
|
||||||
return packageName, v.String(), filename, nil
|
return packageName, packageVersion, filename, nil
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue