mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 13:51:35 +01:00 
			
		
		
		
	Merge branch 'dev' of github.com:gogits/gogs into dev
This commit is contained in:
		
						commit
						29e255422e
					
				
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -33,3 +33,4 @@ _testmain.go | ||||
| *.exe~ | ||||
| gogs | ||||
| __pycache__ | ||||
| *.pem | ||||
|  | ||||
| @ -309,13 +309,13 @@ html, body { | ||||
|     height: 8em; | ||||
| } | ||||
| 
 | ||||
| #repo-import-auth{ | ||||
| #repo-import-auth { | ||||
|     width: 100%; | ||||
|     margin-top: 48px; | ||||
|     box-sizing: border-box; | ||||
| } | ||||
| 
 | ||||
| #repo-import-auth .form-group{ | ||||
| #repo-import-auth .form-group { | ||||
|     box-sizing: border-box; | ||||
|     margin-left: 0; | ||||
|     margin-right: 0; | ||||
| @ -460,28 +460,39 @@ html, body { | ||||
|     padding: 3px 8px; | ||||
| } | ||||
| 
 | ||||
| #user-dashboard-repo-new .dropdown-menu { | ||||
| #user-dashboard-repo-new .dropdown-menu, #nav-repo-new .dropdown-menu { | ||||
|     padding: 0; | ||||
|     margin: 0; | ||||
| } | ||||
| 
 | ||||
| #user-dashboard-repo-new ul { | ||||
| #user-dashboard-repo-new ul, #nav-repo-new ul { | ||||
|     margin: 0; | ||||
|     width: 200px; | ||||
| } | ||||
| 
 | ||||
| #user-dashboard-repo-new li a { | ||||
| #user-dashboard-repo-new li a, #nav-repo-new li a { | ||||
|     line-height: 36px; | ||||
|     display: block; | ||||
|     padding: 0 18px; | ||||
|     color: #444; | ||||
| } | ||||
| 
 | ||||
| #user-dashboard-repo-new li a:hover { | ||||
| #user-dashboard-repo-new li a:hover, #nav-repo-new li a:hover { | ||||
|     background: #0093c4; | ||||
|     color: #FFF; | ||||
| } | ||||
| 
 | ||||
| #nav-repo-new button { | ||||
|     border: none; | ||||
|     background: transparent; | ||||
|     padding: 0; | ||||
|     width: 15px; | ||||
| } | ||||
| 
 | ||||
| #nav-repo-new li .fa { | ||||
|     margin: 0 .5em; | ||||
| } | ||||
| 
 | ||||
| /* gogits repo single page */ | ||||
| 
 | ||||
| #body-nav.repo-nav { | ||||
|  | ||||
							
								
								
									
										55
									
								
								routers/repo/git.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										55
									
								
								routers/repo/git.go
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,55 @@ | ||||
| package repo | ||||
| 
 | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"strings" | ||||
| ) | ||||
| 
 | ||||
| const advertise_refs = "--advertise-refs" | ||||
| 
 | ||||
| func command(cmd string, opts ...string) string { | ||||
| 	return fmt.Sprintf("git %s %s", cmd, strings.Join(opts, " ")) | ||||
| } | ||||
| 
 | ||||
| /*func upload_pack(repository_path string, opts ...string) string { | ||||
| 	cmd = "upload-pack" | ||||
| 	opts = append(opts, "--stateless-rpc", repository_path) | ||||
| 	return command(cmd, opts...) | ||||
| } | ||||
| 
 | ||||
| func receive_pack(repository_path string, opts ...string) string { | ||||
| 	cmd = "receive-pack" | ||||
| 	opts = append(opts, "--stateless-rpc", repository_path) | ||||
| 	return command(cmd, opts...) | ||||
| }*/ | ||||
| 
 | ||||
| /*func update_server_info(repository_path, opts = {}, &block) | ||||
|       cmd = "update-server-info" | ||||
|       args = [] | ||||
|       opts.each {|k,v| args << command_options[k] if command_options.has_key?(k) } | ||||
|       opts[:args] = args | ||||
|       Dir.chdir(repository_path) do # "git update-server-info" does not take a parameter to specify the repository, so set the working directory to the repository | ||||
|         self.command(cmd, opts, &block) | ||||
|       end | ||||
|     end | ||||
| 
 | ||||
|     def get_config_setting(repository_path, key) | ||||
|       path = get_config_location(repository_path) | ||||
|       raise "Config file could not be found for repository in #{repository_path}." unless path | ||||
|       self.command("config", {:args => ["-f #{path}", key]}).chomp | ||||
|     end | ||||
| 
 | ||||
|     def get_config_location(repository_path) | ||||
|       non_bare = File.join(repository_path,'.git') # This is where the config file will be if the repository is non-bare | ||||
|       if File.exists?(non_bare) then # The repository is non-bare | ||||
|         non_bare_config = File.join(non_bare, 'config') | ||||
|         return non_bare_config if File.exists?(non_bare_config) | ||||
|       else # We are dealing with a bare repository | ||||
|         bare_config = File.join(repository_path, "config") | ||||
|         return bare_config if File.exists?(bare_config) | ||||
|       end | ||||
|       return nil | ||||
|     end | ||||
| 
 | ||||
|   end | ||||
| */ | ||||
							
								
								
									
										471
									
								
								routers/repo/http.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										471
									
								
								routers/repo/http.go
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,471 @@ | ||||
| package repo | ||||
| 
 | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"io" | ||||
