From 2123195b3a5ebf6fb7e8941657fb50748133c40f Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 29 Oct 2020 14:42:56 -0400 Subject: [PATCH] Migration failure during reaction migration from gitea (#13344) (#13346) * Migration failure during reaction migration from gitea (#13344) * Migrating reactions is just not that important A failure during migrating reactions should not cause failure of migration. Signed-off-by: Andrew Thornton * When checking issue reactions check the correct permission Signed-off-by: Andrew Thornton Co-authored-by: techknowlogick * Delete gitea_downloader.go * Backport #13349 Unfortunately my final push to #13344 didn't register - or I failed to push it properly. GetIssueCommentReactions in routers/api/v1/repo/issue_reaction.go also makes the same mistake. Co-authored-by: zeripath --- modules/migrations/migrate.go | 2 +- routers/api/v1/repo/issue_reaction.go | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/migrations/migrate.go b/modules/migrations/migrate.go index 2a0e1eb68f..5c666379d5 100644 --- a/modules/migrations/migrate.go +++ b/modules/migrations/migrate.go @@ -84,7 +84,7 @@ func MigrateRepository(ctx context.Context, doer *models.User, ownerName string, } if err2 := models.CreateRepositoryNotice(fmt.Sprintf("Migrate repository from %s failed: %v", opts.OriginalURL, err)); err2 != nil { - log.Error("create respotiry notice failed: ", err2) + log.Error("create repository notice failed: ", err2) } return nil, err } diff --git a/routers/api/v1/repo/issue_reaction.go b/routers/api/v1/repo/issue_reaction.go index 5e49ea4aae..584d11bb83 100644 --- a/routers/api/v1/repo/issue_reaction.go +++ b/routers/api/v1/repo/issue_reaction.go @@ -56,7 +56,11 @@ func GetIssueCommentReactions(ctx *context.APIContext) { return } - if !ctx.Repo.CanRead(models.UnitTypeIssues) { + if err := comment.LoadIssue(); err != nil { + ctx.Error(http.StatusInternalServerError, "comment.LoadIssue", err) + } + + if !ctx.Repo.CanReadIssuesOrPulls(comment.Issue.IsPull) { ctx.Error(http.StatusForbidden, "GetIssueCommentReactions", errors.New("no permission to get reactions")) return } @@ -270,7 +274,7 @@ func GetIssueReactions(ctx *context.APIContext) { return } - if !ctx.Repo.CanRead(models.UnitTypeIssues) { + if !ctx.Repo.CanReadIssuesOrPulls(issue.IsPull) { ctx.Error(http.StatusForbidden, "GetIssueReactions", errors.New("no permission to get reactions")) return }