diff options
Diffstat (limited to 'internal/federation')
| -rw-r--r-- | internal/federation/authenticate.go | 2 | ||||
| -rw-r--r-- | internal/federation/dereferencing/account.go | 5 | ||||
| -rw-r--r-- | internal/federation/federatingprotocol.go | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/internal/federation/authenticate.go b/internal/federation/authenticate.go index 3144d9d05..00fcdfaa9 100644 --- a/internal/federation/authenticate.go +++ b/internal/federation/authenticate.go @@ -216,7 +216,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU } log.Tracef("proceeding with dereference for uncached public key %s", requestingPublicKeyID) - trans, err := f.transportController.NewTransportForUsername(ctx, requestedUsername) + trans, err := f.transportController.NewTransportForUsername(transport.WithFastfail(ctx), requestedUsername) if err != nil { errWithCode := gtserror.NewErrorInternalError(fmt.Errorf("error creating transport for %s: %s", requestedUsername, err)) log.Debug(errWithCode) diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go index 6e107a11d..e351cd2fd 100644 --- a/internal/federation/dereferencing/account.go +++ b/internal/federation/dereferencing/account.go @@ -87,6 +87,11 @@ type GetRemoteAccountParams struct { // // If a local account is passed into this function for whatever reason (hey, it happens!), then it // will be returned from the database without making any remote calls. +// +// Even if a fastfail context is used, and something goes wrong, an account might still be returned instead +// of an error, if we already had the account in our database (in other words, if we just needed to try +// fingering/refreshing the account again). The rationale for this is that it's more useful to be able +// to provide *something* to the caller, even if that something is not necessarily 100% up to date. func (d *deref) GetRemoteAccount(ctx context.Context, params GetRemoteAccountParams) (foundAccount *gtsmodel.Account, err error) { /* In this function we want to retrieve a gtsmodel representation of a remote account, with its proper diff --git a/internal/federation/federatingprotocol.go b/internal/federation/federatingprotocol.go index ef64f4050..dbec47f3d 100644 --- a/internal/federation/federatingprotocol.go +++ b/internal/federation/federatingprotocol.go @@ -34,6 +34,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/log" + "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/uris" "github.com/superseriousbusiness/gotosocial/internal/util" ) @@ -191,7 +192,7 @@ func (f *federator) AuthenticatePostInbox(ctx context.Context, w http.ResponseWr } // we don't have an entry for this instance yet so dereference it - i, err = f.GetRemoteInstance(ctx, username, &url.URL{ + i, err = f.GetRemoteInstance(transport.WithFastfail(ctx), username, &url.URL{ Scheme: publicKeyOwnerURI.Scheme, Host: publicKeyOwnerURI.Host, }) @@ -205,7 +206,7 @@ func (f *federator) AuthenticatePostInbox(ctx context.Context, w http.ResponseWr } } - requestingAccount, err := f.GetRemoteAccount(ctx, dereferencing.GetRemoteAccountParams{ + requestingAccount, err := f.GetRemoteAccount(transport.WithFastfail(ctx), dereferencing.GetRemoteAccountParams{ RequestingUsername: username, RemoteAccountID: publicKeyOwnerURI, }) |