mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 09:17:34 -04: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>
		
	
		
			
				
	
	
		
			202 lines
		
	
	
		
			8.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			202 lines
		
	
	
		
			8.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2017 The Gogs Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package integration
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 	"net/http"
 | |
| 	"net/url"
 | |
| 	"testing"
 | |
| 
 | |
| 	asymkey_model "code.gitea.io/gitea/models/asymkey"
 | |
| 	auth_model "code.gitea.io/gitea/models/auth"
 | |
| 	"code.gitea.io/gitea/models/perm"
 | |
| 	repo_model "code.gitea.io/gitea/models/repo"
 | |
| 	"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 TestViewDeployKeysNoLogin(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/keys")
 | |
| 	MakeRequest(t, req, http.StatusUnauthorized)
 | |
| }
 | |
| 
 | |
| func TestCreateDeployKeyNoLogin(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/keys", api.CreateKeyOption{
 | |
| 		Title: "title",
 | |
| 		Key:   "key",
 | |
| 	})
 | |
| 	MakeRequest(t, req, http.StatusUnauthorized)
 | |
| }
 | |
| 
 | |
| func TestGetDeployKeyNoLogin(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/keys/1")
 | |
| 	MakeRequest(t, req, http.StatusUnauthorized)
 | |
| }
 | |
| 
 | |
| func TestDeleteDeployKeyNoLogin(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	req := NewRequest(t, "DELETE", "/api/v1/repos/user2/repo1/keys/1")
 | |
| 	MakeRequest(t, req, http.StatusUnauthorized)
 | |
| }
 | |
| 
 | |
| func TestCreateReadOnlyDeployKey(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: "repo1"})
 | |
| 	repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
 | |
| 
 | |
| 	session := loginUser(t, repoOwner.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
 | |
| 	keysURL := fmt.Sprintf("/api/v1/repos/%s/%s/keys?token=%s", repoOwner.Name, repo.Name, token)
 | |
| 	rawKeyBody := api.CreateKeyOption{
 | |
| 		Title:    "read-only",
 | |
| 		Key:      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n",
 | |
| 		ReadOnly: true,
 | |
| 	}
 | |
| 	req := NewRequestWithJSON(t, "POST", keysURL, rawKeyBody)
 | |
| 	resp := MakeRequest(t, req, http.StatusCreated)
 | |
| 
 | |
| 	var newDeployKey api.DeployKey
 | |
| 	DecodeJSON(t, resp, &newDeployKey)
 | |
| 	unittest.AssertExistsAndLoadBean(t, &asymkey_model.DeployKey{
 | |
| 		ID:      newDeployKey.ID,
 | |
| 		Name:    rawKeyBody.Title,
 | |
| 		Content: rawKeyBody.Key,
 | |
| 		Mode:    perm.AccessModeRead,
 | |
| 	})
 | |
| }
 | |
| 
 | |
| func TestCreateReadWriteDeployKey(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: "repo1"})
 | |
| 	repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
 | |
| 
 | |
| 	session := loginUser(t, repoOwner.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
 | |
| 	keysURL := fmt.Sprintf("/api/v1/repos/%s/%s/keys?token=%s", repoOwner.Name, repo.Name, token)
 | |
| 	rawKeyBody := api.CreateKeyOption{
 | |
| 		Title: "read-write",
 | |
| 		Key:   "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n",
 | |
| 	}
 | |
| 	req := NewRequestWithJSON(t, "POST", keysURL, rawKeyBody)
 | |
| 	resp := MakeRequest(t, req, http.StatusCreated)
 | |
| 
 | |
| 	var newDeployKey api.DeployKey
 | |
| 	DecodeJSON(t, resp, &newDeployKey)
 | |
| 	unittest.AssertExistsAndLoadBean(t, &asymkey_model.DeployKey{
 | |
| 		ID:      newDeployKey.ID,
 | |
| 		Name:    rawKeyBody.Title,
 | |
| 		Content: rawKeyBody.Key,
 | |
| 		Mode:    perm.AccessModeWrite,
 | |
| 	})
 | |
| }
 | |
| 
 | |
| func TestCreateUserKey(t *testing.T) {
 | |
| 	defer tests.PrepareTestEnv(t)()
 | |
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user1"})
 | |
| 
 | |
| 	session := loginUser(t, "user1")
 | |
| 	token := url.QueryEscape(getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser))
 | |
| 	keysURL := fmt.Sprintf("/api/v1/user/keys?token=%s", token)
 | |
| 	keyType := "ssh-rsa"
 | |
| 	keyContent := "AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM="
 | |
| 	rawKeyBody := api.CreateKeyOption{
 | |
| 		Title: "test-key",
 | |
| 		Key:   keyType + " " + keyContent,
 | |
| 	}
 | |
| 	req := NewRequestWithJSON(t, "POST", keysURL, rawKeyBody)
 | |
| 	resp := MakeRequest(t, req, http.StatusCreated)
 | |
| 
 | |
| 	var newPublicKey api.PublicKey
 | |
| 	DecodeJSON(t, resp, &newPublicKey)
 | |
| 	fingerprint, err := asymkey_model.CalcFingerprint(rawKeyBody.Key)
 | |
| 	assert.NoError(t, err)
 | |
