mirror of
https://github.com/go-gitea/gitea
synced 2025-07-28 05:08:37 +00:00
Improve nuget/rubygems package registries (#34741)
1. Add some missing (optional) fields for nuget v2, and sort the fields to make it easier to maintain 2. Add missing "platform" for rubygems: `VERSION-PLATFORM` and `VERSION_PLATFORM` Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
@@ -18,7 +18,6 @@ import (
|
||||
auth_model "code.gitea.io/gitea/models/auth"
|
||||
"code.gitea.io/gitea/models/db"
|
||||
packages_model "code.gitea.io/gitea/models/packages"
|
||||
container_model "code.gitea.io/gitea/models/packages/container"
|
||||
"code.gitea.io/gitea/models/unittest"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
container_module "code.gitea.io/gitea/modules/packages/container"
|
||||
@@ -71,8 +70,8 @@ func TestPackageContainer(t *testing.T) {
|
||||
configContent := `{"architecture":"amd64","config":{"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":["/true"],"ArgsEscaped":true,"Image":"sha256:9bd8b88dc68b80cffe126cc820e4b52c6e558eb3b37680bfee8e5f3ed7b8c257"},"container":"b89fe92a887d55c0961f02bdfbfd8ac3ddf66167db374770d2d9e9fab3311510","container_config":{"Hostname":"b89fe92a887d","Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":["/bin/sh","-c","#(nop) ","CMD [\"/true\"]"],"ArgsEscaped":true,"Image":"sha256:9bd8b88dc68b80cffe126cc820e4b52c6e558eb3b37680bfee8e5f3ed7b8c257"},"created":"2022-01-01T00:00:00.000000000Z","docker_version":"20.10.12","history":[{"created":"2022-01-01T00:00:00.000000000Z","created_by":"/bin/sh -c #(nop) COPY file:0e7589b0c800daaf6fa460d2677101e4676dd9491980210cb345480e513f3602 in /true "},{"created":"2022-01-01T00:00:00.000000001Z","created_by":"/bin/sh -c #(nop) CMD [\"/true\"]","empty_layer":true}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:0ff3b91bdf21ecdf2f2f3d4372c2098a14dbe06cd678e8f0a85fd4902d00e2e2"]}}`
|
||||
|
||||
manifestDigest := "sha256:4f10484d1c1bb13e3956b4de1cd42db8e0f14a75be1617b60f2de3cd59c803c6"
|
||||
manifestContent := `{"schemaVersion":2,"mediaType":"` + container_model.ContentTypeDockerDistributionManifestV2 + `","config":{"mediaType":"application/vnd.docker.container.image.v1+json","digest":"sha256:4607e093bec406eaadb6f3a340f63400c9d3a7038680744c406903766b938f0d","size":1069},"layers":[{"mediaType":"application/vnd.docker.image.rootfs.diff.tar.gzip","digest":"sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4","size":32}]}`
|
||||
manifestContentType := container_model.ContentTypeDockerDistributionManifestV2
|
||||
manifestContent := `{"schemaVersion":2,"mediaType":"` + container_module.ContentTypeDockerDistributionManifestV2 + `","config":{"mediaType":"application/vnd.docker.container.image.v1+json","digest":"sha256:4607e093bec406eaadb6f3a340f63400c9d3a7038680744c406903766b938f0d","size":1069},"layers":[{"mediaType":"application/vnd.docker.image.rootfs.diff.tar.gzip","digest":"sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4","size":32}]}`
|
||||
manifestContentType := container_module.ContentTypeDockerDistributionManifestV2
|
||||
|
||||
untaggedManifestDigest := "sha256:4305f5f5572b9a426b88909b036e52ee3cf3d7b9c1b01fac840e90747f56623d"
|
||||
untaggedManifestContent := `{"schemaVersion":2,"mediaType":"` + oci.MediaTypeImageManifest + `","config":{"mediaType":"application/vnd.docker.container.image.v1+json","digest":"sha256:4607e093bec406eaadb6f3a340f63400c9d3a7038680744c406903766b938f0d","size":1069},"layers":[{"mediaType":"application/vnd.docker.image.rootfs.diff.tar.gzip","digest":"sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4","size":32}]}`
|
||||
@@ -252,7 +251,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
assert.Equal(t, fmt.Sprintf("/v2/%s/%s/blobs/%s", user.Name, image, blobDigest), resp.Header().Get("Location"))
|
||||
assert.Equal(t, blobDigest, resp.Header().Get("Docker-Content-Digest"))
|
||||
|
||||
pv, err := packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, container_model.UploadVersion)
|
||||
pv, err := packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, container_module.UploadVersion)
|
||||
assert.NoError(t, err)
|
||||
|
||||
pfs, err := packages_model.GetFilesByVersionID(db.DefaultContext, pv.ID)
|
||||
@@ -432,7 +431,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
assert.Len(t, pd.Files, 3)
|
||||
for _, pfd := range pd.Files {
|
||||
switch pfd.File.Name {
|
||||
case container_model.ManifestFilename:
|
||||
case container_module.ManifestFilename:
|
||||
assert.True(t, pfd.File.IsLead)
|
||||
assert.Equal(t, "application/vnd.docker.distribution.manifest.v2+json", pfd.Properties.GetByName(container_module.PropertyMediaType))
|
||||
assert.Equal(t, manifestDigest, pfd.Properties.GetByName(container_module.PropertyDigest))
|
||||
@@ -534,7 +533,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
|
||||
assert.Len(t, pd.Files, 3)
|
||||
for _, pfd := range pd.Files {
|
||||
if pfd.File.Name == container_model.ManifestFilename {
|
||||
if pfd.File.Name == container_module.ManifestFilename {
|
||||
assert.True(t, pfd.File.IsLead)
|
||||
assert.Equal(t, oci.MediaTypeImageManifest, pfd.Properties.GetByName(container_module.PropertyMediaType))
|
||||
assert.Equal(t, untaggedManifestDigest, pfd.Properties.GetByName(container_module.PropertyDigest))
|
||||
|
@@ -46,21 +46,30 @@ func TestPackageNuGet(t *testing.T) {
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
|
||||
type FeedEntryProperties struct {
|
||||
Version string `xml:"Version"`
|
||||
NormalizedVersion string `xml:"NormalizedVersion"`
|
||||
Authors string `xml:"Authors"`
|
||||
Copyright string `xml:"Copyright,omitempty"`
|
||||
Created nuget.TypedValue[time.Time] `xml:"Created"`
|
||||
Dependencies string `xml:"Dependencies"`
|
||||
Description string `xml:"Description"`
|
||||
VersionDownloadCount nuget.TypedValue[int64] `xml:"VersionDownloadCount"`
|
||||
DevelopmentDependency nuget.TypedValue[bool] `xml:"DevelopmentDependency"`
|
||||
DownloadCount nuget.TypedValue[int64] `xml:"DownloadCount"`
|
||||
PackageSize nuget.TypedValue[int64] `xml:"PackageSize"`
|
||||
Created nuget.TypedValue[time.Time] `xml:"Created"`
|
||||
ID string `xml:"Id"`
|
||||
IconURL string `xml:"IconUrl,omitempty"`
|
||||
Language string `xml:"Language,omitempty"`
|
||||
LastUpdated nuget.TypedValue[time.Time] `xml:"LastUpdated"`
|
||||
Published nuget.TypedValue[time.Time] `xml:"Published"`
|
||||
LicenseURL string `xml:"LicenseUrl,omitempty"`
|
||||
MinClientVersion string `xml:"MinClientVersion,omitempty"`
|
||||
NormalizedVersion string `xml:"NormalizedVersion"`
|
||||
Owners string `xml:"Owners,omitempty"`
|
||||
PackageSize nuget.TypedValue[int64] `xml:"PackageSize"`
|
||||
ProjectURL string `xml:"ProjectUrl,omitempty"`
|
||||
Published nuget.TypedValue[time.Time] `xml:"Published"`
|
||||
ReleaseNotes string `xml:"ReleaseNotes,omitempty"`
|
||||
RequireLicenseAcceptance nuget.TypedValue[bool] `xml:"RequireLicenseAcceptance"`
|
||||
Tags string `xml:"Tags,omitempty"`
|
||||
Title string `xml:"Title"`
|
||||
Version string `xml:"Version"`
|
||||
VersionDownloadCount nuget.TypedValue[int64] `xml:"VersionDownloadCount"`
|
||||
}
|
||||
|
||||
type FeedEntry struct {
|
||||
@@ -86,28 +95,54 @@ func TestPackageNuGet(t *testing.T) {
|
||||
readToken := getUserToken(t, user.Name, auth_model.AccessTokenScopeReadPackage)
|
||||
badToken := getUserToken(t, user.Name, auth_model.AccessTokenScopeReadNotification)
|
||||
|
||||
packageName := "test.package"
|
||||
packageName := "test.package" // id
|
||||
packageID := packageName
|
||||
packageVersion := "1.0.3"
|
||||
packageAuthors := "KN4CK3R"
|
||||
packageDescription := "Gitea Test Package"
|
||||
|
||||
symbolFilename := "test.pdb"
|
||||
symbolID := "d910bb6948bd4c6cb40155bcf52c3c94"
|
||||
|
||||
packageCopyright := "Package Copyright"
|
||||
packageIconURL := "https://gitea.io/favicon.png"
|
||||
packageLanguage := "Package Language"
|
||||
packageLicenseURL := "https://gitea.io/license"
|
||||
packageMinClientVersion := "1.0.0.0"
|
||||
packageOwners := "Package Owners"
|
||||
packageProjectURL := "https://gitea.io"
|
||||
packageReleaseNotes := "Package Release Notes"
|
||||
packageTags := "tag_1 tag_2 tag_3"
|
||||
packageTitle := "Package Title"
|
||||
packageDevelopmentDependency := true
|
||||
packageRequireLicenseAcceptance := true
|
||||
|
||||
createNuspec := func(id, version string) string {
|
||||
return `<?xml version="1.0" encoding="utf-8"?>
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>` + id + `</id>
|
||||
<version>` + version + `</version>
|
||||
<authors>` + packageAuthors + `</authors>
|
||||
<description>` + packageDescription + `</description>
|
||||
<dependencies>
|
||||
<group targetFramework=".NETStandard2.0">
|
||||
<dependency id="Microsoft.CSharp" version="4.5.0" />
|
||||
</group>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
</package>`
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
|
||||
<metadata minClientVersion="` + packageMinClientVersion + `">
|
||||
<authors>` + packageAuthors + `</authors>
|
||||
<copyright>` + packageCopyright + `</copyright>
|
||||
<description>` + packageDescription + `</description>
|
||||
<developmentDependency>true</developmentDependency>
|
||||
<iconUrl>` + packageIconURL + `</iconUrl>
|
||||
<id>` + id + `</id>
|
||||
<language>` + packageLanguage + `</language>
|
||||
<licenseUrl>` + packageLicenseURL + `</licenseUrl>
|
||||
<owners>` + packageOwners + `</owners>
|
||||
<projectUrl>` + packageProjectURL + `</projectUrl>
|
||||
<releaseNotes>` + packageReleaseNotes + `</releaseNotes>
|
||||
<requireLicenseAcceptance>true</requireLicenseAcceptance>
|
||||
<tags>` + packageTags + `</tags>
|
||||
<title>` + packageTitle + `</title>
|
||||
<version>` + version + `</version>
|
||||
<dependencies>
|
||||
<group targetFramework=".NETStandard2.0">
|
||||
<dependency id="Microsoft.CSharp" version="4.5.0" />
|
||||
</group>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
</package>`
|
||||
}
|
||||
|
||||
createPackage := func(id, version string) *bytes.Buffer {
|
||||
@@ -393,7 +428,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
|
||||
|
||||
pb, err := packages.GetBlobByID(db.DefaultContext, pf.BlobID)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(412), pb.Size)
|
||||
assert.Equal(t, int64(610), pb.Size)
|
||||
case fmt.Sprintf("%s.%s.snupkg", packageName, packageVersion):
|
||||
assert.False(t, pf.IsLead)
|
||||
|
||||
@@ -405,7 +440,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
|
||||
|
||||
pb, err := packages.GetBlobByID(db.DefaultContext, pf.BlobID)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(427), pb.Size)
|
||||
assert.Equal(t, int64(996), pb.Size)
|
||||
case symbolFilename:
|
||||
assert.False(t, pf.IsLead)
|
||||
|
||||
@@ -736,10 +771,24 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
|
||||
var result FeedEntry
|
||||
decodeXML(t, resp, &result)
|
||||
|
||||
assert.Equal(t, packageName, result.Properties.Title)
|
||||
assert.Equal(t, packageVersion, result.Properties.Version)
|
||||
assert.Equal(t, packageAuthors, result.Properties.Authors)
|
||||
assert.Equal(t, packageDescription, result.Properties.Description)
|
||||
assert.Equal(t, packageID, result.Properties.ID)
|
||||
assert.Equal(t, packageVersion, result.Properties.Version)
|
||||
|
||||
assert.Equal(t, packageCopyright, result.Properties.Copyright)
|
||||
assert.Equal(t, packageDevelopmentDependency, result.Properties.DevelopmentDependency.Value)
|
||||
assert.Equal(t, packageIconURL, result.Properties.IconURL)
|
||||
assert.Equal(t, packageLanguage, result.Properties.Language)
|
||||
assert.Equal(t, packageLicenseURL, result.Properties.LicenseURL)
|
||||
assert.Equal(t, packageMinClientVersion, result.Properties.MinClientVersion)
|
||||
assert.Equal(t, packageOwners, result.Properties.Owners)
|
||||
assert.Equal(t, packageProjectURL, result.Properties.ProjectURL)
|
||||
assert.Equal(t, packageReleaseNotes, result.Properties.ReleaseNotes)
|
||||
assert.Equal(t, packageRequireLicenseAcceptance, result.Properties.RequireLicenseAcceptance.Value)
|
||||
assert.Equal(t, packageTags, result.Properties.Tags)
|
||||
assert.Equal(t, packageTitle, result.Properties.Title)
|
||||
|
||||
assert.Equal(t, "Microsoft.CSharp:4.5.0:.NETStandard2.0", result.Properties.Dependencies)
|
||||
})
|
||||
|
||||
|
@@ -15,9 +15,9 @@ import (
|
||||
auth_model "code.gitea.io/gitea/models/auth"
|
||||
"code.gitea.io/gitea/models/db"
|
||||
packages_model "code.gitea.io/gitea/models/packages"
|
||||
container_model "code.gitea.io/gitea/models/packages/container"
|
||||
"code.gitea.io/gitea/models/unittest"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
container_module "code.gitea.io/gitea/modules/packages/container"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
api "code.gitea.io/gitea/modules/structs"
|
||||
"code.gitea.io/gitea/modules/util"
|
||||
@@ -538,7 +538,7 @@ func TestPackageCleanup(t *testing.T) {
|
||||
assert.NoError(t, err)
|
||||
assert.NotEmpty(t, pbs)
|
||||
|
||||
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_model.UploadVersion)
|
||||
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_module.UploadVersion)
|
||||
assert.NoError(t, err)
|
||||
|
||||
err = packages_cleanup_service.CleanupTask(db.DefaultContext, duration)
|
||||
@@ -548,7 +548,7 @@ func TestPackageCleanup(t *testing.T) {
|
||||
assert.NoError(t, err)
|
||||
assert.Empty(t, pbs)
|
||||
|
||||
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_model.UploadVersion)
|
||||
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_module.UploadVersion)
|
||||
assert.ErrorIs(t, err, packages_model.ErrPackageNotExist)
|
||||
})
|
||||
|
||||
|
Reference in New Issue
Block a user