Merge c870860 into b941e98

Makefile

@@ -36,13 +36,14 @@ openapi:
 	mailchain/goswagger-tool swagger generate spec -b ./cmd/mailchain/internal/http/handlers -o ./docs/openapi/spec.json
 
 	echo "" >>  ./docs/openapi/spec.json
-
+    echo "// nolint: gofmt" > ./docs/openapi/spec.json
 	echo "package handlers" >  ./cmd/mailchain/internal/http/handlers/openapi.go
 	echo "" >>  ./cmd/mailchain/internal/http/handlers/openapi.go
 	echo "// nolint: lll" >>  ./cmd/mailchain/internal/http/handlers/openapi.go
+	echo "// nolint: funlen" >>  ./cmd/mailchain/internal/http/handlers/openapi.go
 	echo 'func spec() string {' >>  ./cmd/mailchain/internal/http/handlers/openapi.go
 	echo '  return `' >>  ./cmd/mailchain/internal/http/handlers/openapi.go
-	cat  ./docs/openapi/spec.json >>  ./cmd/mailchain/internal/http/handlers/openapi.go
+	cat ./docs/openapi/spec.json | sed 's/`/``/g' >>  ./cmd/mailchain/internal/http/handlers/openapi.go
 	echo '`' >>  ./cmd/mailchain/internal/http/handlers/openapi.go
 	echo '}' >>  ./cmd/mailchain/internal/http/handlers/openapi.go
 	addlicense -l apache -c Finobo ./cmd/mailchain/internal/http/handlers/openapi.go	

cmd/mailchain/commands/commandstest/test_util.go

