gitea-mirror
/
go-fed-activity
mirror of https://gitea.com/gitea/go-fed-activity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add unit tests for known bugs. 

Aggressive PublicKey deserialization and Type masquerading bugs.
This commit is contained in:
Cory Slep 2019-10-19 13:30:16 +02:00
parent 00d19306e4
commit 809fd1f041
4 changed files with 318 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
streams/streams_manual_data_test.go
View File

@ -5831,3 +5831,140 @@ func example159Type() vocab.ActivityStreamsMove {
example159Type.SetActivityStreamsTarget(tobj)
return example159Type
}
const personExampleWithPublicKey = `{
"@context": [
"https://www.w3.org/ns/activitystreams",
"https://w3id.org/security/v1"
],
"id":"https://mastodon.technology/users/cj",
"type":"Person",
"following":"https://mastodon.technology/users/cj/following",
"followers":"https://mastodon.technology/users/cj/followers",
"inbox":"https://mastodon.technology/users/cj/inbox",
"outbox":"https://mastodon.technology/users/cj/outbox",
"preferredUsername":"cj",
"name":"cj",
"url":"https://mastodon.technology/@cj",
"publicKey": {
"id":"https://mastodon.technology/users/cj#main-key",
"owner":"https://mastodon.technology/users/cj",
"publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArYzMmldblHfnAPbwfVIo\nFpV6ej3JUS9boZHJbYh9c3IpumDoDXJyThTx19wM8M04fJljJ74aTp+fZdIng6l3\nswT24dvgahMUoD4/NLrPOjulhIOGfYzGYfTduh6wT+aaxV5w+OPO5plOVgrgS+RK\n9mv5SOQIaSLQGNCc5RSKuea8H4fG/bUiPpCXlqq2iVp0hoc3rI3K2NOErxOeex1B\nzcBLupBiXBB5a4hxwTVMfjmxqEZSuC1xnx2c8R9FpZPmhGovqlVzK/JlTPBU53f/\nDT773fOqr2jLTLfS0VNrI0jYpz0GG687O/FDRi2YR91D9NSs9WFHeuVC/A5mhuMH\npQIDAQAB\n-----END PUBLIC KEY-----\n"
}
}`
func personExampleWithPublicKeyType() vocab.ActivityStreamsPerson {
personExampleType := NewActivityStreamsPerson()
idIRI := MustParseURL("https://mastodon.technology/users/cj")
idProp := NewActivityStreamsIdProperty()
idProp.Set(idIRI)
personExampleType.SetActivityStreamsId(idProp)
followingIRI := MustParseURL("https://mastodon.technology/users/cj/following")
followingProp := NewActivityStreamsFollowingProperty()
followingProp.SetIRI(followingIRI)
personExampleType.SetActivityStreamsFollowing(followingProp)
followersIRI := MustParseURL("https://mastodon.technology/users/cj/followers")
followersProp := NewActivityStreamsFollowersProperty()
followersProp.SetIRI(followersIRI)
personExampleType.SetActivityStreamsFollowers(followersProp)
inboxIRI := MustParseURL("https://mastodon.technology/users/cj/inbox")
inboxProp := NewActivityStreamsInboxProperty()
inboxProp.SetIRI(inboxIRI)
personExampleType.SetActivityStreamsInbox(inboxProp)
outboxIRI := MustParseURL("https://mastodon.technology/users/cj/outbox")
outboxProp := NewActivityStreamsOutboxProperty()
outboxProp.SetIRI(outboxIRI)
personExampleType.SetActivityStreamsOutbox(outboxProp)
preferredUsernameProp := NewActivityStreamsPreferredUsernameProperty()
preferredUsernameProp.SetXMLSchemaString("cj")
personExampleType.SetActivityStreamsPreferredUsername(preferredUsernameProp)
nameProp := NewActivityStreamsNameProperty()
nameProp.AppendXMLSchemaString("cj")
personExampleType.SetActivityStreamsName(nameProp)
urlIRI := MustParseURL("https://mastodon.technology/@cj")
urlProp := NewActivityStreamsUrlProperty()
urlProp.AppendIRI(urlIRI)
personExampleType.SetActivityStreamsUrl(urlProp)
publicKeyProp := NewW3IDSecurityV1PublicKeyProperty()
publicKeyType := NewW3IDSecurityV1PublicKey()
pubKeyIdIRI := MustParseURL("https://mastodon.technology/users/cj#main-key")
pubKeyIdProp := NewActivityStreamsIdProperty()
pubKeyIdProp.Set(pubKeyIdIRI)
publicKeyType.SetActivityStreamsId(pubKeyIdProp)
ownerIRI := MustParseURL("https://mastodon.technology/users/cj")
ownerProp := NewW3IDSecurityV1OwnerProperty()
ownerProp.SetIRI(ownerIRI)
publicKeyType.SetW3IDSecurityV1Owner(ownerProp)
publicKeyPemProp := NewW3IDSecurityV1PublicKeyPemProperty()
publicKeyPemProp.Set("-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArYzMmldblHfnAPbwfVIo\nFpV6ej3JUS9boZHJbYh9c3IpumDoDXJyThTx19wM8M04fJljJ74aTp+fZdIng6l3\nswT24dvgahMUoD4/NLrPOjulhIOGfYzGYfTduh6wT+aaxV5w+OPO5plOVgrgS+RK\n9mv5SOQIaSLQGNCc5RSKuea8H4fG/bUiPpCXlqq2iVp0hoc3rI3K2NOErxOeex1B\nzcBLupBiXBB5a4hxwTVMfjmxqEZSuC1xnx2c8R9FpZPmhGovqlVzK/JlTPBU53f/\nDT773fOqr2jLTLfS0VNrI0jYpz0GG687O/FDRi2YR91D9NSs9WFHeuVC/A5mhuMH\npQIDAQAB\n-----END PUBLIC KEY-----\n")
publicKeyType.SetW3IDSecurityV1PublicKeyPem(publicKeyPemProp)
publicKeyProp.AppendW3IDSecurityV1PublicKey(publicKeyType)
personExampleType.SetW3IDSecurityV1PublicKey(publicKeyProp)
return personExampleType
}
type testContextWrapper struct {
vocab.Type
}
func (a *testContextWrapper) JSONLDContext() map[string]string {
m := a.Type.JSONLDContext()
m["https://schema.org#"] = "schema"
m["schema:PropertyValue"] = "PropertyValue"
m["schema:value"] = "value"
return m
}
const serviceHasAttachmentWithUnknown = `{
"@context": [
"https://www.w3.org/ns/activitystreams",
{
"schema": "https://schema.org#",
"PropertyValue": "schema:PropertyValue",
"value": "schema:value"
}
],
"id": "https://example.com/service",
"type": "Service",
"attachment": [
{
"type": "PropertyValue",
"name": "First Object",
"value": "test value on first object"
},
{
"type": "PropertyValue",
"name": "Second Object",
"value": "test value on second object"
}
]
}`
func serviceHasAttachmentWithUnknownType() vocab.ActivityStreamsService {
serviceType := NewActivityStreamsService()
idProp := NewActivityStreamsIdProperty()
idIRI := MustParseURL("https://example.com/service")
idProp.Set(idIRI)
serviceType.SetActivityStreamsId(idProp)
attachmentProp := NewActivityStreamsAttachmentProperty()
firstObject := NewActivityStreamsObject()
firstObjectTypeProp := NewActivityStreamsTypeProperty()
firstObjectTypeProp.AppendXMLSchemaString("PropertyValue")
firstObject.SetActivityStreamsType(firstObjectTypeProp)
firstObjectNameProp := NewActivityStreamsNameProperty()
firstObjectNameProp.AppendXMLSchemaString("First Object")
firstObject.SetActivityStreamsName(firstObjectNameProp)
firstObject.GetUnknownProperties()["value"] = "test value on first object"
attachmentProp.AppendType(&testContextWrapper{firstObject})
secondObject := NewActivityStreamsObject()
secondObjectTypeProp := NewActivityStreamsTypeProperty()
secondObjectTypeProp.AppendXMLSchemaString("PropertyValue")
secondObject.SetActivityStreamsType(secondObjectTypeProp)
secondObjectNameProp := NewActivityStreamsNameProperty()
secondObjectNameProp.AppendXMLSchemaString("Second Object")
secondObject.SetActivityStreamsName(secondObjectNameProp)
secondObject.GetUnknownProperties()["value"] = "test value on second object"
attachmentProp.AppendType(secondObject)
serviceType.SetActivityStreamsAttachment(attachmentProp)
return serviceType
}

