mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Support scoped access tokens (#20908)
This PR adds the support for scopes of access tokens, mimicking the design of GitHub OAuth scopes. The changes of the core logic are in `models/auth` that `AccessToken` struct will have a `Scope` field. The normalized (no duplication of scope), comma-separated scope string will be stored in `access_token` table in the database. In `services/auth`, the scope will be stored in context, which will be used by `reqToken` middleware in API calls. Only OAuth2 tokens will have granular token scopes, while others like BasicAuth will default to scope `all`. A large amount of work happens in `routers/api/v1/api.go` and the corresponding `tests/integration` tests, that is adding necessary scopes to each of the API calls as they fit. - [x] Add `Scope` field to `AccessToken` - [x] Add access control to all API endpoints - [x] Update frontend & backend for when creating tokens - [x] Add a database migration for `scope` column (enable 'all' access to past tokens) I'm aiming to complete it before Gitea 1.19 release. Fixes #4300
This commit is contained in:
		| @@ -9,6 +9,7 @@ import ( | ||||
| 	"net/http" | ||||
| 	"testing" | ||||
|  | ||||
| 	auth_model "code.gitea.io/gitea/models/auth" | ||||
| 	"code.gitea.io/gitea/models/db" | ||||
| 	issues_model "code.gitea.io/gitea/models/issues" | ||||
| 	repo_model "code.gitea.io/gitea/models/repo" | ||||
| @@ -28,7 +29,7 @@ func TestAPIViewPulls(t *testing.T) { | ||||
| 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) | ||||
| 	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | ||||
|  | ||||
| 	ctx := NewAPITestContext(t, "user2", repo.Name) | ||||
| 	ctx := NewAPITestContext(t, "user2", repo.Name, auth_model.AccessTokenScopeRepo) | ||||
|  | ||||
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/pulls?state=all&token="+ctx.Token, owner.Name, repo.Name) | ||||
| 	resp := ctx.Session.MakeRequest(t, req, http.StatusOK) | ||||
| @@ -74,7 +75,7 @@ func TestAPIMergePullWIP(t *testing.T) { | ||||
| 	assert.Contains(t, pr.Issue.Title, setting.Repository.PullRequest.WorkInProgressPrefixes[0]) | ||||
|  | ||||
| 	session := loginUser(t, owner.Name) | ||||
| 	token := getTokenForLoggedInUser(t, session) | ||||
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo) | ||||
| 	req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", owner.Name, repo.Name, pr.Index, token), &forms.MergePullRequestForm{ | ||||
| 		MergeMessageField: pr.Issue.Title, | ||||
| 		Do:                string(repo_model.MergeStyleMerge), | ||||
| @@ -93,7 +94,7 @@ func TestAPICreatePullSuccess(t *testing.T) { | ||||
| 	owner11 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo11.OwnerID}) | ||||
|  | ||||
| 	session := loginUser(t, owner11.Name) | ||||
| 	token := getTokenForLoggedInUser(t, session) | ||||
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo) | ||||
| 	req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", owner10.Name, repo10.Name, token), &api.CreatePullRequestOption{ | ||||
| 		Head:  fmt.Sprintf("%s:master", owner11.Name), | ||||
| 		Base:  "master", | ||||
| @@ -113,7 +114,7 @@ func TestAPICreatePullWithFieldsSuccess(t *testing.T) { | ||||
| 	owner11 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo11.OwnerID}) | ||||
|  | ||||
| 	session := loginUser(t, owner11.Name) | ||||
| 	token := getTokenForLoggedInUser(t, session) | ||||
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo) | ||||
|  | ||||
| 	opts := &api.CreatePullRequestOption{ | ||||
| 		Head:      fmt.Sprintf("%s:master", owner11.Name), | ||||
| @@ -150,7 +151,7 @@ func TestAPICreatePullWithFieldsFailure(t *testing.T) { | ||||
| 	owner11 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo11.OwnerID}) | ||||
|  | ||||
| 	session := loginUser(t, owner11.Name) | ||||
| 	token := getTokenForLoggedInUser(t, session) | ||||
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo) | ||||
|  | ||||
| 	opts := &api.CreatePullRequestOption{ | ||||
| 		Head: fmt.Sprintf("%s:master", owner11.Name), | ||||
| @@ -180,7 +181,7 @@ func TestAPIEditPull(t *testing.T) { | ||||
| 	owner10 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo10.OwnerID}) | ||||
|  | ||||
| 	session := loginUser(t, owner10.Name) | ||||
| 	token := getTokenForLoggedInUser(t, session) | ||||
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo) | ||||
| 	req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", owner10.Name, repo10.Name, token), &api.CreatePullRequestOption{ | ||||
| 		Head:  "develop", | ||||
| 		Base:  "master", | ||||
|   | ||||
		Reference in New Issue
	
	Block a user