@@ -9,10 +9,11 @@ import (
 )
 
 func ExecuteCommandC(root *cobra.Command, args []string, flags map[string]string) (c *cobra.Command, output string, err error) {
-	buf := new(bytes.Buffer)
 	if err := root.ValidateArgs(args); err != nil {
 		return nil, "", err
 	}
+	buf := new(bytes.Buffer)
+
 	root.SetOutput(buf)
 	root.SetArgs(args)
 	for x := range flags {
@@ -24,15 +25,14 @@ func ExecuteCommandC(root *cobra.Command, args []string, flags map[string]string
 }
 
 func AssertCommandOutput(t *testing.T, cmd *cobra.Command, err error, out, wantOutput string) bool {
-	assert := assert.New(t)
 	if err == nil {
-		if !assert.Equal(wantOutput, out) {
+		if !assert.Equal(t, wantOutput, out) {
 			t.Errorf("cmd().Execute().out = %v, want %v", out, wantOutput)
 			return false
 		}
 	}
 	if err != nil {
-		if !assert.Equal(wantOutput+"\n"+cmd.UsageString()+"\n", out) {
+		if !assert.Equal(t, wantOutput+"\n"+cmd.UsageString()+"\n", out) {
 			t.Errorf("cmd().Execute().out = %v, want %v", out, wantOutput)
 			return false
 		}

cmd/mailchain/internal/http/config.go

@@ -22,7 +22,7 @@ type config struct {
 }
 
 // nolint: gocyclo
-func produceConfig(s *settings.Base) (*config, error) {
+func produceConfig(s *settings.Base) (*config, error) { // nolint: funlen
 	mailboxStore, err := s.MailboxState.Produce()
 	if err != nil {
 		return nil, errors.WithMessage(err, "Could not config mailbox store")

cmd/mailchain/internal/http/handlers/messages.go

@@ -32,6 +32,7 @@ import (
 )
 
 // nolint: gocyclo
+// nolint: funlen
 // GetMessages returns a handler get spec
 func GetMessages(inbox stores.State, receivers map[string]mailbox.Receiver, ks keystore.Store,
 	deriveKeyOptions multi.OptionsBuilders) func(w http.ResponseWriter, r *http.Request) {

cmd/mailchain/internal/http/handlers/send_message.go

@@ -39,7 +39,7 @@ import (
 
 // SendMessage handler http
 func SendMessage(sent stores.Sent, senders map[string]sender.Message, ks keystore.Store,
-	deriveKeyOptions multi.OptionsBuilders) func(w http.ResponseWriter, r *http.Request) {
+	deriveKeyOptions multi.OptionsBuilders) func(w http.ResponseWriter, r *http.Request) { // nolint: funlen
 	encrypter := aes256cbc.NewEncrypter()
 	// Post swagger:route POST /messages Send SendMessage
 	//
@@ -104,7 +104,6 @@ func SendMessage(sent stores.Sent, senders map[string]sender.Message, ks keystor
 		}
 
 		w.WriteHeader(http.StatusOK)
-		return
 	}
 }
 

cmd/mailchain/internal/http/server.go

@@ -102,6 +102,7 @@ func SetupFlags(cmd *cobra.Command) error {
 
 func CreateNegroni(config *settings.Server, router http.Handler) *negroni.Negroni {
 	n := negroni.New()
+
 	if !config.CORS.Disabled.Get() {
 		n.Use(cors.New(cors.Options{
 			AllowedOrigins: config.CORS.AllowedOrigins.Get(),

cmd/mailchain/internal/prompts/secret.go

@@ -21,7 +21,7 @@ func Secret(suppliedSecret, prePromptNote, promptLabel string, allowEmpty, confi
 
 func secretFromPrompt(promptLabel string, confirmPrompt bool) (string, error) {
 	prompt := promptui.Prompt{
-		Label: fmt.Sprintf("%s", promptLabel),
+		Label: promptLabel,
 		Mask:  '*',
 	}
 	secret, err := prompt.Run()

cmd/mailchain/internal/prompts/select.go

@@ -29,6 +29,7 @@ func SelectItemSkipable(label string, items []string, skipable bool) (selected s
 	if skipable {
 		items = append([]string{"skip"}, items...)
 	}
+
 	prompt := promptui.Select{
 		Label: label,
 		Items: items,

cmd/mailchain/internal/settings/base.go

@@ -7,6 +7,7 @@ import (
 	"github.com/mailchain/mailchain/cmd/mailchain/internal/settings/output"
 	"github.com/mailchain/mailchain/cmd/mailchain/internal/settings/values"
 	"github.com/mailchain/mailchain/internal/protocols"
+
 	"github.com/mailchain/mailchain/internal/protocols/ethereum"
 	"github.com/mailchain/mailchain/internal/protocols/substrate"
 )

cmd/mailchain/internal/settings/defaults/networks.go

@@ -13,8 +13,8 @@ type NetworkDefaults struct {
 	Disabled              bool
 }
 
-func EthereumNetworkAny() NetworkDefaults {
-	return NetworkDefaults{
+func EthereumNetworkAny() *NetworkDefaults {
+	return &NetworkDefaults{
 		NameServiceAddress:    NameServiceAddressKind,
 		NameServiceDomainName: NameServiceDomainNameKind,
 		PublicKeyFinder:       mailchain.ClientEtherscanNoAuth,
@@ -24,8 +24,8 @@ func EthereumNetworkAny() NetworkDefaults {
 	}
 }
 
-func SubstrateNetworkAny() NetworkDefaults {
-	return NetworkDefaults{
+func SubstrateNetworkAny() *NetworkDefaults {
+	return &NetworkDefaults{
 		// NameServiceAddress:    NameServiceAddressKind,
 		// NameServiceDomainName: NameServiceDomainNameKind,
 		PublicKeyFinder: SubstratePublicKeyFinder,

cmd/mailchain/internal/settings/network.go

@@ -11,7 +11,7 @@ import (
 	"github.com/mailchain/mailchain/sender"
 )
 
-func network(s values.Store, protocol, network string, nd defaults.NetworkDefaults) *Network {
+func network(s values.Store, protocol, network string, nd *defaults.NetworkDefaults) *Network {
 	k := &Network{
 		kind:     network,
 		protocol: protocol,

cmd/mailchain/internal/settings/network_test.go

@@ -18,7 +18,7 @@ func Test_network(t *testing.T) {
 		s        values.Store
 		protocol string
 		network  string
-		nd       defaults.NetworkDefaults
+		nd       *defaults.NetworkDefaults
 	}
 	tests := []struct {
 		name                      string

cmd/relay/relayer/relay.go

@@ -22,6 +22,7 @@ func (f RelayFunc) HandleRequest(w http.ResponseWriter, req *http.Request) {
 		errs.JSONWriter(w, http.StatusBadGateway, err)
 		return
 	}
+
 	defer resp.Body.Close()
 	copyHeader(resp.Header, w.Header())
 	w.WriteHeader(resp.StatusCode)

crypto/cipher/nacl/decrypter.go

@@ -0,0 +1,21 @@
+package nacl
+
+import (
+	"github.com/mailchain/mailchain/crypto"
+	"github.com/mailchain/mailchain/crypto/cipher"
+)
+
+// NewDecrypter create a new decrypter attaching the private key to it
+func NewDecrypter(privateKey crypto.PrivateKey) Decrypter {
+	return Decrypter{privateKey: privateKey}
+}
+
+// Decrypter will decrypt data using AES256CBC method
+type Decrypter struct {
+	privateKey crypto.PrivateKey
+}
+
+// Decrypt data using recipient private key with AES in CBC mode.
+func (d Decrypter) Decrypt(data cipher.EncryptedContent) (cipher.PlainContent, error) {
+	return easyOpen(data, d.privateKey.Bytes())
+}

crypto/cipher/nacl/decrypter_test.go

@@ -0,0 +1,83 @@
+package nacl
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/mailchain/mailchain/crypto"
+	"github.com/mailchain/mailchain/crypto/cipher"
+	"github.com/mailchain/mailchain/crypto/ed25519/ed25519test"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewDecrypter(t *testing.T) {
+	type args struct {
+		privateKey crypto.PrivateKey
+	}
+	tests := []struct {
+		name string
+		args args
+		want Decrypter
+	}{
+		{
+			"success",
+			args{
+				ed25519test.CharlottePrivateKey,
+			},
+			Decrypter{
+				privateKey: ed25519test.CharlottePrivateKey,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := NewDecrypter(tt.args.privateKey); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewDecrypter() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestDecrypter_Decrypt(t *testing.T) {
+	assert := assert.New(t)
+	type fields struct {
+		privateKey crypto.PrivateKey
+	}
+	type args struct {
+		data cipher.EncryptedContent
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    cipher.PlainContent
+		wantErr bool
+	}{
+		{
+			"success-charlotte",
+			fields{
+				ed25519test.CharlottePrivateKey,
+			},
+			args{
+				cipher.EncryptedContent{0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x5b, 0x19, 0x83, 0xe5, 0x6e, 0x7f, 0xed, 0xfe, 0xbb, 0xd0, 0x70, 0x34, 0xce, 0x25, 0x49, 0x76, 0xa3, 0x50, 0x78, 0x91, 0x18, 0xe6, 0xe3},
+			},
+			cipher.PlainContent{0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65},
+			false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			d := Decrypter{
+				privateKey: tt.fields.privateKey,
+			}
+			got, err := d.Decrypt(tt.args.data)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Decrypter.Decrypt() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !assert.Equal(tt.want, got) {
+				t.Errorf("Decrypter.Decrypt() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

crypto/cipher/nacl/encrypter.go

@@ -0,0 +1,38 @@
+package nacl
+
+import (
+	"crypto/rand"
+	"io"
+
+	"github.com/mailchain/mailchain/crypto"
+	"github.com/mailchain/mailchain/crypto/cipher"
+	"github.com/mailchain/mailchain/crypto/ed25519"
+	"github.com/pkg/errors"
+)
+
+// NewEncrypter create a new encrypter with crypto rand for reader
+func NewEncrypter() Encrypter {
+	return Encrypter{rand: rand.Reader}
+}
+
+// Encrypter will encrypt data using AES256CBC method
+type Encrypter struct {
+	rand io.Reader
+}
+
+func (e Encrypter) Encrypt(recipientPublicKey crypto.PublicKey, message cipher.PlainContent) (cipher.EncryptedContent, error) {
+	if err := validatePublicKeyType(recipientPublicKey); err != nil {
+		return nil, err
+	}
+
+	return easySeal(message, recipientPublicKey.Bytes(), e.rand)
+}
+
+func validatePublicKeyType(recipientPublicKey crypto.PublicKey) error {
+	switch recipientPublicKey.(type) {
+	case ed25519.PublicKey:
+		return nil
+	default:
+		return errors.Errorf("invalid public key type for nacl encryption")
+	}
+}