2017-12-06 03:27:10 -07:00
// Copyright 2017 The Gitea Authors. All rights reserved.
2022-11-27 11:20:29 -07:00
// SPDX-License-Identifier: MIT
2017-12-06 03:27:10 -07:00
2022-09-02 13:18:23 -06:00
package integration
2017-12-06 03:27:10 -07:00
import (
"fmt"
"net/http"
"testing"
2023-10-11 01:28:16 -06:00
"time"
2017-12-06 03:27:10 -07:00
2021-12-10 01:14:24 -07:00
asymkey_model "code.gitea.io/gitea/models/asymkey"
2023-01-17 14:46:03 -07:00
auth_model "code.gitea.io/gitea/models/auth"
2021-11-16 01:53:21 -07:00
"code.gitea.io/gitea/models/unittest"
2021-11-24 02:49:20 -07:00
user_model "code.gitea.io/gitea/models/user"
2021-07-24 10:03:58 -06:00
"code.gitea.io/gitea/modules/json"
2024-03-04 22:55:47 -07:00
"code.gitea.io/gitea/modules/setting"
2019-05-11 04:21:34 -06:00
api "code.gitea.io/gitea/modules/structs"
2022-09-02 13:18:23 -06:00
"code.gitea.io/gitea/tests"
2018-09-12 20:33:48 -06:00
2024-03-04 22:55:47 -07:00
"github.com/gobwas/glob"
2018-09-12 20:33:48 -06:00
"github.com/stretchr/testify/assert"
2017-12-06 03:27:10 -07:00
)
func TestAPIAdminCreateAndDeleteSSHKey ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2017-12-06 03:27:10 -07:00
// user1 is an admin user
session := loginUser ( t , "user1" )
2022-08-15 20:22:25 -06:00
keyOwner := unittest . AssertExistsAndLoadBean ( t , & user_model . User { Name : "user2" } )
2017-12-06 03:27:10 -07:00
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getTokenForLoggedInUser ( t , session , auth_model . AccessTokenScopeWriteAdmin )
2023-12-21 16:59:59 -07:00
urlStr := fmt . Sprintf ( "/api/v1/admin/users/%s/keys" , keyOwner . Name )
2017-12-06 03:27:10 -07:00
req := NewRequestWithValues ( t , "POST" , urlStr , map [ string ] string {
2020-10-09 00:52:57 -06:00
"key" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n" ,
2017-12-06 03:27:10 -07:00
"title" : "test-key" ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
resp := MakeRequest ( t , req , http . StatusCreated )
2017-12-06 03:27:10 -07:00
var newPublicKey api . PublicKey
DecodeJSON ( t , resp , & newPublicKey )
2021-12-10 01:14:24 -07:00
unittest . AssertExistsAndLoadBean ( t , & asymkey_model . PublicKey {
2017-12-06 03:27:10 -07:00
ID : newPublicKey . ID ,
Name : newPublicKey . Title ,
Fingerprint : newPublicKey . Fingerprint ,
OwnerID : keyOwner . ID ,
} )
2023-12-21 16:59:59 -07:00
req = NewRequestf ( t , "DELETE" , "/api/v1/admin/users/%s/keys/%d" , keyOwner . Name , newPublicKey . ID ) .
AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
MakeRequest ( t , req , http . StatusNoContent )
2021-12-10 01:14:24 -07:00
unittest . AssertNotExistsBean ( t , & asymkey_model . PublicKey { ID : newPublicKey . ID } )
2017-12-06 03:27:10 -07:00
}
func TestAPIAdminDeleteMissingSSHKey ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2017-12-06 03:27:10 -07:00
2022-12-01 20:39:42 -07:00
// user1 is an admin user
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , "user1" , auth_model . AccessTokenScopeWriteAdmin )
2023-12-21 16:59:59 -07:00
req := NewRequestf ( t , "DELETE" , "/api/v1/admin/users/user1/keys/%d" , unittest . NonexistentID ) .
AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
MakeRequest ( t , req , http . StatusNotFound )
2017-12-06 03:27:10 -07:00
}
func TestAPIAdminDeleteUnauthorizedKey ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2017-12-06 03:27:10 -07:00
adminUsername := "user1"
normalUsername := "user2"
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeWriteAdmin )
2017-12-06 03:27:10 -07:00
2023-12-21 16:59:59 -07:00
urlStr := fmt . Sprintf ( "/api/v1/admin/users/%s/keys" , adminUsername )
2017-12-06 03:27:10 -07:00
req := NewRequestWithValues ( t , "POST" , urlStr , map [ string ] string {
2020-10-09 00:52:57 -06:00
"key" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n" ,
2017-12-06 03:27:10 -07:00
"title" : "test-key" ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
resp := MakeRequest ( t , req , http . StatusCreated )
2017-12-06 03:27:10 -07:00
var newPublicKey api . PublicKey
DecodeJSON ( t , resp , & newPublicKey )
2022-12-01 20:39:42 -07:00
token = getUserToken ( t , normalUsername )
2023-12-21 16:59:59 -07:00
req = NewRequestf ( t , "DELETE" , "/api/v1/admin/users/%s/keys/%d" , adminUsername , newPublicKey . ID ) .
AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
MakeRequest ( t , req , http . StatusForbidden )
2017-12-06 03:27:10 -07:00
}
2018-09-06 21:31:29 -06:00
func TestAPISudoUser ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2018-09-06 21:31:29 -06:00
adminUsername := "user1"
normalUsername := "user2"
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeReadUser )
2018-09-06 21:31:29 -06:00
2023-12-21 16:59:59 -07:00
req := NewRequest ( t , "GET" , fmt . Sprintf ( "/api/v1/user?sudo=%s" , normalUsername ) ) .
AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
resp := MakeRequest ( t , req , http . StatusOK )
2018-09-06 21:31:29 -06:00
var user api . User
DecodeJSON ( t , resp , & user )
assert . Equal ( t , normalUsername , user . UserName )
}
func TestAPISudoUserForbidden ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2018-09-06 21:31:29 -06:00
adminUsername := "user1"
normalUsername := "user2"
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , normalUsername , auth_model . AccessTokenScopeReadAdmin )
2023-12-21 16:59:59 -07:00
req := NewRequest ( t , "GET" , fmt . Sprintf ( "/api/v1/user?sudo=%s" , adminUsername ) ) .
AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
MakeRequest ( t , req , http . StatusForbidden )
2018-09-06 21:31:29 -06:00
}
2019-04-15 10:36:59 -06:00
func TestAPIListUsers ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2019-04-15 10:36:59 -06:00
adminUsername := "user1"
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeReadAdmin )
2019-04-15 10:36:59 -06:00
2023-12-21 16:59:59 -07:00
req := NewRequest ( t , "GET" , "/api/v1/admin/users" ) .
AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
resp := MakeRequest ( t , req , http . StatusOK )
2019-04-15 10:36:59 -06:00
var users [ ] api . User
DecodeJSON ( t , resp , & users )
found := false
for _ , user := range users {
if user . UserName == adminUsername {
found = true
}
}
assert . True ( t , found )
2021-11-24 02:49:20 -07:00
numberOfUsers := unittest . GetCount ( t , & user_model . User { } , "type = 0" )
2023-04-22 15:56:27 -06:00
assert . Len ( t , users , numberOfUsers )
2019-04-15 10:36:59 -06:00
}
2019-05-08 13:17:32 -06:00
func TestAPIListUsersNotLoggedIn ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2019-05-08 13:17:32 -06:00
req := NewRequest ( t , "GET" , "/api/v1/admin/users" )
MakeRequest ( t , req , http . StatusUnauthorized )
}
func TestAPIListUsersNonAdmin ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2019-05-08 13:17:32 -06:00
nonAdminUsername := "user2"
2022-12-01 20:39:42 -07:00
token := getUserToken ( t , nonAdminUsername )
2023-12-21 16:59:59 -07:00
req := NewRequest ( t , "GET" , "/api/v1/admin/users" ) .
AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
MakeRequest ( t , req , http . StatusForbidden )
2019-05-08 13:17:32 -06:00
}
2020-11-14 09:53:43 -07:00
func TestAPICreateUserInvalidEmail ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2020-11-14 09:53:43 -07:00
adminUsername := "user1"
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeWriteAdmin )
2023-12-21 16:59:59 -07:00
req := NewRequestWithValues ( t , "POST" , "/api/v1/admin/users" , map [ string ] string {
2020-11-14 09:53:43 -07:00
"email" : "invalid_email@domain.com\r\n" ,
"full_name" : "invalid user" ,
"login_name" : "invalidUser" ,
"must_change_password" : "true" ,
"password" : "password" ,
"send_notify" : "true" ,
"source_id" : "0" ,
"username" : "invalidUser" ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
MakeRequest ( t , req , http . StatusUnprocessableEntity )
2020-11-14 09:53:43 -07:00
}
2020-11-19 18:56:42 -07:00
2022-10-17 10:23:27 -06:00
func TestAPICreateAndDeleteUser ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
adminUsername := "user1"
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeWriteAdmin )
2022-10-17 10:23:27 -06:00
req := NewRequestWithValues (
t ,
"POST" ,
2023-12-21 16:59:59 -07:00
"/api/v1/admin/users" ,
2022-10-17 10:23:27 -06:00
map [ string ] string {
"email" : "deleteme@domain.com" ,
"full_name" : "delete me" ,
"login_name" : "deleteme" ,
"must_change_password" : "true" ,
"password" : "password" ,
"send_notify" : "true" ,
"source_id" : "0" ,
"username" : "deleteme" ,
} ,
2023-12-21 16:59:59 -07:00
) . AddTokenAuth ( token )
2022-10-17 10:23:27 -06:00
MakeRequest ( t , req , http . StatusCreated )
2023-12-21 16:59:59 -07:00
req = NewRequest ( t , "DELETE" , "/api/v1/admin/users/deleteme" ) .
AddTokenAuth ( token )
2022-10-17 10:23:27 -06:00
MakeRequest ( t , req , http . StatusNoContent )
}
2020-11-19 18:56:42 -07:00
func TestAPIEditUser ( t * testing . T ) {
2022-09-02 13:18:23 -06:00
defer tests . PrepareTestEnv ( t ) ( )
2020-11-19 18:56:42 -07:00
adminUsername := "user1"
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeWriteAdmin )
2023-12-21 16:59:59 -07:00
urlStr := fmt . Sprintf ( "/api/v1/admin/users/%s" , "user2" )
2020-11-19 18:56:42 -07:00
2024-05-04 20:10:20 -06:00
fullNameToChange := "Full Name User 2"
2020-11-19 18:56:42 -07:00
req := NewRequestWithValues ( t , "PATCH" , urlStr , map [ string ] string {
// required
"login_name" : "user2" ,
"source_id" : "0" ,
// to change
2024-05-04 20:10:20 -06:00
"full_name" : fullNameToChange ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
MakeRequest ( t , req , http . StatusOK )
2024-05-04 20:10:20 -06:00
user2 := unittest . AssertExistsAndLoadBean ( t , & user_model . User { LoginName : "user2" } )
assert . Equal ( t , fullNameToChange , user2 . FullName )
2020-11-19 18:56:42 -07:00
empty := ""
req = NewRequestWithJSON ( t , "PATCH" , urlStr , api . EditUserOption {
LoginName : "user2" ,
SourceID : 0 ,
Email : & empty ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2024-02-04 06:29:09 -07:00
resp := MakeRequest ( t , req , http . StatusBadRequest )
2020-11-19 18:56:42 -07:00
2023-07-04 12:36:08 -06:00
errMap := make ( map [ string ] any )
2020-11-19 18:56:42 -07:00
json . Unmarshal ( resp . Body . Bytes ( ) , & errMap )
2024-02-04 06:29:09 -07:00
assert . EqualValues ( t , "e-mail invalid [email: ]" , errMap [ "message" ] . ( string ) )
2021-02-18 01:25:35 -07:00
2024-05-04 20:10:20 -06:00
user2 = unittest . AssertExistsAndLoadBean ( t , & user_model . User { LoginName : "user2" } )
2021-06-06 23:27:09 -06:00
assert . False ( t , user2 . IsRestricted )
2021-02-18 01:25:35 -07:00
bTrue := true
req = NewRequestWithJSON ( t , "PATCH" , urlStr , api . EditUserOption {
// required
LoginName : "user2" ,
SourceID : 0 ,
// to change
Restricted : & bTrue ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2022-12-01 20:39:42 -07:00
MakeRequest ( t , req , http . StatusOK )
2022-08-15 20:22:25 -06:00
user2 = unittest . AssertExistsAndLoadBean ( t , & user_model . User { LoginName : "user2" } )
2021-06-06 23:27:09 -06:00
assert . True ( t , user2 . IsRestricted )
2020-11-19 18:56:42 -07:00
}
2022-10-17 10:23:27 -06:00
func TestAPICreateRepoForUser ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
adminUsername := "user1"
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeWriteAdmin )
2022-10-17 10:23:27 -06:00
req := NewRequestWithJSON (
t ,
"POST" ,
2023-12-21 16:59:59 -07:00
fmt . Sprintf ( "/api/v1/admin/users/%s/repos" , adminUsername ) ,
2022-10-17 10:23:27 -06:00
& api . CreateRepoOption {
Name : "admincreatedrepo" ,
} ,
2023-12-21 16:59:59 -07:00
) . AddTokenAuth ( token )
2022-10-17 10:23:27 -06:00
MakeRequest ( t , req , http . StatusCreated )
}
2023-05-21 09:13:47 -06:00
func TestAPIRenameUser ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
adminUsername := "user1"
Redesign Scoped Access Tokens (#24767)
## 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>
2023-06-04 12:57:16 -06:00
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeWriteAdmin )
2023-12-21 16:59:59 -07:00
urlStr := fmt . Sprintf ( "/api/v1/admin/users/%s/rename" , "user2" )
2023-05-21 09:13:47 -06:00
req := NewRequestWithValues ( t , "POST" , urlStr , map [ string ] string {
// required
"new_name" : "User2" ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2024-02-04 06:29:09 -07:00
MakeRequest ( t , req , http . StatusNoContent )
2023-05-21 09:13:47 -06:00
2023-12-21 16:59:59 -07:00
urlStr = fmt . Sprintf ( "/api/v1/admin/users/%s/rename" , "User2" )
2023-05-21 09:13:47 -06:00
req = NewRequestWithValues ( t , "POST" , urlStr , map [ string ] string {
// required
"new_name" : "User2-2-2" ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2024-02-04 06:29:09 -07:00
MakeRequest ( t , req , http . StatusNoContent )
2023-05-21 09:13:47 -06:00
req = NewRequestWithValues ( t , "POST" , urlStr , map [ string ] string {
// required
"new_name" : "user1" ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2023-05-21 09:13:47 -06:00
// the old user name still be used by with a redirect
MakeRequest ( t , req , http . StatusTemporaryRedirect )
2023-12-21 16:59:59 -07:00
urlStr = fmt . Sprintf ( "/api/v1/admin/users/%s/rename" , "User2-2-2" )
2023-05-21 09:13:47 -06:00
req = NewRequestWithValues ( t , "POST" , urlStr , map [ string ] string {
// required
"new_name" : "user1" ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2023-05-21 09:13:47 -06:00
MakeRequest ( t , req , http . StatusUnprocessableEntity )
req = NewRequestWithValues ( t , "POST" , urlStr , map [ string ] string {
// required
"new_name" : "user2" ,
2023-12-21 16:59:59 -07:00
} ) . AddTokenAuth ( token )
2024-02-04 06:29:09 -07:00
MakeRequest ( t , req , http . StatusNoContent )
2023-05-21 09:13:47 -06:00
}
2023-10-11 01:28:16 -06:00
func TestAPICron ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
// user1 is an admin user
session := loginUser ( t , "user1" )
t . Run ( "List" , func ( t * testing . T ) {
defer tests . PrintCurrentTest ( t ) ( )
token := getTokenForLoggedInUser ( t , session , auth_model . AccessTokenScopeReadAdmin )
2023-12-21 16:59:59 -07:00
req := NewRequest ( t , "GET" , "/api/v1/admin/cron" ) .
AddTokenAuth ( token )
2023-10-11 01:28:16 -06:00
resp := MakeRequest ( t , req , http . StatusOK )
2024-10-01 13:25:08 -06:00
assert . Equal ( t , "29" , resp . Header ( ) . Get ( "X-Total-Count" ) )
2023-10-11 01:28:16 -06:00
var crons [ ] api . Cron
DecodeJSON ( t , resp , & crons )
2024-10-01 13:25:08 -06:00
assert . Len ( t , crons , 29 )
2023-10-11 01:28:16 -06:00
} )
t . Run ( "Execute" , func ( t * testing . T ) {
defer tests . PrintCurrentTest ( t ) ( )
now := time . Now ( )
token := getTokenForLoggedInUser ( t , session , auth_model . AccessTokenScopeWriteAdmin )
// Archive cleanup is harmless, because in the test environment there are none
// and is thus an NOOP operation and therefore doesn't interfere with any other
// tests.
2023-12-21 16:59:59 -07:00
req := NewRequest ( t , "POST" , "/api/v1/admin/cron/archive_cleanup" ) .
AddTokenAuth ( token )
2023-10-11 01:28:16 -06:00
MakeRequest ( t , req , http . StatusNoContent )
// Check for the latest run time for this cron, to ensure it has been run.
2023-12-21 16:59:59 -07:00
req = NewRequest ( t , "GET" , "/api/v1/admin/cron" ) .
AddTokenAuth ( token )
2023-10-11 01:28:16 -06:00
resp := MakeRequest ( t , req , http . StatusOK )
var crons [ ] api . Cron
DecodeJSON ( t , resp , & crons )
for _ , cron := range crons {
if cron . Name == "archive_cleanup" {
assert . True ( t , now . Before ( cron . Prev ) )
}
}
} )
}
2024-03-04 22:55:47 -07:00
func TestAPICreateUser_NotAllowedEmailDomain ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
setting . Service . EmailDomainAllowList = [ ] glob . Glob { glob . MustCompile ( "example.org" ) }
defer func ( ) {
setting . Service . EmailDomainAllowList = [ ] glob . Glob { }
} ( )
adminUsername := "user1"
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeWriteAdmin )
req := NewRequestWithValues ( t , "POST" , "/api/v1/admin/users" , map [ string ] string {
"email" : "allowedUser1@example1.org" ,
"login_name" : "allowedUser1" ,
"username" : "allowedUser1" ,
"password" : "allowedUser1_pass" ,
"must_change_password" : "true" ,
} ) . AddTokenAuth ( token )
2024-03-11 00:07:36 -06:00
resp := MakeRequest ( t , req , http . StatusCreated )
assert . Equal ( t , "the domain of user email allowedUser1@example1.org conflicts with EMAIL_DOMAIN_ALLOWLIST or EMAIL_DOMAIN_BLOCKLIST" , resp . Header ( ) . Get ( "X-Gitea-Warning" ) )
2024-03-04 22:55:47 -07:00
req = NewRequest ( t , "DELETE" , "/api/v1/admin/users/allowedUser1" ) . AddTokenAuth ( token )
MakeRequest ( t , req , http . StatusNoContent )
}
2024-03-05 09:51:56 -07:00
func TestAPIEditUser_NotAllowedEmailDomain ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
setting . Service . EmailDomainAllowList = [ ] glob . Glob { glob . MustCompile ( "example.org" ) }
defer func ( ) {
setting . Service . EmailDomainAllowList = [ ] glob . Glob { }
} ( )
adminUsername := "user1"
token := getUserToken ( t , adminUsername , auth_model . AccessTokenScopeWriteAdmin )
urlStr := fmt . Sprintf ( "/api/v1/admin/users/%s" , "user2" )
newEmail := "user2@example1.com"
req := NewRequestWithJSON ( t , "PATCH" , urlStr , api . EditUserOption {
LoginName : "user2" ,
SourceID : 0 ,
Email : & newEmail ,
} ) . AddTokenAuth ( token )
2024-03-11 00:07:36 -06:00
resp := MakeRequest ( t , req , http . StatusOK )
assert . Equal ( t , "the domain of user email user2@example1.com conflicts with EMAIL_DOMAIN_ALLOWLIST or EMAIL_DOMAIN_BLOCKLIST" , resp . Header ( ) . Get ( "X-Gitea-Warning" ) )
2024-03-05 09:51:56 -07:00
originalEmail := "user2@example.com"
req = NewRequestWithJSON ( t , "PATCH" , urlStr , api . EditUserOption {
LoginName : "user2" ,
SourceID : 0 ,
Email : & originalEmail ,
} ) . AddTokenAuth ( token )
MakeRequest ( t , req , http . StatusOK )
}