| 	unittest.AssertExistsAndLoadBean(t, &asymkey_model.PublicKey{
 | |
| 		ID:          newPublicKey.ID,
 | |
| 		OwnerID:     user.ID,
 | |
| 		Name:        rawKeyBody.Title,
 | |
| 		Fingerprint: fingerprint,
 | |
| 		Mode:        perm.AccessModeWrite,
 | |
| 	})
 | |
| 
 | |
| 	// Search by fingerprint
 | |
| 	fingerprintURL := fmt.Sprintf("/api/v1/user/keys?token=%s&fingerprint=%s", token, newPublicKey.Fingerprint)
 | |
| 
 | |
| 	req = NewRequest(t, "GET", fingerprintURL)
 | |
| 	resp = MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	var fingerprintPublicKeys []api.PublicKey
 | |
| 	DecodeJSON(t, resp, &fingerprintPublicKeys)
 | |
| 	assert.Equal(t, newPublicKey.Fingerprint, fingerprintPublicKeys[0].Fingerprint)
 | |
| 	assert.Equal(t, newPublicKey.ID, fingerprintPublicKeys[0].ID)
 | |
| 	assert.Equal(t, user.ID, fingerprintPublicKeys[0].Owner.ID)
 | |
| 
 | |
| 	fingerprintURL = fmt.Sprintf("/api/v1/users/%s/keys?token=%s&fingerprint=%s", user.Name, token, newPublicKey.Fingerprint)
 | |
| 
 | |
| 	req = NewRequest(t, "GET", fingerprintURL)
 | |
| 	resp = MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	DecodeJSON(t, resp, &fingerprintPublicKeys)
 | |
| 	assert.Equal(t, newPublicKey.Fingerprint, fingerprintPublicKeys[0].Fingerprint)
 | |
| 	assert.Equal(t, newPublicKey.ID, fingerprintPublicKeys[0].ID)
 | |
| 	assert.Equal(t, user.ID, fingerprintPublicKeys[0].Owner.ID)
 | |
| 
 | |
| 	// Fail search by fingerprint
 | |
| 	fingerprintURL = fmt.Sprintf("/api/v1/user/keys?token=%s&fingerprint=%sA", token, newPublicKey.Fingerprint)
 | |
| 
 | |
| 	req = NewRequest(t, "GET", fingerprintURL)
 | |
| 	resp = MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	DecodeJSON(t, resp, &fingerprintPublicKeys)
 | |
| 	assert.Len(t, fingerprintPublicKeys, 0)
 | |
| 
 | |
| 	// Fail searching for wrong users key
 | |
| 	fingerprintURL = fmt.Sprintf("/api/v1/users/%s/keys?token=%s&fingerprint=%s", "user2", token, newPublicKey.Fingerprint)
 | |
| 	req = NewRequest(t, "GET", fingerprintURL)
 | |
| 	resp = MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	DecodeJSON(t, resp, &fingerprintPublicKeys)
 | |
| 	assert.Len(t, fingerprintPublicKeys, 0)
 | |
| 
 | |
| 	// Now login as user 2
 | |
| 	session2 := loginUser(t, "user2")
 | |
| 	token2 := url.QueryEscape(getTokenForLoggedInUser(t, session2, auth_model.AccessTokenScopeWriteUser))
 | |
| 
 | |
| 	// Should find key even though not ours, but we shouldn't know whose it is
 | |
| 	fingerprintURL = fmt.Sprintf("/api/v1/user/keys?token=%s&fingerprint=%s", token2, newPublicKey.Fingerprint)
 | |
| 	req = NewRequest(t, "GET", fingerprintURL)
 | |
| 	resp = MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	DecodeJSON(t, resp, &fingerprintPublicKeys)
 | |
| 	assert.Equal(t, newPublicKey.Fingerprint, fingerprintPublicKeys[0].Fingerprint)
 | |
| 	assert.Equal(t, newPublicKey.ID, fingerprintPublicKeys[0].ID)
 | |
| 	assert.Nil(t, fingerprintPublicKeys[0].Owner)
 | |
| 
 | |
| 	// Should find key even though not ours, but we shouldn't know whose it is
 | |
| 	fingerprintURL = fmt.Sprintf("/api/v1/users/%s/keys?token=%s&fingerprint=%s", user.Name, token2, newPublicKey.Fingerprint)
 | |
| 
 | |
| 	req = NewRequest(t, "GET", fingerprintURL)
 | |
| 	resp = MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	DecodeJSON(t, resp, &fingerprintPublicKeys)
 | |
| 	assert.Equal(t, newPublicKey.Fingerprint, fingerprintPublicKeys[0].Fingerprint)
 | |
| 	assert.Equal(t, newPublicKey.ID, fingerprintPublicKeys[0].ID)
 | |
| 	assert.Nil(t, fingerprintPublicKeys[0].Owner)
 | |
| 
 | |
| 	// Fail when searching for key if it is not ours
 | |
| 	fingerprintURL = fmt.Sprintf("/api/v1/users/%s/keys?token=%s&fingerprint=%s", "user2", token2, newPublicKey.Fingerprint)
 | |
| 	req = NewRequest(t, "GET", fingerprintURL)
 | |
| 	resp = MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	DecodeJSON(t, resp, &fingerprintPublicKeys)
 | |
| 	assert.Len(t, fingerprintPublicKeys, 0)
 | |
| }
 |