mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-03 05:42:26 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] Fix possible race condition in federatingdb (#490)

Browse source 
Signed-off-by: kim <grufwub@gmail.com>
This commit is contained in:
kim 2022-04-28 10:18:27 +01:00 • committed by GitHub
commit cc5f2e98b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 131 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

19
vendor/github.com/superseriousbusiness/activity/pub/util.go generated vendored
View file

@ -753,7 +753,8 @@ func mustHaveActivityActorsMatchObjectActors(c context.Context,
actors vocab.ActivityStreamsActorProperty,
op vocab.ActivityStreamsObjectProperty,
newTransport func(c context.Context, actorBoxIRI *url.URL, gofedAgent string) (t Transport, err error),
boxIRI *url.URL) error {
boxIRI *url.URL,
) error {
activityActorMap := make(map[string]bool, actors.Len())
for iter := actors.Begin(); iter != actors.End(); iter = iter.Next() {
id, err := ToId(iter)
@ -808,7 +809,8 @@ func mustHaveActivityActorsMatchObjectActors(c context.Context,
func add(c context.Context,
op vocab.ActivityStreamsObjectProperty,
target vocab.ActivityStreamsTargetProperty,
db Database) error {
db Database,
) error {
opIds := make([]*url.URL, 0, op.Len())
for iter := op.Begin(); iter != op.End(); iter = iter.Next() {
id, err := ToId(iter)
@ -828,10 +830,11 @@ func add(c context.Context,
// Create anonymous loop function to be able to properly scope the defer
// for the database lock at each iteration.
loopFn := func(t *url.URL) error {
if err := db.Lock(c, t); err != nil {
unlock, err := db.Lock(c, t)
if err != nil {
return err
}
defer db.Unlock(c, t)
defer unlock()
if owns, err := db.Owns(c, t); err != nil {
return err
} else if !owns {
@ -889,7 +892,8 @@ func add(c context.Context,
func remove(c context.Context,
op vocab.ActivityStreamsObjectProperty,
target vocab.ActivityStreamsTargetProperty,
db Database) error {
db Database,
) error {
opIds := make(map[string]bool, op.Len())
for iter := op.Begin(); iter != op.End(); iter = iter.Next() {
id, err := ToId(iter)
@ -909,10 +913,11 @@ func remove(c context.Context,
// Create anonymous loop function to be able to properly scope the defer
// for the database lock at each iteration.
loopFn := func(t *url.URL) error {
if err := db.Lock(c, t); err != nil {
unlock, err := db.Lock(c, t)
if err != nil {
return err
}
defer db.Unlock(c, t)
defer unlock()
if owns, err := db.Owns(c, t); err != nil {
return err
} else if !owns {