mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-31 02:02:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] update common get target account / status doing refresh async (#3124)

Browse source
This commit is contained in:
kim 2024-07-21 13:04:19 +01:00 • committed by GitHub
commit b415337d40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
internal/processing/common/account.go
View file

@ -61,13 +61,22 @@ func (p *Processor) GetTargetAccountBy(
} }
if requester != nil && visible { if requester != nil && visible {
// Ensure the account is up-to-date. // Only refresh account if visible to requester,
p.federator.RefreshAccountAsync(ctx, // and there is *authorized* requester to prevent
// a possible DOS vector for unauthorized clients.
latest, _, err := p.federator.RefreshAccount(ctx,
requester.Username, requester.Username,
target, target,
nil, nil,
nil, nil,
) )
if err != nil {
log.Errorf(ctx, "error refreshing target %s: %v", target.URI, err)
return target, visible, nil
}
// Set latest.
target = latest
} }
return target, visible, nil return target, visible, nil

41
internal/processing/common/status.go
View file

@ -69,33 +69,22 @@ func (p *Processor) GetTargetStatusBy(
} }
if requester != nil && visible { if requester != nil && visible {
// We only bother refreshing if this status // Only refresh status if visible to requester,
// is visible to requester, AND there *is* // and there is *authorized* requester to prevent
// a requester (i.e. request is authorized) // a possible DOS vector for unauthorized clients.
// to prevent a possible DOS vector. latest, _, err := p.federator.RefreshStatus(ctx,
requester.Username,
if window != nil { target,
// Window is explicitly set, so likely nil,
// tighter than the default window. window,
// Do refresh synchronously. )
_, _, err := p.federator.RefreshStatus(ctx, if err != nil {
requester.Username, log.Errorf(ctx, "error refreshing target %s: %v", target.URI, err)
target, return target, visible, nil
nil,
window,
)
if err != nil {
log.Errorf(ctx, "error refreshing status: %v", err)
}
} else {
// Only refresh async *if* out-of-date.
p.federator.RefreshStatusAsync(ctx,
requester.Username,
target,
nil,
nil,
)
} }
// Set latest.
target = latest
} }
return target, visible, nil return target, visible, nil