Fix the permission check

lunny · lunny · commit 7edb840eedf6 · 2025-01-22T23:43:57.000-08:00
diff --git a/services/repository/transfer.go b/services/repository/transfer.go
@@ -481,7 +481,7 @@ func RejectRepositoryTransfer(ctx context.Context, repo *repo_model.Repository,
 }
 
 func canUserCancelTransfer(ctx context.Context, r *repo_model.RepoTransfer, u *user_model.User) bool {
-	if u.ID == r.DoerID {
+	if u.IsAdmin || u.ID == r.DoerID {
 		return true
 	}
 
@@ -504,7 +504,7 @@ func canUserCancelTransfer(ctx context.Context, r *repo_model.RepoTransfer, u *u
 		log.Error("GetUserRepoPermission: %v", err)
 		return false
 	}
-	return perm.IsAdmin()
+	return perm.IsOwner()
 }
 
 // CancelRepositoryTransfer cancels the repository transfer process. The sender or

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ func RejectRepositoryTransfer(ctx context.Context, repo *repo_model.Repository,`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`func canUserCancelTransfer(ctx context.Context, r repo_model.RepoTransfer, u user_model.User) bool {`
`484`		`- if u.ID == r.DoerID {`
	`484`	`+ if u.IsAdmin \|\| u.ID == r.DoerID {`
`485`	`485`	`return true`
`486`	`486`	`}`
`487`	`487`
`@@ -504,7 +504,7 @@ func canUserCancelTransfer(ctx context.Context, r repo_model.RepoTransfer, u u`
`504`	`504`	`log.Error("GetUserRepoPermission: %v", err)`
`505`	`505`	`return false`
`506`	`506`	`}`
`507`		`- return perm.IsAdmin()`
	`507`	`+ return perm.IsOwner()`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`// CancelRepositoryTransfer cancels the repository transfer process. The sender or`