-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Backport #26182 by @Zettat123 Fix #25934 Add `ignoreGlobal` parameter to `reqUnitAccess` and only check global disabled units when `ignoreGlobal` is true. So the org-level projects and user-level projects won't be affected by global disabled `repo.projects` unit. Co-authored-by: Zettat123 <zettat123@gmail.com>
- Loading branch information
Showing
3 changed files
with
74 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -280,3 +280,9 @@ | |
team_id: 20 | ||
type: 9 # package | ||
access_mode: 2 | ||
|
||
- | ||
id: 48 | ||
team_id: 2 | ||
type: 8 | ||
access_mode: 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
// Copyright 2023 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package integration | ||
|
||
import ( | ||
"net/http" | ||
"testing" | ||
|
||
unit_model "code.gitea.io/gitea/models/unit" | ||
"code.gitea.io/gitea/tests" | ||
) | ||
|
||
func TestOrgProjectAccess(t *testing.T) { | ||
defer tests.PrepareTestEnv(t)() | ||
|
||
// disable repo project unit | ||
unit_model.DisabledRepoUnits = []unit_model.Type{unit_model.TypeProjects} | ||
|
||
// repo project, 404 | ||
req := NewRequest(t, "GET", "/user2/repo1/projects") | ||
MakeRequest(t, req, http.StatusNotFound) | ||
|
||
// user project, 200 | ||
req = NewRequest(t, "GET", "/user2/-/projects") | ||
MakeRequest(t, req, http.StatusOK) | ||
|
||
// org project, 200 | ||
req = NewRequest(t, "GET", "/user3/-/projects") | ||
MakeRequest(t, req, http.StatusOK) | ||
|
||
// change the org's visibility to private | ||
session := loginUser(t, "user2") | ||
req = NewRequestWithValues(t, "POST", "/org/user3/settings", map[string]string{ | ||
"_csrf": GetCSRF(t, session, "/user3/-/projects"), | ||
"name": "user3", | ||
"visibility": "2", | ||
}) | ||
session.MakeRequest(t, req, http.StatusSeeOther) | ||
|
||
// user4 can still access the org's project because its team(team1) has the permission | ||
session = loginUser(t, "user4") | ||
req = NewRequest(t, "GET", "/user3/-/projects") | ||
session.MakeRequest(t, req, http.StatusOK) | ||
|
||
// disable team1's project unit | ||
session = loginUser(t, "user2") | ||
req = NewRequestWithValues(t, "POST", "/org/user3/teams/team1/edit", map[string]string{ | ||
"_csrf": GetCSRF(t, session, "/user3/-/projects"), | ||
"team_name": "team1", | ||
"repo_access": "specific", | ||
"permission": "read", | ||
"unit_8": "0", | ||
}) | ||
session.MakeRequest(t, req, http.StatusSeeOther) | ||
|
||
// user4 can no longer access the org's project | ||
session = loginUser(t, "user4") | ||
req = NewRequest(t, "GET", "/user3/-/projects") | ||
session.MakeRequest(t, req, http.StatusNotFound) | ||
} |