[bugfix] return 400 Bad Request on more cases of malformed AS data

go.mod

@@ -7,15 +7,15 @@ toolchain go1.21.3
 require (
 	codeberg.org/gruf/go-bytesize v1.0.2
 	codeberg.org/gruf/go-byteutil v1.2.0
-	codeberg.org/gruf/go-cache/v3 v3.5.6
+	codeberg.org/gruf/go-cache/v3 v3.5.7
 	codeberg.org/gruf/go-debug v1.3.0
-	codeberg.org/gruf/go-errors/v2 v2.2.0
+	codeberg.org/gruf/go-errors/v2 v2.3.1
 	codeberg.org/gruf/go-fastcopy v1.1.2
 	codeberg.org/gruf/go-iotools v0.0.0-20230811115124-5d4223615a7f
 	codeberg.org/gruf/go-kv v1.6.4
 	codeberg.org/gruf/go-logger/v2 v2.2.1
 	codeberg.org/gruf/go-mutexes v1.3.1
-	codeberg.org/gruf/go-runners v1.6.1
+	codeberg.org/gruf/go-runners v1.6.2
 	codeberg.org/gruf/go-sched v1.2.3
 	codeberg.org/gruf/go-store/v2 v2.2.4
 	github.com/DmitriyVTitov/size v1.5.0

go.sum

@@ -46,13 +46,13 @@ codeberg.org/gruf/go-bytesize v1.0.2 h1:Mo+ITi+0uZ4YNSZf2ed6Qw8acOI39W4mmgE1a8ls
 codeberg.org/gruf/go-bytesize v1.0.2/go.mod h1:n/GU8HzL9f3UNp/mUKyr1qVmTlj7+xacpp0OHfkvLPs=
 codeberg.org/gruf/go-byteutil v1.2.0 h1:YoxkpUOoHS82BcPXfiIcWLe/YhS8QhpNUHdfuhN09QM=
 codeberg.org/gruf/go-byteutil v1.2.0/go.mod h1:cWM3tgMCroSzqoBXUXMhvxTxYJp+TbCr6ioISRY5vSU=
-codeberg.org/gruf/go-cache/v3 v3.5.6 h1:TJnNOuij5DF/ZK9pDB61SlYzxidRQeYjYYW3dfFSznc=
-codeberg.org/gruf/go-cache/v3 v3.5.6/go.mod h1:NbsGQUgEdNFd631WSasvCHIVAaY9ovuiSeoBwtsIeDc=
+codeberg.org/gruf/go-cache/v3 v3.5.7 h1:5hut49a8Wp3hdwrCEJYj6pHY2aRR1hyTmkK4+wHVYq4=
+codeberg.org/gruf/go-cache/v3 v3.5.7/go.mod h1:Thahfuf3PgHSv2+1zHpvhRdX97tx1WXurVNGWpZucAM=
 codeberg.org/gruf/go-debug v1.3.0 h1:PIRxQiWUFKtGOGZFdZ3Y0pqyfI0Xr87j224IYe2snZs=
 codeberg.org/gruf/go-debug v1.3.0/go.mod h1:N+vSy9uJBQgpQcJUqjctvqFz7tBHJf+S/PIjLILzpLg=
 codeberg.org/gruf/go-errors/v2 v2.0.0/go.mod h1:ZRhbdhvgoUA3Yw6e56kd9Ox984RrvbEFC2pOXyHDJP4=
-codeberg.org/gruf/go-errors/v2 v2.2.0 h1:CxnTtR4+BqRGeBHuG/FdCKM4m3otMdfPVez6ReBebkM=
-codeberg.org/gruf/go-errors/v2 v2.2.0/go.mod h1:LfzD9nkAAJpEDbkUqOZQ2jdaQ8VrK0pnR36zLOMFq6Y=
+codeberg.org/gruf/go-errors/v2 v2.3.1 h1:5+OChx06R8HT+OFB3KFetPdaptQYBS9XVZKKf30wIbk=
+codeberg.org/gruf/go-errors/v2 v2.3.1/go.mod h1:LfzD9nkAAJpEDbkUqOZQ2jdaQ8VrK0pnR36zLOMFq6Y=
 codeberg.org/gruf/go-fastcopy v1.1.2 h1:YwmYXPsyOcRBxKEE2+w1bGAZfclHVaPijFsOVOcnNcw=
 codeberg.org/gruf/go-fastcopy v1.1.2/go.mod h1:GDDYR0Cnb3U/AIfGM3983V/L+GN+vuwVMvrmVABo21s=
 codeberg.org/gruf/go-fastpath/v2 v2.0.0 h1:iAS9GZahFhyWEH0KLhFEJR+txx1ZhMXxYzu2q5Qo9c0=
@@ -69,8 +69,8 @@ codeberg.org/gruf/go-maps v1.0.3 h1:VDwhnnaVNUIy5O93CvkcE2IZXnMB1+IJjzfop9V12es=
 codeberg.org/gruf/go-maps v1.0.3/go.mod h1:D5LNDxlC9rsDuVQVM6JObaVGAdHB6g2dTdOdkh1aXWA=
 codeberg.org/gruf/go-mutexes v1.3.1 h1:8ibAjWwx08GJSq5R+lM9nwtJw2aAhMPKSXbfJ9EpDsA=
 codeberg.org/gruf/go-mutexes v1.3.1/go.mod h1:1j/6/MBeBQUedAtAtysLLnBKogfOZAxdym0E3wlaBD8=
-codeberg.org/gruf/go-runners v1.6.1 h1:0KNiEfGnmNUs9intqxEAWqIKUyxVOmYTtn3kPVOHsjQ=
-codeberg.org/gruf/go-runners v1.6.1/go.mod h1:QRcSExqXX8DM0rm8Xs6qX7baOzyvw0JIe4mu3TsQT+Y=
+codeberg.org/gruf/go-runners v1.6.2 h1:oQef9niahfHu/wch14xNxlRMP8i+ABXH1Cb9PzZ4oYo=
+codeberg.org/gruf/go-runners v1.6.2/go.mod h1:Tq5PrZ/m/rBXbLZz0u5if+yP3nG5Sf6S8O/GnyEePeQ=
 codeberg.org/gruf/go-sched v1.2.3 h1:H5ViDxxzOBR3uIyGBCf0eH8b1L8wMybOXcdtUUTXZHk=
 codeberg.org/gruf/go-sched v1.2.3/go.mod h1:vT9uB6KWFIIwnG9vcPY2a0alYNoqdL1mSzRM8I+PK7A=
 codeberg.org/gruf/go-store/v2 v2.2.4 h1:8HO1Jh2gg7boQKA3hsDAIXd9zwieu5uXwDXEcTOD9js=

internal/ap/extract.go

@@ -328,29 +328,6 @@ func ExtractAttributedToURI(i WithAttributedTo) (*url.URL, error) {
 	return nil, gtserror.New("couldn't find iri for attributed to")
 }
 
-// ExtractPublished extracts the published time from the given
-// WithPublished. Will return an error if the published property
-// is not set, is not a time.Time, or is zero.
-func ExtractPublished(i WithPublished) (time.Time, error) {
-	t := time.Time{}
-
-	publishedProp := i.GetActivityStreamsPublished()
-	if publishedProp == nil {
-		return t, gtserror.New("published prop was nil")
-	}
-
-	if !publishedProp.IsXMLSchemaDateTime() {
-		return t, gtserror.New("published prop was not date time")
-	}
-
-	t = publishedProp.Get()
-	if t.IsZero() {
-		return t, gtserror.New("published time was zero")
-	}
-
-	return t, nil
-}
-
 // ExtractIconURI extracts the first URI it can find from
 // the given WithIcon which links to a supported image file.
 // Input will look something like this:

internal/ap/interfaces.go

@@ -416,6 +416,12 @@ type WithOutbox interface {
 	SetActivityStreamsOutbox(vocab.ActivityStreamsOutboxProperty)
 }
 
+// WithSharedInbox represents an activity with ActivityStreamsSharedInboxProperty
+type WithSharedInbox interface {
+	GetActivityStreamsSharedInbox() vocab.ActivityStreamsSharedInboxProperty
+	SetActivityStreamsSharedInbox(vocab.ActivityStreamsSharedInboxProperty)
+}
+
 // WithFollowing represents an activity with ActivityStreamsFollowingProperty
 type WithFollowing interface {
 	GetActivityStreamsFollowing() vocab.ActivityStreamsFollowingProperty

internal/ap/properties.go

@@ -55,24 +55,20 @@ func MustSet[W, T any](fn func(W, T) error, with W, value T) {
 // GetJSONLDId returns the ID of 'with', or nil.
 func GetJSONLDId(with WithJSONLDId) *url.URL {
 	idProp := with.GetJSONLDId()
-	if idProp == nil {
-		return nil
-	}
-	id := idProp.Get()
-	if id == nil {
+	if idProp == nil || !idProp.IsXMLSchemaAnyURI() {
 		return nil
 	}
-	return id
+	return idProp.Get()
 }
 
 // SetJSONLDId sets the given URL to the JSONLD ID of 'with'.
 func SetJSONLDId(with WithJSONLDId, id *url.URL) {
 	idProp := with.GetJSONLDId()
 	if idProp == nil {
 		idProp = streams.NewJSONLDIdProperty()
+		with.SetJSONLDId(idProp)
 	}
 	idProp.SetIRI(id)
-	with.SetJSONLDId(idProp)
 }
 
 // SetJSONLDIdStr sets the given string to the JSONLDID of 'with'. Returns error
@@ -139,14 +135,46 @@ func AppendBcc(with WithBcc, bcc ...*url.URL) {
 	}, bcc...)
 }
 
-// GetActor returns the IRIs contained in the Actor property of 'with'. Panics on entries with missing ID.
-func GetActor(with WithActor) []*url.URL {
+// GetURL returns the IRIs contained in the URL property of 'with'.
+func GetURL(with WithURL) []*url.URL {
+	urlProp := with.GetActivityStreamsUrl()
+	if urlProp == nil || urlProp.Len() == 0 {
+		return nil
+	}
+	urls := make([]*url.URL, 0, urlProp.Len())
+	for i := 0; i < urlProp.Len(); i++ {
+		at := urlProp.At(i)
+		if at.IsXMLSchemaAnyURI() {
+			u := at.GetXMLSchemaAnyURI()
+			urls = append(urls, u)
+		}
+	}
+	return urls
+}
+
+// AppendURL appends the given URLs to the URL property of 'with'.
+func AppendURL(with WithURL, url ...*url.URL) {
+	if len(url) == 0 {
+		return
+	}
+	urlProp := with.GetActivityStreamsUrl()
+	if urlProp == nil {
+		urlProp = streams.NewActivityStreamsUrlProperty()
+		with.SetActivityStreamsUrl(urlProp)
+	}
+	for _, u := range url {
+		urlProp.AppendXMLSchemaAnyURI(u)
+	}
+}
+
+// GetActorIRIs returns the IRIs contained in the Actor property of 'with'.
+func GetActorIRIs(with WithActor) []*url.URL {
 	actorProp := with.GetActivityStreamsActor()
 	return getIRIs[vocab.ActivityStreamsActorPropertyIterator](actorProp)
 }
 
-// AppendActor appends the given IRIs to the Actor property of 'with'.
-func AppendActor(with WithActor, actor ...*url.URL) {
+// AppendActorIRIs appends the given IRIs to the Actor property of 'with'.
+func AppendActorIRIs(with WithActor, actor ...*url.URL) {
 	appendIRIs(func() Property[vocab.ActivityStreamsActorPropertyIterator] {
 		actorProp := with.GetActivityStreamsActor()
 		if actorProp == nil {
@@ -157,7 +185,25 @@ func AppendActor(with WithActor, actor ...*url.URL) {
 	}, actor...)
 }
 
-// GetAttributedTo returns the IRIs contained in the AttributedTo property of 'with'. Panics on entries with missing ID.
+// GetObjectIRIs returns the IRIs contained in the Object property of 'with'.
+func GetObjectIRIs(with WithObject) []*url.URL {
+	objectProp := with.GetActivityStreamsObject()
+	return getIRIs[vocab.ActivityStreamsObjectPropertyIterator](objectProp)
+}
+
+// AppendObjectIRIs appends the given IRIs to the Object property of 'with'.
+func AppendObjectIRIs(with WithObject) {
+	appendIRIs(func() Property[vocab.ActivityStreamsObjectPropertyIterator] {
+		objectProp := with.GetActivityStreamsObject()
+		if objectProp == nil {
+			objectProp = streams.NewActivityStreamsObjectProperty()
+			with.SetActivityStreamsObject(objectProp)
+		}
+		return objectProp
+	})
+}
+
+// GetAttributedTo returns the IRIs contained in the AttributedTo property of 'with'.
 func GetAttributedTo(with WithAttributedTo) []*url.URL {
 	attribProp := with.GetActivityStreamsAttributedTo()
 	return getIRIs[vocab.ActivityStreamsAttributedToPropertyIterator](attribProp)
@@ -175,7 +221,7 @@ func AppendAttributedTo(with WithAttributedTo, attribTo ...*url.URL) {
 	}, attribTo...)
 }
 
-// GetInReplyTo returns the IRIs contained in the InReplyTo property of 'with'. Panics on entries with missing ID.
+// GetInReplyTo returns the IRIs contained in the InReplyTo property of 'with'.
 func GetInReplyTo(with WithInReplyTo) []*url.URL {
 	replyProp := with.GetActivityStreamsInReplyTo()
 	return getIRIs[vocab.ActivityStreamsInReplyToPropertyIterator](replyProp)
@@ -193,10 +239,105 @@ func AppendInReplyTo(with WithInReplyTo, replyTo ...*url.URL) {
 	}, replyTo...)
 }
 
+// GetInbox returns the IRI contained in the Inbox property of 'with'.
+func GetInbox(with WithInbox) *url.URL {
+	inboxProp := with.GetActivityStreamsInbox()
+	if inboxProp == nil || !inboxProp.IsIRI() {
+		return nil
+	}
+	return inboxProp.GetIRI()
+}
+
+// SetInbox sets the given IRI on the Inbox property of 'with'.
+func SetInbox(with WithInbox, inbox *url.URL) {
+	inboxProp := with.GetActivityStreamsInbox()
+	if inboxProp == nil {
+		inboxProp = streams.NewActivityStreamsInboxProperty()
+		with.SetActivityStreamsInbox(inboxProp)
+	}
+	inboxProp.SetIRI(inbox)
+}
+
+// GetOutbox returns the IRI contained in the Outbox property of 'with'.
+func GetOutbox(with WithOutbox) *url.URL {
+	outboxProp := with.GetActivityStreamsOutbox()
+	if outboxProp == nil || !outboxProp.IsIRI() {
+		return nil
+	}
+	return outboxProp.GetIRI()
+}
+
+// SetOutbox sets the given IRI on the Outbox property of 'with'.
+func SetOutbox(with WithOutbox, outbox *url.URL) {
+	outboxProp := with.GetActivityStreamsOutbox()
+	if outboxProp == nil {
+		outboxProp = streams.NewActivityStreamsOutboxProperty()
+		with.SetActivityStreamsOutbox(outboxProp)
+	}
+	outboxProp.SetIRI(outbox)
+}
+
+// GetFollowers returns the IRI contained in the Following property of 'with'.
+func GetFollowing(with WithFollowing) *url.URL {
+	followProp := with.GetActivityStreamsFollowing()
+	if followProp == nil || !followProp.IsIRI() {
+		return nil
+	}
+	return followProp.GetIRI()
+}
+
+// SetFollowers sets the given IRI on the Following property of 'with'.
+func SetFollowing(with WithFollowing, following *url.URL) {
+	followProp := with.GetActivityStreamsFollowing()
+	if followProp == nil {
+		followProp = streams.NewActivityStreamsFollowingProperty()
+		with.SetActivityStreamsFollowing(followProp)
+	}
+	followProp.SetIRI(following)
+}
+
+// GetFollowers returns the IRI contained in the Followers property of 'with'.
+func GetFollowers(with WithFollowers) *url.URL {
+	followProp := with.GetActivityStreamsFollowers()
+	if followProp == nil || !followProp.IsIRI() {
+		return nil
+	}
+	return followProp.GetIRI()
+}
+
+// SetFollowers sets the given IRI on the Followers property of 'with'.
+func SetFollowers(with WithFollowers, followers *url.URL) {
+	followProp := with.GetActivityStreamsFollowers()
+	if followProp == nil {
+		followProp = streams.NewActivityStreamsFollowersProperty()
+		with.SetActivityStreamsFollowers(followProp)
+	}
+	followProp.SetIRI(followers)
+}
+
+// GetFeatured returns the IRI contained in the Featured property of 'with'.
+func GetFeatured(with WithFeatured) *url.URL {
+	featuredProp := with.GetTootFeatured()
+	if featuredProp == nil || !featuredProp.IsIRI() {
+		return nil
+	}
+	return featuredProp.GetIRI()
+}
+
+// SetFeatured sets the given IRI on the Featured property of 'with'.
+func SetFeatured(with WithFeatured, featured *url.URL) {
+	featuredProp := with.GetTootFeatured()
+	if featuredProp == nil {
+		featuredProp = streams.NewTootFeaturedProperty()
+		with.SetTootFeatured(featuredProp)
+	}
+	featuredProp.SetIRI(featured)
+}
+
 // GetPublished returns the time contained in the Published property of 'with'.
 func GetPublished(with WithPublished) time.Time {
 	publishProp := with.GetActivityStreamsPublished()
-	if publishProp == nil {
+	if publishProp == nil || !publishProp.IsXMLSchemaDateTime() {
 		return time.Time{}
 	}
 	return publishProp.Get()
@@ -215,7 +356,7 @@ func SetPublished(with WithPublished, published time.Time) {
 // GetEndTime returns the time contained in the EndTime property of 'with'.
 func GetEndTime(with WithEndTime) time.Time {
 	endTimeProp := with.GetActivityStreamsEndTime()
-	if endTimeProp == nil {
+	if endTimeProp == nil || !endTimeProp.IsXMLSchemaDateTime() {
 		return time.Time{}
 	}
 	return endTimeProp.Get()
@@ -240,7 +381,8 @@ func GetClosed(with WithClosed) []time.Time {
 	closed := make([]time.Time, 0, closedProp.Len())
 	for i := 0; i < closedProp.Len(); i++ {
 		at := closedProp.At(i)
-		if t := at.GetXMLSchemaDateTime(); !t.IsZero() {
+		if at.IsXMLSchemaDateTime() {
+			t := at.GetXMLSchemaDateTime()
 			closed = append(closed, t)
 		}
 	}
@@ -265,7 +407,7 @@ func AppendClosed(with WithClosed, closed ...time.Time) {
 // GetVotersCount returns the integer contained in the VotersCount property of 'with', if found.
 func GetVotersCount(with WithVotersCount) int {
 	votersProp := with.GetTootVotersCount()
-	if votersProp == nil {
+	if votersProp == nil || !votersProp.IsXMLSchemaNonNegativeInteger() {
 		return 0
 	}
 	return votersProp.Get()
@@ -281,6 +423,25 @@ func SetVotersCount(with WithVotersCount, count int) {
 	votersProp.Set(count)
 }
 
+// GetDiscoverable returns the boolean contained in the Discoverable property of 'with'.
+func GetDiscoverable(with WithDiscoverable) bool {
+	discoverProp := with.GetTootDiscoverable()
+	if discoverProp == nil || !discoverProp.IsXMLSchemaBoolean() {
+		return false
+	}
+	return discoverProp.Get()
+}
+
+// SetDiscoverable sets the given boolean on the Discoverable property of 'with'.
+func SetDiscoverable(with WithDiscoverable, discoverable bool) {
+	discoverProp := with.GetTootDiscoverable()
+	if discoverProp == nil {
+		discoverProp = streams.NewTootDiscoverableProperty()
+		with.SetTootDiscoverable(discoverProp)
+	}
+	discoverProp.Set(discoverable)
+}
+
 func getIRIs[T TypeOrIRI](prop Property[T]) []*url.URL {
 	if prop == nil || prop.Len() == 0 {
 		return nil

internal/ap/resolve_test.go

@@ -42,7 +42,7 @@ func (suite *ResolveTestSuite) TestResolveDocumentAsAccountable() {
 	b := []byte(suite.typeToJson(suite.document1))
 
 	accountable, err := ap.ResolveAccountable(context.Background(), b)
-	suite.True(gtserror.WrongType(err))
+	suite.True(gtserror.IsWrongType(err))
 	suite.EqualError(err, "ResolveAccountable: cannot resolve vocab type *typedocument.ActivityStreamsDocument as accountable")
 	suite.Nil(accountable)
 }