| 	"io/ioutil" | ||||
| 	"log" | ||||
| 	"net/http" | ||||
| 	"os" | ||||
| 	"os/exec" | ||||
| 	"path" | ||||
| 	"regexp" | ||||
| 	"strconv" | ||||
| 	"strings" | ||||
| 	"time" | ||||
| 
 | ||||
| 	"github.com/go-martini/martini" | ||||
| 	"github.com/gogits/gogs/models" | ||||
| 	"github.com/gogits/gogs/modules/base" | ||||
| 	"github.com/gogits/gogs/modules/middleware" | ||||
| ) | ||||
| 
 | ||||
| func Http(ctx *middleware.Context, params martini.Params) { | ||||
| 	username := params["username"] | ||||
| 	reponame := params["reponame"] | ||||
| 	if strings.HasSuffix(reponame, ".git") { | ||||
| 		reponame = reponame[:len(reponame)-4] | ||||
| 	} | ||||
| 
 | ||||
| 	var isPull bool | ||||
| 	service := ctx.Query("service") | ||||
| 	if service == "git-receive-pack" || | ||||
| 		strings.HasSuffix(ctx.Req.URL.Path, "git-receive-pack") { | ||||
| 		isPull = false | ||||
| 	} else if service == "git-upload-pack" || | ||||
| 		strings.HasSuffix(ctx.Req.URL.Path, "git-upload-pack") { | ||||
| 		isPull = true | ||||
| 	} else { | ||||
| 		isPull = (ctx.Req.Method == "GET") | ||||
| 	} | ||||
| 
 | ||||
| 	repoUser, err := models.GetUserByName(username) | ||||
| 	if err != nil { | ||||
| 		ctx.Handle(500, "repo.GetUserByName", nil) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	repo, err := models.GetRepositoryByName(repoUser.Id, reponame) | ||||
| 	if err != nil { | ||||
| 		ctx.Handle(500, "repo.GetRepositoryByName", nil) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	// only public pull don't need auth | ||||
| 	var askAuth = !(!repo.IsPrivate && isPull) | ||||
| 
 | ||||
| 	// check access | ||||
| 	if askAuth { | ||||
| 		baHead := ctx.Req.Header.Get("Authorization") | ||||
| 		if baHead == "" { | ||||
| 			// ask auth | ||||
| 			authRequired(ctx) | ||||
| 			return | ||||
| 		} | ||||
| 
 | ||||
| 		auths := strings.Fields(baHead) | ||||
| 		// currently check basic auth | ||||
| 		// TODO: support digit auth | ||||
| 		if len(auths) != 2 || auths[0] != "Basic" { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} | ||||
| 		authUsername, passwd, err := basicDecode(auths[1]) | ||||
| 		if err != nil { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} | ||||
| 
 | ||||
| 		authUser, err := models.GetUserByName(authUsername) | ||||
| 		if err != nil { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} | ||||
| 
 | ||||
| 		newUser := &models.User{Passwd: passwd, Salt: authUser.Salt} | ||||
| 
 | ||||
| 		newUser.EncodePasswd() | ||||
| 		if authUser.Passwd != newUser.Passwd { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} | ||||
| 
 | ||||
| 		var tp = models.AU_WRITABLE | ||||
| 		if isPull { | ||||
| 			tp = models.AU_READABLE | ||||
| 		} | ||||
| 
 | ||||
| 		has, err := models.HasAccess(authUsername, username+"/"+reponame, tp) | ||||
| 		if err != nil { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} else if !has { | ||||
| 			if tp == models.AU_READABLE { | ||||
| 				has, err = models.HasAccess(authUsername, username+"/"+reponame, models.AU_WRITABLE) | ||||
| 				if err != nil || !has { | ||||
| 					ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 					return | ||||
| 				} | ||||
| 			} else { | ||||
| 				ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 				return | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	config := Config{base.RepoRootPath, "git", true, true, func(rpc string, input []byte) { | ||||
| 		//fmt.Println("rpc:", rpc) | ||||
| 		//fmt.Println("input:", string(input)) | ||||
| 	}} | ||||
| 
 | ||||
| 	handler := HttpBackend(&config) | ||||
| 	handler(ctx.ResponseWriter, ctx.Req) | ||||
| 
 | ||||
| 	/* Webdav | ||||
| 	dir := models.RepoPath(username, reponame) | ||||
| 
 | ||||
| 	prefix := path.Join("/", username, params["reponame"]) | ||||
| 	server := webdav.NewServer( | ||||
| 		dir, prefix, true) | ||||
| 
 | ||||
| 	server.ServeHTTP(ctx.ResponseWriter, ctx.Req) | ||||
| 	*/ | ||||
| } | ||||
| 
 | ||||
| type route struct { | ||||
| 	cr      *regexp.Regexp | ||||
| 	method  string | ||||
| 	handler func(handler) | ||||
| } | ||||
| 
 | ||||
| type Config struct { | ||||
| 	ReposRoot   string | ||||
| 	GitBinPath  string | ||||
| 	UploadPack  bool | ||||
| 	ReceivePack bool | ||||
| 	OnSucceed   func(rpc string, input []byte) | ||||
| } | ||||
| 
 | ||||
| type handler struct { | ||||
| 	*Config | ||||
| 	w    http.ResponseWriter | ||||
| 	r    *http.Request | ||||
| 	Dir  string | ||||
| 	File string | ||||
| } | ||||
| 
 | ||||
| var routes = []route{ | ||||
| 	{regexp.MustCompile("(.*?)/git-upload-pack$"), "POST", serviceUploadPack}, | ||||
| 	{regexp.MustCompile("(.*?)/git-receive-pack$"), "POST", serviceReceivePack}, | ||||
| 	{regexp.MustCompile("(.*?)/info/refs$"), "GET", getInfoRefs}, | ||||
| 	{regexp.MustCompile("(.*?)/HEAD$"), "GET", getTextFile}, | ||||
| 	{regexp.MustCompile("(.*?)/objects/info/alternates$"), "GET", getTextFile}, | ||||
| 	{regexp.MustCompile("(.*?)/objects/info/http-alternates$"), "GET", getTextFile}, | ||||
| 	{regexp.MustCompile("(.*?)/objects/info/packs$"), "GET", getInfoPacks}, | ||||
| 	{regexp.MustCompile("(.*?)/objects/info/[^/]*$"), "GET", getTextFile}, | ||||
| 	{regexp.MustCompile("(.*?)/objects/[0-9a-f]{2}/[0-9a-f]{38}$"), "GET", getLooseObject}, | ||||
| 	{regexp.MustCompile("(.*?)/objects/pack/pack-[0-9a-f]{40}\\.pack$"), "GET", getPackFile}, | ||||
| 	{regexp.MustCompile("(.*?)/objects/pack/pack-[0-9a-f]{40}\\.idx$"), "GET", getIdxFile}, | ||||
| } | ||||
| 
 | ||||
| // Request handling function | ||||
| func HttpBackend(config *Config) http.HandlerFunc { | ||||
| 	return func(w http.ResponseWriter, r *http.Request) { | ||||
| 		//log.Printf("%s %s %s %s", r.RemoteAddr, r.Method, r.URL.Path, r.Proto) | ||||
| 		for _, route := range routes { | ||||
| 			if m := route.cr.FindStringSubmatch(r.URL.Path); m != nil { | ||||
| 				if route.method != r.Method { | ||||
| 					renderMethodNotAllowed(w, r) | ||||
| 					return | ||||
| 				} | ||||
| 
 | ||||
| 				file := strings.Replace(r.URL.Path, m[1]+"/", "", 1) | ||||
| 				dir, err := getGitDir(config, m[1]) | ||||
| 
 | ||||
| 				if err != nil { | ||||
| 					log.Print(err) | ||||
| 					renderNotFound(w) | ||||
| 					return | ||||
| 				} | ||||
| 
 | ||||
| 				hr := handler{config, w, r, dir, file} | ||||
| 				route.handler(hr) | ||||
| 				return | ||||
| 			} | ||||
| 		} | ||||
| 		renderNotFound(w) | ||||
| 		return | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| // Actual command handling functions | ||||
| 
 | ||||
| func serviceUploadPack(hr handler) { | ||||
| 	serviceRpc("upload-pack", hr) | ||||
| } | ||||
| 
 | ||||
| func serviceReceivePack(hr handler) { | ||||
| 	serviceRpc("receive-pack", hr) | ||||
| } | ||||
| 
 | ||||
| func serviceRpc(rpc string, hr handler) { | ||||
| 	w, r, dir := hr.w, hr.r, hr.Dir | ||||
| 	access := hasAccess(r, hr.Config, dir, rpc, true) | ||||
| 
 | ||||
| 	if access == false { | ||||
| 		renderNoAccess(w) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	input, _ := ioutil.ReadAll(r.Body) | ||||
| 
 | ||||
| 	w.Header().Set("Content-Type", fmt.Sprintf("application/x-git-%s-result", rpc)) | ||||
| 	w.WriteHeader(http.StatusOK) | ||||
| 
 | ||||
| 	args := []string{rpc, "--stateless-rpc", dir} | ||||
| 	cmd := exec.Command(hr.Config.GitBinPath, args...) | ||||
| 	cmd.Dir = dir | ||||
| 	in, err := cmd.StdinPipe() | ||||
| 	if err != nil { | ||||
| 		log.Print(err) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	stdout, err := cmd.StdoutPipe() | ||||
| 	if err != nil { | ||||
| 		log.Print(err) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	err = cmd.Start() | ||||
| 	if err != nil { | ||||
| 		log.Print(err) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	in.Write(input) | ||||
| 	io.Copy(w, stdout) | ||||
| 	cmd.Wait() | ||||
| 
 | ||||
| 	if hr.Config.OnSucceed != nil { | ||||
| 		hr.Config.OnSucceed(rpc, input) | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| func getInfoRefs(hr handler) { | ||||
| 	w, r, dir := hr.w, hr.r, hr.Dir | ||||
| 	serviceName := getServiceType(r) | ||||
| 	access := hasAccess(r, hr.Config, dir, serviceName, false) | ||||
| 
 | ||||
| 	if access { | ||||
| 		args := []string{serviceName, "--stateless-rpc", "--advertise-refs", "."} | ||||
| 		refs := gitCommand(hr.Config.GitBinPath, dir, args...) | ||||
| 
 | ||||
| 		hdrNocache(w) | ||||
| 		w.Header().Set("Content-Type", fmt.Sprintf("application/x-git-%s-advertisement", serviceName)) | ||||
| 		w.WriteHeader(http.StatusOK) | ||||
| 		w.Write(packetWrite("# service=git-" + serviceName + "\n")) | ||||
| 		w.Write(packetFlush()) | ||||
| 		w.Write(refs) | ||||
| 	} else { | ||||
| 		updateServerInfo(hr.Config.GitBinPath, dir) | ||||
| 		hdrNocache(w) | ||||
| 		sendFile("text/plain; charset=utf-8", hr) | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| func getInfoPacks(hr handler) { | ||||
| 	hdrCacheForever(hr.w) | ||||
| 	sendFile("text/plain; charset=utf-8", hr) | ||||
| } | ||||
| 
 | ||||
| func getLooseObject(hr handler) { | ||||
| 	hdrCacheForever(hr.w) | ||||
| 	sendFile("application/x-git-loose-object", hr) | ||||
| } | ||||
| 
 | ||||
| func getPackFile(hr handler) { | ||||
| 	hdrCacheForever(hr.w) | ||||
| 	sendFile("application/x-git-packed-objects", hr) | ||||
| } | ||||
| 
 | ||||
| func getIdxFile(hr handler) { | ||||
| 	hdrCacheForever(hr.w) | ||||
| 	sendFile("application/x-git-packed-objects-toc", hr) | ||||
| } | ||||
| 
 | ||||
| func getTextFile(hr handler) { | ||||
| 	hdrNocache(hr.w) | ||||
| 	sendFile("text/plain", hr) | ||||
| } | ||||
| 
 | ||||
| // Logic helping functions | ||||
| 
 | ||||
| func sendFile(contentType string, hr handler) { | ||||
| 	w, r := hr.w, hr.r | ||||
| 	reqFile := path.Join(hr.Dir, hr.File) | ||||
| 
 | ||||
| 	//fmt.Println("sendFile:", reqFile) | ||||
| 
 | ||||
| 	f, err := os.Stat(reqFile) | ||||
| 	if os.IsNotExist(err) { | ||||
| 		renderNotFound(w) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	w.Header().Set("Content-Type", contentType) | ||||
| 	w.Header().Set("Content-Length", fmt.Sprintf("%d", f.Size())) | ||||
| 	w.Header().Set("Last-Modified", f.ModTime().Format(http.TimeFormat)) | ||||
| 	http.ServeFile(w, r, reqFile) | ||||
| } | ||||
| 
 | ||||
| func getGitDir(config *Config, filePath string) (string, error) { | ||||
| 	root := config.ReposRoot | ||||
| 
 | ||||
| 	if root == "" { | ||||
| 		cwd, err := os.Getwd() | ||||
| 
 | ||||
| 		if err != nil { | ||||
| 			log.Print(err) | ||||
| 			return "", err | ||||
| 		} | ||||
| 
 | ||||
| 		root = cwd | ||||
| 	} | ||||
| 
 | ||||
| 	f := path.Join(root, filePath) | ||||
| 	if _, err := os.Stat(f); os.IsNotExist(err) { | ||||
| 		return "", err | ||||
| 	} | ||||
| 
 | ||||
| 	return f, nil | ||||
| } | ||||
| 
 | ||||
| func getServiceType(r *http.Request) string { | ||||
| 	serviceType := r.FormValue("service") | ||||
| 
 | ||||
| 	if s := strings.HasPrefix(serviceType, "git-"); !s { | ||||
| 		return "" | ||||
| 	} | ||||
| 
 | ||||
| 	return strings.Replace(serviceType, "git-", "", 1) | ||||
| } | ||||
| 
 | ||||
| func hasAccess(r *http.Request, config *Config, dir string, rpc string, checkContentType bool) bool { | ||||
| 	if checkContentType { | ||||
| 		if r.Header.Get("Content-Type") != fmt.Sprintf("application/x-git-%s-request", rpc) { | ||||
| 			return false | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	if !(rpc == "upload-pack" || rpc == "receive-pack") { | ||||
| 		return false | ||||
| 	} | ||||
| 	if rpc == "receive-pack" { | ||||
| 		return config.ReceivePack | ||||
| 	} | ||||
| 	if rpc == "upload-pack" { | ||||
| 		return config.UploadPack | ||||
| 	} | ||||
| 
 | ||||
| 	return getConfigSetting(config.GitBinPath, rpc, dir) | ||||
| } | ||||
| 
 | ||||
| func getConfigSetting(gitBinPath, serviceName string, dir string) bool { | ||||
| 	serviceName = strings.Replace(serviceName, "-", "", -1) | ||||
| 	setting := getGitConfig(gitBinPath, "http."+serviceName, dir) | ||||
| 
 | ||||
| 	if serviceName == "uploadpack" { | ||||
| 		return setting != "false" | ||||
| 	} | ||||
| 
 | ||||
| 	return setting == "true" | ||||
| } | ||||
| 
 | ||||
| func getGitConfig(gitBinPath, configName string, dir string) string { | ||||
| 	args := []string{"config", configName} | ||||
| 	out := string(gitCommand(gitBinPath, dir, args...)) | ||||
| 	return out[0 : len(out)-1] | ||||
| } | ||||
| 
 | ||||
| func updateServerInfo(gitBinPath, dir string) []byte { | ||||
| 	args := []string{"update-server-info"} | ||||
| 	return gitCommand(gitBinPath, dir, args...) | ||||
| } | ||||
| 
 | ||||
| func gitCommand(gitBinPath, dir string, args ...string) []byte { | ||||
| 	command := exec.Command(gitBinPath, args...) | ||||
| 	command.Dir = dir | ||||
| 	out, err := command.Output() | ||||
| 
 | ||||
| 	if err != nil { | ||||
| 		log.Print(err) | ||||
| 	} | ||||
| 
 | ||||
| 	return out | ||||
| } | ||||
| 
 | ||||
| // HTTP error response handling functions | ||||
| 
 | ||||
| func renderMethodNotAllowed(w http.ResponseWriter, r *http.Request) { | ||||
| 	if r.Proto == "HTTP/1.1" { | ||||
| 		w.WriteHeader(http.StatusMethodNotAllowed) | ||||
| 		w.Write([]byte("Method Not Allowed")) | ||||
| 	} else { | ||||
| 		w.WriteHeader(http.StatusBadRequest) | ||||
| 		w.Write([]byte("Bad Request")) | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| func renderNotFound(w http.ResponseWriter) { | ||||
| 	w.WriteHeader(http.StatusNotFound) | ||||
| 	w.Write([]byte("Not Found")) | ||||
| } | ||||
| 
 | ||||
| func renderNoAccess(w http.ResponseWriter) { | ||||
| 	w.WriteHeader(http.StatusForbidden) | ||||
| 	w.Write([]byte("Forbidden")) | ||||
| } | ||||
| 
 | ||||
| // Packet-line handling function | ||||
| 
 | ||||
| func packetFlush() []byte { | ||||
| 	return []byte("0000") | ||||
| } | ||||
| 
 | ||||
| func packetWrite(str string) []byte { | ||||
| 	s := strconv.FormatInt(int64(len(str)+4), 16) | ||||
| 
 | ||||
| 	if len(s)%4 != 0 { | ||||
| 		s = strings.Repeat("0", 4-len(s)%4) + s | ||||
| 	} | ||||
| 
 | ||||
| 	return []byte(s + str) | ||||
| } | ||||
| 
 | ||||
| // Header writing functions | ||||
| 
 | ||||
| func hdrNocache(w http.ResponseWriter) { | ||||
| 	w.Header().Set("Expires", "Fri, 01 Jan 1980 00:00:00 GMT") | ||||
| 	w.Header().Set("Pragma", "no-cache") | ||||
| 	w.Header().Set("Cache-Control", "no-cache, max-age=0, must-revalidate") | ||||
| } | ||||
| 
 | ||||
| func hdrCacheForever(w http.ResponseWriter) { | ||||
| 	now := time.Now().Unix() | ||||
| 	expires := now + 31536000 | ||||
| 	w.Header().Set("Date", fmt.Sprintf("%d", now)) | ||||
| 	w.Header().Set("Expires", fmt.Sprintf("%d", expires)) | ||||
| 	w.Header().Set("Cache-Control", "public, max-age=31536000") | ||||
| } | ||||
| 
 | ||||
| // Main | ||||
| /* | ||||
| func main() { | ||||
| 	http.HandleFunc("/", requestHandler()) | ||||
| 
 | ||||
| 	err := http.ListenAndServe(":8080", nil) | ||||
| 	if err != nil { | ||||
| 		log.Fatal("ListenAndServe: ", err) | ||||
| 	} | ||||
| }*/ | ||||
| @ -14,8 +14,6 @@ import ( | ||||
| 
 | ||||
| 	"github.com/go-martini/martini" | ||||
| 
 | ||||
| 	"github.com/gogits/webdav" | ||||
| 
 | ||||
| 	"github.com/gogits/gogs/models" | ||||
| 	"github.com/gogits/gogs/modules/auth" | ||||
| 	"github.com/gogits/gogs/modules/base" | ||||
| @ -296,89 +294,6 @@ func authRequired(ctx *middleware.Context) { | ||||
| 	ctx.HTML(401, fmt.Sprintf("status/401")) | ||||
| } | ||||
| 
 | ||||
| func Http(ctx *middleware.Context, params martini.Params) { | ||||
| 	username := params["username"] | ||||
| 	reponame := params["reponame"] | ||||
| 	if strings.HasSuffix(reponame, ".git") { | ||||
| 		reponame = reponame[:len(reponame)-4] | ||||
| 	} | ||||
| 
 | ||||
| 	//fmt.Println("req:", ctx.Req.Header) | ||||
| 
 | ||||
| 	repoUser, err := models.GetUserByName(username) | ||||
| 	if err != nil { | ||||
| 		ctx.Handle(500, "repo.GetUserByName", nil) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	repo, err := models.GetRepositoryByName(repoUser.Id, reponame) | ||||
| 	if err != nil { | ||||
| 		ctx.Handle(500, "repo.GetRepositoryByName", nil) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	isPull := webdav.IsPullMethod(ctx.Req.Method) | ||||
| 	var askAuth = !(!repo.IsPrivate && isPull) | ||||
| 
 | ||||
| 	//authRequired(ctx) | ||||
| 	//return | ||||
| 
 | ||||
| 	// check access | ||||
| 	if askAuth { | ||||
| 		// check digit auth | ||||
| 
 | ||||
| 		// check basic auth | ||||
| 		baHead := ctx.Req.Header.Get("Authorization") | ||||
| 		if baHead == "" { | ||||
| 			authRequired(ctx) | ||||
| 			return | ||||
| 		} | ||||
| 
 | ||||
| 		auths := strings.Fields(baHead) | ||||
| 		if len(auths) != 2 || auths[0] != "Basic" { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} | ||||
| 		authUsername, passwd, err := basicDecode(auths[1]) | ||||
| 		if err != nil { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} | ||||
| 
 | ||||
| 		authUser, err := models.GetUserByName(authUsername) | ||||
| 		if err != nil { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} | ||||
| 
 | ||||
| 		newUser := &models.User{Passwd: passwd} | ||||
| 		newUser.EncodePasswd() | ||||
| 		if authUser.Passwd != newUser.Passwd { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} | ||||
| 
 | ||||
| 		var tp = models.AU_WRITABLE | ||||
| 		if isPull { | ||||
| 			tp = models.AU_READABLE | ||||
| 		} | ||||
| 
 | ||||
| 		has, err := models.HasAccess(authUsername, username+"/"+reponame, tp) | ||||
| 		if err != nil || !has { | ||||
| 			ctx.Handle(401, "no basic auth and digit auth", nil) | ||||
| 			return | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	dir := models.RepoPath(username, reponame) | ||||
| 
 | ||||
| 	prefix := path.Join("/", username, params["reponame"]) | ||||
| 	server := webdav.NewServer( | ||||
| 		dir, prefix, true) | ||||
| 
 | ||||
| 	server.ServeHTTP(ctx.ResponseWriter, ctx.Req) | ||||
| } | ||||
| 
 | ||||
| func Setting(ctx *middleware.Context, params martini.Params) { | ||||
| 	if !ctx.Repo.IsOwner { | ||||
| 		ctx.Handle(404, "repo.Setting", nil) | ||||
|  | ||||
| @ -8,9 +8,18 @@ | ||||
|             <a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}"> | ||||
|                 <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/> | ||||
|             </a> | ||||
|             <a class="navbar-right nav-item{{if .PageIsNewRepo}} active{{end}}" href="/repo/create" data-toggle="tooltip" data-placement="bottom" title="New Repository"><i class="fa fa-plus fa-lg"></i></a> | ||||
|             <a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="/user/setting"  data-toggle="tooltip" data-placement="bottom" title="Setting"><i class="fa fa-cogs fa-lg"></i></a> | ||||
|             {{if .IsAdmin}}<a class="navbar-right nav-item{{if .PageIsAdmin}} active{{end}}" href="/admin"  data-toggle="tooltip" data-placement="bottom" title="Admin"><i class="fa fa-gear fa-lg"></i></a>{{end}} | ||||
|             <div class="navbar-right nav-item pull-right{{if .PageIsNewRepo}} active{{end}}" id="nav-repo-new" data-toggle="tooltip" data-placement="bottom" title="New Repo"> | ||||
|                 <button type="button" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square fa-lg"></i></button> | ||||
|                 <div class="dropdown-menu"> | ||||
|                     <ul class="list-unstyled"> | ||||
|                         <li><a href="/repo/create"><i class="fa fa-book"></i>Repository</a></li> | ||||
|                         <li><a href="/repo/mirror"><i class="fa fa-clipboard"></i>Mirror</a></li> | ||||
|                         <li><a href="#"><i class="fa fa-users"></i>Organization</a></li> | ||||
|                     </ul> | ||||
|                 </div> | ||||
|             </div> | ||||
|             {{else}}<a id="nav-signin" class="nav-item navbar-right navbar-btn btn btn-danger" href="/user/login/">Sign In</a> | ||||
|             <a id="nav-signup" class="nav-item navbar-right" href="/user/sign_up/">Sign Up</a>{{end}} | ||||
|         </nav> | ||||
|  | ||||
| @ -3,7 +3,7 @@ | ||||
| <div class="container" id="body"> | ||||
|     <form action="/repo/create" method="post" class="form-horizontal card" id="repo-create"> | ||||
|         {{.CsrfTokenHtml}} | ||||
|         <h3>Import Repository</h3> | ||||
|         <h3>Create Repository Mirror</h3> | ||||
|         <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div> | ||||
|         <div class="form-group"> | ||||
|             <label class="col-md-2 control-label">From<strong class="text-danger">*</strong></label> | ||||
|  | ||||
| @ -30,17 +30,13 @@ | ||||
|         <div class="panel panel-default repo-panel"> | ||||
|             <div class="panel-heading">Your Repositories | ||||
|                 <div class="btn-group pull-right" id="user-dashboard-repo-new"> | ||||
|                     <button type="button" class="btn btn-success btn-sm"><i class="fa fa-plus-square"></i>New</button> | ||||
|                     <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown"> | ||||
|                         <span class="caret"></span> | ||||
|                     </button> | ||||
|                     <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square"></i>New</button> | ||||
|                     <div class="dropdown-menu dropdown-menu-right"> | ||||
|                        <ul class="list-unstyled"> | ||||
|                            <li><a href="/repo/create"><i class="fa fa-book"></i>Repository</a></li> | ||||
|                            <li><a href="/repo/mirror"><i class="fa fa-clipboard"></i>Mirror</a></li> | ||||
|                            <li><a href="#"><i class="fa fa-users"></i>Organization</a></li> | ||||
|                        </ul> | ||||
| 
 | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|  | ||||
							
								
								
									
										56
									
								
								update.go
									
									
									
									
									
								
							
							
						
						
									
										56
									
								
								update.go
									
									
									
									
									
								
							| @ -42,32 +42,7 @@ func newUpdateLogger(execDir string) { | ||||
| 	qlog.Info("Start logging update...") | ||||
| } | ||||
| 
 | ||||
| // for command: ./gogs update | ||||
| func runUpdate(c *cli.Context) { | ||||
| 	execDir, _ := base.ExecDir() | ||||
| 	newUpdateLogger(execDir) | ||||
| 
 | ||||
| 	base.NewConfigContext() | ||||
| 	models.LoadModelsConfig() | ||||
| 
 | ||||
| 	if models.UseSQLite3 { | ||||
| 		os.Chdir(execDir) | ||||
| 	} | ||||
| 
 | ||||
| 	models.SetEngine() | ||||
| 
 | ||||
| 	args := c.Args() | ||||
| 	if len(args) != 3 { | ||||
| 		qlog.Fatal("received less 3 parameters") | ||||
| 	} | ||||
| 
 | ||||
| 	refName := args[0] | ||||
| 	if refName == "" { | ||||
| 		qlog.Fatal("refName is empty, shouldn't use") | ||||
| 	} | ||||
| 	oldCommitId := args[1] | ||||
| 	newCommitId := args[2] | ||||
| 
 | ||||
| func update(refName, oldCommitId, newCommitId string) { | ||||
| 	isNew := strings.HasPrefix(oldCommitId, "0000000") | ||||
| 	if isNew && | ||||
| 		strings.HasPrefix(newCommitId, "0000000") { | ||||
| @ -158,3 +133,32 @@ func runUpdate(c *cli.Context) { | ||||
| 		qlog.Fatalf("runUpdate.models.CommitRepoAction: %v", err) | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| // for command: ./gogs update | ||||
| func runUpdate(c *cli.Context) { | ||||
| 	execDir, _ := base.ExecDir() | ||||
| 	newUpdateLogger(execDir) | ||||
| 
 | ||||
| 	base.NewConfigContext() | ||||
| 	models.LoadModelsConfig() | ||||
| 
 | ||||
| 	if models.UseSQLite3 { | ||||
| 		os.Chdir(execDir) | ||||
| 	} | ||||
| 
 | ||||
| 	models.SetEngine() | ||||
| 
 | ||||
| 	args := c.Args() | ||||
| 	if len(args) != 3 { | ||||
| 		qlog.Fatal("received less 3 parameters") | ||||
| 	} | ||||
| 
 | ||||
| 	refName := args[0] | ||||
| 	if refName == "" { | ||||
| 		qlog.Fatal("refName is empty, shouldn't use") | ||||
| 	} | ||||
| 	oldCommitId := args[1] | ||||
| 	newCommitId := args[2] | ||||
| 
 | ||||
| 	update(refName, oldCommitId, newCommitId) | ||||
| } | ||||
|  | ||||
							
								
								
									
										9
									
								
								web.go
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								web.go
									
									
									
									
									
								
							| @ -11,10 +11,10 @@ import ( | ||||
| 
 | ||||
| 	"github.com/codegangsta/cli" | ||||
| 	"github.com/go-martini/martini" | ||||
| 
 | ||||
| 	qlog "github.com/qiniu/log" | ||||
| 
 | ||||
| 	"github.com/gogits/binding" | ||||
| 
 | ||||
| 	"github.com/gogits/gogs/modules/auth" | ||||
| 	"github.com/gogits/gogs/modules/avatar" | ||||
| 	"github.com/gogits/gogs/modules/base" | ||||
| @ -72,6 +72,11 @@ func runWeb(*cli.Context) { | ||||
| 
 | ||||
| 	reqSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true}) | ||||
| 	ignSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: base.Service.RequireSignInView}) | ||||
| 	ignSignInAndCsrf := middleware.Toggle(&middleware.ToggleOptions{ | ||||
| 		SignInRequire: base.Service.RequireSignInView, | ||||
| 		DisableCsrf:   true, | ||||
| 	}) | ||||
| 
 | ||||
| 	reqSignOut := middleware.Toggle(&middleware.ToggleOptions{SignOutRequire: true}) | ||||
| 
 | ||||
| 	bindIgnErr := binding.BindIgnErr | ||||
| @ -169,7 +174,7 @@ func runWeb(*cli.Context) { | ||||
| 	m.Group("/:username", func(r martini.Router) { | ||||
| 		r.Any("/:reponame/**", repo.Http) | ||||
| 		r.Get("/:reponame", middleware.RepoAssignment(true, true, true), repo.Single) | ||||
| 	}, ignSignIn) | ||||
| 	}, ignSignInAndCsrf) | ||||
| 
 | ||||
| 	// Not found handler. | ||||
| 	m.NotFound(routers.NotFound) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user