diff options
author | 2024-02-23 15:24:40 +0000 | |
---|---|---|
committer | 2024-02-23 16:24:40 +0100 | |
commit | 1d51e3c8d68fe79ee1103d3e412d4e823d99eaaa (patch) | |
tree | 122318b89d56ba9310bf65df5adf6c42f9611c31 /internal/federation/authenticate.go | |
parent | [feature] Add "what is this" section to index template (#2680) (diff) | |
download | gotosocial-1d51e3c8d68fe79ee1103d3e412d4e823d99eaaa.tar.xz |
[bugfix] 2643 bug search for account url doesnt always work when redirected (#2673)
* update activity library so dereferencer returns full response and checks *final* link to allow for redirects
* temporarily add bodged fixed library
* remove unused code
* update getAccountFeatured() to use dereferenceCollectionPage()
* make sure to release map
* perform a 2nd decode to ensure reader is empty after primary decode
* add comment explaining choice of using Decode() instead of Unmarshal()
* update embedded activity library to latest matching https://github.com/superseriousbusiness/activity/pull/21
* add checks to look for changed URI and re-check database if redirected
* update max iteration count to 512, add checks during dereferenceAncestors() for indirect URLs
* remove doubled-up code
* fix use of status instead of current
* use URIs for checking equality for security
* use the latest known URI for boost_of_uri in case original was an indirect
* add dereferenceCollection() function for dereferenceAccountFeatured()
* pull in latest github.com/superseriousbusiness/activity version (and remove the bodge!!)
* fix typo in code comments
* update decodeType() to accept a readcloser and handle body closing
* switch to checking using BoostOfID and add note why not using BoostOfURI
* ensure InReplyTo gets unset when deleting status parent in case currently stubbed
* add tests for Collection and CollectionPage iterators
Diffstat (limited to 'internal/federation/authenticate.go')
-rw-r--r-- | internal/federation/authenticate.go | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/internal/federation/authenticate.go b/internal/federation/authenticate.go index 59281fa65..596233b19 100644 --- a/internal/federation/authenticate.go +++ b/internal/federation/authenticate.go @@ -23,6 +23,7 @@ import ( "encoding/json" "errors" "fmt" + "io" "net/http" "net/url" "time" @@ -414,10 +415,19 @@ func (f *Federator) callForPubKey( // The actual http call to the remote server is // made right here by the Dereference function. - pubKeyBytes, err := trans.Dereference(ctx, pubKeyID) + rsp, err := trans.Dereference(ctx, pubKeyID) + if err == nil { - // No problem. - return pubKeyBytes, nil + // Read the response body data. + b, err := io.ReadAll(rsp.Body) + _ = rsp.Body.Close() // done + + if err != nil { + err := gtserror.Newf("error reading pubkey: %w", err) + return nil, gtserror.NewErrorInternalError(err) + } + + return b, nil } if gtserror.StatusCode(err) == http.StatusGone { |