2021-12-10 13:44:24 +05:30
|
|
|
// Copyright 2021 The Gitea Authors. All rights reserved.
|
2022-11-27 23:50:29 +05:30
|
|
|
// SPDX-License-Identifier: MIT
|
2019-10-16 19:12:42 +05:30
|
|
|
|
2021-12-10 13:44:24 +05:30
|
|
|
package asymkey
|
2019-10-16 19:12:42 +05:30
|
|
|
|
|
|
|
import (
|
2022-01-20 04:56:57 +05:30
|
|
|
"context"
|
2021-12-10 13:44:24 +05:30
|
|
|
"fmt"
|
2019-10-16 19:12:42 +05:30
|
|
|
"strings"
|
|
|
|
|
2021-12-10 13:44:24 +05:30
|
|
|
asymkey_model "code.gitea.io/gitea/models/asymkey"
|
2022-01-02 18:42:35 +05:30
|
|
|
"code.gitea.io/gitea/models/auth"
|
2021-09-24 17:02:56 +05:30
|
|
|
"code.gitea.io/gitea/models/db"
|
2022-06-12 21:21:54 +05:30
|
|
|
git_model "code.gitea.io/gitea/models/git"
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
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>
2024-01-28 01:39:51 +05:30
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
2021-11-24 15:19:20 +05:30
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
2019-10-16 19:12:42 +05:30
|
|
|
"code.gitea.io/gitea/modules/git"
|
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>
2024-01-28 01:39:51 +05:30
|
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
2019-10-16 19:12:42 +05:30
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
|
|
"code.gitea.io/gitea/modules/process"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
)
|
|
|
|
|
|
|
|
type signingMode string
|
|
|
|
|
|
|
|
const (
|
|
|
|
never signingMode = "never"
|
|
|
|
always signingMode = "always"
|
|
|
|
pubkey signingMode = "pubkey"
|
|
|
|
twofa signingMode = "twofa"
|
|
|
|
parentSigned signingMode = "parentsigned"
|
|
|
|
baseSigned signingMode = "basesigned"
|
|
|
|
headSigned signingMode = "headsigned"
|
|
|
|
commitsSigned signingMode = "commitssigned"
|
2019-12-15 16:36:31 +05:30
|
|
|
approved signingMode = "approved"
|
2020-01-15 14:02:57 +05:30
|
|
|
noKey signingMode = "nokey"
|
2019-10-16 19:12:42 +05:30
|
|
|
)
|
|
|
|
|
|
|
|
func signingModeFromStrings(modeStrings []string) []signingMode {
|
|
|
|
returnable := make([]signingMode, 0, len(modeStrings))
|
|
|
|
for _, mode := range modeStrings {
|
2020-09-19 22:14:55 +05:30
|
|
|
signMode := signingMode(strings.ToLower(strings.TrimSpace(mode)))
|
2019-10-16 19:12:42 +05:30
|
|
|
switch signMode {
|
|
|
|
case never:
|
|
|
|
return []signingMode{never}
|
|
|
|
case always:
|
|
|
|
return []signingMode{always}
|
|
|
|
case pubkey:
|
|
|
|
fallthrough
|
|
|
|
case twofa:
|
|
|
|
fallthrough
|
|
|
|
case parentSigned:
|
|
|
|
fallthrough
|
|
|
|
case baseSigned:
|
|
|
|
fallthrough
|
|
|
|
case headSigned:
|
|
|
|
fallthrough
|
2019-12-15 16:36:31 +05:30
|
|
|
case approved:
|
|
|
|
fallthrough
|
2019-10-16 19:12:42 +05:30
|
|
|
case commitsSigned:
|
|
|
|
returnable = append(returnable, signMode)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(returnable) == 0 {
|
|
|
|
return []signingMode{never}
|
|
|
|
}
|
|
|
|
return returnable
|
|
|
|
}
|
|
|
|
|
2021-12-10 13:44:24 +05:30
|
|
|
// ErrWontSign explains the first reason why a commit would not be signed
|
|
|
|
// There may be other reasons - this is just the first reason found
|
|
|
|
type ErrWontSign struct {
|
|
|
|
Reason signingMode
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e *ErrWontSign) Error() string {
|
|
|
|
return fmt.Sprintf("wont sign: %s", e.Reason)
|
|
|
|
}
|
|
|
|
|
|
|
|
// IsErrWontSign checks if an error is a ErrWontSign
|
|
|
|
func IsErrWontSign(err error) bool {
|
|
|
|
_, ok := err.(*ErrWontSign)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
|
2020-09-19 22:14:55 +05:30
|
|
|
// SigningKey returns the KeyID and git Signature for the repo
|
2022-01-20 04:56:57 +05:30
|
|
|
func SigningKey(ctx context.Context, repoPath string) (string, *git.Signature) {
|
2019-10-16 19:12:42 +05:30
|
|
|
if setting.Repository.Signing.SigningKey == "none" {
|
2020-09-19 22:14:55 +05:30
|
|
|
return "", nil
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
if setting.Repository.Signing.SigningKey == "default" || setting.Repository.Signing.SigningKey == "" {
|
|
|
|
// Can ignore the error here as it means that commit.gpgsign is not set
|
2022-04-01 08:25:30 +05:30
|
|
|
value, _, _ := git.NewCommand(ctx, "config", "--get", "commit.gpgsign").RunStdString(&git.RunOpts{Dir: repoPath})
|
2019-10-16 19:12:42 +05:30
|
|
|
sign, valid := git.ParseBool(strings.TrimSpace(value))
|
|
|
|
if !sign || !valid {
|
2020-09-19 22:14:55 +05:30
|
|
|
return "", nil
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
|
2022-04-01 08:25:30 +05:30
|
|
|
signingKey, _, _ := git.NewCommand(ctx, "config", "--get", "user.signingkey").RunStdString(&git.RunOpts{Dir: repoPath})
|
|
|
|
signingName, _, _ := git.NewCommand(ctx, "config", "--get", "user.name").RunStdString(&git.RunOpts{Dir: repoPath})
|
|
|
|
signingEmail, _, _ := git.NewCommand(ctx, "config", "--get", "user.email").RunStdString(&git.RunOpts{Dir: repoPath})
|
2020-09-19 22:14:55 +05:30
|
|
|
return strings.TrimSpace(signingKey), &git.Signature{
|
|
|
|
Name: strings.TrimSpace(signingName),
|
|
|
|
Email: strings.TrimSpace(signingEmail),
|
|
|
|
}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
|
2020-09-19 22:14:55 +05:30
|
|
|
return setting.Repository.Signing.SigningKey, &git.Signature{
|
|
|
|
Name: setting.Repository.Signing.SigningName,
|
|
|
|
Email: setting.Repository.Signing.SigningEmail,
|
|
|
|
}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
// PublicSigningKey gets the public signing key within a provided repository directory
|
2022-01-20 04:56:57 +05:30
|
|
|
func PublicSigningKey(ctx context.Context, repoPath string) (string, error) {
|
|
|
|
signingKey, _ := SigningKey(ctx, repoPath)
|
2019-10-16 19:12:42 +05:30
|
|
|
if signingKey == "" {
|
|
|
|
return "", nil
|
|
|
|
}
|
|
|
|
|
2022-01-20 04:56:57 +05:30
|
|
|
content, stderr, err := process.GetManager().ExecDir(ctx, -1, repoPath,
|
2019-10-16 19:12:42 +05:30
|
|
|
"gpg --export -a", "gpg", "--export", "-a", signingKey)
|
|
|
|
if err != nil {
|
|
|
|
log.Error("Unable to get default signing key in %s: %s, %s, %v", repoPath, signingKey, stderr, err)
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
return content, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// SignInitialCommit determines if we should sign the initial commit to this repository
|
2022-01-20 04:56:57 +05:30
|
|
|
func SignInitialCommit(ctx context.Context, repoPath string, u *user_model.User) (bool, string, *git.Signature, error) {
|
2019-10-16 19:12:42 +05:30
|
|
|
rules := signingModeFromStrings(setting.Repository.Signing.InitialCommit)
|
2022-01-20 04:56:57 +05:30
|
|
|
signingKey, sig := SigningKey(ctx, repoPath)
|
2019-10-16 19:12:42 +05:30
|
|
|
if signingKey == "" {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{noKey}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
|
2020-07-06 17:37:07 +05:30
|
|
|
Loop:
|
2019-10-16 19:12:42 +05:30
|
|
|
for _, rule := range rules {
|
|
|
|
switch rule {
|
|
|
|
case never:
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{never}
|
2019-10-16 19:12:42 +05:30
|
|
|
case always:
|
2020-07-06 17:37:07 +05:30
|
|
|
break Loop
|
2019-10-16 19:12:42 +05:30
|
|
|
case pubkey:
|
2024-01-15 07:49:25 +05:30
|
|
|
keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
|
|
|
|
OwnerID: u.ID,
|
|
|
|
IncludeSubKeys: true,
|
|
|
|
})
|
2020-01-15 14:02:57 +05:30
|
|
|
if err != nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2020-01-15 14:02:57 +05:30
|
|
|
}
|
|
|
|
if len(keys) == 0 {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{pubkey}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
case twofa:
|
2023-09-15 11:43:19 +05:30
|
|
|
twofaModel, err := auth.GetTwoFactorByUID(ctx, u.ID)
|
2022-01-02 18:42:35 +05:30
|
|
|
if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2020-01-15 14:02:57 +05:30
|
|
|
}
|
|
|
|
if twofaModel == nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{twofa}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-09-19 22:14:55 +05:30
|
|
|
return true, signingKey, sig, nil
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
// SignWikiCommit determines if we should sign the commits to this repository wiki
|
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>
2024-01-28 01:39:51 +05:30
|
|
|
func SignWikiCommit(ctx context.Context, repo *repo_model.Repository, u *user_model.User) (bool, string, *git.Signature, error) {
|
|
|
|
repoWikiPath := repo.WikiPath()
|
2019-10-16 19:12:42 +05:30
|
|
|
rules := signingModeFromStrings(setting.Repository.Signing.Wiki)
|
2022-01-20 04:56:57 +05:30
|
|
|
signingKey, sig := SigningKey(ctx, repoWikiPath)
|
2019-10-16 19:12:42 +05:30
|
|
|
if signingKey == "" {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{noKey}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
|
2020-07-06 17:37:07 +05:30
|
|
|
Loop:
|
2019-10-16 19:12:42 +05:30
|
|
|
for _, rule := range rules {
|
|
|
|
switch rule {
|
|
|
|
case never:
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{never}
|
2019-10-16 19:12:42 +05:30
|
|
|
case always:
|
2020-07-06 17:37:07 +05:30
|
|
|
break Loop
|
2019-10-16 19:12:42 +05:30
|
|
|
case pubkey:
|
2024-01-15 07:49:25 +05:30
|
|
|
keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
|
|
|
|
OwnerID: u.ID,
|
|
|
|
IncludeSubKeys: true,
|
|
|
|
})
|
2020-01-15 14:02:57 +05:30
|
|
|
if err != nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2020-01-15 14:02:57 +05:30
|
|
|
}
|
|
|
|
if len(keys) == 0 {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{pubkey}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
case twofa:
|
2023-09-15 11:43:19 +05:30
|
|
|
twofaModel, err := auth.GetTwoFactorByUID(ctx, u.ID)
|
2022-01-02 18:42:35 +05:30
|
|
|
if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2020-01-15 14:02:57 +05:30
|
|
|
}
|
|
|
|
if twofaModel == nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{twofa}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
case parentSigned:
|
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>
2024-01-28 01:39:51 +05:30
|
|
|
gitRepo, err := gitrepo.OpenWikiRepository(ctx, repo)
|
2019-10-16 19:12:42 +05:30
|
|
|
if err != nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
2019-11-13 12:31:19 +05:30
|
|
|
defer gitRepo.Close()
|
2019-10-16 19:12:42 +05:30
|
|
|
commit, err := gitRepo.GetCommit("HEAD")
|
|
|
|
if err != nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
if commit.Signature == nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{parentSigned}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
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.
2023-02-15 19:07:34 +05:30
|
|
|
verification := asymkey_model.ParseCommitWithSignature(ctx, commit)
|
2019-10-16 19:12:42 +05:30
|
|
|
if !verification.Verified {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{parentSigned}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-09-19 22:14:55 +05:30
|
|
|
return true, signingKey, sig, nil
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
// SignCRUDAction determines if we should sign a CRUD commit to this repository
|
2022-01-20 04:56:57 +05:30
|
|
|
func SignCRUDAction(ctx context.Context, repoPath string, u *user_model.User, tmpBasePath, parentCommit string) (bool, string, *git.Signature, error) {
|
2019-10-16 19:12:42 +05:30
|
|
|
rules := signingModeFromStrings(setting.Repository.Signing.CRUDActions)
|
2022-01-20 04:56:57 +05:30
|
|
|
signingKey, sig := SigningKey(ctx, repoPath)
|
2019-10-16 19:12:42 +05:30
|
|
|
if signingKey == "" {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{noKey}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
|
2020-07-06 17:37:07 +05:30
|
|
|
Loop:
|
2019-10-16 19:12:42 +05:30
|
|
|
for _, rule := range rules {
|
|
|
|
switch rule {
|
|
|
|
case never:
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{never}
|
2019-10-16 19:12:42 +05:30
|
|
|
case always:
|
2020-07-06 17:37:07 +05:30
|
|
|
break Loop
|
2019-10-16 19:12:42 +05:30
|
|
|
case pubkey:
|
2024-01-15 07:49:25 +05:30
|
|
|
keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
|
|
|
|
OwnerID: u.ID,
|
|
|
|
IncludeSubKeys: true,
|
|
|
|
})
|
2020-01-15 14:02:57 +05:30
|
|
|
if err != nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2020-01-15 14:02:57 +05:30
|
|
|
}
|
|
|
|
if len(keys) == 0 {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{pubkey}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
case twofa:
|
2023-09-15 11:43:19 +05:30
|
|
|
twofaModel, err := auth.GetTwoFactorByUID(ctx, u.ID)
|
2022-01-02 18:42:35 +05:30
|
|
|
if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2020-01-15 14:02:57 +05:30
|
|
|
}
|
|
|
|
if twofaModel == nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{twofa}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
case parentSigned:
|
2022-03-30 00:43:41 +05:30
|
|
|
gitRepo, err := git.OpenRepository(ctx, tmpBasePath)
|
2019-10-16 19:12:42 +05:30
|
|
|
if err != nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
2019-11-13 12:31:19 +05:30
|
|
|
defer gitRepo.Close()
|
2019-10-16 19:12:42 +05:30
|
|
|
commit, err := gitRepo.GetCommit(parentCommit)
|
|
|
|
if err != nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, err
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
if commit.Signature == nil {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{parentSigned}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
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.
2023-02-15 19:07:34 +05:30
|
|
|
verification := asymkey_model.ParseCommitWithSignature(ctx, commit)
|
2019-10-16 19:12:42 +05:30
|
|
|
if !verification.Verified {
|
2020-09-19 22:14:55 +05:30
|
|
|
return false, "", nil, &ErrWontSign{parentSigned}
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-09-19 22:14:55 +05:30
|
|
|
return true, signingKey, sig, nil
|
2019-10-16 19:12:42 +05:30
|
|
|
}
|
2021-12-10 13:44:24 +05:30
|
|
|
|
|
|
|
// SignMerge determines if we should sign a PR merge commit to the base repository
|
2022-06-13 15:07:59 +05:30
|
|
|
func SignMerge(ctx context.Context, pr *issues_model.PullRequest, u *user_model.User, tmpBasePath, baseCommit, headCommit string) (bool, string, *git.Signature, error) {
|
2022-11-19 13:42:33 +05:30
|
|
|
if err := pr.LoadBaseRepo(ctx); err != nil {
|
2021-12-10 13:44:24 +05:30
|
|
|
log.Error("Unable to get Base Repo for pull request")
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
repo := pr.BaseRepo
|
|
|
|
|
2022-01-20 04:56:57 +05:30
|
|
|
signingKey, signer := SigningKey(ctx, repo.RepoPath())
|
2021-12-10 13:44:24 +05:30
|
|
|
if signingKey == "" {
|
|
|
|
return false, "", nil, &ErrWontSign{noKey}
|
|
|
|
}
|
|
|
|
rules := signingModeFromStrings(setting.Repository.Signing.Merges)
|
|
|
|
|
|
|
|
var gitRepo *git.Repository
|
|
|
|
var err error
|
|
|
|
|
|
|
|
Loop:
|
|
|
|
for _, rule := range rules {
|
|
|
|
switch rule {
|
|
|
|
case never:
|
|
|
|
return false, "", nil, &ErrWontSign{never}
|
|
|
|
case always:
|
|
|
|
break Loop
|
|
|
|
case pubkey:
|
2024-01-15 07:49:25 +05:30
|
|
|
keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
|
|
|
|
OwnerID: u.ID,
|
|
|
|
IncludeSubKeys: true,
|
|
|
|
})
|
2021-12-10 13:44:24 +05:30
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
if len(keys) == 0 {
|
|
|
|
return false, "", nil, &ErrWontSign{pubkey}
|
|
|
|
}
|
|
|
|
case twofa:
|
2023-09-15 11:43:19 +05:30
|
|
|
twofaModel, err := auth.GetTwoFactorByUID(ctx, u.ID)
|
2022-01-02 18:42:35 +05:30
|
|
|
if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) {
|
2021-12-10 13:44:24 +05:30
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
if twofaModel == nil {
|
|
|
|
return false, "", nil, &ErrWontSign{twofa}
|
|
|
|
}
|
|
|
|
case approved:
|
2023-01-16 13:30:22 +05:30
|
|
|
protectedBranch, err := git_model.GetFirstMatchProtectedBranchRule(ctx, repo.ID, pr.BaseBranch)
|
2021-12-10 13:44:24 +05:30
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
if protectedBranch == nil {
|
|
|
|
return false, "", nil, &ErrWontSign{approved}
|
|
|
|
}
|
2022-06-13 15:07:59 +05:30
|
|
|
if issues_model.GetGrantedApprovalsCount(ctx, protectedBranch, pr) < 1 {
|
2021-12-10 13:44:24 +05:30
|
|
|
return false, "", nil, &ErrWontSign{approved}
|
|
|
|
}
|
|
|
|
case baseSigned:
|
|
|
|
if gitRepo == nil {
|
2022-03-30 00:43:41 +05:30
|
|
|
gitRepo, err = git.OpenRepository(ctx, tmpBasePath)
|
2021-12-10 13:44:24 +05:30
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
defer gitRepo.Close()
|
|
|
|
}
|
|
|
|
commit, err := gitRepo.GetCommit(baseCommit)
|
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
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.
2023-02-15 19:07:34 +05:30
|
|
|
verification := asymkey_model.ParseCommitWithSignature(ctx, commit)
|
2021-12-10 13:44:24 +05:30
|
|
|
if !verification.Verified {
|
|
|
|
return false, "", nil, &ErrWontSign{baseSigned}
|
|
|
|
}
|
|
|
|
case headSigned:
|
|
|
|
if gitRepo == nil {
|
2022-03-30 00:43:41 +05:30
|
|
|
gitRepo, err = git.OpenRepository(ctx, tmpBasePath)
|
2021-12-10 13:44:24 +05:30
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
defer gitRepo.Close()
|
|
|
|
}
|
|
|
|
commit, err := gitRepo.GetCommit(headCommit)
|
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
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.
2023-02-15 19:07:34 +05:30
|
|
|
verification := asymkey_model.ParseCommitWithSignature(ctx, commit)
|
2021-12-10 13:44:24 +05:30
|
|
|
if !verification.Verified {
|
|
|
|
return false, "", nil, &ErrWontSign{headSigned}
|
|
|
|
}
|
|
|
|
case commitsSigned:
|
|
|
|
if gitRepo == nil {
|
2022-03-30 00:43:41 +05:30
|
|
|
gitRepo, err = git.OpenRepository(ctx, tmpBasePath)
|
2021-12-10 13:44:24 +05:30
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
defer gitRepo.Close()
|
|
|
|
}
|
|
|
|
commit, err := gitRepo.GetCommit(headCommit)
|
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
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.
2023-02-15 19:07:34 +05:30
|
|
|
verification := asymkey_model.ParseCommitWithSignature(ctx, commit)
|
2021-12-10 13:44:24 +05:30
|
|
|
if !verification.Verified {
|
|
|
|
return false, "", nil, &ErrWontSign{commitsSigned}
|
|
|
|
}
|
|
|
|
// need to work out merge-base
|
|
|
|
mergeBaseCommit, _, err := gitRepo.GetMergeBase("", baseCommit, headCommit)
|
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
commitList, err := commit.CommitsBeforeUntil(mergeBaseCommit)
|
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
for _, commit := range commitList {
|
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.
2023-02-15 19:07:34 +05:30
|
|
|
verification := asymkey_model.ParseCommitWithSignature(ctx, commit)
|
2021-12-10 13:44:24 +05:30
|
|
|
if !verification.Verified {
|
|
|
|
return false, "", nil, &ErrWontSign{commitsSigned}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true, signingKey, signer, nil
|
|
|
|
}
|