core
/
gitea
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #807 parse the userinfo with the golang tools 

Note, this is now only fixed with Go version >= 1.4.2, see this bug in Go: 07d86b1f2d
This commit is contained in:
Peter Smit 2015-01-02 12:14:11 +02:00
parent 0b56272c13
commit d016eaaa09
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
routers/repo/repo.go
View File

@ -6,6 +6,7 @@ package repo
import ( import (
"fmt" "fmt"
"net/url"
"os" "os"
"path" "path"
"strings" "strings"
@ -180,11 +181,20 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
} }
} }
authStr := strings.Replace(fmt.Sprintf("://%s:%s", u, err := url.Parse(form.HttpsUrl)
form.AuthUserName, form.AuthPasswd), "@", "%40", -1)
url := strings.Replace(form.HttpsUrl, "://", authStr+"@", 1) if err != nil || u.Scheme != "https" {
ctx.Data["Err_HttpsUrl"] = true
ctx.RenderWithErr(ctx.Tr("form.url_error"), MIGRATE, &form)
return
}
if len(form.AuthUserName) > 0 || len(form.AuthPasswd) > 0 {
u.User = url.UserPassword(form.AuthUserName, form.AuthPasswd)
}
repo, err := models.MigrateRepository(ctxUser, form.RepoName, form.Description, form.Private, repo, err := models.MigrateRepository(ctxUser, form.RepoName, form.Description, form.Private,
form.Mirror, url) form.Mirror, u.String())
if err == nil { if err == nil {
log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName) log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + form.RepoName) ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + form.RepoName)