2023-05-25 16:17:19 +03:00
// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package integration
import (
"fmt"
"net/http"
"testing"
auth_model "code.gitea.io/gitea/models/auth"
issues_model "code.gitea.io/gitea/models/issues"
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 TestAPIPinIssue ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
assert . NoError ( t , unittest . LoadFixtures ( ) )
repo := unittest . AssertExistsAndLoadBean ( t , & repo_model . Repository { ID : 1 } )
issue := unittest . AssertExistsAndLoadBean ( t , & issues_model . Issue { RepoID : repo . ID } )
owner := unittest . AssertExistsAndLoadBean ( t , & user_model . User { ID : repo . OwnerID } )
session := loginUser ( t , owner . Name )
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 21:57:16 +03:00
token := getTokenForLoggedInUser ( t , session , auth_model . AccessTokenScopeWriteIssue )
2023-05-25 16:17:19 +03:00
// Pin the Issue
urlStr := fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d/pin?token=%s" ,
repo . OwnerName , repo . Name , issue . Index , token )
req := NewRequest ( t , "POST" , urlStr )
MakeRequest ( t , req , http . StatusNoContent )
// Check if the Issue is pinned
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d" , repo . OwnerName , repo . Name , issue . Index )
req = NewRequest ( t , "GET" , urlStr )
resp := MakeRequest ( t , req , http . StatusOK )
var issueAPI api . Issue
DecodeJSON ( t , resp , & issueAPI )
assert . Equal ( t , 1 , issueAPI . PinOrder )
}
func TestAPIUnpinIssue ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
assert . NoError ( t , unittest . LoadFixtures ( ) )
repo := unittest . AssertExistsAndLoadBean ( t , & repo_model . Repository { ID : 1 } )
issue := unittest . AssertExistsAndLoadBean ( t , & issues_model . Issue { RepoID : repo . ID } )
owner := unittest . AssertExistsAndLoadBean ( t , & user_model . User { ID : repo . OwnerID } )
session := loginUser ( t , owner . Name )
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 21:57:16 +03:00
token := getTokenForLoggedInUser ( t , session , auth_model . AccessTokenScopeWriteIssue )
2023-05-25 16:17:19 +03:00
// Pin the Issue
urlStr := fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d/pin?token=%s" ,
repo . OwnerName , repo . Name , issue . Index , token )
req := NewRequest ( t , "POST" , urlStr )
MakeRequest ( t , req , http . StatusNoContent )
// Check if the Issue is pinned
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d" , repo . OwnerName , repo . Name , issue . Index )
req = NewRequest ( t , "GET" , urlStr )
resp := MakeRequest ( t , req , http . StatusOK )
var issueAPI api . Issue
DecodeJSON ( t , resp , & issueAPI )
assert . Equal ( t , 1 , issueAPI . PinOrder )
// Unpin the Issue
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d/pin?token=%s" ,
repo . OwnerName , repo . Name , issue . Index , token )
req = NewRequest ( t , "DELETE" , urlStr )
MakeRequest ( t , req , http . StatusNoContent )
// Check if the Issue is no longer pinned
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d" , repo . OwnerName , repo . Name , issue . Index )
req = NewRequest ( t , "GET" , urlStr )
resp = MakeRequest ( t , req , http . StatusOK )
DecodeJSON ( t , resp , & issueAPI )
assert . Equal ( t , 0 , issueAPI . PinOrder )
}
func TestAPIMoveIssuePin ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
assert . NoError ( t , unittest . LoadFixtures ( ) )
repo := unittest . AssertExistsAndLoadBean ( t , & repo_model . Repository { ID : 1 } )
issue := unittest . AssertExistsAndLoadBean ( t , & issues_model . Issue { RepoID : repo . ID } )
issue2 := unittest . AssertExistsAndLoadBean ( t , & issues_model . Issue { ID : 2 , RepoID : repo . ID } )
owner := unittest . AssertExistsAndLoadBean ( t , & user_model . User { ID : repo . OwnerID } )
session := loginUser ( t , owner . Name )
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 21:57:16 +03:00
token := getTokenForLoggedInUser ( t , session , auth_model . AccessTokenScopeWriteIssue )
2023-05-25 16:17:19 +03:00
// Pin the first Issue
urlStr := fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d/pin?token=%s" ,
repo . OwnerName , repo . Name , issue . Index , token )
req := NewRequest ( t , "POST" , urlStr )
MakeRequest ( t , req , http . StatusNoContent )
// Check if the first Issue is pinned at position 1
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d" , repo . OwnerName , repo . Name , issue . Index )
req = NewRequest ( t , "GET" , urlStr )
resp := MakeRequest ( t , req , http . StatusOK )
var issueAPI api . Issue
DecodeJSON ( t , resp , & issueAPI )
assert . Equal ( t , 1 , issueAPI . PinOrder )
// Pin the second Issue
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d/pin?token=%s" ,
repo . OwnerName , repo . Name , issue2 . Index , token )
req = NewRequest ( t , "POST" , urlStr )
MakeRequest ( t , req , http . StatusNoContent )
// Move the first Issue to position 2
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d/pin/2?token=%s" ,
repo . OwnerName , repo . Name , issue . Index , token )
req = NewRequest ( t , "PATCH" , urlStr )
MakeRequest ( t , req , http . StatusNoContent )
// Check if the first Issue is pinned at position 2
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d" , repo . OwnerName , repo . Name , issue . Index )
req = NewRequest ( t , "GET" , urlStr )
resp = MakeRequest ( t , req , http . StatusOK )
var issueAPI3 api . Issue
DecodeJSON ( t , resp , & issueAPI3 )
assert . Equal ( t , 2 , issueAPI3 . PinOrder )
// Check if the second Issue is pinned at position 1
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d" , repo . OwnerName , repo . Name , issue2 . Index )
req = NewRequest ( t , "GET" , urlStr )
resp = MakeRequest ( t , req , http . StatusOK )
var issueAPI4 api . Issue
DecodeJSON ( t , resp , & issueAPI4 )
assert . Equal ( t , 1 , issueAPI4 . PinOrder )
}
func TestAPIListPinnedIssues ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
assert . NoError ( t , unittest . LoadFixtures ( ) )
repo := unittest . AssertExistsAndLoadBean ( t , & repo_model . Repository { ID : 1 } )
issue := unittest . AssertExistsAndLoadBean ( t , & issues_model . Issue { RepoID : repo . ID } )
owner := unittest . AssertExistsAndLoadBean ( t , & user_model . User { ID : repo . OwnerID } )
session := loginUser ( t , owner . Name )
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 21:57:16 +03:00
token := getTokenForLoggedInUser ( t , session , auth_model . AccessTokenScopeWriteIssue )
2023-05-25 16:17:19 +03:00
// Pin the Issue
urlStr := fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/%d/pin?token=%s" ,
repo . OwnerName , repo . Name , issue . Index , token )
req := NewRequest ( t , "POST" , urlStr )
MakeRequest ( t , req , http . StatusNoContent )
// Check if the Issue is in the List
urlStr = fmt . Sprintf ( "/api/v1/repos/%s/%s/issues/pinned" , repo . OwnerName , repo . Name )
req = NewRequest ( t , "GET" , urlStr )
resp := MakeRequest ( t , req , http . StatusOK )
var issueList [ ] api . Issue
DecodeJSON ( t , resp , & issueList )
assert . Equal ( t , 1 , len ( issueList ) )
assert . Equal ( t , issue . ID , issueList [ 0 ] . ID )
}
func TestAPIListPinnedPullrequests ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
assert . NoError ( t , unittest . LoadFixtures ( ) )
repo := unittest . AssertExistsAndLoadBean ( t , & repo_model . Repository { ID : 1 } )
urlStr := fmt . Sprintf ( "/api/v1/repos/%s/%s/pulls/pinned" , repo . OwnerName , repo . Name )
req := NewRequest ( t , "GET" , urlStr )
resp := MakeRequest ( t , req , http . StatusOK )
var prList [ ] api . PullRequest
DecodeJSON ( t , resp , & prList )
assert . Equal ( t , 0 , len ( prList ) )
}
func TestAPINewPinAllowed ( t * testing . T ) {
defer tests . PrepareTestEnv ( t ) ( )
repo := unittest . AssertExistsAndLoadBean ( t , & repo_model . Repository { ID : 1 } )
owner := unittest . AssertExistsAndLoadBean ( t , & user_model . User { ID : repo . OwnerID } )
urlStr := fmt . Sprintf ( "/api/v1/repos/%s/%s/new_pin_allowed" , owner . Name , repo . Name )
req := NewRequest ( t , "GET" , urlStr )
resp := MakeRequest ( t , req , http . StatusOK )
var newPinsAllowed api . NewIssuePinsAllowed
DecodeJSON ( t , resp , & newPinsAllowed )
assert . True ( t , newPinsAllowed . Issues )
assert . True ( t , newPinsAllowed . PullRequests )
}