mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-10-25 03:22:36 +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>
		
	
			
		
			
				
	
	
		
			110 lines
		
	
	
	
		
			2.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			110 lines
		
	
	
	
		
			2.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2023 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package v1_20 //nolint
 | |
| 
 | |
| import (
 | |
| 	"sort"
 | |
| 	"strings"
 | |
| 	"testing"
 | |
| 
 | |
| 	"code.gitea.io/gitea/models/migrations/base"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| type testCase struct {
 | |
| 	Old OldAccessTokenScope
 | |
| 	New AccessTokenScope
 | |
| }
 | |
| 
 | |
| func createOldTokenScope(scopes ...OldAccessTokenScope) OldAccessTokenScope {
 | |
| 	s := make([]string, 0, len(scopes))
 | |
| 	for _, os := range scopes {
 | |
| 		s = append(s, string(os))
 | |
| 	}
 | |
| 	return OldAccessTokenScope(strings.Join(s, ","))
 | |
| }
 | |
| 
 | |
| func createNewTokenScope(scopes ...AccessTokenScope) AccessTokenScope {
 | |
| 	s := make([]string, 0, len(scopes))
 | |
| 	for _, os := range scopes {
 | |
| 		s = append(s, string(os))
 | |
| 	}
 | |
| 	return AccessTokenScope(strings.Join(s, ","))
 | |
| }
 | |
| 
 | |
| func Test_ConvertScopedAccessTokens(t *testing.T) {
 | |
| 	tests := []testCase{
 | |
| 		{
 | |
| 			createOldTokenScope(OldAccessTokenScopeRepo, OldAccessTokenScopeUserFollow),
 | |
| 			createNewTokenScope(AccessTokenScopeWriteRepository, AccessTokenScopeWriteUser),
 | |
| 		},
 | |
| 		{
 | |
| 			createOldTokenScope(OldAccessTokenScopeUser, OldAccessTokenScopeWritePackage, OldAccessTokenScopeSudo),
 | |
| 			createNewTokenScope(AccessTokenScopeWriteAdmin, AccessTokenScopeWritePackage, AccessTokenScopeWriteUser),
 | |
| 		},
 | |
| 		{
 | |
| 			createOldTokenScope(),
 | |
| 			createNewTokenScope(),
 | |
| 		},
 | |
| 		{
 | |
| 			createOldTokenScope(OldAccessTokenScopeReadGPGKey, OldAccessTokenScopeReadOrg, OldAccessTokenScopeAll),
 | |
| 			createNewTokenScope(AccessTokenScopeAll),
 | |
| 		},
 | |
| 		{
 | |
| 			createOldTokenScope(OldAccessTokenScopeReadGPGKey, "invalid"),
 | |
| 			createNewTokenScope("invalid", AccessTokenScopeReadUser),
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	// add a test for each individual mapping
 | |
| 	for oldScope, newScope := range accessTokenScopeMap {
 | |
| 		tests = append(tests, testCase{
 | |
| 			oldScope,
 | |
| 			createNewTokenScope(newScope...),
 | |
| 		})
 | |
| 	}
 | |
| 
 | |
| 	x, deferable := base.PrepareTestEnv(t, 0, new(AccessToken))
 | |
| 	defer deferable()
 | |
| 	if x == nil || t.Failed() {
 | |
| 		t.Skip()
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	// verify that no fixtures were loaded
 | |
| 	count, err := x.Count(&AccessToken{})
 | |
| 	assert.NoError(t, err)
 | |
| 	assert.Equal(t, int64(0), count)
 | |
| 
 | |
| 	for _, tc := range tests {
 | |
| 		_, err = x.Insert(&AccessToken{
 | |
| 			Scope: string(tc.Old),
 | |
| 		})
 | |
| 		assert.NoError(t, err)
 | |
| 	}
 | |
| 
 | |
| 	// migrate the scopes
 | |
| 	err = ConvertScopedAccessTokens(x)
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	// migrate the scopes again (migration should be idempotent)
 | |
| 	err = ConvertScopedAccessTokens(x)
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	tokens := make([]AccessToken, 0)
 | |
| 	err = x.Find(&tokens)
 | |
| 	assert.NoError(t, err)
 | |
| 	assert.Equal(t, len(tests), len(tokens))
 | |
| 
 | |
| 	// sort the tokens (insertion order by auto-incrementing primary key)
 | |
| 	sort.Slice(tokens, func(i, j int) bool {
 | |
| 		return tokens[i].ID < tokens[j].ID
 | |
| 	})
 | |
| 
 | |
| 	// verify that the converted scopes are equal to the expected test result
 | |
| 	for idx, newToken := range tokens {
 | |
| 		assert.Equal(t, string(tests[idx].New), newToken.Scope)
 | |
| 	}
 | |
| }
 |