|
|
|
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
|
|
|
// Package contexttest provides utilities for testing Web/API contexts with models.
|
|
|
|
package contexttest
|
|
|
|
|
|
|
|
import (
|
|
|
|
gocontext "context"
|
|
|
|
"io"
|
|
|
|
"maps"
|
|
|
|
"net/http"
|
|
|
|
"net/http/httptest"
|
|
|
|
"net/url"
|
|
|
|
"strings"
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
access_model "code.gitea.io/gitea/models/perm/access"
|
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
|
|
"code.gitea.io/gitea/models/unittest"
|
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
|
|
"code.gitea.io/gitea/modules/cache"
|
Simplify how git repositories are opened (#28937)
## Purpose
This is a refactor toward building an abstraction over managing git
repositories.
Afterwards, it does not matter anymore if they are stored on the local
disk or somewhere remote.
## What this PR changes
We used `git.OpenRepository` everywhere previously.
Now, we should split them into two distinct functions:
Firstly, there are temporary repositories which do not change:
```go
git.OpenRepository(ctx, diskPath)
```
Gitea managed repositories having a record in the database in the
`repository` table are moved into the new package `gitrepo`:
```go
gitrepo.OpenRepository(ctx, repo_model.Repo)
```
Why is `repo_model.Repository` the second parameter instead of file
path?
Because then we can easily adapt our repository storage strategy.
The repositories can be stored locally, however, they could just as well
be stored on a remote server.
## Further changes in other PRs
- A Git Command wrapper on package `gitrepo` could be created. i.e.
`NewCommand(ctx, repo_model.Repository, commands...)`. `git.RunOpts{Dir:
repo.RepoPath()}`, the directory should be empty before invoking this
method and it can be filled in the function only. #28940
- Remove the `RepoPath()`/`WikiPath()` functions to reduce the
possibility of mistakes.
---------
Co-authored-by: delvh <dev.lh@web.de>
10 months ago
|
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
|
|
|
"code.gitea.io/gitea/modules/session"
|
Make HTML template functions support context (#24056)
# Background
Golang template is not friendly for large projects, and Golang template
team is quite slow, related:
* `https://github.com/golang/go/issues/54450`
Without upstream support, we can also have our solution to make HTML
template functions support context.
It helps a lot, the above Golang template issue `#54450` explains a lot:
1. It makes `{{Locale.Tr}}` could be used in any template, without
passing unclear `(dict "root" . )` anymore.
2. More and more functions need `context`, like `avatar`, etc, we do not
need to do `(dict "Context" $.Context)` anymore.
3. Many request-related functions could be shared by parent&children
templates, like "user setting" / "system setting"
See the test `TestScopedTemplateSetFuncMap`, one template set, two
`Execute` calls with different `CtxFunc`.
# The Solution
Instead of waiting for upstream, this PR re-uses the escaped HTML
template trees, use `AddParseTree` to add related templates/trees to a
new template instance, then the new template instance can have its own
FuncMap , the function calls in the template trees will always use the
new template's FuncMap.
`template.New` / `template.AddParseTree` / `adding-FuncMap` are all
quite fast, so the performance is not affected.
The details:
1. Make a new `html/template/Template` for `all` templates
2. Add template code to the `all` template
3. Freeze the `all` template, reset its exec func map, it shouldn't
execute any template.
4. When a router wants to render a template by its `name`
1. Find the `name` in `all`
2. Find all its related sub templates
3. Escape all related templates (just like what the html template
package does)
4. Add the escaped parse-trees of related templates into a new (scoped)
`text/template/Template`
5. Add context-related func map into the new (scoped) text template
6. Execute the new (scoped) text template
7. To improve performance, the escaped templates are cached to `template
sets`
# FAQ
## There is a `unsafe` call, is this PR unsafe?
This PR is safe. Golang has strict language definition, it's safe to do
so: https://pkg.go.dev/unsafe#Pointer (1) Conversion of a *T1 to Pointer
to *T2
## What if Golang template supports such feature in the future?
The public structs/interfaces/functions introduced by this PR is quite
simple, the code of `HTMLRender` is not changed too much. It's very easy
to switch to the official mechanism if there would be one.
## Does this PR change the template execution behavior?
No, see the tests (welcome to design more tests if it's necessary)
---------
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Jason Song <i@wolfogre.com>
Co-authored-by: Giteabot <teabot@gitea.io>
2 years ago
|
|
|
"code.gitea.io/gitea/modules/templates"
|
|
|
|
"code.gitea.io/gitea/modules/translation"
|
|
|
|
"code.gitea.io/gitea/modules/web/middleware"
|
|
|
|
"code.gitea.io/gitea/services/context"
|
|
|
|
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
)
|
|
|
|
|
|
|
|
func mockRequest(t *testing.T, reqPath string) *http.Request {
|
|
|
|
method, path, found := strings.Cut(reqPath, " ")
|
|
|
|
if !found {
|
|
|
|
method = "GET"
|
|
|
|
path = reqPath
|
|
|
|
}
|
|
|
|
requestURL, err := url.Parse(path)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
req := &http.Request{Method: method, Host: requestURL.Host, URL: requestURL, Form: maps.Clone(requestURL.Query()), Header: http.Header{}}
|
|
|
|
req = req.WithContext(middleware.WithContextData(req.Context()))
|
|
|
|
return req
|
|
|
|
}
|
|
|
|
|
|
|
|
type MockContextOption struct {
|
|
|
|
Render context.Render
|
|
|
|
SessionStore *session.MockStore
|
|
|
|
}
|
|
|
|
|
|
|
|
// MockContext mock context for unit tests
|
|
|
|
func MockContext(t *testing.T, reqPath string, opts ...MockContextOption) (*context.Context, *httptest.ResponseRecorder) {
|
|
|
|
var opt MockContextOption
|
|
|
|
if len(opts) > 0 {
|
|
|
|
opt = opts[0]
|
|
|
|
}
|
|
|
|
if opt.Render == nil {
|
|
|
|
opt.Render = &MockRender{}
|
|
|
|
}
|
|
|
|
resp := httptest.NewRecorder()
|
|
|
|
req := mockRequest(t, reqPath)
|
|
|
|
base, baseCleanUp := context.NewBaseContext(resp, req)
|
|
|
|
_ = baseCleanUp // during test, it doesn't need to do clean up. TODO: this can be improved later
|
|
|
|
base.Data = middleware.GetContextData(req.Context())
|
|
|
|
base.Locale = &translation.MockLocale{}
|
|
|
|
|
|
|
|
chiCtx := chi.NewRouteContext()
|
|
|
|
ctx := context.NewWebContext(base, opt.Render, nil)
|
|
|
|
ctx.AppendContextValue(context.WebContextKey, ctx)
|
|
|
|
ctx.AppendContextValue(chi.RouteCtxKey, chiCtx)
|
|
|
|
if opt.SessionStore != nil {
|
|
|
|
ctx.AppendContextValue(session.MockStoreContextKey, opt.SessionStore)
|
|
|
|
ctx.Session = opt.SessionStore
|
|
|
|
}
|
|
|
|
ctx.Cache = cache.GetCache()
|
|
|
|
ctx.PageData = map[string]any{}
|
|
|
|
ctx.Data["PageStartTime"] = time.Now()
|
|
|
|
return ctx, resp
|
|
|
|
}
|
|
|
|
|
|
|
|
// MockAPIContext mock context for unit tests
|
|
|
|
func MockAPIContext(t *testing.T, reqPath string) (*context.APIContext, *httptest.ResponseRecorder) {
|
|
|
|
resp := httptest.NewRecorder()
|
|
|
|
req := mockRequest(t, reqPath)
|
|
|
|
base, baseCleanUp := context.NewBaseContext(resp, req)
|
|
|
|
base.Data = middleware.GetContextData(req.Context())
|
|
|
|
base.Locale = &translation.MockLocale{}
|
|
|
|
ctx := &context.APIContext{Base: base}
|
|
|
|
_ = baseCleanUp // during test, it doesn't need to do clean up. TODO: this can be improved later
|
|
|
|
|
|
|
|
chiCtx := chi.NewRouteContext()
|
|
|
|
ctx.Base.AppendContextValue(chi.RouteCtxKey, chiCtx)
|
|
|
|
return ctx, resp
|
|
|
|
}
|
|
|
|
|
|
|
|
func MockPrivateContext(t *testing.T, reqPath string) (*context.PrivateContext, *httptest.ResponseRecorder) {
|
|
|
|
resp := httptest.NewRecorder()
|
|
|
|
req := mockRequest(t, reqPath)
|
|
|
|
base, baseCleanUp := context.NewBaseContext(resp, req)
|
|
|
|
base.Data = middleware.GetContextData(req.Context())
|
|
|
|
base.Locale = &translation.MockLocale{}
|
|
|
|
ctx := &context.PrivateContext{Base: base}
|
|
|
|
_ = baseCleanUp // during test, it doesn't need to do clean up. TODO: this can be improved later
|
|
|
|
chiCtx := chi.NewRouteContext()
|
|
|
|
ctx.Base.AppendContextValue(chi.RouteCtxKey, chiCtx)
|
|
|
|
return ctx, resp
|
|
|
|
}
|
|
|
|
|
|
|
|
// LoadRepo load a repo into a test context.
|
|
|
|
func LoadRepo(t *testing.T, ctx gocontext.Context, repoID int64) {
|
|
|
|
var doer *user_model.User
|
|
|
|
repo := &context.Repository{}
|
|
|
|
switch ctx := ctx.(type) {
|
|
|
|
case *context.Context:
|
|
|
|
ctx.Repo = repo
|
|
|
|
doer = ctx.Doer
|
|
|
|
case *context.APIContext:
|
|
|
|
ctx.Repo = repo
|
|
|
|
doer = ctx.Doer
|
|
|
|
default:
|
|
|
|
assert.FailNow(t, "context is not *context.Context or *context.APIContext")
|
|
|
|
}
|
|
|
|
|
|
|
|
repo.Repository = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: repoID})
|
|
|
|
var err error
|
|
|
|
repo.Owner, err = user_model.GetUserByID(ctx, repo.Repository.OwnerID)
|
Add Organization Wide Labels (#10814)
* Add organization wide labels
Implement organization wide labels similar to organization wide
webhooks. This lets you create individual labels for organizations that can be used
for all repos under that organization (so being able to reuse the same
label across multiple repos).
This makes it possible for small organizations with many repos to use
labels effectively.
Fixes #7406
* Add migration
* remove comments
* fix tests
* Update options/locale/locale_en-US.ini
Removed unused translation string
* show org labels in issue search label filter
* Use more clear var name
* rename migration after merge from master
* comment typo
* update migration again after rebase with master
* check for orgID <=0 per guillep2k review
* fmt
* Apply suggestions from code review
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* remove unused code
* Make sure RepoID is 0 when searching orgID per code review
* more changes/code review requests
* More descriptive translation var per code review
* func description/delete comment when issue label deleted instead of hiding it
* remove comment
* only use issues in that repo when calculating number of open issues for org label on repo label page
* Add integration test for IssuesSearch API with labels
* remove unused function
* Update models/issue_label.go
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Use subquery in GetLabelIDsInReposByNames
* Fix tests to use correct orgID
* fix more tests
* IssuesSearch api now uses new BuildLabelNamesIssueIDsCondition. Add a few more tests as well
* update comment for clarity
* Revert previous code change now that we can use the new BuildLabelNamesIssueIDsCondition
* Don't sort repos by date in IssuesSearch API
After much debugging I've found a strange issue where in some cases MySQL will return a different result than other enigines if a query is sorted by a null collumn. For example with our integration test data where we don't set updated_unix in repository fixtures:
SELECT `id`, `owner_id`, `owner_name`, `lower_name`, `name`, `description`, `website`, `original_service_type`, `original_url`, `default_branch`, `num_watches`, `num_stars`, `num_forks`, `num_issues`, `num_closed_issues`, `num_pulls`, `num_closed_pulls`, `num_milestones`, `num_closed_milestones`, `is_private`, `is_empty`, `is_archived`, `is_mirror`, `status`, `is_fork`, `fork_id`, `is_template`, `template_id`, `size`, `is_fsck_enabled`, `close_issues_via_commit_in_any_branch`, `topics`, `avatar`, `created_unix`, `updated_unix` FROM `repository` ORDER BY updated_unix DESC LIMIT 15 OFFSET 45
Returns different results for MySQL than other engines. However, the similar query:
SELECT `id`, `owner_id`, `owner_name`, `lower_name`, `name`, `description`, `website`, `original_service_type`, `original_url`, `default_branch`, `num_watches`, `num_stars`, `num_forks`, `num_issues`, `num_closed_issues`, `num_pulls`, `num_closed_pulls`, `num_milestones`, `num_closed_milestones`, `is_private`, `is_empty`, `is_archived`, `is_mirror`, `status`, `is_fork`, `fork_id`, `is_template`, `template_id`, `size`, `is_fsck_enabled`, `close_issues_via_commit_in_any_branch`, `topics`, `avatar`, `created_unix`, `updated_unix` FROM `repository` ORDER BY updated_unix DESC LIMIT 15 OFFSET 30
Returns the same results.
This causes integration tests to fail on MySQL in certain cases but would never show up in a real installation. Since this API call always returns issues based on the optionally provided repo_priority_id or the issueID itself, there is no change to results by changing the repo sorting method used to get ids earlier in the function.
* linter is back!
* code review
* remove now unused option
* Fix newline at end of files
* more unused code
* update to master
* check for matching ids before query
* Update models/issue_label.go
Co-Authored-By: 6543 <6543@obermui.de>
* Update models/issue_label.go
* update comments
* Update routers/org/setting.go
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: 6543 <6543@obermui.de>
5 years ago
|
|
|
assert.NoError(t, err)
|
|
|
|
repo.RepoLink = repo.Repository.Link()
|
|
|
|
repo.Permission, err = access_model.GetUserRepoPermission(ctx, repo.Repository, doer)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// LoadRepoCommit loads a repo's commit into a test context.
|
|
|
|
func LoadRepoCommit(t *testing.T, ctx gocontext.Context) {
|
|
|
|
var repo *context.Repository
|
|
|
|
switch ctx := ctx.(type) {
|
|
|
|
case *context.Context:
|
|
|
|
repo = ctx.Repo
|
|
|
|
case *context.APIContext:
|
|
|
|
repo = ctx.Repo
|
|
|
|
default:
|
|
|
|
assert.FailNow(t, "context is not *context.Context or *context.APIContext")
|
|
|
|
}
|
|
|
|
|
Simplify how git repositories are opened (#28937)
## Purpose
This is a refactor toward building an abstraction over managing git
repositories.
Afterwards, it does not matter anymore if they are stored on the local
disk or somewhere remote.
## What this PR changes
We used `git.OpenRepository` everywhere previously.
Now, we should split them into two distinct functions:
Firstly, there are temporary repositories which do not change:
```go
git.OpenRepository(ctx, diskPath)
```
Gitea managed repositories having a record in the database in the
`repository` table are moved into the new package `gitrepo`:
```go
gitrepo.OpenRepository(ctx, repo_model.Repo)
```
Why is `repo_model.Repository` the second parameter instead of file
path?
Because then we can easily adapt our repository storage strategy.
The repositories can be stored locally, however, they could just as well
be stored on a remote server.
## Further changes in other PRs
- A Git Command wrapper on package `gitrepo` could be created. i.e.
`NewCommand(ctx, repo_model.Repository, commands...)`. `git.RunOpts{Dir:
repo.RepoPath()}`, the directory should be empty before invoking this
method and it can be filled in the function only. #28940
- Remove the `RepoPath()`/`WikiPath()` functions to reduce the
possibility of mistakes.
---------
Co-authored-by: delvh <dev.lh@web.de>
10 months ago
|
|
|
gitRepo, err := gitrepo.OpenRepository(ctx, repo.Repository)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
defer gitRepo.Close()
|
|
|
|
branch, err := gitRepo.GetHEADBranch()
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NotNil(t, branch)
|
|
|
|
if branch != nil {
|
|
|
|
repo.Commit, err = gitRepo.GetBranchCommit(branch.Name)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// LoadUser load a user into a test context
|
|
|
|
func LoadUser(t *testing.T, ctx gocontext.Context, userID int64) {
|
|
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userID})
|
|
|
|
switch ctx := ctx.(type) {
|
|
|
|
case *context.Context:
|
|
|
|
ctx.Doer = doer
|
|
|
|
case *context.APIContext:
|
|
|
|
ctx.Doer = doer
|
|
|
|
default:
|
|
|
|
assert.FailNow(t, "context is not *context.Context or *context.APIContext")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// LoadGitRepo load a git repo into a test context. Requires that ctx.Repo has
|
|
|
|
// already been populated.
|
|
|
|
func LoadGitRepo(t *testing.T, ctx *context.Context) {
|
|
|
|
assert.NoError(t, ctx.Repo.Repository.LoadOwner(ctx))
|
|
|
|
var err error
|
Simplify how git repositories are opened (#28937)
## Purpose
This is a refactor toward building an abstraction over managing git
repositories.
Afterwards, it does not matter anymore if they are stored on the local
disk or somewhere remote.
## What this PR changes
We used `git.OpenRepository` everywhere previously.
Now, we should split them into two distinct functions:
Firstly, there are temporary repositories which do not change:
```go
git.OpenRepository(ctx, diskPath)
```
Gitea managed repositories having a record in the database in the
`repository` table are moved into the new package `gitrepo`:
```go
gitrepo.OpenRepository(ctx, repo_model.Repo)
```
Why is `repo_model.Repository` the second parameter instead of file
path?
Because then we can easily adapt our repository storage strategy.
The repositories can be stored locally, however, they could just as well
be stored on a remote server.
## Further changes in other PRs
- A Git Command wrapper on package `gitrepo` could be created. i.e.
`NewCommand(ctx, repo_model.Repository, commands...)`. `git.RunOpts{Dir:
repo.RepoPath()}`, the directory should be empty before invoking this
method and it can be filled in the function only. #28940
- Remove the `RepoPath()`/`WikiPath()` functions to reduce the
possibility of mistakes.
---------
Co-authored-by: delvh <dev.lh@web.de>
10 months ago
|
|
|
ctx.Repo.GitRepo, err = gitrepo.OpenRepository(ctx, ctx.Repo.Repository)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
type MockRender struct{}
|
|
|
|
|
|
|
|
func (tr *MockRender) TemplateLookup(tmpl string, _ gocontext.Context) (templates.TemplateExecutor, error) {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (tr *MockRender) HTML(w io.Writer, status int, _ string, _ any, _ gocontext.Context) error {
|
|
|
|
if resp, ok := w.(http.ResponseWriter); ok {
|
|
|
|
resp.WriteHeader(status)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|