From 0770cc7bcb1ef1c1c939d98f80d0fc8c3cdd6770 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 11 Apr 2023 14:58:38 +0800 Subject: [PATCH 1/3] Fix branch protection priority --- models/git/protected_banch_list_test.go | 76 +++++++++++++++++++++++++ models/git/protected_branch_list.go | 4 +- 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 models/git/protected_banch_list_test.go diff --git a/models/git/protected_banch_list_test.go b/models/git/protected_banch_list_test.go new file mode 100644 index 0000000000000..4bb3136d580bf --- /dev/null +++ b/models/git/protected_banch_list_test.go @@ -0,0 +1,76 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package git + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestBranchRuleMatchPriority(t *testing.T) { + kases := []struct { + Rules []string + BranchName string + ExpectedMatchIdx int + }{ + { + Rules: []string{"release/*", "release/v1.17"}, + BranchName: "release/v1.17", + ExpectedMatchIdx: 1, + }, + { + Rules: []string{"release/v1.17", "release/*"}, + BranchName: "release/v1.17", + ExpectedMatchIdx: 0, + }, + { + Rules: []string{"release/**/v1.17", "release/test/v1.17"}, + BranchName: "release/test/v1.17", + ExpectedMatchIdx: 1, + }, + { + Rules: []string{"release/test/v1.17", "release/**/v1.17"}, + BranchName: "release/test/v1.17", + ExpectedMatchIdx: 0, + }, + { + Rules: []string{"release/**", "release/v1.0.0"}, + BranchName: "release/v1.0.0", + ExpectedMatchIdx: 1, + }, + { + Rules: []string{"release/v1.0.0", "release/**"}, + BranchName: "release/v1.0.0", + ExpectedMatchIdx: 0, + }, + { + Rules: []string{"release/**", "release/v1.0.0"}, + BranchName: "release/v2.0.0", + ExpectedMatchIdx: 0, + }, + { + Rules: []string{"release/*", "release/v1.0.0"}, + BranchName: "release/1/v2.0.0", + ExpectedMatchIdx: -1, + }, + } + + for _, kase := range kases { + var pbs ProtectedBranchRules + for _, rule := range kase.Rules { + pbs = append(pbs, &ProtectedBranch{RuleName: rule}) + } + pbs.sort() + matchedPB := pbs.GetFirstMatched(kase.BranchName) + if matchedPB == nil { + if kase.ExpectedMatchIdx >= 0 { + assert.Error(t, fmt.Errorf("no matched rules but expected %s[%d]", kase.Rules[kase.ExpectedMatchIdx], kase.ExpectedMatchIdx)) + } + } else { + assert.EqualValues(t, kase.Rules[kase.ExpectedMatchIdx], matchedPB.RuleName) + } + } +} diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 99c433aa000f8..f2c6e58b98efc 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -33,7 +33,7 @@ func (rules ProtectedBranchRules) sort() { return true } } else if rules[j].isPlainName { - return true + return false } return rules[i].CreatedUnix < rules[j].CreatedUnix }) @@ -46,7 +46,7 @@ func FindRepoProtectedBranchRules(ctx context.Context, repoID int64) (ProtectedB if err != nil { return nil, err } - rules.sort() + rules.sort() // to make non-glob rules have higher priority, and for same glob/non-glob rules, first created rules have higher priority return rules, nil } From 888fc09d18d5213b08fa1d3fc0f434dad62da1ce Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 11 Apr 2023 15:28:49 +0800 Subject: [PATCH 2/3] optimization --- models/git/protected_branch_list.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index f2c6e58b98efc..8282a779dc164 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -28,12 +28,8 @@ func (rules ProtectedBranchRules) sort() { sort.Slice(rules, func(i, j int) bool { rules[i].loadGlob() rules[j].loadGlob() - if rules[i].isPlainName { - if !rules[j].isPlainName { - return true - } - } else if rules[j].isPlainName { - return false + if rules[i].isPlainName != rules[j].isPlainName { + return rules[i].isPlainName // plain name comes first, so plan name means "less" } return rules[i].CreatedUnix < rules[j].CreatedUnix }) From 3917766004d816ca0373a92708b1b49aea990b7e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 11 Apr 2023 17:34:12 +0800 Subject: [PATCH 3/3] Update models/git/protected_branch_list.go Co-authored-by: Yarden Shoham --- models/git/protected_branch_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 8282a779dc164..17fe6d701fb4a 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -29,7 +29,7 @@ func (rules ProtectedBranchRules) sort() { rules[i].loadGlob() rules[j].loadGlob() if rules[i].isPlainName != rules[j].isPlainName { - return rules[i].isPlainName // plain name comes first, so plan name means "less" + return rules[i].isPlainName // plain name comes first, so plain name means "less" } return rules[i].CreatedUnix < rules[j].CreatedUnix })