summaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-05-27 16:35:35 +0200
committerLibravatar GitHub <noreply@github.com>2022-05-27 16:35:35 +0200
commitdc8cc7e364de3342c84c2329da6a0addfcbba273 (patch)
tree2645e28ba4ba97014582075c577b011dafb79c16 /internal
parent[performance] Don't retry/backoff invalid http requests that will never succe... (diff)
downloadgotosocial-dc8cc7e364de3342c84c2329da6a0addfcbba273.tar.xz
[chore] Add test for dereferencing Owncast service account (#613)
Diffstat (limited to 'internal')
-rw-r--r--internal/federation/dereferencing/account_test.go20
-rw-r--r--internal/federation/dereferencing/dereferencer_test.go15
-rw-r--r--internal/typeutils/astointernal_test.go43
-rw-r--r--internal/typeutils/converter_test.go51
4 files changed, 129 insertions, 0 deletions
diff --git a/internal/federation/dereferencing/account_test.go b/internal/federation/dereferencing/account_test.go
index cb6f9588c..75c02af75 100644
--- a/internal/federation/dereferencing/account_test.go
+++ b/internal/federation/dereferencing/account_test.go
@@ -51,6 +51,26 @@ func (suite *AccountTestSuite) TestDereferenceGroup() {
suite.Equal(ap.ActorGroup, dbGroup.ActorType)
}
+func (suite *AccountTestSuite) TestDereferenceService() {
+ fetchingAccount := suite.testAccounts["local_account_1"]
+
+ serviceURL := testrig.URLMustParse("https://owncast.example.org/federation/user/rgh")
+ service, err := suite.dereferencer.GetRemoteAccount(context.Background(), fetchingAccount.Username, serviceURL, false, false)
+ suite.NoError(err)
+ suite.NotNil(service)
+ suite.NotNil(service)
+
+ // service values should be set
+ suite.Equal("https://owncast.example.org/federation/user/rgh", service.URI)
+ suite.Equal("https://owncast.example.org/federation/user/rgh", service.URL)
+
+ // service should be in the database
+ dbService, err := suite.db.GetAccountByURI(context.Background(), service.URI)
+ suite.NoError(err)
+ suite.Equal(service.ID, dbService.ID)
+ suite.Equal(ap.ActorService, dbService.ActorType)
+}
+
func TestAccountTestSuite(t *testing.T) {
suite.Run(t, new(AccountTestSuite))
}
diff --git a/internal/federation/dereferencing/dereferencer_test.go b/internal/federation/dereferencing/dereferencer_test.go
index 339490e5d..96ec7869f 100644
--- a/internal/federation/dereferencing/dereferencer_test.go
+++ b/internal/federation/dereferencing/dereferencer_test.go
@@ -46,6 +46,7 @@ type DereferencerStandardTestSuite struct {
testRemoteStatuses map[string]vocab.ActivityStreamsNote
testRemotePeople map[string]vocab.ActivityStreamsPerson
testRemoteGroups map[string]vocab.ActivityStreamsGroup
+ testRemoteServices map[string]vocab.ActivityStreamsService
testRemoteAttachments map[string]testrig.RemoteAttachmentFile
testAccounts map[string]*gtsmodel.Account
@@ -60,6 +61,7 @@ func (suite *DereferencerStandardTestSuite) SetupTest() {
suite.testRemoteStatuses = testrig.NewTestFediStatuses()
suite.testRemotePeople = testrig.NewTestFediPeople()
suite.testRemoteGroups = testrig.NewTestFediGroups()
+ suite.testRemoteServices = testrig.NewTestFediServices()
suite.testRemoteAttachments = testrig.NewTestFediAttachments("../../../testrig/media")
suite.db = testrig.NewTestDB()
@@ -126,6 +128,19 @@ func (suite *DereferencerStandardTestSuite) mockTransportController() transport.
responseType = "application/activity+json"
}
+ if service, ok := suite.testRemoteServices[req.URL.String()]; ok {
+ serviceI, err := streams.Serialize(service)
+ if err != nil {
+ panic(err)
+ }
+ serviceJson, err := json.Marshal(serviceI)
+ if err != nil {
+ panic(err)
+ }
+ responseBytes = serviceJson
+ responseType = "application/activity+json"
+ }
+
if attachment, ok := suite.testRemoteAttachments[req.URL.String()]; ok {
responseBytes = attachment.Data
responseType = attachment.ContentType
diff --git a/internal/typeutils/astointernal_test.go b/internal/typeutils/astointernal_test.go
index d06178fb1..25fe0884a 100644
--- a/internal/typeutils/astointernal_test.go
+++ b/internal/typeutils/astointernal_test.go
@@ -157,6 +157,49 @@ func (suite *ASToInternalTestSuite) TestParseReplyWithMention() {
suite.Equal(gtsmodel.VisibilityUnlocked, status.Visibility)
}
+func (suite *ASToInternalTestSuite) TestParseOwncastService() {
+ m := make(map[string]interface{})
+ err := json.Unmarshal([]byte(owncastService), &m)
+ suite.NoError(err)
+
+ t, err := streams.ToType(context.Background(), m)
+ suite.NoError(err)
+
+ rep, ok := t.(ap.Accountable)
+ suite.True(ok)
+
+ acct, err := suite.typeconverter.ASRepresentationToAccount(context.Background(), rep, false)
+ suite.NoError(err)
+
+ suite.Equal("rgh", acct.Username)
+ suite.Equal("owncast.example.org", acct.Domain)
+ suite.Equal("https://owncast.example.org/logo/external", acct.AvatarRemoteURL)
+ suite.Equal("https://owncast.example.org/logo/external", acct.HeaderRemoteURL)
+ suite.Equal("Rob's Owncast Server", acct.DisplayName)
+ suite.Equal("linux audio stuff ", acct.Note)
+ suite.True(acct.Bot)
+ suite.False(acct.Locked)
+ suite.True(acct.Discoverable)
+ suite.Equal("https://owncast.example.org/federation/user/rgh", acct.URI)
+ suite.Equal("https://owncast.example.org/federation/user/rgh", acct.URL)
+ suite.Equal("https://owncast.example.org/federation/user/rgh/inbox", acct.InboxURI)
+ suite.Equal("https://owncast.example.org/federation/user/rgh/outbox", acct.OutboxURI)
+ suite.Equal("https://owncast.example.org/federation/user/rgh/followers", acct.FollowersURI)
+ suite.Equal("Service", acct.ActorType)
+ suite.Equal("https://owncast.example.org/federation/user/rgh#main-key", acct.PublicKeyURI)
+
+ acct.ID = "01G42D57DTCJQE8XT9KD4K88RK"
+
+ apiAcct, err := suite.typeconverter.AccountToAPIAccountPublic(context.Background(), acct)
+ suite.NoError(err)
+ suite.NotNil(apiAcct)
+
+ b, err := json.Marshal(apiAcct)
+ suite.NoError(err)
+
+ fmt.Printf("\n\n\n%s\n\n\n", string(b))
+}
+
func TestASToInternalTestSuite(t *testing.T) {
suite.Run(t, new(ASToInternalTestSuite))
}
diff --git a/internal/typeutils/converter_test.go b/internal/typeutils/converter_test.go
index 4d782c822..0983669ac 100644
--- a/internal/typeutils/converter_test.go
+++ b/internal/typeutils/converter_test.go
@@ -414,6 +414,57 @@ const (
}
}
`
+ owncastService = `
+ {
+ "@context": [
+ "https://www.w3.org/ns/activitystreams",
+ "http://joinmastodon.org/ns",
+ "https://w3id.org/security/v1"
+ ],
+ "attachment": {
+ "name": "Stream",
+ "type": "PropertyValue",
+ "value": "<a href=\"https://owncast.example.org\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\">https://owncast.example.org</a>"
+ },
+ "discoverable": true,
+ "followers": "https://owncast.example.org/federation/user/rgh/followers",
+ "icon": {
+ "type": "Image",
+ "url": "https://owncast.example.org/logo/external"
+ },
+ "id": "https://owncast.example.org/federation/user/rgh",
+ "image": {
+ "type": "Image",
+ "url": "https://owncast.example.org/logo/external"
+ },
+ "inbox": "https://owncast.example.org/federation/user/rgh/inbox",
+ "manuallyApprovesFollowers": false,
+ "name": "Rob's Owncast Server",
+ "outbox": "https://owncast.example.org/federation/user/rgh/outbox",
+ "preferredUsername": "rgh",
+ "publicKey": {
+ "id": "https://owncast.example.org/federation/user/rgh#main-key",
+ "owner": "https://owncast.example.org/federation/user/rgh",
+ "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurN+lUNwcGV2poLNtaoT\naRtJzN6s4SDcBmIFk82lxhdMKC6/Nssm+hvDuxWGqL0+dHwSvrG11rA6irGuSzRk\niHjYyVwYe/p1CxqJxzUfZVJAWdsCFWy+HtDrTWs5sggj1MiL59uGxvkCep+OYBuG\nBI8CvSOMLrDp8soCg3EY+zSgpXtGMuRaaUukavsfuglApShB61ny7W8LG252iKC5\nmyO8L7l8TNa5BrIi/pRHLzvv9aWiCa8VKtvmqj+mClEhpkRhImSk5GPJXgouTTgl\ntT28NYYciSf9YYgZ0SNWHdLUCdkMF592j4+BbkPvdgzc70G4yyu2GcWnTzBuvF5X\nYwIDAQAB\n-----END PUBLIC KEY-----\n"
+ },
+ "published": "2022-05-22T18:44:57Z",
+ "summary": "linux audio stuff ",
+ "tag": [
+ {
+ "href": "https://directory.owncast.online/tags/owncast",
+ "name": "#owncast",
+ "type": "Hashtag"
+ },
+ {
+ "href": "https://directory.owncast.online/tags/streaming",
+ "name": "#streaming",
+ "type": "Hashtag"
+ }
+ ],
+ "type": "Service",
+ "url": "https://owncast.example.org/federation/user/rgh"
+ }
+`
)
type TypeUtilsTestSuite struct {