mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 07:12:25 -05:00
[feature] add worker task serialization logic (#2989)
* improved server shutdown with more precise shutdown of modules + deferring of ALL of it
* move delivery and workers into separate files
* add worker task model and Serialize() / Deserialize() methods for message types
* start adding message serialize / deserialize tests
* start adding test cases
* update body rewinding to rely on standard library mechanism of r.GetBody()
* remove request rewinding (http.Client{} should already handle this)
* standard library already handles rewinding
* improved code comment
* move the newPOST() function contents to prepare(), fits better with current API
* add Serialize() / Deserialize() implementations for Delivery{} type
* finish writing FromClientAPI sserialize / deserialize tests
* start adding FromFediAPI{} serialize / deserialize test cases
* fix FromFediAPI{} tests
* add tests for delivery message type
* fix repeat code
* missing license header
* use testrig status and accounts for marshal / unmarshaling tests
* add a specific test for checking account RSA keys are preserved
This commit is contained in:
kim
GitHub
parent
4ce5c37df5
commit
7b1ccbd65a
31 changed files with 6318 additions and 457 deletions
|
|
@ -18,9 +18,15 @@
|
|||
package messages
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"net/url"
|
||||
"reflect"
|
||||
|
||||
"codeberg.org/gruf/go-structr"
|
||||
"github.com/superseriousbusiness/activity/streams"
|
||||
"github.com/superseriousbusiness/activity/streams/vocab"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
||||
)
|
||||
|
||||
|
|
@ -50,6 +56,105 @@ type FromClientAPI struct {
|
|||
Target *gtsmodel.Account
|
||||
}
|
||||
|
||||
// fromClientAPI is an internal type
|
||||
// for FromClientAPI that provides a
|
||||
// json serialize / deserialize -able
|
||||
// shape that minimizes required data.
|
||||
type fromClientAPI struct {
|
||||
APObjectType string `json:"ap_object_type,omitempty"`
|
||||
APActivityType string `json:"ap_activity_type,omitempty"`
|
||||
GTSModel json.RawMessage `json:"gts_model,omitempty"`
|
||||
GTSModelType string `json:"gts_model_type,omitempty"`
|
||||
TargetURI string `json:"target_uri,omitempty"`
|
||||
OriginID string `json:"origin_id,omitempty"`
|
||||
TargetID string `json:"target_id,omitempty"`
|
||||
}
|
||||
|
||||
// Serialize will serialize the worker data as data blob for storage,
|
||||
// note that this will flatten some of the data e.g. only account IDs.
|
||||
func (msg *FromClientAPI) Serialize() ([]byte, error) {
|
||||
var (
|
||||
modelType string
|
||||
originID string
|
||||
targetID string
|
||||
)
|
||||
|
||||
// Set database model type if any provided.
|
||||
if t := reflect.TypeOf(msg.GTSModel); t != nil {
|
||||
modelType = t.String()
|
||||
}
|
||||
|
||||
// Set origin account ID.
|
||||
if msg.Origin != nil {
|
||||
originID = msg.Origin.ID
|
||||
}
|
||||
|
||||
// Set target account ID.
|
||||
if msg.Target != nil {
|
||||
targetID = msg.Target.ID
|
||||
}
|
||||
|
||||
// Marshal GTS model as raw JSON block.
|
||||
modelJSON, err := json.Marshal(msg.GTSModel)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Marshal as internal JSON type.
|
||||
return json.Marshal(fromClientAPI{
|
||||
APObjectType: msg.APObjectType,
|
||||
APActivityType: msg.APActivityType,
|
||||
GTSModel: modelJSON,
|
||||
GTSModelType: modelType,
|
||||
TargetURI: msg.TargetURI,
|
||||
OriginID: originID,
|
||||
TargetID: targetID,
|
||||
})
|
||||
}
|
||||
|
||||
// Deserialize will attempt to deserialize a blob of task data,
|
||||
// which will involve unflattening previously serialized data and
|
||||
// leave some message structures as placeholders to holding IDs.
|
||||
func (msg *FromClientAPI) Deserialize(data []byte) error {
|
||||
var imsg fromClientAPI
|
||||
|
||||
// Unmarshal as internal JSON type.
|
||||
err := json.Unmarshal(data, &imsg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Copy over the simplest fields.
|
||||
msg.APObjectType = imsg.APObjectType
|
||||
msg.APActivityType = imsg.APActivityType
|
||||
msg.TargetURI = imsg.TargetURI
|
||||
|
||||
// Resolve Go type from JSON data.
|
||||
msg.GTSModel, err = resolveGTSModel(
|
||||
imsg.GTSModelType,
|
||||
imsg.GTSModel,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if imsg.OriginID != "" {
|
||||
// Set origin account ID using a
|
||||
// barebones model (later filled in).
|
||||
msg.Origin = new(gtsmodel.Account)
|
||||
msg.Origin.ID = imsg.OriginID
|
||||
}
|
||||
|
||||
if imsg.TargetID != "" {
|
||||
// Set target account ID using a
|
||||
// barebones model (later filled in).
|
||||
msg.Target = new(gtsmodel.Account)
|
||||
msg.Target.ID = imsg.TargetID
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ClientMsgIndices defines queue indices this
|
||||
// message type should be accessible / stored under.
|
||||
func ClientMsgIndices() []structr.IndexConfig {
|
||||
|
|
@ -91,6 +196,133 @@ type FromFediAPI struct {
|
|||
Receiving *gtsmodel.Account
|
||||
}
|
||||
|
||||
// fromFediAPI is an internal type
|
||||
// for FromFediAPI that provides a
|
||||
// json serialize / deserialize -able
|
||||
// shape that minimizes required data.
|
||||
type fromFediAPI struct {
|
||||
APObjectType string `json:"ap_object_type,omitempty"`
|
||||
APActivityType string `json:"ap_activity_type,omitempty"`
|
||||
APIRI string `json:"ap_iri,omitempty"`
|
||||
APObject map[string]interface{} `json:"ap_object,omitempty"`
|
||||
GTSModel json.RawMessage `json:"gts_model,omitempty"`
|
||||
GTSModelType string `json:"gts_model_type,omitempty"`
|
||||
TargetURI string `json:"target_uri,omitempty"`
|
||||
RequestingID string `json:"requesting_id,omitempty"`
|
||||
ReceivingID string `json:"receiving_id,omitempty"`
|
||||
}
|
||||
|
||||
// Serialize will serialize the worker data as data blob for storage,
|
||||
// note that this will flatten some of the data e.g. only account IDs.
|
||||
func (msg *FromFediAPI) Serialize() ([]byte, error) {
|
||||
var (
|
||||
gtsModelType string
|
||||
apIRI string
|
||||
apObject map[string]interface{}
|
||||
requestingID string
|
||||
receivingID string
|
||||
)
|
||||
|
||||
// Set AP IRI string.
|
||||
if msg.APIRI != nil {
|
||||
apIRI = msg.APIRI.String()
|
||||
}
|
||||
|
||||
// Set serialized AP object data if set.
|
||||
if t, ok := msg.APObject.(vocab.Type); ok {
|
||||
obj, err := t.Serialize()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
apObject = obj
|
||||
}
|
||||
|
||||
// Set database model type if any provided.
|
||||
if t := reflect.TypeOf(msg.GTSModel); t != nil {
|
||||
gtsModelType = t.String()
|
||||
}
|
||||
|
||||
// Set requesting account ID.
|
||||
if msg.Requesting != nil {
|
||||
requestingID = msg.Requesting.ID
|
||||
}
|
||||
|
||||
// Set receiving account ID.
|
||||
if msg.Receiving != nil {
|
||||
receivingID = msg.Receiving.ID
|
||||
}
|
||||
|
||||
// Marshal GTS model as raw JSON block.
|
||||
modelJSON, err := json.Marshal(msg.GTSModel)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Marshal as internal JSON type.
|
||||
return json.Marshal(fromFediAPI{
|
||||
APObjectType: msg.APObjectType,
|
||||
APActivityType: msg.APActivityType,
|
||||
APIRI: apIRI,
|
||||
APObject: apObject,
|
||||
GTSModel: modelJSON,
|
||||
GTSModelType: gtsModelType,
|
||||
TargetURI: msg.TargetURI,
|
||||
RequestingID: requestingID,
|
||||
ReceivingID: receivingID,
|
||||
})
|
||||
}
|
||||
|
||||
// Deserialize will attempt to deserialize a blob of task data,
|
||||
// which will involve unflattening previously serialized data and
|
||||
// leave some message structures as placeholders to holding IDs.
|
||||
func (msg *FromFediAPI) Deserialize(data []byte) error {
|
||||
var imsg fromFediAPI
|
||||
|
||||
// Unmarshal as internal JSON type.
|
||||
err := json.Unmarshal(data, &imsg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Copy over the simplest fields.
|
||||
msg.APObjectType = imsg.APObjectType
|
||||
msg.APActivityType = imsg.APActivityType
|
||||
msg.TargetURI = imsg.TargetURI
|
||||
|
||||
// Resolve AP object from JSON data.
|
||||
msg.APObject, err = resolveAPObject(
|
||||
imsg.APObject,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Resolve Go type from JSON data.
|
||||
msg.GTSModel, err = resolveGTSModel(
|
||||
imsg.GTSModelType,
|
||||
imsg.GTSModel,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if imsg.RequestingID != "" {
|
||||
// Set requesting account ID using a
|
||||
// barebones model (later filled in).
|
||||
msg.Requesting = new(gtsmodel.Account)
|
||||
msg.Requesting.ID = imsg.RequestingID
|
||||
}
|
||||
|
||||
if imsg.ReceivingID != "" {
|
||||
// Set target account ID using a
|
||||
// barebones model (later filled in).
|
||||
msg.Receiving = new(gtsmodel.Account)
|
||||
msg.Receiving.ID = imsg.ReceivingID
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// FederatorMsgIndices defines queue indices this
|
||||
// message type should be accessible / stored under.
|
||||
func FederatorMsgIndices() []structr.IndexConfig {
|
||||
|
|
@ -101,3 +333,61 @@ func FederatorMsgIndices() []structr.IndexConfig {
|
|||
{Fields: "Receiving.ID", Multiple: true},
|
||||
}
|
||||
}
|
||||
|
||||
// resolveAPObject resolves an ActivityPub object from its "serialized" JSON map
|
||||
// (yes the terminology here is weird, but that's how go-fed/activity is written).
|
||||
func resolveAPObject(data map[string]interface{}) (interface{}, error) {
|
||||
if len(data) == 0 {
|
||||
// No data given.
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
// Resolve vocab.Type from "raw" input data map.
|
||||
return streams.ToType(context.Background(), data)
|
||||
}
|
||||
|
||||
// resolveGTSModel is unfortunately where things get messy... our data is stored as JSON
|
||||
// in the database, which serializes struct types as key-value pairs surrounded by curly
|
||||
// braces. Deserializing from that gives us back a data blob of key-value pairs, which
|
||||
// we then need to wrangle back into the original type. So we also store the type name
|
||||
// and use this to determine the appropriate Go structure type to unmarshal into to.
|
||||
func resolveGTSModel(typ string, data []byte) (interface{}, error) {
|
||||
if typ == "" && data == nil {
|
||||
// No data given.
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
var value interface{}
|
||||
|
||||
switch typ {
|
||||
case reflect.TypeOf((*gtsmodel.Account)(nil)).String():
|
||||
value = new(gtsmodel.Account)
|
||||
case reflect.TypeOf((*gtsmodel.Block)(nil)).String():
|
||||
value = new(gtsmodel.Block)
|
||||
case reflect.TypeOf((*gtsmodel.Follow)(nil)).String():
|
||||
value = new(gtsmodel.Follow)
|
||||
case reflect.TypeOf((*gtsmodel.FollowRequest)(nil)).String():
|
||||
value = new(gtsmodel.FollowRequest)
|
||||
case reflect.TypeOf((*gtsmodel.Move)(nil)).String():
|
||||
value = new(gtsmodel.Move)
|
||||
case reflect.TypeOf((*gtsmodel.Poll)(nil)).String():
|
||||
value = new(gtsmodel.Poll)
|
||||
case reflect.TypeOf((*gtsmodel.PollVote)(nil)).String():
|
||||
value = new(*gtsmodel.PollVote)
|
||||
case reflect.TypeOf((*gtsmodel.Report)(nil)).String():
|
||||
value = new(gtsmodel.Report)
|
||||
case reflect.TypeOf((*gtsmodel.Status)(nil)).String():
|
||||
value = new(gtsmodel.Status)
|
||||
case reflect.TypeOf((*gtsmodel.StatusFave)(nil)).String():
|
||||
value = new(gtsmodel.StatusFave)
|
||||
default:
|
||||
return nil, gtserror.Newf("unknown type: %s", typ)
|
||||
}
|
||||
|
||||
// Attempt to unmarshal value JSON into destination.
|
||||
if err := json.Unmarshal(data, &value); err != nil {
|
||||
return nil, gtserror.Newf("error unmarshaling %s value data: %w", typ, err)
|
||||
}
|
||||
|
||||
return value, nil
|
||||
}
|
||||
|
|
|
|||
292
internal/messages/messages_test.go
Normal file
292
internal/messages/messages_test.go
Normal file
|
|
@ -0,0 +1,292 @@
|
|||
// GoToSocial
|
||||
// Copyright (C) GoToSocial Authors admin@gotosocial.org
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
package messages_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"net/url"
|
||||
"testing"
|
||||
|
||||
"github.com/superseriousbusiness/gotosocial/internal/ap"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/messages"
|
||||
"github.com/superseriousbusiness/gotosocial/testrig"
|
||||
|
||||
"github.com/google/go-cmp/cmp"
|
||||
)
|
||||
|
||||
var testStatus = testrig.NewTestStatuses()["admin_account_status_1"]
|
||||
|
||||
var testAccount = testrig.NewTestAccounts()["admin_account"]
|
||||
|
||||
var fromClientAPICases = []struct {
|
||||
msg messages.FromClientAPI
|
||||
data []byte
|
||||
}{
|
||||
{
|
||||
msg: messages.FromClientAPI{
|
||||
APObjectType: ap.ObjectNote,
|
||||
APActivityType: ap.ActivityCreate,
|
||||
GTSModel: testStatus,
|
||||
TargetURI: "https://gotosocial.org",
|
||||
Origin: >smodel.Account{ID: "654321"},
|
||||
Target: >smodel.Account{ID: "123456"},
|
||||
},
|
||||
data: toJSON(map[string]any{
|
||||
"ap_object_type": ap.ObjectNote,
|
||||
"ap_activity_type": ap.ActivityCreate,
|
||||
"gts_model": json.RawMessage(toJSON(testStatus)),
|
||||
"gts_model_type": "*gtsmodel.Status",
|
||||
"target_uri": "https://gotosocial.org",
|
||||
"origin_id": "654321",
|
||||
"target_id": "123456",
|
||||
}),
|
||||
},
|
||||
{
|
||||
msg: messages.FromClientAPI{
|
||||
APObjectType: ap.ObjectProfile,
|
||||
APActivityType: ap.ActivityUpdate,
|
||||
GTSModel: testAccount,
|
||||
TargetURI: "https://uk-queen-is-dead.org",
|
||||
Origin: >smodel.Account{ID: "123456"},
|
||||
Target: >smodel.Account{ID: "654321"},
|
||||
},
|
||||
data: toJSON(map[string]any{
|
||||
"ap_object_type": ap.ObjectProfile,
|
||||
"ap_activity_type": ap.ActivityUpdate,
|
||||
"gts_model": json.RawMessage(toJSON(testAccount)),
|
||||
"gts_model_type": "*gtsmodel.Account",
|
||||
"target_uri": "https://uk-queen-is-dead.org",
|
||||
"origin_id": "123456",
|
||||
"target_id": "654321",
|
||||
}),
|
||||
},
|
||||
}
|
||||
|
||||
var fromFediAPICases = []struct {
|
||||
msg messages.FromFediAPI
|
||||
data []byte
|
||||
}{
|
||||
{
|
||||
msg: messages.FromFediAPI{
|
||||
APObjectType: ap.ObjectNote,
|
||||
APActivityType: ap.ActivityCreate,
|
||||
GTSModel: testStatus,
|
||||
TargetURI: "https://gotosocial.org",
|
||||
Requesting: >smodel.Account{ID: "654321"},
|
||||
Receiving: >smodel.Account{ID: "123456"},
|
||||
},
|
||||
data: toJSON(map[string]any{
|
||||
"ap_object_type": ap.ObjectNote,
|
||||
"ap_activity_type": ap.ActivityCreate,
|
||||
"gts_model": json.RawMessage(toJSON(testStatus)),
|
||||
"gts_model_type": "*gtsmodel.Status",
|
||||
"target_uri": "https://gotosocial.org",
|
||||
"requesting_id": "654321",
|
||||
"receiving_id": "123456",
|
||||
}),
|
||||
},
|
||||
{
|
||||
msg: messages.FromFediAPI{
|
||||
APObjectType: ap.ObjectProfile,
|
||||
APActivityType: ap.ActivityUpdate,
|
||||
GTSModel: testAccount,
|
||||
TargetURI: "https://uk-queen-is-dead.org",
|
||||
Requesting: >smodel.Account{ID: "123456"},
|
||||
Receiving: >smodel.Account{ID: "654321"},
|
||||
},
|
||||
data: toJSON(map[string]any{
|
||||
"ap_object_type": ap.ObjectProfile,
|
||||
"ap_activity_type": ap.ActivityUpdate,
|
||||
"gts_model": json.RawMessage(toJSON(testAccount)),
|
||||
"gts_model_type": "*gtsmodel.Account",
|
||||
"target_uri": "https://uk-queen-is-dead.org",
|
||||
"requesting_id": "123456",
|
||||
"receiving_id": "654321",
|
||||
}),
|
||||
},
|
||||
}
|
||||
|
||||
func TestSerializeFromClientAPI(t *testing.T) {
|
||||
for _, test := range fromClientAPICases {
|
||||
// Serialize test message to blob.
|
||||
data, err := test.msg.Serialize()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Check serialized JSON data as expected.
|
||||
assertJSONEqual(t, test.data, data)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeserializeFromClientAPI(t *testing.T) {
|
||||
for _, test := range fromClientAPICases {
|
||||
var msg messages.FromClientAPI
|
||||
|
||||
// Deserialize test message blob.
|
||||
err := msg.Deserialize(test.data)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Check that msg is as expected.
|
||||
assertEqual(t, test.msg.APActivityType, msg.APActivityType)
|
||||
assertEqual(t, test.msg.APObjectType, msg.APObjectType)
|
||||
assertEqual(t, test.msg.GTSModel, msg.GTSModel)
|
||||
assertEqual(t, test.msg.TargetURI, msg.TargetURI)
|
||||
assertEqual(t, accountID(test.msg.Origin), accountID(msg.Origin))
|
||||
assertEqual(t, accountID(test.msg.Target), accountID(msg.Target))
|
||||
|
||||
// Perform final check to ensure
|
||||
// account model keys deserialized.
|
||||
assertEqualRSA(t, test.msg.GTSModel, msg.GTSModel)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSerializeFromFediAPI(t *testing.T) {
|
||||
for _, test := range fromFediAPICases {
|
||||
// Serialize test message to blob.
|
||||
data, err := test.msg.Serialize()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Check serialized JSON data as expected.
|
||||
assertJSONEqual(t, test.data, data)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeserializeFromFediAPI(t *testing.T) {
|
||||
for _, test := range fromFediAPICases {
|
||||
var msg messages.FromFediAPI
|
||||
|
||||
// Deserialize test message blob.
|
||||
err := msg.Deserialize(test.data)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Check that msg is as expected.
|
||||
assertEqual(t, test.msg.APActivityType, msg.APActivityType)
|
||||
assertEqual(t, test.msg.APObjectType, msg.APObjectType)
|
||||
assertEqual(t, urlStr(test.msg.APIRI), urlStr(msg.APIRI))
|
||||
assertEqual(t, test.msg.APObject, msg.APObject)
|
||||
assertEqual(t, test.msg.GTSModel, msg.GTSModel)
|
||||
assertEqual(t, test.msg.TargetURI, msg.TargetURI)
|
||||
assertEqual(t, accountID(test.msg.Receiving), accountID(msg.Receiving))
|
||||
assertEqual(t, accountID(test.msg.Requesting), accountID(msg.Requesting))
|
||||
|
||||
// Perform final check to ensure
|
||||
// account model keys deserialized.
|
||||
assertEqualRSA(t, test.msg.GTSModel, msg.GTSModel)
|
||||
}
|
||||
}
|
||||
|
||||
// assertEqualRSA asserts that test account model RSA keys are equal.
|
||||
func assertEqualRSA(t *testing.T, expect, receive any) bool {
|
||||
t.Helper()
|
||||
|
||||
account1, ok1 := expect.(*gtsmodel.Account)
|
||||
|
||||
account2, ok2 := receive.(*gtsmodel.Account)
|
||||
|
||||
if ok1 != ok2 {
|
||||
t.Errorf("different model types: expect=%T receive=%T", expect, receive)
|
||||
return false
|
||||
} else if !ok1 {
|
||||
return true
|
||||
}
|
||||
|
||||
if !account1.PublicKey.Equal(account2.PublicKey) {
|
||||
t.Error("public keys do not match")
|
||||
return false
|
||||
}
|
||||
|
||||
t.Logf("publickey=%v", account1.PublicKey)
|
||||
|
||||
if !account1.PrivateKey.Equal(account2.PrivateKey) {
|
||||
t.Error("private keys do not match")
|
||||
return false
|
||||
}
|
||||
|
||||
t.Logf("privatekey=%v", account1.PrivateKey)
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
// assertEqual asserts that two values (of any type!) are equal,
|
||||
// note we use the 'cmp' library here as it's much more useful in
|
||||
// outputting debug information than testify, and handles more complex
|
||||
// types like rsa public / private key comparisons correctly.
|
||||
func assertEqual(t *testing.T, expect, receive any) bool {
|
||||
t.Helper()
|
||||
if diff := cmp.Diff(expect, receive); diff != "" {
|
||||
t.Error(diff)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// assertJSONEqual asserts that two slices of JSON data are equal.
|
||||
func assertJSONEqual(t *testing.T, expect, receive []byte) bool {
|
||||
t.Helper()
|
||||
return assertEqual(t, fromJSON(expect), fromJSON(receive))
|
||||
}
|
||||
|
||||
// urlStr returns url as string, or empty.
|
||||
func urlStr(url *url.URL) string {
|
||||
if url == nil {
|
||||
return ""
|
||||
}
|
||||
return url.String()
|
||||
}
|
||||
|
||||
// accountID returns account's ID, or empty.
|
||||
func accountID(account *gtsmodel.Account) string {
|
||||
if account == nil {
|
||||
return ""
|
||||
}
|
||||
return account.ID
|
||||
}
|
||||
|
||||
// fromJSON unmarshals input data as JSON.
|
||||
func fromJSON(b []byte) any {
|
||||
r := bytes.NewReader(b)
|
||||
d := json.NewDecoder(r)
|
||||
d.UseNumber()
|
||||
var a any
|
||||
err := d.Decode(&a)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if d.More() {
|
||||
panic("multiple json values in b")
|
||||
}
|
||||
return a
|
||||
}
|
||||
|
||||
// toJSON marshals input type as JSON data.
|
||||
func toJSON(a any) []byte {
|
||||
b, err := json.Marshal(a)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return b
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue