mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 03:18:24 +00:00 
			
		
		
		
	## 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>
		
	
		
			
				
	
	
		
			195 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			195 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2017 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package integration
 | |
| 
 | |
| import (
 | |
| 	"net/http"
 | |
| 	"net/url"
 | |
| 	"testing"
 | |
| 
 | |
| 	auth_model "code.gitea.io/gitea/models/auth"
 | |
| 	api "code.gitea.io/gitea/modules/structs"
 | |
| 	"code.gitea.io/gitea/tests"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func testAPIGetBranch(t *testing.T, branchName string, exists bool) {
 | |
| 	token := getUserToken(t, "user2", auth_model.AccessTokenScopeReadRepository)
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branches/%s?token=%s", branchName, token)
 | |
| 	resp := MakeRequest(t, req, NoExpectedStatus)
 | |
| 	if !exists {
 | |
| 		assert.EqualValues(t, http.StatusNotFound, resp.Code)
 | |
| 		return
 | |
| 	}
 | |
| 	assert.EqualValues(t, http.StatusOK, resp.Code)
 | |
| 	var branch api.Branch
 | |
| 	DecodeJSON(t, resp, &branch)
 | |
| 	assert.EqualValues(t, branchName, branch.Name)
 | |
| 	assert.True(t, branch.UserCanPush)
 | |
| 	assert.True(t, branch.UserCanMerge)
 | |
| }
 | |
| 
 | |
| func testAPIGetBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) {
 | |
| 	token := getUserToken(t, "user2", auth_model.AccessTokenScopeReadRepository)
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branch_protections/%s?token=%s", branchName, token)
 | |
| 	resp := MakeRequest(t, req, expectedHTTPStatus)
 | |
| 
 | |
| 	if resp.Code == http.StatusOK {
 | |
| 		var branchProtection api.BranchProtection
 | |
| 		DecodeJSON(t, resp, &branchProtection)
 | |
| 		assert.EqualValues(t, branchName, branchProtection.RuleName)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func testAPICreateBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) {
 | |
| 	token := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteRepository)
 | |
| 	req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/branch_protections?token="+token, &api.BranchProtection{
 | |
| 		RuleName: branchName,
 | |
| 	})
 | |
| 	resp := MakeRequest(t, req, expectedHTTPStatus)
 | |
| 
 | |
| 	if resp.Code == http.StatusCreated {
 | |
| 		var branchProtection api.BranchProtection
 | |
| 		DecodeJSON(t, resp, &branchProtection)
 | |
| 		assert.EqualValues(t, branchName, branchProtection.RuleName)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func testAPIEditBranchProtection(t *testing.T, branchName string, body *api.BranchProtection, expectedHTTPStatus int) {
 | |
| 	token := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteRepository)
 | |
| 	req := NewRequestWithJSON(t, "PATCH", "/api/v1/repos/user2/repo1/branch_protections/"+branchName+"?token="+token, body)
 | |
| 	resp := MakeRequest(t, req, expectedHTTPStatus)
 | |
| 
 | |
| 	if resp.Code == http.StatusOK {
 | |
| 		var branchProtection api.BranchProtection
 | |
| 		DecodeJSON(t, resp, &branchProtection)
 | |
| 		assert.EqualValues(t, branchName, branchProtection.RuleName)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func testAPIDeleteBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) {
 | |
| 	token := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteRepository)
 | |
| 	req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branch_protections/%s?token=%s", branchName, token)
 | |
| 	MakeRequest(t, req, expectedHTTPStatus)
 | |
| }
 | |
| 
 | |
| func testAPIDeleteBranch(t *testing.T, branchName string, expectedHTTPStatus int) {
 | |
| 	token := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteRepository)
 | |
| 	req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branches/%s?token=%s", branchName, token)
 | |
| 	MakeRequest(t, req, expectedHTTPStatus)
 | |
| }
 | |
| 
 | |
