NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-14 18:24:14 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

Fix DeleteCollaboration transaction behaviour (#28886) (#28889)

Browse source 
Backport #28886 by @KN4CK3R

The method can't be called with an outer transaction because if the user
is not a collaborator the outer transaction will be rolled back even if
the inner transaction uses the no-error path.

`has == 0` leads to `return nil` which cancels the transaction. A
standalone call of this method does nothing but if used with an outer
transaction, that will be canceled.

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
This commit is contained in:
Giteabot 2024-01-22 16:10:45 +08:00 committed by GitHub
parent 633996db8e
commit fd1edb9d9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/repository/collaboration.go
View file

@ -26,9 +26,12 @@ func DeleteCollaboration(ctx context.Context, repo *repo_model.Repository, uid i
} }
defer committer.Close() defer committer.Close()
if has, err := db.GetEngine(ctx).Delete(collaboration); err != nil || has == 0 { if has, err := db.GetEngine(ctx).Delete(collaboration); err != nil {
return err return err
} else if err = access_model.RecalculateAccesses(ctx, repo); err != nil { } else if has == 0 {
return committer.Commit()
}
if err = access_model.RecalculateAccesses(ctx, repo); err != nil {
return err return err
} }