|
|
|
|
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
|
|
|
|
|
package integration
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"fmt"
|
|
|
|
|
"net/http"
|
|
|
|
|
"sort"
|
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
|
|
auth_model "code.gitea.io/gitea/models/auth"
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
"code.gitea.io/gitea/models/db"
|
|
|
|
|
"code.gitea.io/gitea/models/organization"
|
|
|
|
|
"code.gitea.io/gitea/models/repo"
|
|
|
|
|
"code.gitea.io/gitea/models/unit"
|
|
|
|
|
"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/services/convert"
|
|
|
|
|
"code.gitea.io/gitea/tests"
|
|
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
func TestAPITeam(t *testing.T) {
|
|
|
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
|
|
|
|
|
|
teamUser := unittest.AssertExistsAndLoadBean(t, &organization.TeamUser{ID: 1})
|
|
|
|
|
team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamUser.TeamID})
|
|
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: teamUser.UID})
|
|
|
|
|
|
|
|
|
|
session := loginUser(t, user.Name)
|
|
|
|
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeAdminOrg)
|
|
|
|
|
req := NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamUser.TeamID)
|
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
|
|
|
|
|
var apiTeam api.Team
|
|
|
|
|
DecodeJSON(t, resp, &apiTeam)
|
|
|
|
|
assert.EqualValues(t, team.ID, apiTeam.ID)
|
|
|
|
|
assert.Equal(t, team.Name, apiTeam.Name)
|
|
|
|
|
|
|
|
|
|
// non team member user will not access the teams details
|
|
|
|
|
teamUser2 := unittest.AssertExistsAndLoadBean(t, &organization.TeamUser{ID: 3})
|
|
|
|
|
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: teamUser2.UID})
|
|
|
|
|
|
|
|
|
|
session = loginUser(t, user2.Name)
|
|
|
|
|
token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadOrg)
|
|
|
|
|
req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamUser.TeamID)
|
|
|
|
|
_ = MakeRequest(t, req, http.StatusForbidden)
|
|
|
|
|
|
|
|
|
|
req = NewRequestf(t, "GET", "/api/v1/teams/%d", teamUser.TeamID)
|
|
|
|
|
_ = MakeRequest(t, req, http.StatusUnauthorized)
|
|
|
|
|
|
|
|
|
|
// Get an admin user able to create, update and delete teams.
|
|
|
|
|
user = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
|
|
|
|
session = loginUser(t, user.Name)
|
|
|
|
|
token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeAdminOrg)
|
|
|
|
|
|
|
|
|
|
org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 6})
|
|
|
|
|
|
|
|
|
|
// Create team.
|
|
|
|
|
teamToCreate := &api.CreateTeamOption{
|
|
|
|
|
Name: "team1",
|
|
|
|
|
Description: "team one",
|
|
|
|
|
IncludesAllRepositories: true,
|
|
|
|
|
Permission: "write",
|
|
|
|
|
Units: []string{"repo.code", "repo.issues"},
|
|
|
|
|
}
|
|
|
|
|
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams?token=%s", org.Name, token), teamToCreate)
|
|
|
|
|
resp = MakeRequest(t, req, http.StatusCreated)
|
|
|
|
|
apiTeam = api.Team{}
|
|
|
|
|
DecodeJSON(t, resp, &apiTeam)
|
|
|
|
|
checkTeamResponse(t, "CreateTeam1", &apiTeam, teamToCreate.Name, teamToCreate.Description, teamToCreate.IncludesAllRepositories,
|
|
|
|
|
teamToCreate.Permission, teamToCreate.Units, nil)
|
|
|
|
|
checkTeamBean(t, apiTeam.ID, teamToCreate.Name, teamToCreate.Description, teamToCreate.IncludesAllRepositories,
|
|
|
|
|
teamToCreate.Permission, teamToCreate.Units, nil)
|
|
|
|
|
teamID := apiTeam.ID
|
|
|
|
|
|
|
|
|
|
// Edit team.
|
|
|
|
|
editDescription := "team 1"
|
|
|
|
|
editFalse := false
|
|
|
|
|
teamToEdit := &api.EditTeamOption{
|
|
|
|
|
Name: "teamone",
|
|
|
|
|
Description: &editDescription,
|
|
|
|
|
Permission: "admin",
|
|
|
|
|
IncludesAllRepositories: &editFalse,
|
|
|
|
|
Units: []string{"repo.code", "repo.pulls", "repo.releases"},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d?token=%s", teamID, token), teamToEdit)
|
|
|
|
|
resp = MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
apiTeam = api.Team{}
|
|
|
|
|
DecodeJSON(t, resp, &apiTeam)
|
|
|
|
|
checkTeamResponse(t, "EditTeam1", &apiTeam, teamToEdit.Name, *teamToEdit.Description, *teamToEdit.IncludesAllRepositories,
|
|
|
|
|
teamToEdit.Permission, unit.AllUnitKeyNames(), nil)
|
|
|
|
|
checkTeamBean(t, apiTeam.ID, teamToEdit.Name, *teamToEdit.Description, *teamToEdit.IncludesAllRepositories,
|
|
|
|
|
teamToEdit.Permission, unit.AllUnitKeyNames(), nil)
|
|
|
|
|
|
|
|
|
|
// Edit team Description only
|
|
|
|
|
editDescription = "first team"
|
|
|
|
|
teamToEditDesc := api.EditTeamOption{Description: &editDescription}
|
|
|
|
|
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d?token=%s", teamID, token), teamToEditDesc)
|
|
|
|
|
resp = MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
apiTeam = api.Team{}
|
|
|
|
|
DecodeJSON(t, resp, &apiTeam)
|
|
|
|
|
checkTeamResponse(t, "EditTeam1_DescOnly", &apiTeam, teamToEdit.Name, *teamToEditDesc.Description, *teamToEdit.IncludesAllRepositories,
|
|
|
|
|
teamToEdit.Permission, unit.AllUnitKeyNames(), nil)
|
|
|
|
|
checkTeamBean(t, apiTeam.ID, teamToEdit.Name, *teamToEditDesc.Description, *teamToEdit.IncludesAllRepositories,
|
|
|
|
|
teamToEdit.Permission, unit.AllUnitKeyNames(), nil)
|
|
|
|
|
|
|
|
|
|
// Read team.
|
|
|
|
|
teamRead := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID})
|
|
|
|
|
assert.NoError(t, teamRead.LoadUnits(db.DefaultContext))
|
|
|
|
|
req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamID)
|
|
|
|
|
resp = MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
apiTeam = api.Team{}
|
|
|
|
|
DecodeJSON(t, resp, &apiTeam)
|
|
|
|
|
checkTeamResponse(t, "ReadTeam1", &apiTeam, teamRead.Name, *teamToEditDesc.Description, teamRead.IncludesAllRepositories,
|
|
|
|
|
teamRead.AccessMode.String(), teamRead.GetUnitNames(), teamRead.GetUnitsMap())
|
|
|
|
|
|
|
|
|
|
// Delete team.
|
|
|
|
|
req = NewRequestf(t, "DELETE", "/api/v1/teams/%d?token="+token, teamID)
|
|
|
|
|
MakeRequest(t, req, http.StatusNoContent)
|
|
|
|
|
unittest.AssertNotExistsBean(t, &organization.Team{ID: teamID})
|
|
|
|
|
|
|
|
|
|
// create team again via UnitsMap
|
|
|
|
|
// Create team.
|
|
|
|
|
teamToCreate = &api.CreateTeamOption{
|
|
|
|
|
Name: "team2",
|
|
|
|
|
Description: "team two",
|
|
|
|
|
IncludesAllRepositories: true,
|
|
|
|
|
Permission: "write",
|
|
|
|
|
UnitsMap: map[string]string{"repo.code": "read", "repo.issues": "write", "repo.wiki": "none"},
|
|
|
|
|
}
|
|
|
|
|
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams?token=%s", org.Name, token), teamToCreate)
|
|
|
|
|
resp = MakeRequest(t, req, http.StatusCreated)
|
|
|
|
|
apiTeam = api.Team{}
|
|
|
|
|
DecodeJSON(t, resp, &apiTeam)
|
|
|
|
|
checkTeamResponse(t, "CreateTeam2", &apiTeam, teamToCreate.Name, teamToCreate.Description, teamToCreate.IncludesAllRepositories,
|
|
|
|
|
"read", nil, teamToCreate.UnitsMap)
|
|
|
|
|
checkTeamBean(t, apiTeam.ID, teamToCreate.Name, teamToCreate.Description, teamToCreate.IncludesAllRepositories,
|
|
|
|
|
"read", nil, teamToCreate.UnitsMap)
|
|
|
|
|
teamID = apiTeam.ID
|
|
|
|
|
|
|
|
|
|
// Edit team.
|
|
|
|
|
editDescription = "team 1"
|
|
|
|
|
editFalse = false
|
|
|
|
|
teamToEdit = &api.EditTeamOption{
|
|
|
|
|
Name: "teamtwo",
|
|
|
|
|
Description: &editDescription,
|
|
|
|
|
Permission: "write",
|
|
|
|
|
IncludesAllRepositories: &editFalse,
|
|
|
|
|
UnitsMap: map[string]string{"repo.code": "read", "repo.pulls": "read", "repo.releases": "write"},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d?token=%s", teamID, token), teamToEdit)
|
|
|
|
|
resp = MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
apiTeam = api.Team{}
|
|
|
|
|
DecodeJSON(t, resp, &apiTeam)
|
|
|
|
|
checkTeamResponse(t, "EditTeam2", &apiTeam, teamToEdit.Name, *teamToEdit.Description, *teamToEdit.IncludesAllRepositories,
|
|
|
|
|
"read", nil, teamToEdit.UnitsMap)
|
|
|
|
|
checkTeamBean(t, apiTeam.ID, teamToEdit.Name, *teamToEdit.Description, *teamToEdit.IncludesAllRepositories,
|
|
|
|
|
"read", nil, teamToEdit.UnitsMap)
|
|
|
|
|
|
|
|
|
|
// Edit team Description only
|
|
|
|
|
editDescription = "second team"
|
|
|
|
|
teamToEditDesc = api.EditTeamOption{Description: &editDescription}
|
|
|
|
|
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d?token=%s", teamID, token), teamToEditDesc)
|
|
|
|
|
resp = MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
apiTeam = api.Team{}
|
|
|
|
|
DecodeJSON(t, resp, &apiTeam)
|
|
|
|
|
checkTeamResponse(t, "EditTeam2_DescOnly", &apiTeam, teamToEdit.Name, *teamToEditDesc.Description, *teamToEdit.IncludesAllRepositories,
|
|
|
|
|
"read", nil, teamToEdit.UnitsMap)
|
|
|
|
|
checkTeamBean(t, apiTeam.ID, teamToEdit.Name, *teamToEditDesc.Description, *teamToEdit.IncludesAllRepositories,
|
|
|
|
|
"read", nil, teamToEdit.UnitsMap)
|
|
|
|
|
|
|
|
|
|
// Read team.
|
|
|
|
|
teamRead = unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID})
|
|
|
|
|
req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamID)
|
|
|
|
|
resp = MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
apiTeam = api.Team{}
|
|
|
|
|
DecodeJSON(t, resp, &apiTeam)
|
|
|
|
|
assert.NoError(t, teamRead.LoadUnits(db.DefaultContext))
|
|
|
|
|
checkTeamResponse(t, "ReadTeam2", &apiTeam, teamRead.Name, *teamToEditDesc.Description, teamRead.IncludesAllRepositories,
|
|
|
|
|
teamRead.AccessMode.String(), teamRead.GetUnitNames(), teamRead.GetUnitsMap())
|
|
|
|
|
|
|
|
|
|
// Delete team.
|
|
|
|
|
req = NewRequestf(t, "DELETE", "/api/v1/teams/%d?token="+token, teamID)
|
|
|
|
|
MakeRequest(t, req, http.StatusNoContent)
|
|
|
|
|
unittest.AssertNotExistsBean(t, &organization.Team{ID: teamID})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func checkTeamResponse(t *testing.T, testName string, apiTeam *api.Team, name, description string, includesAllRepositories bool, permission string, units []string, unitsMap map[string]string) {
|
|
|
|
|
t.Run(testName, func(t *testing.T) {
|
|
|
|
|
assert.Equal(t, name, apiTeam.Name, "name")
|
|
|
|
|
assert.Equal(t, description, apiTeam.Description, "description")
|
|
|
|
|
assert.Equal(t, includesAllRepositories, apiTeam.IncludesAllRepositories, "includesAllRepositories")
|
|
|
|
|
assert.Equal(t, permission, apiTeam.Permission, "permission")
|
|
|
|
|
if units != nil {
|
|
|
|
|
sort.StringSlice(units).Sort()
|
|
|
|
|
sort.StringSlice(apiTeam.Units).Sort()
|
|
|
|
|
assert.EqualValues(t, units, apiTeam.Units, "units")
|
|
|
|
|
}
|
|
|
|
|
if unitsMap != nil {
|
|
|
|
|
assert.EqualValues(t, unitsMap, apiTeam.UnitsMap, "unitsMap")
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func checkTeamBean(t *testing.T, id int64, name, description string, includesAllRepositories bool, permission string, units []string, unitsMap map[string]string) {
|
|
|
|
|
team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: id})
|
|
|
|
|
assert.NoError(t, team.LoadUnits(db.DefaultContext), "LoadUnits")
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
apiTeam, err := convert.ToTeam(db.DefaultContext, team)
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
checkTeamResponse(t, fmt.Sprintf("checkTeamBean/%s_%s", name, description), apiTeam, name, description, includesAllRepositories, permission, units, unitsMap)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type TeamSearchResults struct {
|
|
|
|
|
OK bool `json:"ok"`
|
|
|
|
|
Data []*api.Team `json:"data"`
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestAPITeamSearch(t *testing.T) {
|
|
|
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
|
|
|
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
|
|
|
org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 17})
|
|
|
|
|
|
|
|
|
|
var results TeamSearchResults
|
|
|
|
|
|
|
|
|
|
token := getUserToken(t, user.Name, auth_model.AccessTokenScopeReadOrg)
|
|
|
|
|
req := NewRequestf(t, "GET", "/api/v1/orgs/%s/teams/search?q=%s&token=%s", org.Name, "_team", token)
|
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
DecodeJSON(t, resp, &results)
|
|
|
|
|
assert.NotEmpty(t, results.Data)
|
|
|
|
|
assert.Len(t, results.Data, 1)
|
|
|
|
|
assert.Equal(t, "test_team", results.Data[0].Name)
|
|
|
|
|
|
|
|
|
|
// no access if not organization member
|
|
|
|
|
user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
|
|
|
|
|
token5 := getUserToken(t, user5.Name, auth_model.AccessTokenScopeReadOrg)
|
|
|
|
|
|
|
|
|
|
req = NewRequestf(t, "GET", "/api/v1/orgs/%s/teams/search?q=%s&token=%s", org.Name, "team", token5)
|
|
|
|
|
MakeRequest(t, req, http.StatusForbidden)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestAPIGetTeamRepo(t *testing.T) {
|
|
|
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
|
|
|
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 15})
|
|
|
|
|
teamRepo := unittest.AssertExistsAndLoadBean(t, &repo.Repository{ID: 24})
|
|
|
|
|
team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 5})
|
|
|
|
|
|
|
|
|
|
var results api.Repository
|
|
|
|
|
|
|
|
|
|
token := getUserToken(t, user.Name, auth_model.AccessTokenScopeReadOrg)
|
|
|
|
|
req := NewRequestf(t, "GET", "/api/v1/teams/%d/repos/%s/?token=%s", team.ID, teamRepo.FullName(), token)
|
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
DecodeJSON(t, resp, &results)
|
|
|
|
|
assert.Equal(t, "big_test_private_4", teamRepo.Name)
|
|
|
|
|
|
|
|
|
|
// no access if not organization member
|
|
|
|
|
user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
|
|
|
|
|
token5 := getUserToken(t, user5.Name, auth_model.AccessTokenScopeReadOrg)
|
|
|
|
|
|
|
|
|
|
req = NewRequestf(t, "GET", "/api/v1/teams/%d/repos/%s/?token=%s", team.ID, teamRepo.FullName(), token5)
|
|
|
|
|
MakeRequest(t, req, http.StatusNotFound)
|
|
|
|
|
}
|
