improved ssh supports
This commit is contained in:
		
							parent
							
								
									fee3bd0a93
								
							
						
					
					
						commit
						104aa23a9e
					
				| 
						 | 
				
			
			@ -2,7 +2,7 @@ APP_NAME = Gogs - Go Git Service
 | 
			
		|||
RUN_USER = git
 | 
			
		||||
 | 
			
		||||
[repository]
 | 
			
		||||
ROOT = /home/git/gogs-repositories
 | 
			
		||||
ROOT = /Users/lunny/git/gogs-repositories
 | 
			
		||||
 | 
			
		||||
[server]
 | 
			
		||||
HTTP_ADDR = 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -34,7 +34,7 @@ func IsRepositoryExist(user *User, reposName string) (bool, error) {
 | 
			
		|||
	if err != nil {
 | 
			
		||||
		return has, err
 | 
			
		||||
	}
 | 
			
		||||
	s, err := os.Stat(filepath.Join(RepoRootPath, user.Name, reposName))
 | 
			
		||||
	s, err := os.Stat(RepoPath(user.Name, reposName))
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return false, nil
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										8
									
								
								serve.go
								
								
								
								
							
							
						
						
									
										8
									
								
								serve.go
								
								
								
								
							| 
						 | 
				
			
			@ -65,7 +65,7 @@ func runServ(*cli.Context) {
 | 
			
		|||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	println(cmd)
 | 
			
		||||
	//println(cmd)
 | 
			
		||||
 | 
			
		||||
	verb, args := parseCmd(cmd)
 | 
			
		||||
	rr := strings.SplitN(strings.Trim(args, "'"), "/", 2)
 | 
			
		||||
| 
						 | 
				
			
			@ -80,13 +80,13 @@ func runServ(*cli.Context) {
 | 
			
		|||
	isWrite := In(verb, COMMANDS_WRITE)
 | 
			
		||||
	isRead := In(verb, COMMANDS_READONLY)
 | 
			
		||||
 | 
			
		||||
	println("repoPath:", models.RepoPath(user.Name, repoName))
 | 
			
		||||
	//println("repoPath:", models.RepoPath(user.Name, repoName))
 | 
			
		||||
 | 
			
		||||
	switch {
 | 
			
		||||
	case isWrite:
 | 
			
		||||
		has, err := models.HasAccess(user.Name, repoName, COMMANDS_WRITE[verb])
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			fmt.Println("Inernel error")
 | 
			
		||||
			fmt.Println("Inernel error:", err)
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		if !has {
 | 
			
		||||
| 
						 | 
				
			
			@ -136,7 +136,7 @@ func runServ(*cli.Context) {
 | 
			
		|||
 | 
			
		||||
	fullPath := models.RepoPath(user.Name, repoName)
 | 
			
		||||
	newcmd := fmt.Sprintf("%s '%s'", verb, fullPath)
 | 
			
		||||
	println(newcmd)
 | 
			
		||||
	//println(newcmd)
 | 
			
		||||
	gitcmd := exec.Command("git", "shell", "-c", newcmd)
 | 
			
		||||
	gitcmd.Stdout = os.Stdout
 | 
			
		||||
	gitcmd.Stderr = os.Stderr
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue