mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[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
This commit is contained in:
@ -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 {
|
||||
|
Reference in New Issue
Block a user