Skip to content

Fix the permission of team's Actions unit issue #24536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
May 5, 2023
Merged

Fix the permission of team's Actions unit issue #24536

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8a6925f
fix
sillyguodong May 4, 2023
e19b232
fix
sillyguodong May 4, 2023
1366069
tooltip
sillyguodong May 5, 2023
433693b
check actions when init config
sillyguodong May 5, 2023
a310cda
revert
sillyguodong May 5, 2023
0757bfe
fix
sillyguodong May 5, 2023
03ef03d
typo
sillyguodong May 5, 2023
6f748c9
unit test
sillyguodong May 5, 2023
1f79db8
typo
sillyguodong May 5, 2023
d9ceed4
append DisabledRepoUnits when initializing setting
sillyguodong May 5, 2023
0e5143f
update
sillyguodong May 5, 2023
7248662
Merge branch 'main' into bugfix/issue_24449
GiteaBot May 5, 2023
1e60cff
Merge branch 'main' into bugfix/issue_24449
GiteaBot May 5, 2023
cc0cefd
Merge branch 'main' into bugfix/issue_24449
GiteaBot May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions models/unit/unit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,26 @@ func LoadUnitConfig() {
if len(invalidKeys) > 0 {
log.Warn("Invalid keys in disabled repo units: %s", strings.Join(invalidKeys, ", "))
}

var isActionsDisabled bool
// Check that must units are not disabled
for i, disabledU := range DisabledRepoUnits {
if disabledU == TypeActions {
isActionsDisabled = true
}
if !disabledU.CanDisable() {
log.Warn("Not allowed to global disable unit %s", disabledU.String())
DisabledRepoUnits = append(DisabledRepoUnits[:i], DisabledRepoUnits[i+1:]...)
}
}

// Check that actions.ENABLED
if !isActionsDisabled && !setting.Actions.Enabled {
// not disabled in `repo.DISABLED_REPO_UNITS` but disabled in `actions.ENABLED`
// also append into the slice of DisabledRepoUnits
DisabledRepoUnits = append(DisabledRepoUnits, TypeActions)
}

setDefaultRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultRepoUnits...)
if len(invalidKeys) > 0 {
log.Warn("Invalid keys in default repo units: %s", strings.Join(invalidKeys, ", "))
Expand Down
13 changes: 13 additions & 0 deletions models/unit/unit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func TestLoadUnitConfig(t *testing.T) {
setting.Repository.DisabledRepoUnits = []string{"repo.issues"}
setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls"}
setting.Repository.DefaultForkRepoUnits = []string{"repo.releases"}
setting.Actions.Enabled = true
LoadUnitConfig()
assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits)
assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits)
Expand All @@ -36,6 +37,7 @@ func TestLoadUnitConfig(t *testing.T) {
setting.Repository.DisabledRepoUnits = []string{"repo.issues", "invalid.1"}
setting.Repository.DefaultRepoUnits = []string{"repo.code", "invalid.2", "repo.releases", "repo.issues", "repo.pulls"}
setting.Repository.DefaultForkRepoUnits = []string{"invalid.3", "repo.releases"}
setting.Actions.Enabled = true
LoadUnitConfig()
assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits)
assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits)
Expand All @@ -45,9 +47,20 @@ func TestLoadUnitConfig(t *testing.T) {
setting.Repository.DisabledRepoUnits = []string{"repo.issues", "repo.issues"}
setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls", "repo.code"}
setting.Repository.DefaultForkRepoUnits = []string{"repo.releases", "repo.releases"}
setting.Actions.Enabled = true
LoadUnitConfig()
assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits)
assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits)
assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits)
})
t.Run("actions_disabled", func(t *testing.T) {
setting.Repository.DisabledRepoUnits = []string{"repo.issues"}
setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls"}
setting.Repository.DefaultForkRepoUnits = []string{"repo.releases"}
setting.Actions.Enabled = false
LoadUnitConfig()
assert.Equal(t, []Type{TypeIssues, TypeActions}, DisabledRepoUnits)
assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits)
assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits)
})
}