mirror of
				https://gitcode.com/gitea/gitea.git
				synced 2025-10-25 12:26:40 +08:00 
			
		
		
		
	 18de83b2a3
			
		
	
	18de83b2a3
	
	
	
		
			
			## Changes
- Adds the following high level access scopes, each with `read` and
`write` levels:
    - `activitypub`
    - `admin` (hidden if user is not a site admin)
    - `misc`
    - `notification`
    - `organization`
    - `package`
    - `issue`
    - `repository`
    - `user`
- Adds new middleware function `tokenRequiresScopes()` in addition to
`reqToken()`
  -  `tokenRequiresScopes()` is used for each high-level api section
- _if_ a scoped token is present, checks that the required scope is
included based on the section and HTTP method
  - `reqToken()` is used for individual routes
- checks that required authentication is present (but does not check
scope levels as this will already have been handled by
`tokenRequiresScopes()`
- Adds migration to convert old scoped access tokens to the new set of
scopes
- Updates the user interface for scope selection
### User interface example
<img width="903" alt="Screen Shot 2023-05-31 at 1 56 55 PM"
src="https://github.com/go-gitea/gitea/assets/23248839/654766ec-2143-4f59-9037-3b51600e32f3">
<img width="917" alt="Screen Shot 2023-05-31 at 1 56 43 PM"
src="https://github.com/go-gitea/gitea/assets/23248839/1ad64081-012c-4a73-b393-66b30352654c">
## tokenRequiresScopes  Design Decision
- `tokenRequiresScopes()` was added to more reliably cover api routes.
For an incoming request, this function uses the given scope category
(say `AccessTokenScopeCategoryOrganization`) and the HTTP method (say
`DELETE`) and verifies that any scoped tokens in use include
`delete:organization`.
- `reqToken()` is used to enforce auth for individual routes that
require it. If a scoped token is not present for a request,
`tokenRequiresScopes()` will not return an error
## TODO
- [x] Alphabetize scope categories
- [x] Change 'public repos only' to a radio button (private vs public).
Also expand this to organizations
- [X] Disable token creation if no scopes selected. Alternatively, show
warning
- [x] `reqToken()` is missing from many `POST/DELETE` routes in the api.
`tokenRequiresScopes()` only checks that a given token has the correct
scope, `reqToken()` must be used to check that a token (or some other
auth) is present.
   -  _This should be addressed in this PR_
- [x] The migration should be reviewed very carefully in order to
minimize access changes to existing user tokens.
   - _This should be addressed in this PR_
- [x] Link to api to swagger documentation, clarify what
read/write/delete levels correspond to
- [x] Review cases where more than one scope is needed as this directly
deviates from the api definition.
   - _This should be addressed in this PR_
   - For example: 
   ```go
	m.Group("/users/{username}/orgs", func() {
		m.Get("", reqToken(), org.ListUserOrgs)
		m.Get("/{org}/permissions", reqToken(), org.GetUserOrgsPermissions)
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser,
auth_model.AccessTokenScopeCategoryOrganization),
context_service.UserAssignmentAPI())
   ```
## Future improvements
- [ ] Add required scopes to swagger documentation
- [ ] Redesign `reqToken()` to be opt-out rather than opt-in
- [ ] Subdivide scopes like `repository`
- [ ] Once a token is created, if it has no scopes, we should display
text instead of an empty bullet point
- [ ] If the 'public repos only' option is selected, should read
categories be selected by default
Closes #24501
Closes #24799
Co-authored-by: Jonathan Tran <jon@allspice.io>
Co-authored-by: Kyle D <kdumontnu@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
		
	
		
			
				
	
	
		
			221 lines
		
	
	
		
			8.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			221 lines
		
	
	
		
			8.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2019 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package integration
 | |
| 
 | |
| import (
 | |
| 	"net/http"
 | |
| 	"testing"
 | |
| 
 | |
| 	auth_model "code.gitea.io/gitea/models/auth"
 | |
| 	"code.gitea.io/gitea/models/unittest"
 | |
| 	user_model "code.gitea.io/gitea/models/user"
 | |
| 	api "code.gitea.io/gitea/modules/structs"
 | |
| 	"code.gitea.io/gitea/tests"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func compareCommitFiles(t *testing.T, expect []string, files []*api.CommitAffectedFiles) {
 | |
| 	var actual []string
 | |
| 	for i := range files {
 | |
| 		actual = append(actual, files[i].Filename)
 | |
| 	}
 | |
| 	assert.ElementsMatch(t, expect, actual)
 | |
| }
 | |
| 
 | |
| func TestAPIReposGitCommits(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 	// Login as User2.
 | |
| 	session := loginUser(t, user.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
 | |
| 
 | |
| 	// check invalid requests
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/12345?token="+token, user.Name)
 | |
| 	MakeRequest(t, req, http.StatusNotFound)
 | |
| 
 | |
| 	req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/..?token="+token, user.Name)
 | |
| 	MakeRequest(t, req, http.StatusUnprocessableEntity)
 | |
| 
 | |
| 	req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/branch-not-exist?token="+token, user.Name)
 | |
| 	MakeRequest(t, req, http.StatusNotFound)
 | |
| 
 | |
| 	for _, ref := range [...]string{
 | |
| 		"master", // Branch
 | |
| 		"v1.1",   // Tag
 | |
| 		"65f1",   // short sha
 | |
| 		"65f1bf27bc3bf70f64657658635e66094edbcb4d", // full sha
 | |
| 	} {
 | |
| 		req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/%s?token="+token, user.Name, ref)
 | |
| 		MakeRequest(t, req, http.StatusOK)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestAPIReposGitCommitList(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 	// Login as User2.
 | |
| 	session := loginUser(t, user.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
 | |
| 
 | |
| 	// Test getting commits (Page 1)
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo20/commits?token="+token+"¬=master&sha=remove-files-a", user.Name)
 | |
| 	resp := MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	var apiData []api.Commit
 | |
| 	DecodeJSON(t, resp, &apiData)
 | |
| 
 | |
| 	assert.Len(t, apiData, 2)
 | |
| 	assert.EqualValues(t, "cfe3b3c1fd36fba04f9183287b106497e1afe986", apiData[0].CommitMeta.SHA)
 | |
| 	compareCommitFiles(t, []string{"link_hi", "test.csv"}, apiData[0].Files)
 | |
| 	assert.EqualValues(t, "c8e31bc7688741a5287fcde4fbb8fc129ca07027", apiData[1].CommitMeta.SHA)
 | |
| 	compareCommitFiles(t, []string{"test.csv"}, apiData[1].Files)
 | |
| 
 | |
| 	assert.EqualValues(t, resp.Header().Get("X-Total"), "2")
 | |
| }
 | |
| 
 | |
| func TestAPIReposGitCommitListNotMaster(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 	// Login as User2.
 | |
| 	session := loginUser(t, user.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
 | |
| 
 | |
| 	// Test getting commits (Page 1)
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?token="+token, user.Name)
 | |
| 	resp := MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	var apiData []api.Commit
 | |
| 	DecodeJSON(t, resp, &apiData)
 | |
| 
 | |
| 	assert.Len(t, apiData, 3)
 | |
| 	assert.EqualValues(t, "69554a64c1e6030f051e5c3f94bfbd773cd6a324", apiData[0].CommitMeta.SHA)
 | |
| 	compareCommitFiles(t, []string{"readme.md"}, apiData[0].Files)
 | |
| 	assert.EqualValues(t, "27566bd5738fc8b4e3fef3c5e72cce608537bd95", apiData[1].CommitMeta.SHA)
 | |
| 	compareCommitFiles(t, []string{"readme.md"}, apiData[1].Files)
 | |
| 	assert.EqualValues(t, "5099b81332712fe655e34e8dd63574f503f61811", apiData[2].CommitMeta.SHA)
 | |
| 	compareCommitFiles(t, []string{"readme.md"}, apiData[2].Files)
 | |
| 
 | |
| 	assert.EqualValues(t, resp.Header().Get("X-Total"), "3")
 | |
| }
 | |
| 
 | |
| func TestAPIReposGitCommitListPage2Empty(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 	// Login as User2.
 | |
| 	session := loginUser(t, user.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
 | |
| 
 | |
| 	// Test getting commits (Page=2)
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?token="+token+"&page=2", user.Name)
 | |
| 	resp := MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	var apiData []api.Commit
 | |
| 	DecodeJSON(t, resp, &apiData)
 | |
| 
 | |
| 	assert.Len(t, apiData, 0)
 | |
| }
 | |
| 
 | |
| func TestAPIReposGitCommitListDifferentBranch(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 	// Login as User2.
 | |
| 	session := loginUser(t, user.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
 | |
| 
 | |
| 	// Test getting commits (Page=1, Branch=good-sign)
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?token="+token+"&sha=good-sign", user.Name)
 | |
| 	resp := MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	var apiData []api.Commit
 | |
| 	DecodeJSON(t, resp, &apiData)
 | |
| 
 | |
| 	assert.Len(t, apiData, 1)
 | |
| 	assert.Equal(t, "f27c2b2b03dcab38beaf89b0ab4ff61f6de63441", apiData[0].CommitMeta.SHA)
 | |
| 	compareCommitFiles(t, []string{"readme.md"}, apiData[0].Files)
 | |
| }
 | |
| 
 | |
| func TestAPIReposGitCommitListWithoutSelectFields(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 	// Login as User2.
 | |
| 	session := loginUser(t, user.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
 | |
| 
 | |
| 	// Test getting commits without files, verification, and stats
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?token="+token+"&sha=good-sign&stat=false&files=false&verification=false", user.Name)
 | |
| 	resp := MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	var apiData []api.Commit
 | |
| 	DecodeJSON(t, resp, &apiData)
 | |
| 
 | |
| 	assert.Len(t, apiData, 1)
 | |
| 	assert.Equal(t, "f27c2b2b03dcab38beaf89b0ab4ff61f6de63441", apiData[0].CommitMeta.SHA)
 | |
| 	assert.Equal(t, (*api.CommitStats)(nil), apiData[0].Stats)
 | |
| 	assert.Equal(t, (*api.PayloadCommitVerification)(nil), apiData[0].RepoCommit.Verification)
 | |
| 	assert.Equal(t, ([]*api.CommitAffectedFiles)(nil), apiData[0].Files)
 | |
| }
 | |
| 
 | |
| func TestDownloadCommitDiffOrPatch(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 	// Login as User2.
 | |
| 	session := loginUser(t, user.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
 | |
| 
 | |
| 	// Test getting diff
 | |
| 	reqDiff := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/git/commits/f27c2b2b03dcab38beaf89b0ab4ff61f6de63441.diff?token="+token, user.Name)
 | |
| 	resp := MakeRequest(t, reqDiff, http.StatusOK)
 | |
| 	assert.EqualValues(t,
 | |
| 		"commit f27c2b2b03dcab38beaf89b0ab4ff61f6de63441\nAuthor: User2 <user2@example.com>\nDate:   Sun Aug 6 19:55:01 2017 +0200\n\n    good signed commit\n\ndiff --git a/readme.md b/readme.md\nnew file mode 100644\nindex 0000000..458121c\n--- /dev/null\n+++ b/readme.md\n@@ -0,0 +1 @@\n+good sign\n",
 | |
| 		resp.Body.String())
 | |
| 
 | |
| 	// Test getting patch
 | |
| 	reqPatch := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/git/commits/f27c2b2b03dcab38beaf89b0ab4ff61f6de63441.patch?token="+token, user.Name)
 | |
| 	resp = MakeRequest(t, reqPatch, http.StatusOK)
 | |
| 	assert.EqualValues(t,
 | |
| 		"From f27c2b2b03dcab38beaf89b0ab4ff61f6de63441 Mon Sep 17 00:00:00 2001\nFrom: User2 <user2@example.com>\nDate: Sun, 6 Aug 2017 19:55:01 +0200\nSubject: [PATCH] good signed commit\n\n---\n readme.md | 1 +\n 1 file changed, 1 insertion(+)\n create mode 100644 readme.md\n\ndiff --git a/readme.md b/readme.md\nnew file mode 100644\nindex 0000000..458121c\n--- /dev/null\n+++ b/readme.md\n@@ -0,0 +1 @@\n+good sign\n",
 | |
| 		resp.Body.String())
 | |
| }
 | |
| 
 | |
| func TestGetFileHistory(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 	// Login as User2.
 | |
| 	session := loginUser(t, user.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
 | |
| 
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?path=readme.md&token="+token+"&sha=good-sign", user.Name)
 | |
| 	resp := MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	var apiData []api.Commit
 | |
| 	DecodeJSON(t, resp, &apiData)
 | |
| 
 | |
| 	assert.Len(t, apiData, 1)
 | |
| 	assert.Equal(t, "f27c2b2b03dcab38beaf89b0ab4ff61f6de63441", apiData[0].CommitMeta.SHA)
 | |
| 	compareCommitFiles(t, []string{"readme.md"}, apiData[0].Files)
 | |
| 
 | |
| 	assert.EqualValues(t, resp.Header().Get("X-Total"), "1")
 | |
| }
 | |
| 
 | |
| func TestGetFileHistoryNotOnMaster(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 	// Login as User2.
 | |
| 	session := loginUser(t, user.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
 | |
| 
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo20/commits?path=test.csv&token="+token+"&sha=add-csv¬=master", user.Name)
 | |
| 	resp := MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	var apiData []api.Commit
 | |
| 	DecodeJSON(t, resp, &apiData)
 | |
| 
 | |
| 	assert.Len(t, apiData, 1)
 | |
| 	assert.Equal(t, "c8e31bc7688741a5287fcde4fbb8fc129ca07027", apiData[0].CommitMeta.SHA)
 | |
| 	compareCommitFiles(t, []string{"test.csv"}, apiData[0].Files)
 | |
| 
 | |
| 	assert.EqualValues(t, resp.Header().Get("X-Total"), "1")
 | |
| }
 |