15
streams/streams_test.go
View File

@ -9,10 +9,6 @@ import (
"testing"
)
type serializer interface {
Serialize() (map[string]interface{}, error)
}
// IsKnownResolverError returns true if it is known that an example from
// GetTestTable will trigger a JSONResolver error.
func IsKnownResolverError(t TestTable) (b bool, reason string) {
@ -38,12 +34,11 @@ func TestJSONResolver(t *testing.T) {
name := example.name
t.Logf("Testing table test case %q", name)
ex := example.expectedJSON
resFn := func(s serializer) error {
m, err := s.Serialize()
resFn := func(s vocab.Type) error {
m, err := Serialize(s)
if err != nil {
return err
}
m["@context"] = "https://www.w3.org/ns/activitystreams"
actual, err := json.Marshal(m)
if diff, err := GetJSONDiff(actual, []byte(ex)); err == nil && diff != nil {
t.Errorf("%s: Serialize JSON equality is false:\n%s", name, diff)
@ -243,7 +238,7 @@ func TestJSONResolverErrors(t *testing.T) {
name := example.name
t.Logf("Testing table test case %q", name)
ex := example.expectedJSON
resFn := func(s serializer) error { return nil }
resFn := func(s vocab.Type) error { return nil }
r, err := NewJSONResolver(
func(c context.Context, x vocab.ActivityStreamsAccept) error {
return resFn(x)
@ -492,10 +487,10 @@ func TestNulls(t *testing.T) {
expectedUpdate.SetActivityStreamsObject(objectNote)
// Variable to aid in deserialization in tests
var actual serializer
var actual vocab.Type
tables := []struct {
name string
expected serializer
expected vocab.Type
callback interface{}
input string
inputWithoutNulls string

1
streams/util.go
View File

@ -50,6 +50,7 @@ func Serialize(a vocab.Type) (m map[string]interface{}, e error) {
}
// TODO: Update the context instead if it already exists
m[jsonLDContext] = contextValue
// TODO: Sort the context based on arbitrary order.
// Delete any existing `@context` in child maps.
var cleanFnRecur func(map[string]interface{})
cleanFnRecur = func(r map[string]interface{}) {

333
streams/vocab_test.go
View File

File diff suppressed because it is too large Load Diff