You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
2.5 KiB
51 lines
2.5 KiB
Index: src/code.gitea.io/gitea/models/repo.go |
|
--- src/code.gitea.io/gitea/models/repo.go.orig 2020-04-01 23:33:35.000000000 +0200 |
|
+++ src/code.gitea.io/gitea/models/repo.go 2020-04-01 23:36:43.980025000 +0200 |
|
@@ -885,11 +885,23 @@ |
|
|
|
cl := new(CloneLink) |
|
if setting.SSH.Port != 22 { |
|
- cl.SSH = fmt.Sprintf("ssh://%s@%s:%d/%s/%s.git", sshUser, setting.SSH.Domain, setting.SSH.Port, repo.OwnerName, repoName) |
|
+ if setting.SSH.StartBuiltinServer { |
|
+ cl.SSH = fmt.Sprintf("ssh://%s:%d/%s/%s.git", setting.SSH.Domain, setting.SSH.Port, repo.OwnerName, repoName) |
|
+ } else { |
|
+ cl.SSH = fmt.Sprintf("ssh://%s@%s:%d/%s/%s.git", sshUser, setting.SSH.Domain, setting.SSH.Port, repo.OwnerName, repoName) |
|
+ } |
|
} else if setting.Repository.UseCompatSSHURI { |
|
- cl.SSH = fmt.Sprintf("ssh://%s@%s/%s/%s.git", sshUser, setting.SSH.Domain, repo.OwnerName, repoName) |
|
+ if setting.SSH.StartBuiltinServer { |
|
+ cl.SSH = fmt.Sprintf("ssh://%s/%s/%s.git", setting.SSH.Domain, repo.OwnerName, repoName) |
|
+ } else { |
|
+ cl.SSH = fmt.Sprintf("ssh://%s@%s/%s/%s.git", sshUser, setting.SSH.Domain, repo.OwnerName, repoName) |
|
+ } |
|
} else { |
|
- cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", sshUser, setting.SSH.Domain, repo.OwnerName, repoName) |
|
+ if setting.SSH.StartBuiltinServer { |
|
+ cl.SSH = fmt.Sprintf("%s:%s/%s.git", setting.SSH.Domain, repo.OwnerName, repoName) |
|
+ } else { |
|
+ cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", sshUser, setting.SSH.Domain, repo.OwnerName, repoName) |
|
+ } |
|
} |
|
cl.HTTPS = ComposeHTTPSCloneURL(repo.OwnerName, repoName) |
|
return cl |
|
Index: src/code.gitea.io/gitea/models/ssh_key.go |
|
--- src/code.gitea.io/gitea/models/ssh_key.go.orig 2020-04-01 23:36:43.980614000 +0200 |
|
+++ src/code.gitea.io/gitea/models/ssh_key.go 2020-04-01 23:38:43.010391000 +0200 |
|
@@ -36,7 +36,7 @@ |
|
|
|
const ( |
|
tplCommentPrefix = `# gitea public key` |
|
- tplCommand = "%s --config=%q serv key-%d" |
|
+ tplCommand = "%s --config=%q key-%d" |
|
tplPublicKey = tplCommentPrefix + "\n" + `command=%q,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n" |
|
) |
|
|
|
@@ -82,7 +82,7 @@ |
|
|
|
// AuthorizedString returns formatted public key string for authorized_keys file. |
|
func (key *PublicKey) AuthorizedString() string { |
|
- return fmt.Sprintf(tplPublicKey, fmt.Sprintf(tplCommand, setting.AppPath, setting.CustomConf, key.ID), key.Content) |
|
+ return fmt.Sprintf(tplPublicKey, fmt.Sprintf(tplCommand, "@l_prefix@/sbin/gitea-serv", setting.CustomConf, key.ID), key.Content) |
|
} |
|
|
|
func extractTypeFromBase64Key(key string) (string, error) {
|
|
|