opt github.com

misc/git/server.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"os/exec"
 	"path"
 	"regexp"
 	"strconv"
@@ -23,38 +22,23 @@ import (
 	kit "shylinux.com/x/toolkits"
 )
 
-func requestReader(req *http.Request) (io.ReadCloser, error) {
+func requestReader(m *ice.Message) (io.ReadCloser, error) {
-	switch req.Header.Get("content-encoding") {
+	switch m.R.Header.Get("content-encoding") {
-	case "gzip":
-		return gzip.NewReader(req.Body)
 	case "deflate":
-		return flate.NewReader(req.Body), nil
+		return flate.NewReader(m.R.Body), nil
+	case "gzip":
+		return gzip.NewReader(m.R.Body)
 	}
-	return req.Body, nil
+	return m.R.Body, nil
 }
-func packetWrite(str string) []byte {
+func packetWrite(m *ice.Message, cmd string, str ...string) {
-	s := strconv.FormatInt(int64(len(str)+4), 16)
+	s := strconv.FormatInt(int64(len(cmd)+4), 16)
 	if len(s)%4 != 0 {
 		s = strings.Repeat("0", 4-len(s)%4) + s
 	}
-	return []byte(s + str)
+	m.W.Write([]byte(s + cmd + "0000" + strings.Join(str, "")))
-}
-func packetFlush() []byte {
-	return []byte("0000")
 }
 
-var basicAuthRegex = regexp.MustCompile("^([^:]*):(.*)$")
-
-func _server_param(m *ice.Message, arg ...string) (string, string) {
-	repos, service := path.Join(arg...), kit.Select(arg[len(arg)-1], m.Option("service"))
-	switch {
-	case strings.HasSuffix(repos, "info/refs"):
-		repos = strings.TrimSuffix(repos, "info/refs")
-	default:
-		repos = strings.TrimSuffix(repos, service)
-	}
-	return kit.Path(m.Conf(SERVER, kit.META_PATH), "repos", repos), strings.TrimPrefix(service, "git-")
-}
 func _server_login(m *ice.Message) error {
 	parts := strings.SplitN(m.R.Header.Get("Authorization"), " ", 2)
 	if len(parts) < 2 {
@@ -85,71 +69,46 @@ func _server_login(m *ice.Message) error {
 	}
 	return nil
 }
-func _server_repos(m *ice.Message, arg ...string) {
+func _server_param(m *ice.Message, arg ...string) (string, string) {
-	m.Option(cli.CMD_DIR, path.Join(m.Conf(SERVER, kit.META_PATH), REPOS))
+	repos, service := path.Join(arg...), kit.Select(arg[len(arg)-1], m.Option("service"))
-	p := strings.TrimSuffix(path.Join(arg...), "info/refs")
+	switch {
-	if _, e := os.Stat(path.Join(m.Option(cli.CMD_DIR), p)); os.IsNotExist(e) {
+	case strings.HasSuffix(repos, "info/refs"):
-		m.Cmd(cli.SYSTEM, GIT, INIT, "--bare", p) // 创建仓库
+		repos = strings.TrimSuffix(repos, "info/refs")
+	default:
+		repos = strings.TrimSuffix(repos, service)
 	}
+	return kit.Path(m.Conf(SERVER, kit.META_PATH), REPOS, repos), strings.TrimPrefix(service, "git-")
 }
-func _server_cmd(m *ice.Message, arg ...string) error {
+func _server_repos(m *ice.Message, arg ...string) error {
 	repos, service := _server_param(m, arg...)
 
+	m.Option(cli.CMD_DIR, repos)
 	if strings.HasSuffix(path.Join(arg...), "info/refs") {
-		command := exec.Command("/usr/bin/git", service, "--stateless-rpc", "--advertise-refs", ".")
+		// m.W.Header().Set("Pragma", "no-cache")
-		command.Dir = repos
+		// m.W.Header().Set("Expires", "Fri, 01 Jan 1980 00:00:00 GMT")
-		out, err := command.Output()
+		// m.W.Header().Set("Cache-Control", "no-cache, max-age=0, must-revalidate")
-		if err != nil {
-			return err
-		}
-
-		m.W.Header().Set("Expires", "Fri, 01 Jan 1980 00:00:00 GMT")
-		m.W.Header().Set("Pragma", "no-cache")
-		m.W.Header().Set("Cache-Control", "no-cache, max-age=0, must-revalidate")
-
 		m.W.Header().Set("Content-Type", fmt.Sprintf("application/x-git-%s-advertisement", service))
-		m.W.WriteHeader(http.StatusOK)
+		msg := m.Cmd(cli.SYSTEM, GIT, service, "--stateless-rpc", "--advertise-refs", ".")
-		m.W.Write(packetWrite("# service=git-" + service + "\n"))
+		packetWrite(m, "# service=git-"+service+"\n", msg.Result())
-		m.W.Write(packetFlush())
+
-		m.W.Write(out)
 		return nil
 	}
 
-	command := exec.Command("/usr/bin/git", service, "--stateless-rpc", ".")
+	reader, err := requestReader(m)
-	command.Dir = repos
-
-	stdin, err := command.StdinPipe()
-	if err != nil {
-		return err
-	}
-	stdout, err := command.StdoutPipe()
-	if err != nil {
-		return err
-	}
-	defer stdout.Close()
-
-	if err = command.Start(); err != nil {
-		return err
-	}
-
-	reader, err := requestReader(m.R)
 	if err != nil {
 		return err
 	}
 	defer reader.Close()
 
-	io.Copy(stdin, reader)
+	m.Option(cli.CMD_OUTPUT, m.W)
-	stdin.Close()
+	m.Option(cli.CMD_INPUT, reader)
-
 	m.W.Header().Set("Content-Type", fmt.Sprintf("application/x-git-%s-result", service))
-	io.Copy(m.W, stdout)
+	m.Cmd(cli.SYSTEM, GIT, service, "--stateless-rpc", ".")
-
-	if err = command.Wait(); err != nil {
-		return err
-	}
 	return nil
 }
 
+var basicAuthRegex = regexp.MustCompile("^([^:]*):(.*)$")
+
 const SERVER = "server"
 
 func init() {
@@ -166,20 +125,22 @@ func init() {
 				return
 			}
 
-			switch _, service := _server_param(m, arg...); service {
+			switch repos, service := _server_param(m, arg...); service {
 			case "receive-pack": // 上传代码
 				if err := _server_login(m); err != nil {
 					m.W.Header().Set("WWW-Authenticate", `Basic realm="git server"`)
 					http.Error(m.W, err.Error(), 401)
 					return // 认证失败
 				}
-				_server_repos(m, arg...)
+				if _, e := os.Stat(path.Join(repos)); os.IsNotExist(e) {
+					m.Cmd(cli.SYSTEM, GIT, INIT, "--bare", repos) // 创建仓库
+				}
 
 			case "upload-pack": // 下载代码
 
 			}
 
-			if err := _server_cmd(m, arg...); err != nil {
+			if err := _server_repos(m, arg...); err != nil {
 				http.Error(m.W, err.Error(), 500)
 				return // 未知错误
 			}