qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-02-04 11:55:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[bugfix] Don't panic on delivery of Activity with no object (#3730)

Browse source
This commit is contained in:
tobi 2025-02-03 12:52:24 +01:00 committed by GitHub
parent acd3e80ae1
commit 053d820845
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
internal/federation/federatingprotocol.go
View file

@ -116,33 +116,36 @@ func (f *Federator) PostInboxRequestBodyHook(ctx context.Context, r *http.Reques
otherIRIs = append(otherIRIs, ap.ExtractCcURIs(addressable)...) otherIRIs = append(otherIRIs, ap.ExtractCcURIs(addressable)...)
} }
// Now perform the same checks, but for the Object(s) of the Activity. // Now perform the same checks, but
// for any Object(s) of the Activity.
objectProp := activity.GetActivityStreamsObject() objectProp := activity.GetActivityStreamsObject()
for iter := objectProp.Begin(); iter != objectProp.End(); iter = iter.Next() { if objectProp != nil {
if iter.IsIRI() { for iter := objectProp.Begin(); iter != objectProp.End(); iter = iter.Next() {
otherIRIs = append(otherIRIs, iter.GetIRI()) if iter.IsIRI() {
continue otherIRIs = append(otherIRIs, iter.GetIRI())
} continue
t := iter.GetType()
if t == nil {
continue
}
objectID, err := pub.GetId(t)
if err == nil {
otherIRIs = append(otherIRIs, objectID)
}
if replyToable, ok := t.(ap.ReplyToable); ok {
if inReplyToURI := ap.ExtractInReplyToURI(replyToable); inReplyToURI != nil {
otherIRIs = append(otherIRIs, inReplyToURI)
} }
}
if addressable, ok := t.(ap.Addressable); ok { t := iter.GetType()
otherIRIs = append(otherIRIs, ap.ExtractToURIs(addressable)...) if t == nil {
otherIRIs = append(otherIRIs, ap.ExtractCcURIs(addressable)...) continue
}
objectID, err := pub.GetId(t)
if err == nil {
otherIRIs = append(otherIRIs, objectID)
}
if replyToable, ok := t.(ap.ReplyToable); ok {
if inReplyToURI := ap.ExtractInReplyToURI(replyToable); inReplyToURI != nil {
otherIRIs = append(otherIRIs, inReplyToURI)
}
}
if addressable, ok := t.(ap.Addressable); ok {
otherIRIs = append(otherIRIs, ap.ExtractToURIs(addressable)...)
otherIRIs = append(otherIRIs, ap.ExtractCcURIs(addressable)...)
}
} }
} }