From ddea32e5946db6cf18d58519a0131a7b4f30b2b2 Mon Sep 17 00:00:00 2001 From: dragon Date: Tue, 14 Jan 2025 17:12:58 +0800 Subject: [PATCH 01/10] feat4arch --- custom/conf/app.example.ini | 3 + modules/setting/packages.go | 3 + services/packages/arch/repository.go | 41 +++++++--- services/packages/arch/vercmp.go | 112 ++++++++++++++++++++++++++ services/packages/arch/vercmp_test.go | 25 ++++++ 5 files changed, 172 insertions(+), 12 deletions(-) create mode 100644 services/packages/arch/vercmp.go create mode 100644 services/packages/arch/vercmp_test.go diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 8e64c834d7373..efd34f939d0e3 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2624,6 +2624,9 @@ LEVEL = Info ;LIMIT_SIZE_VAGRANT = -1 ;; Enable RPM re-signing by default. (It will overwrite the old signature ,using v4 format, not compatible with CentOS 6 or older) ;DEFAULT_RPM_SIGN_ENABLED = false +;; Keep only the latest version in Arch DB. +;METADATA_ARCH_LATEST_VERSION = false + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; default storage for attachments, lfs and avatars diff --git a/modules/setting/packages.go b/modules/setting/packages.go index 3f618cfd64115..12f7a459505df 100644 --- a/modules/setting/packages.go +++ b/modules/setting/packages.go @@ -45,6 +45,8 @@ var ( LimitSizeVagrant int64 DefaultRPMSignEnabled bool + + DefaultMetaArchLatestVersion bool }{ Enabled: true, LimitTotalOwnerCount: -1, @@ -102,6 +104,7 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) { Packages.LimitSizeSwift = mustBytes(sec, "LIMIT_SIZE_SWIFT") Packages.LimitSizeVagrant = mustBytes(sec, "LIMIT_SIZE_VAGRANT") Packages.DefaultRPMSignEnabled = sec.Key("DEFAULT_RPM_SIGN_ENABLED").MustBool(false) + Packages.DefaultMetaArchLatestVersion = sec.Key("METADATA_ARCH_LATEST_VERSION").MustBool(false) return nil } diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index 6731d9a1ac728..302ff8d520f4c 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -23,6 +23,7 @@ import ( "code.gitea.io/gitea/modules/json" packages_module "code.gitea.io/gitea/modules/packages" arch_module "code.gitea.io/gitea/modules/packages/arch" + "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" packages_service "code.gitea.io/gitea/services/packages" @@ -235,6 +236,30 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package return packages_service.DeletePackageFile(ctx, pf) } + vpfs := make(map[string]*entryOptions) + for _, pf := range pfs { + current := &entryOptions{ + File: pf, + } + current.Version, err = packages_model.GetVersionByID(ctx, pf.VersionID) + if err != nil { + return err + } + + if setting.Packages.DefaultMetaArchLatestVersion { + old := vpfs[pf.Name] + if old != nil { + if compareVersions(old.Version.Version, current.Version.Version) == -1 { + vpfs[pf.Name] = current + } + } else { + vpfs[pf.Name] = current + } + } else { + vpfs[pf.Name] = current + } + } + indexContent, _ := packages_module.NewHashedBuffer() defer indexContent.Close() @@ -243,15 +268,7 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package cache := make(map[int64]*packages_model.Package) - for _, pf := range pfs { - opts := &entryOptions{ - File: pf, - } - - opts.Version, err = packages_model.GetVersionByID(ctx, pf.VersionID) - if err != nil { - return err - } + for _, opts := range vpfs { if err := json.Unmarshal([]byte(opts.Version.MetadataJSON), &opts.VersionMetadata); err != nil { return err } @@ -263,12 +280,12 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package } cache[opts.Package.ID] = opts.Package } - opts.Blob, err = packages_model.GetBlobByID(ctx, pf.BlobID) + opts.Blob, err = packages_model.GetBlobByID(ctx, opts.File.BlobID) if err != nil { return err } - sig, err := packages_model.GetPropertiesByName(ctx, packages_model.PropertyTypeFile, pf.ID, arch_module.PropertySignature) + sig, err := packages_model.GetPropertiesByName(ctx, packages_model.PropertyTypeFile, opts.File.ID, arch_module.PropertySignature) if err != nil { return err } @@ -277,7 +294,7 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package } opts.Signature = sig[0].Value - meta, err := packages_model.GetPropertiesByName(ctx, packages_model.PropertyTypeFile, pf.ID, arch_module.PropertyMetadata) + meta, err := packages_model.GetPropertiesByName(ctx, packages_model.PropertyTypeFile, opts.File.ID, arch_module.PropertyMetadata) if err != nil { return err } diff --git a/services/packages/arch/vercmp.go b/services/packages/arch/vercmp.go new file mode 100644 index 0000000000000..682f2cf1deee8 --- /dev/null +++ b/services/packages/arch/vercmp.go @@ -0,0 +1,112 @@ +package arch + +import ( + "strings" + "unicode" +) + +// https://gitlab.archlinux.org/pacman/pacman/-/blob/d55b47e5512808b67bc944feb20c2bcc6c1a4c45/lib/libalpm/version.c +// generated by chatgpt + +import ( + "strconv" +) + +func parseEVR(evr string) (epoch, version, release string) { + if before, after, f := strings.Cut(evr, ":"); f { + epoch = before + evr = after + } else { + epoch = "0" + } + + if before, after, f := strings.Cut(evr, "-"); f { + version = before + release = after + } else { + version = evr + release = "1" + } + return epoch, version, release +} + +func compareSegments(a, b []string) int { + lenA, lenB := len(a), len(b) + var l int + if lenA > lenB { + l = lenB + } else { + l = lenA + } + for i := 0; i < l; i++ { + if r := compare(a[i], b[i]); r != 0 { + return r + } + } + if lenA == lenB { + return 0 + } else if l == lenA { + return -1 + } else { + return 1 + } +} + +func compare(a, b string) int { + if a == b { + return 0 + } + + aNumeric := isNumeric(a) + bNumeric := isNumeric(b) + + if aNumeric && bNumeric { + aInt, _ := strconv.Atoi(a) + bInt, _ := strconv.Atoi(b) + switch { + case aInt < bInt: + return -1 + case aInt > bInt: + return 1 + default: + return 0 + } + } + + if aNumeric { + return 1 + } + if bNumeric { + return -1 + } + + return strings.Compare(a, b) +} + +func isNumeric(s string) bool { + for _, c := range s { + if !unicode.IsDigit(c) { + return false + } + } + return true +} + +func compareVersions(a, b string) int { + if a == b { + return 0 + } + + epochA, versionA, releaseA := parseEVR(a) + epochB, versionB, releaseB := parseEVR(b) + + if res := compareSegments([]string{epochA}, []string{epochB}); res != 0 { + return res + } + + if res := compareSegments(strings.Split(versionA, "."), strings.Split(versionB, ".")); res != 0 { + return res + } + + return compareSegments([]string{releaseA}, []string{releaseB}) +} diff --git a/services/packages/arch/vercmp_test.go b/services/packages/arch/vercmp_test.go new file mode 100644 index 0000000000000..8f055855fc769 --- /dev/null +++ b/services/packages/arch/vercmp_test.go @@ -0,0 +1,25 @@ +package arch + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/require" +) + +func TestCompareVersions(t *testing.T) { + // https://man.archlinux.org/man/vercmp.8.en + checks := [][]string{ + {"1.0a", "1.0b", "1.0beta", "1.0p", "1.0pre", "1.0rc", "1.0", "1.0.a", "1.0.1"}, + {"1", "1.0", "1.1", "1.1.1", "1.2", "2.0", "3.0.0"}, + } + for _, check := range checks { + for i := 0; i < len(check)-1; i++ { + require.Equal(t, -1, compareVersions(check[i], check[i+1]), fmt.Sprintf("%s > %s", check[i], check[i+1])) + require.Equal(t, 1, compareVersions(check[i+1], check[i]), fmt.Sprintf("%s > %s", check[i], check[i+1])) + } + } + require.Equal(t, 1, compareVersions("1.0-2", "1.0")) + require.Equal(t, 0, compareVersions("0:1.0-1", "1.0")) + require.Equal(t, 1, compareVersions("1:1.0-1", "2.0")) +} From 1dbf859807a751e4d3d398529f5400e36ed0f8e5 Mon Sep 17 00:00:00 2001 From: dragon Date: Tue, 14 Jan 2025 17:17:07 +0800 Subject: [PATCH 02/10] feat4arch --- services/packages/arch/vercmp.go | 1 - 1 file changed, 1 deletion(-) diff --git a/services/packages/arch/vercmp.go b/services/packages/arch/vercmp.go index 682f2cf1deee8..d11e3fb10f20a 100644 --- a/services/packages/arch/vercmp.go +++ b/services/packages/arch/vercmp.go @@ -6,7 +6,6 @@ import ( ) // https://gitlab.archlinux.org/pacman/pacman/-/blob/d55b47e5512808b67bc944feb20c2bcc6c1a4c45/lib/libalpm/version.c -// generated by chatgpt import ( "strconv" From 08b39678e00fce06cc4f07b7384850102660829d Mon Sep 17 00:00:00 2001 From: dragon Date: Tue, 14 Jan 2025 17:29:38 +0800 Subject: [PATCH 03/10] fix lint --- services/packages/arch/vercmp_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/packages/arch/vercmp_test.go b/services/packages/arch/vercmp_test.go index 8f055855fc769..1ff8f416a4d1e 100644 --- a/services/packages/arch/vercmp_test.go +++ b/services/packages/arch/vercmp_test.go @@ -1,7 +1,6 @@ package arch import ( - "fmt" "testing" "github.com/stretchr/testify/require" @@ -15,8 +14,8 @@ func TestCompareVersions(t *testing.T) { } for _, check := range checks { for i := 0; i < len(check)-1; i++ { - require.Equal(t, -1, compareVersions(check[i], check[i+1]), fmt.Sprintf("%s > %s", check[i], check[i+1])) - require.Equal(t, 1, compareVersions(check[i+1], check[i]), fmt.Sprintf("%s > %s", check[i], check[i+1])) + require.Equal(t, -1, compareVersions(check[i], check[i+1])) + require.Equal(t, 1, compareVersions(check[i+1], check[i])) } } require.Equal(t, 1, compareVersions("1.0-2", "1.0")) From 3b55815e5347fb9f853c3e96a659f8850eca04f4 Mon Sep 17 00:00:00 2001 From: dragon Date: Wed, 15 Jan 2025 15:21:26 +0800 Subject: [PATCH 04/10] add tests & fix lint --- modules/setting/packages.go | 4 +- services/packages/arch/repository.go | 14 +-- services/packages/arch/vercmp.go | 3 +- tests/integration/api_packages_arch_test.go | 95 ++++++++++++++------- 4 files changed, 76 insertions(+), 40 deletions(-) diff --git a/modules/setting/packages.go b/modules/setting/packages.go index 12f7a459505df..f722cb5ee4c73 100644 --- a/modules/setting/packages.go +++ b/modules/setting/packages.go @@ -46,7 +46,7 @@ var ( DefaultRPMSignEnabled bool - DefaultMetaArchLatestVersion bool + RepoLatestVersionArch bool }{ Enabled: true, LimitTotalOwnerCount: -1, @@ -104,7 +104,7 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) { Packages.LimitSizeSwift = mustBytes(sec, "LIMIT_SIZE_SWIFT") Packages.LimitSizeVagrant = mustBytes(sec, "LIMIT_SIZE_VAGRANT") Packages.DefaultRPMSignEnabled = sec.Key("DEFAULT_RPM_SIGN_ENABLED").MustBool(false) - Packages.DefaultMetaArchLatestVersion = sec.Key("METADATA_ARCH_LATEST_VERSION").MustBool(false) + Packages.RepoLatestVersionArch = sec.Key("METADATA_ARCH_LATEST_VERSION").MustBool(false) return nil } diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index 302ff8d520f4c..d7a3f88f02c27 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -236,7 +236,7 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package return packages_service.DeletePackageFile(ctx, pf) } - vpfs := make(map[string]*entryOptions) + vpfs := make(map[int64]*entryOptions) for _, pf := range pfs { current := &entryOptions{ File: pf, @@ -246,17 +246,17 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package return err } - if setting.Packages.DefaultMetaArchLatestVersion { - old := vpfs[pf.Name] - if old != nil { + if setting.Packages.RepoLatestVersionArch { + if old, ok := vpfs[current.Version.PackageID]; ok { if compareVersions(old.Version.Version, current.Version.Version) == -1 { - vpfs[pf.Name] = current + vpfs[current.Version.PackageID] = current } } else { - vpfs[pf.Name] = current + vpfs[current.Version.PackageID] = current } } else { - vpfs[pf.Name] = current + // keep all files + vpfs[current.File.ID] = current } } diff --git a/services/packages/arch/vercmp.go b/services/packages/arch/vercmp.go index d11e3fb10f20a..7068d4e970d3d 100644 --- a/services/packages/arch/vercmp.go +++ b/services/packages/arch/vercmp.go @@ -46,9 +46,8 @@ func compareSegments(a, b []string) int { return 0 } else if l == lenA { return -1 - } else { - return 1 } + return 1 } func compare(a, b string) int { diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index 9c7a9dd19dec1..e358ab448fbdf 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -17,6 +17,8 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" arch_module "code.gitea.io/gitea/modules/packages/arch" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/test" arch_service "code.gitea.io/gitea/services/packages/arch" "code.gitea.io/gitea/tests" @@ -79,6 +81,34 @@ license = MIT`) return buf.Bytes() } + readIndexContent := func(r io.Reader) (map[string]string, error) { + gzr, err := gzip.NewReader(r) + if err != nil { + return nil, err + } + + content := make(map[string]string) + + tr := tar.NewReader(gzr) + for { + hd, err := tr.Next() + if err == io.EOF { + break + } + if err != nil { + return nil, err + } + + buf, err := io.ReadAll(tr) + if err != nil { + return nil, err + } + + content[hd.Name] = string(buf) + } + + return content, nil + } compressions := []string{"gz", "xz", "zst"} repositories := []string{"main", "testing", "with/slash", ""} @@ -171,35 +201,6 @@ license = MIT`) MakeRequest(t, req, http.StatusConflict) }) - readIndexContent := func(r io.Reader) (map[string]string, error) { - gzr, err := gzip.NewReader(r) - if err != nil { - return nil, err - } - - content := make(map[string]string) - - tr := tar.NewReader(gzr) - for { - hd, err := tr.Next() - if err == io.EOF { - break - } - if err != nil { - return nil, err - } - - buf, err := io.ReadAll(tr) - if err != nil { - return nil, err - } - - content[hd.Name] = string(buf) - } - - return content, nil - } - t.Run("Index", func(t *testing.T) { defer tests.PrintCurrentTest(t)() @@ -299,4 +300,40 @@ license = MIT`) }) } } + t.Run("KeepLastVersion", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + defer test.MockVariableValue(&setting.Packages.RepoLatestVersionArch, true)() + pkgVer1 := createPackage("gz", "gitea-test", "1.0.0", "aarch64") + pkgVer2 := createPackage("gz", "gitea-test", "1.0.1", "aarch64") + req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgVer1)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusCreated) + req = NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgVer2)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusCreated) + + req = NewRequest(t, "GET", fmt.Sprintf("%s/aarch64/%s", rootURL, arch_service.IndexArchiveFilename)) + resp := MakeRequest(t, req, http.StatusOK) + + content, err := readIndexContent(resp.Body) + assert.NoError(t, err) + assert.Len(t, content, 2) + + _, has := content["gitea-test-1.0.0/desc"] + assert.False(t, has) + _, has = content["gitea-test-1.0.1/desc"] + assert.True(t, has) + + req = NewRequest(t, "DELETE", fmt.Sprintf("%s/gitea-test/1.0.1/aarch64", rootURL)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusNoContent) + + req = NewRequest(t, "GET", fmt.Sprintf("%s/aarch64/%s", rootURL, arch_service.IndexArchiveFilename)) + resp = MakeRequest(t, req, http.StatusOK) + content, err = readIndexContent(resp.Body) + assert.NoError(t, err) + assert.Len(t, content, 2) + _, has = content["gitea-test-1.0.0/desc"] + assert.True(t, has) + }) } From cae7f0bb655319c145927b021057d38a75e9e801 Mon Sep 17 00:00:00 2001 From: dragon Date: Wed, 15 Jan 2025 15:24:11 +0800 Subject: [PATCH 05/10] rename settings --- custom/conf/app.example.ini | 2 +- modules/setting/packages.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index efd34f939d0e3..3823d00ddb150 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2625,7 +2625,7 @@ LEVEL = Info ;; Enable RPM re-signing by default. (It will overwrite the old signature ,using v4 format, not compatible with CentOS 6 or older) ;DEFAULT_RPM_SIGN_ENABLED = false ;; Keep only the latest version in Arch DB. -;METADATA_ARCH_LATEST_VERSION = false +;REPO_KEEP_LATEST_VERSION_ARCH = false ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/modules/setting/packages.go b/modules/setting/packages.go index f722cb5ee4c73..9bc749695592e 100644 --- a/modules/setting/packages.go +++ b/modules/setting/packages.go @@ -104,7 +104,7 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) { Packages.LimitSizeSwift = mustBytes(sec, "LIMIT_SIZE_SWIFT") Packages.LimitSizeVagrant = mustBytes(sec, "LIMIT_SIZE_VAGRANT") Packages.DefaultRPMSignEnabled = sec.Key("DEFAULT_RPM_SIGN_ENABLED").MustBool(false) - Packages.RepoLatestVersionArch = sec.Key("METADATA_ARCH_LATEST_VERSION").MustBool(false) + Packages.RepoLatestVersionArch = sec.Key("REPO_KEEP_LATEST_VERSION_ARCH").MustBool(false) return nil } From 8570827d36ce7cc724af6dd28406f69e1589c454 Mon Sep 17 00:00:00 2001 From: dragon Date: Wed, 15 Jan 2025 15:31:59 +0800 Subject: [PATCH 06/10] add copyright --- services/packages/arch/vercmp.go | 3 +++ services/packages/arch/vercmp_test.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/services/packages/arch/vercmp.go b/services/packages/arch/vercmp.go index 7068d4e970d3d..0d33dda0f1232 100644 --- a/services/packages/arch/vercmp.go +++ b/services/packages/arch/vercmp.go @@ -1,3 +1,6 @@ +// Copyright 2025 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + package arch import ( diff --git a/services/packages/arch/vercmp_test.go b/services/packages/arch/vercmp_test.go index 1ff8f416a4d1e..2014a6d429d14 100644 --- a/services/packages/arch/vercmp_test.go +++ b/services/packages/arch/vercmp_test.go @@ -1,3 +1,6 @@ +// Copyright 2025 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + package arch import ( From a8b043add92d6f96c8309a94b180f19b9d8ed41a Mon Sep 17 00:00:00 2001 From: dragon Date: Mon, 20 Jan 2025 09:08:08 +0800 Subject: [PATCH 07/10] rename setting --- custom/conf/app.example.ini | 2 +- modules/setting/packages.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 3823d00ddb150..af69ba70b19e2 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2625,7 +2625,7 @@ LEVEL = Info ;; Enable RPM re-signing by default. (It will overwrite the old signature ,using v4 format, not compatible with CentOS 6 or older) ;DEFAULT_RPM_SIGN_ENABLED = false ;; Keep only the latest version in Arch DB. -;REPO_KEEP_LATEST_VERSION_ARCH = false +;KEEP_LATEST_VERSION_ARCH = false ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/modules/setting/packages.go b/modules/setting/packages.go index 9bc749695592e..8eb0400203740 100644 --- a/modules/setting/packages.go +++ b/modules/setting/packages.go @@ -104,7 +104,7 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) { Packages.LimitSizeSwift = mustBytes(sec, "LIMIT_SIZE_SWIFT") Packages.LimitSizeVagrant = mustBytes(sec, "LIMIT_SIZE_VAGRANT") Packages.DefaultRPMSignEnabled = sec.Key("DEFAULT_RPM_SIGN_ENABLED").MustBool(false) - Packages.RepoLatestVersionArch = sec.Key("REPO_KEEP_LATEST_VERSION_ARCH").MustBool(false) + Packages.RepoLatestVersionArch = sec.Key("KEEP_LATEST_VERSION_ARCH").MustBool(false) return nil } From 97ed2e798e2c6500bbcec527021c5187f8229012 Mon Sep 17 00:00:00 2001 From: dragon Date: Tue, 21 Jan 2025 09:27:09 +0800 Subject: [PATCH 08/10] fix typo --- custom/conf/app.example.ini | 4 ++-- modules/setting/packages.go | 4 ++-- services/packages/arch/repository.go | 2 +- tests/integration/api_packages_arch_test.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index af69ba70b19e2..e8394d4217bf3 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2624,8 +2624,8 @@ LEVEL = Info ;LIMIT_SIZE_VAGRANT = -1 ;; Enable RPM re-signing by default. (It will overwrite the old signature ,using v4 format, not compatible with CentOS 6 or older) ;DEFAULT_RPM_SIGN_ENABLED = false -;; Keep only the latest version in Arch DB. -;KEEP_LATEST_VERSION_ARCH = false +;; Only show the latest version in the Arch index. +;SHOW_LATEST_VERSION_ARCH = false ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/modules/setting/packages.go b/modules/setting/packages.go index 8eb0400203740..72d8238bfd4f8 100644 --- a/modules/setting/packages.go +++ b/modules/setting/packages.go @@ -46,7 +46,7 @@ var ( DefaultRPMSignEnabled bool - RepoLatestVersionArch bool + ShowLatestVersionArch bool }{ Enabled: true, LimitTotalOwnerCount: -1, @@ -104,7 +104,7 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) { Packages.LimitSizeSwift = mustBytes(sec, "LIMIT_SIZE_SWIFT") Packages.LimitSizeVagrant = mustBytes(sec, "LIMIT_SIZE_VAGRANT") Packages.DefaultRPMSignEnabled = sec.Key("DEFAULT_RPM_SIGN_ENABLED").MustBool(false) - Packages.RepoLatestVersionArch = sec.Key("KEEP_LATEST_VERSION_ARCH").MustBool(false) + Packages.ShowLatestVersionArch = sec.Key("SHOW_LATEST_VERSION_ARCH").MustBool(false) return nil } diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index d7a3f88f02c27..225e5d9ad5c05 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -246,7 +246,7 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package return err } - if setting.Packages.RepoLatestVersionArch { + if setting.Packages.ShowLatestVersionArch { if old, ok := vpfs[current.Version.PackageID]; ok { if compareVersions(old.Version.Version, current.Version.Version) == -1 { vpfs[current.Version.PackageID] = current diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index e358ab448fbdf..760394da80e4e 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -302,7 +302,7 @@ license = MIT`) } t.Run("KeepLastVersion", func(t *testing.T) { defer tests.PrintCurrentTest(t)() - defer test.MockVariableValue(&setting.Packages.RepoLatestVersionArch, true)() + defer test.MockVariableValue(&setting.Packages.ShowLatestVersionArch, true)() pkgVer1 := createPackage("gz", "gitea-test", "1.0.0", "aarch64") pkgVer2 := createPackage("gz", "gitea-test", "1.0.1", "aarch64") req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgVer1)). From e7bbefb5ce4260a2e8fde625e009def7b031f85b Mon Sep 17 00:00:00 2001 From: dragon Date: Mon, 10 Feb 2025 09:21:16 +0800 Subject: [PATCH 09/10] remove options --- custom/conf/app.example.ini | 3 --- modules/setting/packages.go | 3 --- services/packages/arch/repository.go | 12 +++--------- tests/integration/api_packages_arch_test.go | 3 --- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index d098e961c7ac5..899209874f7cc 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2630,9 +2630,6 @@ LEVEL = Info ;LIMIT_SIZE_VAGRANT = -1 ;; Enable RPM re-signing by default. (It will overwrite the old signature ,using v4 format, not compatible with CentOS 6 or older) ;DEFAULT_RPM_SIGN_ENABLED = false -;; Only show the latest version in the Arch index. -;SHOW_LATEST_VERSION_ARCH = false - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; default storage for attachments, lfs and avatars diff --git a/modules/setting/packages.go b/modules/setting/packages.go index 72d8238bfd4f8..3f618cfd64115 100644 --- a/modules/setting/packages.go +++ b/modules/setting/packages.go @@ -45,8 +45,6 @@ var ( LimitSizeVagrant int64 DefaultRPMSignEnabled bool - - ShowLatestVersionArch bool }{ Enabled: true, LimitTotalOwnerCount: -1, @@ -104,7 +102,6 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) { Packages.LimitSizeSwift = mustBytes(sec, "LIMIT_SIZE_SWIFT") Packages.LimitSizeVagrant = mustBytes(sec, "LIMIT_SIZE_VAGRANT") Packages.DefaultRPMSignEnabled = sec.Key("DEFAULT_RPM_SIGN_ENABLED").MustBool(false) - Packages.ShowLatestVersionArch = sec.Key("SHOW_LATEST_VERSION_ARCH").MustBool(false) return nil } diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index e693abbba377d..81c7b0355fbe0 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -23,7 +23,6 @@ import ( "code.gitea.io/gitea/modules/json" packages_module "code.gitea.io/gitea/modules/packages" arch_module "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" packages_service "code.gitea.io/gitea/services/packages" @@ -246,17 +245,12 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package return err } - if setting.Packages.ShowLatestVersionArch { - if old, ok := vpfs[current.Version.PackageID]; ok { - if compareVersions(old.Version.Version, current.Version.Version) == -1 { - vpfs[current.Version.PackageID] = current - } - } else { + if old, ok := vpfs[current.Version.PackageID]; ok { + if compareVersions(old.Version.Version, current.Version.Version) == -1 { vpfs[current.Version.PackageID] = current } } else { - // keep all files - vpfs[current.File.ID] = current + vpfs[current.Version.PackageID] = current } } diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index 760394da80e4e..b9064ca3d1c96 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -17,8 +17,6 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" arch_module "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" arch_service "code.gitea.io/gitea/services/packages/arch" "code.gitea.io/gitea/tests" @@ -302,7 +300,6 @@ license = MIT`) } t.Run("KeepLastVersion", func(t *testing.T) { defer tests.PrintCurrentTest(t)() - defer test.MockVariableValue(&setting.Packages.ShowLatestVersionArch, true)() pkgVer1 := createPackage("gz", "gitea-test", "1.0.0", "aarch64") pkgVer2 := createPackage("gz", "gitea-test", "1.0.1", "aarch64") req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgVer1)). From 219d8722ec69ed873941fab9cab530b74bcc469c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 11 Feb 2025 18:41:22 +0800 Subject: [PATCH 10/10] Update services/packages/arch/repository.go --- services/packages/arch/repository.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index 81c7b0355fbe0..a12af82ba5f5d 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -245,6 +245,9 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package return err } + // here we compare the versions but not using SearchLatestVersions because we shouldn't allow "downgrading" to a older version by "latest" one. + // https://wiki.archlinux.org/title/Downgrading_packages : randomly downgrading can mess up dependencies: + // If a downgrade involves a soname change, all dependencies may need downgrading or rebuilding too. if old, ok := vpfs[current.Version.PackageID]; ok { if compareVersions(old.Version.Version, current.Version.Version) == -1 { vpfs[current.Version.PackageID] = current