mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-22 09:54:24 +01:00
6844258c67
Fix #31707. Also related to #31715. Some Actions resources could has different types of ownership. It could be: - global: all repos and orgs/users can use it. - org/user level: only the org/user can use it. - repo level: only the repo can use it. There are two ways to distinguish org/user level from repo level: 1. `{owner_id: 1, repo_id: 2}` for repo level, and `{owner_id: 1, repo_id: 0}` for org level. 2. `{owner_id: 0, repo_id: 2}` for repo level, and `{owner_id: 1, repo_id: 0}` for org level. The first way seems more reasonable, but it may not be true. The point is that although a resource, like a runner, belongs to a repo (it can be used by the repo), the runner doesn't belong to the repo's org (other repos in the same org cannot use the runner). So, the second method makes more sense. And the first way is not user-friendly to query, we must set the repo id to zero to avoid wrong results. So, #31715 should be right. And the most simple way to fix #31707 is just: ```diff - shared.GetRegistrationToken(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.ID) + shared.GetRegistrationToken(ctx, 0, ctx.Repo.Repository.ID) ``` However, it is quite intuitive to set both owner id and repo id since the repo belongs to the owner. So I prefer to be compatible with it. If we get both owner id and repo id not zero when creating or finding, it's very clear that the caller want one with repo level, but set owner id accidentally. So it's OK to accept it but fix the owner id to zero. (cherry picked from commit a33e74d40d356e8f628ac06a131cb203a3609dec) |
||
|---|---|---|
| .. | ||
| artifact.go | ||
| forgejo.go | ||
| forgejo_test.go | ||
| main_test.go | ||
| run.go | ||
| run_job.go | ||
| run_job_list.go | ||
| run_list.go | ||
| runner.go | ||
| runner_list.go | ||
| runner_test.go | ||
| runner_token.go | ||
| runner_token_test.go | ||
| schedule.go | ||
| schedule_list.go | ||
| schedule_spec.go | ||
| schedule_spec_list.go | ||
| status.go | ||
| task.go | ||
| task_list.go | ||
| task_output.go | ||
| task_step.go | ||
| tasks_version.go | ||
| utils.go | ||
| utils_test.go | ||
| variable.go | ||