mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-29 20:16:17 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

some more fiddling

Browse source
This commit is contained in:
tsmethurst 2021-09-07 14:07:13 +02:00 • committed by tsmethurst
commit 11d64db5a3
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
internal/trans/decoders.go
View file

@ -20,22 +20,23 @@ package trans
import (
"crypto/rsa"
"encoding"
"fmt"
"net"
"reflect"
"time"
"github.com/mitchellh/mapstructure"
"github.com/sirupsen/logrus"
transmodel "github.com/superseriousbusiness/gotosocial/internal/trans/model"
)
func accountDecode(e transmodel.TransEntry) (*transmodel.Account, error) {
func (i *importer) accountDecode(e transmodel.TransEntry) (*transmodel.Account, error) {
a := &transmodel.Account{}
decoderConfig := &mapstructure.DecoderConfig{
DecodeHook: mapstructure.ComposeDecodeHookFunc(
mapstructure.StringToTimeHookFunc(time.RFC3339),
PrivateKeyHookFunc(),
keyHookFunc(i.log),
),
Result: a,
}
@ -51,16 +52,20 @@ func accountDecode(e transmodel.TransEntry) (*transmodel.Account, error) {
return a, nil
}
var PrivateKeyHookFunc mapstructure.DecodeHookFunc = func(f reflect.Type, t reflect.Type, data interface{}) (interface{}, error) {
if t != reflect.TypeOf(rsa.PrivateKey{}) {
return data, nil
func keyHookFunc(log *logrus.Logger) mapstructure.DecodeHookFunc {
return func(f reflect.Type, t reflect.Type, data interface{}) (interface{}, error) {
if t != reflect.TypeOf(rsa.PrivateKey{}) {
return data, nil
}
result := reflect.New(t).Interface()
unmarshaller, ok := result.(encoding.BinaryUnmarshaler)
if !ok {
return data, nil
}
if err := unmarshaller.UnmarshalBinary([]byte(data.(string))); err != nil {
return nil, err
}
return result, nil
}
rsa.
// Convert it by parsing
_, net, err := net.ParseCIDR(data.(string))
return net, err
}

2
internal/trans/input.go
View file

@ -34,7 +34,7 @@ func (i *importer) inputEntry(ctx context.Context, entry transmodel.TransEntry)
switch transmodel.TransType(t) {
case transmodel.TransAccount:
account, err := accountDecode(entry)
account, err := i.accountDecode(entry)
if err != nil {
return fmt.Errorf("inputEntry: error decoding entry into account: %s", err)
}