| func TestAPIGetBranch(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	for _, test := range []struct {
 | |
| 		BranchName string
 | |
| 		Exists     bool
 | |
| 	}{
 | |
| 		{"master", true},
 | |
| 		{"master/doesnotexist", false},
 | |
| 		{"feature/1", true},
 | |
| 		{"feature/1/doesnotexist", false},
 | |
| 	} {
 | |
| 		testAPIGetBranch(t, test.BranchName, test.Exists)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestAPICreateBranch(t *testing.T) {
 | |
| 	onGiteaRun(t, testAPICreateBranches)
 | |
| }
 | |
| 
 | |
| func testAPICreateBranches(t *testing.T, giteaURL *url.URL) {
 | |
| 	username := "user2"
 | |
| 	ctx := NewAPITestContext(t, username, "my-noo-repo", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
 | |
| 	giteaURL.Path = ctx.GitPath()
 | |
| 
 | |
| 	t.Run("CreateRepo", doAPICreateRepository(ctx, false))
 | |
| 	testCases := []struct {
 | |
| 		OldBranch          string
 | |
| 		NewBranch          string
 | |
| 		ExpectedHTTPStatus int
 | |
| 	}{
 | |
| 		// Creating branch from default branch
 | |
| 		{
 | |
| 			OldBranch:          "",
 | |
| 			NewBranch:          "new_branch_from_default_branch",
 | |
| 			ExpectedHTTPStatus: http.StatusCreated,
 | |
| 		},
 | |
| 		// Creating branch from master
 | |
| 		{
 | |
| 			OldBranch:          "master",
 | |
| 			NewBranch:          "new_branch_from_master_1",
 | |
| 			ExpectedHTTPStatus: http.StatusCreated,
 | |
| 		},
 | |
| 		// Trying to create from master but already exists
 | |
| 		{
 | |
| 			OldBranch:          "master",
 | |
| 			NewBranch:          "new_branch_from_master_1",
 | |
| 			ExpectedHTTPStatus: http.StatusConflict,
 | |
| 		},
 | |
| 		// Trying to create from other branch (not default branch)
 | |
| 		{
 | |
| 			OldBranch:          "new_branch_from_master_1",
 | |
| 			NewBranch:          "branch_2",
 | |
| 			ExpectedHTTPStatus: http.StatusCreated,
 | |
| 		},
 | |
| 		// Trying to create from a branch which does not exist
 | |
| 		{
 | |
| 			OldBranch:          "does_not_exist",
 | |
| 			NewBranch:          "new_branch_from_non_existent",
 | |
| 			ExpectedHTTPStatus: http.StatusNotFound,
 | |
| 		},
 | |
| 	}
 | |
| 	for _, test := range testCases {
 | |
| 		session := ctx.Session
 | |
| 		testAPICreateBranch(t, session, "user2", "my-noo-repo", test.OldBranch, test.NewBranch, test.ExpectedHTTPStatus)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func testAPICreateBranch(t testing.TB, session *TestSession, user, repo, oldBranch, newBranch string, status int) bool {
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
 | |
| 	req := NewRequestWithJSON(t, "POST", "/api/v1/repos/"+user+"/"+repo+"/branches?token="+token, &api.CreateBranchRepoOption{
 | |
| 		BranchName:    newBranch,
 | |
| 		OldBranchName: oldBranch,
 | |
| 	})
 | |
| 	resp := MakeRequest(t, req, status)
 | |
| 
 | |
| 	var branch api.Branch
 | |
| 	DecodeJSON(t, resp, &branch)
 | |
| 
 | |
| 	if status == http.StatusCreated {
 | |
| 		assert.EqualValues(t, newBranch, branch.Name)
 | |
| 	}
 | |
| 
 | |
| 	return resp.Result().StatusCode == status
 | |
| }
 | |
| 
 | |
| func TestAPIBranchProtection(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 
 | |
| 	// Branch protection  on branch that not exist
 | |
| 	testAPICreateBranchProtection(t, "master/doesnotexist", http.StatusCreated)
 | |
| 	// Get branch protection on branch that exist but not branch protection
 | |
| 	testAPIGetBranchProtection(t, "master", http.StatusNotFound)
 | |
| 
 | |
| 	testAPICreateBranchProtection(t, "master", http.StatusCreated)
 | |
| 	// Can only create once
 | |
| 	testAPICreateBranchProtection(t, "master", http.StatusForbidden)
 | |
| 
 | |
| 	// Can't delete a protected branch
 | |
| 	testAPIDeleteBranch(t, "master", http.StatusForbidden)
 | |
| 
 | |
| 	testAPIGetBranchProtection(t, "master", http.StatusOK)
 | |
| 	testAPIEditBranchProtection(t, "master", &api.BranchProtection{
 | |
| 		EnablePush: true,
 | |
| 	}, http.StatusOK)
 | |
| 
 | |
| 	testAPIDeleteBranchProtection(t, "master", http.StatusNoContent)
 | |
| 
 | |
| 	// Test branch deletion
 | |
| 	testAPIDeleteBranch(t, "master", http.StatusForbidden)
 | |
| 	testAPIDeleteBranch(t, "branch2", http.StatusNoContent)
 | |
| }
 |