From ba469cd592b1361cdb77f1c608727307bfe46892 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Mon, 31 Jan 2022 11:26:51 +0100 Subject: [PATCH] Encode and decode lock struct in eos in base64 --- pkg/storage/utils/eosfs/eosfs.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/storage/utils/eosfs/eosfs.go b/pkg/storage/utils/eosfs/eosfs.go index 91b85f2be41..40bc7388444 100644 --- a/pkg/storage/utils/eosfs/eosfs.go +++ b/pkg/storage/utils/eosfs/eosfs.go @@ -31,6 +31,8 @@ import ( "strings" "time" + b64 "encoding/base64" + "github.com/ReneKroon/ttlcache/v2" "github.com/bluele/gcache" grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" @@ -653,12 +655,16 @@ func encodeLock(l *provider.Lock) (string, error) { if err != nil { return "", err } - return string(data), nil + return b64.StdEncoding.EncodeToString(data), nil } func decodeLock(raw string) (*provider.Lock, error) { + data, err := b64.StdEncoding.DecodeString(raw) + if err != nil { + return nil, err + } l := new(provider.Lock) - err := json.Unmarshal([]byte(raw), l) + err = json.Unmarshal(data, l) if err != nil { return nil, err }