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