mirror of
				https://gitcode.com/gitea/gitea.git
				synced 2025-10-25 12:26:40 +08:00 
			
		
		
		
	 6bc3079c00
			
		
	
	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>
		
			
				
	
	
		
			198 lines
		
	
	
		
			6.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			198 lines
		
	
	
		
			6.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2019 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package integration
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"fmt"
 | |
| 	"net"
 | |
| 	"net/http"
 | |
| 	"net/url"
 | |
| 	"os"
 | |
| 	"path"
 | |
| 	"path/filepath"
 | |
| 	"strconv"
 | |
| 	"testing"
 | |
| 	"time"
 | |
| 
 | |
| 	"code.gitea.io/gitea/modules/git"
 | |
| 	"code.gitea.io/gitea/modules/setting"
 | |
| 	"code.gitea.io/gitea/modules/ssh"
 | |
| 	"code.gitea.io/gitea/modules/util"
 | |
| 	"code.gitea.io/gitea/tests"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func withKeyFile(t *testing.T, keyname string, callback func(string)) {
 | |
| 	tmpDir := t.TempDir()
 | |
| 
 | |
| 	err := os.Chmod(tmpDir, 0o700)
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	keyFile := filepath.Join(tmpDir, keyname)
 | |
| 	err = ssh.GenKeyPair(keyFile)
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	err = os.WriteFile(path.Join(tmpDir, "ssh"), []byte("#!/bin/bash\n"+
 | |
| 		"ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\" \"$@\""), 0o700)
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	// Setup ssh wrapper
 | |
| 	os.Setenv("GIT_SSH", path.Join(tmpDir, "ssh"))
 | |
| 	os.Setenv("GIT_SSH_COMMAND",
 | |
| 		"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i \""+keyFile+"\"")
 | |
| 	os.Setenv("GIT_SSH_VARIANT", "ssh")
 | |
| 
 | |
| 	callback(keyFile)
 | |
| }
 | |
| 
 | |
| func createSSHUrl(gitPath string, u *url.URL) *url.URL {
 | |
| 	u2 := *u
 | |
| 	u2.Scheme = "ssh"
 | |
| 	u2.User = url.User("git")
 | |
| 	u2.Host = net.JoinHostPort(setting.SSH.ListenHost, strconv.Itoa(setting.SSH.ListenPort))
 | |
| 	u2.Path = gitPath
 | |
| 	return &u2
 | |
| }
 | |
| 
 | |
| func onGiteaRunTB(t testing.TB, callback func(testing.TB, *url.URL), prepare ...bool) {
 | |
| 	if len(prepare) == 0 || prepare[0] {
 | |
| 		defer tests.PrepareTestEnv(t, 1)()
 | |
| 	}
 | |
| 	s := http.Server{
 | |
| 		Handler: c,
 | |
| 	}
 | |
| 
 | |
| 	u, err := url.Parse(setting.AppURL)
 | |
| 	assert.NoError(t, err)
 | |
| 	listener, err := net.Listen("tcp", u.Host)
 | |
| 	i := 0
 | |
| 	for err != nil && i <= 10 {
 | |
| 		time.Sleep(100 * time.Millisecond)
 | |
| 		listener, err = net.Listen("tcp", u.Host)
 | |
| 		i++
 | |
| 	}
 | |
| 	assert.NoError(t, err)
 | |
| 	u.Host = listener.Addr().String()
 | |
| 
 | |
| 	defer func() {
 | |
| 		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
 | |
| 		s.Shutdown(ctx)
 | |
| 		cancel()
 | |
| 	}()
 | |
| 
 | |
| 	go s.Serve(listener)
 | |
| 	// Started by config go ssh.Listen(setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs)
 | |
| 
 | |
| 	callback(t, u)
 | |
| }
 | |
| 
 | |
| func onGiteaRun(t *testing.T, callback func(*testing.T, *url.URL), prepare ...bool) {
 | |
| 	onGiteaRunTB(t, func(t testing.TB, u *url.URL) {
 | |
| 		callback(t.(*testing.T), u)
 | |
| 	}, prepare...)
 | |
| }
 | |
| 
 | |
| func doGitClone(dstLocalPath string, u *url.URL) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		assert.NoError(t, git.CloneWithArgs(context.Background(), git.AllowLFSFiltersArgs(), u.String(), dstLocalPath, git.CloneRepoOptions{}))
 | |
| 		exist, err := util.IsExist(filepath.Join(dstLocalPath, "README.md"))
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.True(t, exist)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doPartialGitClone(dstLocalPath string, u *url.URL) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		assert.NoError(t, git.CloneWithArgs(context.Background(), git.AllowLFSFiltersArgs(), u.String(), dstLocalPath, git.CloneRepoOptions{
 | |
| 			Filter: "blob:none",
 | |
| 		}))
 | |
| 		exist, err := util.IsExist(filepath.Join(dstLocalPath, "README.md"))
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.True(t, exist)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doGitCloneFail(u *url.URL) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		tmpDir := t.TempDir()
 | |
| 		assert.Error(t, git.Clone(git.DefaultContext, u.String(), tmpDir, git.CloneRepoOptions{}))
 | |
| 		exist, err := util.IsExist(filepath.Join(tmpDir, "README.md"))
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.False(t, exist)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doGitInitTestRepository(dstPath string) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		// Init repository in dstPath
 | |
| 		assert.NoError(t, git.InitRepository(git.DefaultContext, dstPath, false))
 | |
| 		// forcibly set default branch to master
 | |
| 		_, _, err := git.NewCommand(git.DefaultContext, "symbolic-ref", "HEAD", git.BranchPrefix+"master").RunStdString(&git.RunOpts{Dir: dstPath})
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.NoError(t, os.WriteFile(filepath.Join(dstPath, "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", dstPath)), 0o644))
 | |
| 		assert.NoError(t, git.AddChanges(dstPath, true))
 | |
| 		signature := git.Signature{
 | |
| 			Email: "test@example.com",
 | |
| 			Name:  "test",
 | |
| 			When:  time.Now(),
 | |
| 		}
 | |
| 		assert.NoError(t, git.CommitChanges(dstPath, git.CommitChangesOptions{
 | |
| 			Committer: &signature,
 | |
| 			Author:    &signature,
 | |
| 			Message:   "Initial Commit",
 | |
| 		}))
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doGitAddRemote(dstPath, remoteName string, u *url.URL) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		_, _, err := git.NewCommand(git.DefaultContext, "remote", "add").AddDynamicArguments(remoteName, u.String()).RunStdString(&git.RunOpts{Dir: dstPath})
 | |
| 		assert.NoError(t, err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doGitPushTestRepository(dstPath string, args ...string) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		_, _, err := git.NewCommand(git.DefaultContext, "push", "-u").AddArguments(git.ToTrustedCmdArgs(args)...).RunStdString(&git.RunOpts{Dir: dstPath})
 | |
| 		assert.NoError(t, err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doGitPushTestRepositoryFail(dstPath string, args ...string) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		_, _, err := git.NewCommand(git.DefaultContext, "push").AddArguments(git.ToTrustedCmdArgs(args)...).RunStdString(&git.RunOpts{Dir: dstPath})
 | |
| 		assert.Error(t, err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doGitCreateBranch(dstPath, branch string) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		_, _, err := git.NewCommand(git.DefaultContext, "checkout", "-b").AddDynamicArguments(branch).RunStdString(&git.RunOpts{Dir: dstPath})
 | |
| 		assert.NoError(t, err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doGitCheckoutBranch(dstPath string, args ...string) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		_, _, err := git.NewCommandContextNoGlobals(git.DefaultContext, git.AllowLFSFiltersArgs()...).AddArguments("checkout").AddArguments(git.ToTrustedCmdArgs(args)...).RunStdString(&git.RunOpts{Dir: dstPath})
 | |
| 		assert.NoError(t, err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doGitMerge(dstPath string, args ...string) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		_, _, err := git.NewCommand(git.DefaultContext, "merge").AddArguments(git.ToTrustedCmdArgs(args)...).RunStdString(&git.RunOpts{Dir: dstPath})
 | |
| 		assert.NoError(t, err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doGitPull(dstPath string, args ...string) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		_, _, err := git.NewCommandContextNoGlobals(git.DefaultContext, git.AllowLFSFiltersArgs()...).AddArguments("pull").AddArguments(git.ToTrustedCmdArgs(args)...).RunStdString(&git.RunOpts{Dir: dstPath})
 | |
| 		assert.NoError(t, err)
 | |
| 	}
 | |
| }
 |