Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deadlock when deleting team user #13093

Merged
merged 1 commit into from
Oct 10, 2020

Conversation

zeripath
Copy link
Contributor

Backport #13092

models.getUserRepoPermission(...) calls HasOrgVisible which
uses models.x potentially outside of the transaction e provided
as an argument to getUserRepoPermission.

This PR switches to use hasOrgVisible(e, ...).

Fix #12983

Signed-off-by: Andrew Thornton art27@cantab.net

Backport go-gitea#13092

`models.getUserRepoPermission(...)` calls `HasOrgVisible` which
uses `models.x` potentially outside of the transaction `e` provided
as an argument to `getUserRepoPermission`.

This PR switches to use `hasOrgVisible(e, ...)`.

Fix go-gitea#12983

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added type/bug issue/critical This issue should be fixed ASAP. If it is a PR, the PR should be merged ASAP labels Oct 10, 2020
@zeripath zeripath added this to the 1.12.6 milestone Oct 10, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 10, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 10, 2020
@lafriks lafriks merged commit a0a77c9 into go-gitea:release/v1.12 Oct 10, 2020
@zeripath zeripath deleted the backport-13092 branch October 10, 2020 20:00
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
issue/critical This issue should be fixed ASAP. If it is a PR, the PR should be merged ASAP lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants