modes/repo: incorrect SSH clone URL for #742

modules/middleware/context.go

@@ -39,29 +39,25 @@ type Context struct {
 	IsBasicAuth bool
 
 	Repo struct {
-		IsOwner     bool
-		IsTrueOwner bool
-		IsWatching  bool
-		IsBranch    bool
-		IsTag       bool
-		IsCommit    bool
-		IsAdmin     bool // Current user is admin level.
-		HasAccess   bool
-		Repository  *models.Repository
-		Owner       *models.User
-		Commit      *git.Commit
-		Tag         *git.Tag
-		GitRepo     *git.Repository
-		BranchName  string
-		TagName     string
-		TreeName    string
-		CommitId    string
-		RepoLink    string
-		CloneLink   struct {
-			SSH   string
-			HTTPS string
-			Git   string
-		}
+		IsOwner      bool
+		IsTrueOwner  bool
+		IsWatching   bool
+		IsBranch     bool
+		IsTag        bool
+		IsCommit     bool
+		IsAdmin      bool // Current user is admin level.
+		HasAccess    bool
+		Repository   *models.Repository
+		Owner        *models.User
+		Commit       *git.Commit
+		Tag          *git.Tag
+		GitRepo      *git.Repository
+		BranchName   string
+		TagName      string
+		TreeName     string
+		CommitId     string
+		RepoLink     string
+		CloneLink    models.CloneLink
 		CommitsCount int
 		Mirror       *models.Mirror
 	}

modules/middleware/repo.go

@@ -386,12 +386,11 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
 		ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner
 		ctx.Data["IsRepositoryTrueOwner"] = ctx.Repo.IsTrueOwner
 
-		if setting.SshPort != 22 {
-			ctx.Repo.CloneLink.SSH = fmt.Sprintf("ssh://%s@%s:%d/%s/%s.git", setting.RunUser, setting.Domain, setting.SshPort, u.LowerName, repo.LowerName)
-		} else {
-			ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", setting.RunUser, setting.Domain, u.LowerName, repo.LowerName)
+		ctx.Repo.CloneLink, err = repo.CloneLink()
+		if err != nil {
+			ctx.Handle(500, "CloneLink", err)
+			return
 		}
-		ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", setting.AppUrl, u.LowerName, repo.LowerName)
 		ctx.Data["CloneLink"] = ctx.Repo.CloneLink
 
 		if ctx.Repo.Repository.IsGoget {