peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix fork repository cycle to self (#2860)

Browse Source 
* fix fork repository cycle to self

* rename testForkRepo to traverseParentRepo
This commit is contained in:
Lunny Xiao 2017-11-06 12:12:55 +08:00 committed by GitHub
parent ff9daa3e9b
commit cdc4600725
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
routers/repo/pull.go
View File

@ -62,7 +62,6 @@ func getForkRepository(ctx *context.Context) *models.Repository {
ctx.Data["description"] = forkRepo.Description ctx.Data["description"] = forkRepo.Description
ctx.Data["IsPrivate"] = forkRepo.IsPrivate ctx.Data["IsPrivate"] = forkRepo.IsPrivate
canForkToUser := forkRepo.OwnerID != ctx.User.ID && !ctx.User.HasForkedRepo(forkRepo.ID) canForkToUser := forkRepo.OwnerID != ctx.User.ID && !ctx.User.HasForkedRepo(forkRepo.ID)
ctx.Data["CanForkToUser"] = canForkToUser
if err = forkRepo.GetOwner(); err != nil { if err = forkRepo.GetOwner(); err != nil {
ctx.Handle(500, "GetOwner", err) ctx.Handle(500, "GetOwner", err)
@ -81,6 +80,31 @@ func getForkRepository(ctx *context.Context) *models.Repository {
orgs = append(orgs, org) orgs = append(orgs, org)
} }
} }
var traverseParentRepo = forkRepo
for {
if ctx.User.ID == traverseParentRepo.OwnerID {
canForkToUser = false
} else {
for i, org := range orgs {
if org.ID == traverseParentRepo.OwnerID {
orgs = append(orgs[:i], orgs[i+1:]...)
break
}
}
}
if !traverseParentRepo.IsFork {
break
}
traverseParentRepo, err = models.GetRepositoryByID(traverseParentRepo.ForkID)
if err != nil {
ctx.Handle(500, "GetRepositoryByID", err)
return nil
}
}
ctx.Data["CanForkToUser"] = canForkToUser
ctx.Data["Orgs"] = orgs ctx.Data["Orgs"] = orgs
if canForkToUser { if canForkToUser {
@ -125,10 +149,26 @@ func ForkPost(ctx *context.Context, form auth.CreateRepoForm) {
return return
} }
repo, has := models.HasForkedRepo(ctxUser.ID, forkRepo.ID) var err error
if has { var traverseParentRepo = forkRepo
ctx.Redirect(setting.AppSubURL + "/" + ctxUser.Name + "/" + repo.Name) for {
return if ctxUser.ID == traverseParentRepo.OwnerID {
ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), tplFork, &form)
return
}
repo, has := models.HasForkedRepo(ctxUser.ID, traverseParentRepo.ID)
if has {
ctx.Redirect(setting.AppSubURL + "/" + ctxUser.Name + "/" + repo.Name)
return
}
if !traverseParentRepo.IsFork {
break
}
traverseParentRepo, err = models.GetRepositoryByID(traverseParentRepo.ForkID)
if err != nil {
ctx.Handle(500, "GetRepositoryByID", err)
return
}
} }
// Check ownership of organization. // Check ownership of organization.