Skip to content
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

Improve permission check of packages #23879

Merged
merged 10 commits into from
Apr 6, 2023
Merged

Improve permission check of packages #23879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb77f9a
fix
yp05327 Apr 3, 2023
0615bad
add todo
yp05327 Apr 3, 2023
7cf4b57
add test
yp05327 Apr 4, 2023
6e3931c
fix
yp05327 Apr 4, 2023
7e07bac
fix
yp05327 Apr 5, 2023
4320930
add new line
yp05327 Apr 5, 2023
c1aad04
fix order
yp05327 Apr 5, 2023
782a7b3
fix index
yp05327 Apr 5, 2023
847af05
Update modules/context/package.go
lunny Apr 6, 2023
00f7d12
Merge branch 'main' into improve-permission-check-in-package
lunny Apr 6, 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
6 changes: 6 additions & 0 deletions models/fixtures/org_user.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,9 @@
uid: 31
org_id: 19
is_public: true

-
id: 14
uid: 5
org_id: 23
is_public: false
11 changes: 11 additions & 0 deletions models/fixtures/team.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,15 @@
num_repos: 0
num_members: 0
includes_all_repositories: false
can_create_org_repo: true

-
id: 17
org_id: 23
lower_name: team14writeauth
name: team14WriteAuth
authorize: 2 # write
num_repos: 0
num_members: 1
includes_all_repositories: false
can_create_org_repo: true
6 changes: 6 additions & 0 deletions models/fixtures/team_unit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,3 +268,9 @@
team_id: 9
type: 1 # code
access_mode: 1

-
id: 46
team_id: 17
type: 9 # package
access_mode: 0
yp05327 marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 6 additions & 0 deletions models/fixtures/team_user.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,9 @@
org_id: 3
team_id: 14
uid: 2

-
id: 18
org_id: 23
team_id: 17
uid: 5
10 changes: 10 additions & 0 deletions tests/integration/api_packages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ func TestPackageAccess(t *testing.T) {
admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
inactive := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 9})
privatedOrg := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 23})

uploadPackage := func(doer, owner *user_model.User, expectedStatus int) {
url := fmt.Sprintf("/api/packages/%s/generic/test-package/1.0/file.bin", owner.Name)
Expand All @@ -170,6 +171,15 @@ func TestPackageAccess(t *testing.T) {
uploadPackage(inactive, user, http.StatusUnauthorized)
uploadPackage(admin, inactive, http.StatusCreated)
uploadPackage(admin, user, http.StatusCreated)

// team.authorize is write, but team_unit.access_mode is none
// so the user can not upload packages or get package list
uploadPackage(user, privatedOrg, http.StatusUnauthorized)

session := loginUser(t, user.Name)
tokenReadPackage := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadPackage)
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s?token=%s", privatedOrg.Name, tokenReadPackage))
MakeRequest(t, req, http.StatusForbidden)
}

func TestPackageQuota(t *testing.T) {
Expand Down