mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-04 14:46:57 -05:00
6bc3079c00
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> |
||
|---|---|---|
| .. | ||
| actions | ||
| activity.go | ||
| attachment.go | ||
| blame.go | ||
| branch.go | ||
| cherry_pick.go | ||
| commit.go | ||
| compare.go | ||
| download.go | ||
| editor_test.go | ||
| editor.go | ||
| find.go | ||
| http_test.go | ||
| http.go | ||
| issue_content_history.go | ||
| issue_dependency.go | ||
| issue_label_test.go | ||
| issue_label.go | ||
| issue_lock.go | ||
| issue_stopwatch.go | ||
| issue_test.go | ||
| issue_timetrack.go | ||
| issue_watch.go | ||
| issue.go | ||
| lfs.go | ||
| main_test.go | ||
| middlewares.go | ||
| migrate.go | ||
| milestone.go | ||
| packages.go | ||
| patch.go | ||
| projects_test.go | ||
| projects.go | ||
| pull_review.go | ||
| pull.go | ||
| release_test.go | ||
| release.go | ||
| render.go | ||
| repo.go | ||
| runners.go | ||
| search.go | ||
| setting_protected_branch.go | ||
| setting_secrets.go | ||
| setting.go | ||
| settings_test.go | ||
| tag.go | ||
| topic.go | ||
| treelist.go | ||
| view_test.go | ||
| view.go | ||
| webhook.go | ||
| wiki_test.go | ||
| wiki.go | ||