|
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
|
|
|
package repository
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"fmt"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
|
|
|
"sort"
|
|
|
|
"strings"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
|
|
"code.gitea.io/gitea/modules/git"
|
|
|
|
"code.gitea.io/gitea/modules/label"
|
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
|
|
"code.gitea.io/gitea/modules/options"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
"code.gitea.io/gitea/modules/util"
|
|
|
|
asymkey_service "code.gitea.io/gitea/services/asymkey"
|
|
|
|
)
|
|
|
|
|
|
|
|
type OptionFile struct {
|
|
|
|
DisplayName string
|
|
|
|
Description string
|
|
|
|
}
|
|
|
|
|
|
|
|
var (
|
|
|
|
// Gitignores contains the gitiginore files
|
|
|
|
Gitignores []string
|
|
|
|
|
|
|
|
// Licenses contains the license files
|
|
|
|
Licenses []string
|
|
|
|
|
|
|
|
// Readmes contains the readme files
|
|
|
|
Readmes []string
|
|
|
|
|
|
|
|
// LabelTemplateFiles contains the label template files, each item has its DisplayName and Description
|
|
|
|
LabelTemplateFiles []OptionFile
|
|
|
|
labelTemplateFileMap = map[string]string{} // DisplayName => FileName mapping
|
|
|
|
)
|
|
|
|
|
|
|
|
type optionFileList struct {
|
|
|
|
all []string // all files provided by bindata & custom-path. Sorted.
|
|
|
|
custom []string // custom files provided by custom-path. Non-sorted, internal use only.
|
|
|
|
}
|
|
|
|
|
|
|
|
// mergeCustomLabelFiles merges the custom label files. Always use the file's main name (DisplayName) as the key to de-duplicate.
|
|
|
|
func mergeCustomLabelFiles(fl optionFileList) []string {
|
|
|
|
exts := map[string]int{"": 0, ".yml": 1, ".yaml": 2} // "yaml" file has the highest priority to be used.
|
|
|
|
|
|
|
|
m := map[string]string{}
|
|
|
|
merge := func(list []string) {
|
|
|
|
sort.Slice(list, func(i, j int) bool { return exts[filepath.Ext(list[i])] < exts[filepath.Ext(list[j])] })
|
|
|
|
for _, f := range list {
|
|
|
|
m[strings.TrimSuffix(f, filepath.Ext(f))] = f
|
|
|
|
}
|
|
|
|
}
|
|
|
|
merge(fl.all)
|
|
|
|
merge(fl.custom)
|
|
|
|
|
|
|
|
files := make([]string, 0, len(m))
|
|
|
|
for _, f := range m {
|
|
|
|
files = append(files, f)
|
|
|
|
}
|
|
|
|
sort.Strings(files)
|
|
|
|
return files
|
|
|
|
}
|
|
|
|
|
|
|
|
// LoadRepoConfig loads the repository config
|
|
|
|
func LoadRepoConfig() error {
|
|
|
|
types := []string{"gitignore", "license", "readme", "label"} // option file directories
|
|
|
|
typeFiles := make([]optionFileList, len(types))
|
|
|
|
for i, t := range types {
|
|
|
|
var err error
|
|
|
|
if typeFiles[i].all, err = options.AssetFS().ListFiles(t, true); err != nil {
|
|
|
|
return fmt.Errorf("failed to list %s files: %w", t, err)
|
|
|
|
}
|
|
|
|
sort.Strings(typeFiles[i].all)
|
|
|
|
customPath := filepath.Join(setting.CustomPath, "options", t)
|
|
|
|
if isDir, err := util.IsDir(customPath); err != nil {
|
|
|
|
return fmt.Errorf("failed to check custom %s dir: %w", t, err)
|
|
|
|
} else if isDir {
|
|
|
|
if typeFiles[i].custom, err = util.StatDir(customPath); err != nil {
|
|
|
|
return fmt.Errorf("failed to list custom %s files: %w", t, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Gitignores = typeFiles[0].all
|
|
|
|
Licenses = typeFiles[1].all
|
|
|
|
Readmes = typeFiles[2].all
|
|
|
|
|
|
|
|
// Load label templates
|
|
|
|
LabelTemplateFiles = nil
|
|
|
|
labelTemplateFileMap = map[string]string{}
|
|
|
|
for _, file := range mergeCustomLabelFiles(typeFiles[3]) {
|
|
|
|
description, err := label.LoadTemplateDescription(file)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("failed to load labels: %w", err)
|
|
|
|
}
|
|
|
|
displayName := strings.TrimSuffix(file, filepath.Ext(file))
|
|
|
|
labelTemplateFileMap[displayName] = file
|
|
|
|
LabelTemplateFiles = append(LabelTemplateFiles, OptionFile{DisplayName: displayName, Description: description})
|
|
|
|
}
|
|
|
|
|
|
|
|
// Filter out invalid names and promote preferred licenses.
|
|
|
|
sortedLicenses := make([]string, 0, len(Licenses))
|
|
|
|
for _, name := range setting.Repository.PreferredLicenses {
|
Improve utils of slices (#22379)
- Move the file `compare.go` and `slice.go` to `slice.go`.
- Fix `ExistsInSlice`, it's buggy
- It uses `sort.Search`, so it assumes that the input slice is sorted.
- It passes `func(i int) bool { return slice[i] == target })` to
`sort.Search`, that's incorrect, check the doc of `sort.Search`.
- Conbine `IsInt64InSlice(int64, []int64)` and `ExistsInSlice(string,
[]string)` to `SliceContains[T]([]T, T)`.
- Conbine `IsSliceInt64Eq([]int64, []int64)` and `IsEqualSlice([]string,
[]string)` to `SliceSortedEqual[T]([]T, T)`.
- Add `SliceEqual[T]([]T, T)` as a distinction from
`SliceSortedEqual[T]([]T, T)`.
- Redesign `RemoveIDFromList([]int64, int64) ([]int64, bool)` to
`SliceRemoveAll[T]([]T, T) []T`.
- Add `SliceContainsFunc[T]([]T, func(T) bool)` and
`SliceRemoveAllFunc[T]([]T, func(T) bool)` for general use.
- Add comments to explain why not `golang.org/x/exp/slices`.
- Add unit tests.
2 years ago
|
|
|
if util.SliceContainsString(Licenses, name, true) {
|
|
|
|
sortedLicenses = append(sortedLicenses, name)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for _, name := range Licenses {
|
Improve utils of slices (#22379)
- Move the file `compare.go` and `slice.go` to `slice.go`.
- Fix `ExistsInSlice`, it's buggy
- It uses `sort.Search`, so it assumes that the input slice is sorted.
- It passes `func(i int) bool { return slice[i] == target })` to
`sort.Search`, that's incorrect, check the doc of `sort.Search`.
- Conbine `IsInt64InSlice(int64, []int64)` and `ExistsInSlice(string,
[]string)` to `SliceContains[T]([]T, T)`.
- Conbine `IsSliceInt64Eq([]int64, []int64)` and `IsEqualSlice([]string,
[]string)` to `SliceSortedEqual[T]([]T, T)`.
- Add `SliceEqual[T]([]T, T)` as a distinction from
`SliceSortedEqual[T]([]T, T)`.
- Redesign `RemoveIDFromList([]int64, int64) ([]int64, bool)` to
`SliceRemoveAll[T]([]T, T) []T`.
- Add `SliceContainsFunc[T]([]T, func(T) bool)` and
`SliceRemoveAllFunc[T]([]T, func(T) bool)` for general use.
- Add comments to explain why not `golang.org/x/exp/slices`.
- Add unit tests.
2 years ago
|
|
|
if !util.SliceContainsString(setting.Repository.PreferredLicenses, name, true) {
|
|
|
|
sortedLicenses = append(sortedLicenses, name)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Licenses = sortedLicenses
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// InitRepoCommit temporarily changes with work directory.
|
|
|
|
func InitRepoCommit(ctx context.Context, tmpPath string, repo *repo_model.Repository, u *user_model.User, defaultBranch string) (err error) {
|
|
|
|
commitTimeStr := time.Now().Format(time.RFC3339)
|
|
|
|
|
|
|
|
sig := u.NewGitSig()
|
|
|
|
// Because this may call hooks we should pass in the environment
|
|
|
|
env := append(os.Environ(),
|
|
|
|
"GIT_AUTHOR_NAME="+sig.Name,
|
|
|
|
"GIT_AUTHOR_EMAIL="+sig.Email,
|
|
|
|
"GIT_AUTHOR_DATE="+commitTimeStr,
|
|
|
|
"GIT_COMMITTER_DATE="+commitTimeStr,
|
|
|
|
)
|
|
|
|
committerName := sig.Name
|
|
|
|
committerEmail := sig.Email
|
|
|
|
|
|
|
|
if stdout, _, err := git.NewCommand(ctx, "add", "--all").
|
|
|
|
SetDescription(fmt.Sprintf("initRepoCommit (git add): %s", tmpPath)).
|
|
|
|
RunStdString(&git.RunOpts{Dir: tmpPath}); err != nil {
|
|
|
|
log.Error("git add --all failed: Stdout: %s\nError: %v", stdout, err)
|
|
|
|
return fmt.Errorf("git add --all: %w", err)
|
|
|
|
}
|
|
|
|
|
Use `--message=%s` for git commit message (#23028)
Close #23027
`git commit` message option _only_ supports 4 formats (well, only ....):
* `"commit", "-m", msg`
* `"commit", "-m{msg}"` (no space)
* `"commit", "--message", msg`
* `"commit", "--message={msg}"`
The long format with `=` is the best choice, and it's documented in `man
git-commit`:
`-m <msg>, --message=<msg> ...`
ps: I would suggest always use long format option for git command, as
much as possible.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years ago
|
|
|
cmd := git.NewCommand(ctx, "commit", "--message=Initial commit").
|
|
|
|
AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email)
|
|
|
|
|
|
|
|
sign, keyID, signer, _ := asymkey_service.SignInitialCommit(ctx, tmpPath, u)
|
|
|
|
if sign {
|
Refactor git command package to improve security and maintainability (#22678)
This PR follows #21535 (and replace #22592)
## Review without space diff
https://github.com/go-gitea/gitea/pull/22678/files?diff=split&w=1
## Purpose of this PR
1. Make git module command completely safe (risky user inputs won't be
passed as argument option anymore)
2. Avoid low-level mistakes like
https://github.com/go-gitea/gitea/pull/22098#discussion_r1045234918
3. Remove deprecated and dirty `CmdArgCheck` function, hide the `CmdArg`
type
4. Simplify code when using git command
## The main idea of this PR
* Move the `git.CmdArg` to the `internal` package, then no other package
except `git` could use it. Then developers could never do
`AddArguments(git.CmdArg(userInput))` any more.
* Introduce `git.ToTrustedCmdArgs`, it's for user-provided and already
trusted arguments. It's only used in a few cases, for example: use git
arguments from config file, help unit test with some arguments.
* Introduce `AddOptionValues` and `AddOptionFormat`, they make code more
clear and simple:
* Before: `AddArguments("-m").AddDynamicArguments(message)`
* After: `AddOptionValues("-m", message)`
* -
* Before: `AddArguments(git.CmdArg(fmt.Sprintf("--author='%s <%s>'",
sig.Name, sig.Email)))`
* After: `AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email)`
## FAQ
### Why these changes were not done in #21535 ?
#21535 is mainly a search&replace, it did its best to not change too
much logic.
Making the framework better needs a lot of changes, so this separate PR
is needed as the second step.
### The naming of `AddOptionXxx`
According to git's manual, the `--xxx` part is called `option`.
### How can it guarantee that `internal.CmdArg` won't be not misused?
Go's specification guarantees that. Trying to access other package's
internal package causes compilation error.
And, `golangci-lint` also denies the git/internal package. Only the
`git/command.go` can use it carefully.
### There is still a `ToTrustedCmdArgs`, will it still allow developers
to make mistakes and pass untrusted arguments?
Generally speaking, no. Because when using `ToTrustedCmdArgs`, the code
will be very complex (see the changes for examples). Then developers and
reviewers can know that something might be unreasonable.
### Why there was a `CmdArgCheck` and why it's removed?
At the moment of #21535, to reduce unnecessary changes, `CmdArgCheck`
was introduced as a hacky patch. Now, almost all code could be written
as `cmd := NewCommand(); cmd.AddXxx(...)`, then there is no need for
`CmdArgCheck` anymore.
### Why many codes for `signArg == ""` is deleted?
Because in the old code, `signArg` could never be empty string, it's
either `-S[key-id]` or `--no-gpg-sign`. So the `signArg == ""` is just
dead code.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years ago
|
|
|
cmd.AddOptionFormat("-S%s", keyID)
|
|
|
|
|
|
|
|
if repo.GetTrustModel() == repo_model.CommitterTrustModel || repo.GetTrustModel() == repo_model.CollaboratorCommitterTrustModel {
|
|
|
|
// need to set the committer to the KeyID owner
|
|
|
|
committerName = signer.Name
|
|
|
|
committerEmail = signer.Email
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
cmd.AddArguments("--no-gpg-sign")
|
|
|
|
}
|
|
|
|
|
|
|
|
env = append(env,
|
|
|
|
"GIT_COMMITTER_NAME="+committerName,
|
|
|
|
"GIT_COMMITTER_EMAIL="+committerEmail,
|
|
|
|
)
|
|
|
|
|
|
|
|
if stdout, _, err := cmd.
|
|
|
|
SetDescription(fmt.Sprintf("initRepoCommit (git commit): %s", tmpPath)).
|
|
|
|
RunStdString(&git.RunOpts{Dir: tmpPath, Env: env}); err != nil {
|
|
|
|
log.Error("Failed to commit: %v: Stdout: %s\nError: %v", cmd.String(), stdout, err)
|
|
|
|
return fmt.Errorf("git commit: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(defaultBranch) == 0 {
|
|
|
|
defaultBranch = setting.Repository.DefaultBranch
|
|
|
|
}
|
|
|
|
|
|
|
|
if stdout, _, err := git.NewCommand(ctx, "push", "origin").AddDynamicArguments("HEAD:" + defaultBranch).
|
|
|
|
SetDescription(fmt.Sprintf("initRepoCommit (git push): %s", tmpPath)).
|
|
|
|
RunStdString(&git.RunOpts{Dir: tmpPath, Env: InternalPushingEnvironment(u, repo)}); err != nil {
|
|
|
|
log.Error("Failed to push back to HEAD: Stdout: %s\nError: %v", stdout, err)
|
|
|
|
return fmt.Errorf("git push: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func CheckInitRepository(ctx context.Context, owner, name, objectFormatName string) (err error) {
|
|
|
|
// Somehow the directory could exist.
|
|
|
|
repoPath := repo_model.RepoPath(owner, name)
|
|
|
|
isExist, err := util.IsExist(repoPath)
|
|
|
|
if err != nil {
|
|
|
|
log.Error("Unable to check if %s exists. Error: %v", repoPath, err)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if isExist {
|
|
|
|
return repo_model.ErrRepoFilesAlreadyExist{
|
|
|
|
Uname: owner,
|
|
|
|
Name: name,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Init git bare new repository.
|
|
|
|
if err = git.InitRepository(ctx, repoPath, true, objectFormatName); err != nil {
|
|
|
|
return fmt.Errorf("git.InitRepository: %w", err)
|
|
|
|
} else if err = CreateDelegateHooks(repoPath); err != nil {
|
|
|
|
return fmt.Errorf("createDelegateHooks: %w", err)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// InitializeLabels adds a label set to a repository using a template
|
|
|
|
func InitializeLabels(ctx context.Context, id int64, labelTemplate string, isOrg bool) error {
|
|
|
|
list, err := LoadTemplateLabelsByDisplayName(labelTemplate)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
labels := make([]*issues_model.Label, len(list))
|
|
|
|
for i := 0; i < len(list); i++ {
|
|
|
|
labels[i] = &issues_model.Label{
|
|
|
|
Name: list[i].Name,
|
|
|
|
Exclusive: list[i].Exclusive,
|
|
|
|
Description: list[i].Description,
|
|
|
|
Color: list[i].Color,
|
|
|
|
}
|
|
|
|
if isOrg {
|
|
|
|
labels[i].OrgID = id
|
|
|
|
} else {
|
|
|
|
labels[i].RepoID = id
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for _, label := range labels {
|
|
|
|
if err = issues_model.NewLabel(ctx, label); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// LoadTemplateLabelsByDisplayName loads a label template by its display name
|
|
|
|
func LoadTemplateLabelsByDisplayName(displayName string) ([]*label.Label, error) {
|
|
|
|
if fileName, ok := labelTemplateFileMap[displayName]; ok {
|
|
|
|
return label.LoadTemplateFile(fileName)
|
|
|
|
}
|
|
|
|
return nil, label.ErrTemplateLoad{TemplateFile: displayName, OriginalError: fmt.Errorf("label template %q not found", displayName)}
|
|
|
|
}
|