diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2024-02-23 15:24:40 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-02-23 16:24:40 +0100 |
| commit | 1d51e3c8d68fe79ee1103d3e412d4e823d99eaaa (patch) | |
| tree | 122318b89d56ba9310bf65df5adf6c42f9611c31 /internal/ap/resolve_test.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/ap/resolve_test.go')
| -rw-r--r-- | internal/ap/resolve_test.go | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/internal/ap/resolve_test.go b/internal/ap/resolve_test.go index bc32af7e4..aaf90ab0a 100644 --- a/internal/ap/resolve_test.go +++ b/internal/ap/resolve_test.go @@ -18,7 +18,9 @@ package ap_test import ( + "bytes" "context" + "io" "testing" "github.com/stretchr/testify/suite" @@ -33,7 +35,9 @@ type ResolveTestSuite struct { func (suite *ResolveTestSuite) TestResolveDocumentAsStatusable() { b := []byte(suite.typeToJson(suite.document1)) - statusable, err := ap.ResolveStatusable(context.Background(), b) + statusable, err := ap.ResolveStatusable( + context.Background(), io.NopCloser(bytes.NewReader(b)), + ) suite.NoError(err) suite.NotNil(statusable) } @@ -41,7 +45,9 @@ func (suite *ResolveTestSuite) TestResolveDocumentAsStatusable() { func (suite *ResolveTestSuite) TestResolveDocumentAsAccountable() { b := []byte(suite.typeToJson(suite.document1)) - accountable, err := ap.ResolveAccountable(context.Background(), b) + accountable, err := ap.ResolveAccountable( + context.Background(), io.NopCloser(bytes.NewReader(b)), + ) suite.True(gtserror.IsWrongType(err)) suite.EqualError(err, "ResolveAccountable: cannot resolve vocab type *typedocument.ActivityStreamsDocument as accountable") suite.Nil(accountable) @@ -51,9 +57,11 @@ func (suite *ResolveTestSuite) TestResolveHTMLAsAccountable() { b := []byte(`<!DOCTYPE html> <title>.</title>`) - accountable, err := ap.ResolveAccountable(context.Background(), b) + accountable, err := ap.ResolveAccountable( + context.Background(), io.NopCloser(bytes.NewReader(b)), + ) suite.True(gtserror.IsWrongType(err)) - suite.EqualError(err, "ResolveAccountable: error unmarshalling bytes into json: invalid character '<' looking for beginning of value") + suite.EqualError(err, "ResolveAccountable: error decoding into json: invalid character '<' looking for beginning of value") suite.Nil(accountable) } @@ -64,7 +72,9 @@ func (suite *ResolveTestSuite) TestResolveNonAPJSONAsAccountable() { "pee pee":"poo poo" }`) - accountable, err := ap.ResolveAccountable(context.Background(), b) + accountable, err := ap.ResolveAccountable( + context.Background(), io.NopCloser(bytes.NewReader(b)), + ) suite.True(gtserror.IsWrongType(err)) suite.EqualError(err, "ResolveAccountable: error resolving json into ap vocab type: activity stream did not match any known types") suite.Nil(accountable) |