SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

[chore] improved enrichAccount() logging (#1602) 

* slight refactor and improved logging on failed webfinger in enrichAccount()

* use correct log format directive

---------

Signed-off-by: kim <grufwub@gmail.com>
This commit is contained in:
kim 2023-03-08 17:19:49 +00:00 committed by GitHub
parent e397272fe8
commit d0dee8d0b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/federation/dereferencing/account.go
View File

@ -156,13 +156,15 @@ func (d *deref) enrichAccount(ctx context.Context, requestUser string, uri *url.
// A username was provided so we can attempt a webfinger, this ensures up-to-date accountdomain info. // A username was provided so we can attempt a webfinger, this ensures up-to-date accountdomain info.
accDomain, accURI, err := d.fingerRemoteAccount(ctx, transport, account.Username, account.Domain) accDomain, accURI, err := d.fingerRemoteAccount(ctx, transport, account.Username, account.Domain)
if err != nil && account.URI == "" { switch {
// this is a new account (to us) with username@domain but failed case err != nil && account.URI == "":
// webfinger, there is nothing more we can do in this situation. // this is a new account (to us) with username@domain but failed webfinger, nothing more we can do.
return nil, fmt.Errorf("enrichAccount: error webfingering account: %w", err) return nil, fmt.Errorf("enrichAccount: error webfingering account: %w", err)
}
if err == nil { case err != nil:
log.Errorf(ctx, "error webfingering[1] remote account %s@%s: %v", account.Username, account.Domain, err)
case err == nil:
if account.Domain != accDomain { if account.Domain != accDomain {
// After webfinger, we now have correct account domain from which we can do a final DB check. // After webfinger, we now have correct account domain from which we can do a final DB check.
alreadyAccount, err := d.db.GetAccountByUsernameDomain(ctx, account.Username, accDomain) alreadyAccount, err := d.db.GetAccountByUsernameDomain(ctx, account.Username, accDomain)
@ -224,7 +226,11 @@ func (d *deref) enrichAccount(ctx context.Context, requestUser string, uri *url.
// Now we have a username we can attempt it, this ensures up-to-date accountdomain info. // Now we have a username we can attempt it, this ensures up-to-date accountdomain info.
accDomain, _, err := d.fingerRemoteAccount(ctx, transport, latestAcc.Username, uri.Host) accDomain, _, err := d.fingerRemoteAccount(ctx, transport, latestAcc.Username, uri.Host)
if err == nil { switch {
case err != nil:
log.Errorf(ctx, "error webfingering[2] remote account %s@%s: %v", latestAcc.Username, uri.Host, err)
case err == nil:
// Update account with latest info. // Update account with latest info.
latestAcc.Domain = accDomain latestAcc.Domain = accDomain
} }