unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 324 Wiki Activity

rename Codec to Secrets (#1581)

Browse Source
This commit is contained in:
Asim Aslam
2020-04-27 14:57:57 +01:00
committed by GitHub
parent 434997e676
commit 83ab47333f
5 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/secrets/secretbox/secretbox.go
View File

@@ -18,8 +18,8 @@ type secretBox struct {
secretKey [keyLength]byte
}
// NewCodec returns a secretbox codec
func NewCodec(opts ...secrets.Option) secrets.Codec {
// NewSecrets returns a secretbox codec
func NewSecrets(opts ...secrets.Option) secrets.Secrets {
sb := &secretBox{}
for _, o := range opts {
o(&sb.options)
@@ -31,13 +31,13 @@ func (s *secretBox) Init(opts ...secrets.Option) error {
for _, o := range opts {
o(&s.options)
}
if len(s.options.SecretKey) == 0 {
if len(s.options.Key) == 0 {
return errors.New("no secret key is defined")
}
if len(s.options.SecretKey) != keyLength {
if len(s.options.Key) != keyLength {
return errors.Errorf("secret key must be %d bytes long", keyLength)
}
copy(s.secretKey[:], s.options.SecretKey)
copy(s.secretKey[:], s.options.Key)
return nil
}

8
config/secrets/secretbox/secretbox_test.go
View File

@@ -14,21 +14,21 @@ func TestSecretBox(t *testing.T) {
t.Fatal(err)
}
s := NewCodec()
s := NewSecrets()
if err := s.Init(); err == nil {
t.Error("Secretbox accepted an empty secret key")
}
if err := s.Init(secrets.SecretKey([]byte("invalid"))); err == nil {
if err := s.Init(secrets.Key([]byte("invalid"))); err == nil {
t.Error("Secretbox accepted a secret key that is invalid")
}
if err := s.Init(secrets.SecretKey(secretKey)); err != nil {
if err := s.Init(secrets.Key(secretKey)); err != nil {
t.Fatal(err)
}
o := s.Options()
if !reflect.DeepEqual(o.SecretKey, secretKey) {
if !reflect.DeepEqual(o.Key, secretKey) {
t.Error("Init() didn't set secret key correctly")
}
if s.String() != "nacl-secretbox" {