wip: berty bot experiments

.gitignore

@@ -21,6 +21,7 @@ debug.log
 /js/*.db.d
 tool/deployments/*/data
 node_modules
+.idea/
 
 # Go CMD's build output
 go/cmd/berty/berty

go/cmd/berty/groupinit.go

@@ -10,7 +10,7 @@ import (
 	qrterminal "github.com/mdp/qrterminal/v3"
 	"github.com/peterbourgon/ff/v3/ffcli"
 
-	"berty.tech/berty/v2/go/internal/bertylinks"
+	"berty.tech/berty/v2/go/pkg/bertylinks"
 	"berty.tech/berty/v2/go/pkg/bertyprotocol"
 	"berty.tech/berty/v2/go/pkg/messengertypes"
 )

go/cmd/berty/mini/utils.go

@@ -4,7 +4,7 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"berty.tech/berty/v2/go/internal/bertylinks"
+	"berty.tech/berty/v2/go/pkg/bertylinks"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/protocoltypes"
 )

go/cmd/berty/mini/view_group.go

@@ -48,7 +48,7 @@ func (v *groupView) View() tview.Primitive {
 func (v *groupView) commandParser(ctx context.Context, input string) error {
 	input = strings.TrimSpace(input)
 
-	if len(input) > 0 && input[0] == '/' {
+	if len(input) > 1 && input[0] == '/' && input[1] != '/' {
 		for _, attrs := range commandList() {
 			if prefix := fmt.Sprintf("/%s", attrs.title); strings.HasPrefix(strings.ToLower(input), prefix) {
 				if !attrs.hideInLog {

go/cmd/berty/mini/view_group_outgoing.go

@@ -20,7 +20,7 @@ import (
 	"github.com/mdp/qrterminal/v3"
 	"moul.io/godev"
 
-	"berty.tech/berty/v2/go/internal/bertylinks"
+	"berty.tech/berty/v2/go/pkg/bertylinks"
 	"berty.tech/berty/v2/go/pkg/bertyvcissuer"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/messengertypes"
@@ -959,6 +959,11 @@ func newMessageCommand(ctx context.Context, v *groupView, cmd string) error {
 		return nil
 	}
 
+	// check for '/' messages
+	if strings.HasPrefix(cmd, "//") {
+		cmd = cmd[1:]
+	}
+
 	payload, err := proto.Marshal(&messengertypes.AppMessage_UserMessage{
 		Body: cmd,
 	})

go/cmd/berty/push.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/peterbourgon/ff/v3/ffcli"
 
-	"berty.tech/berty/v2/go/internal/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/authtypes"
 	"berty.tech/berty/v2/go/pkg/bertypushrelay"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/pushtypes"
 )
 

go/cmd/berty/servicekey.go

@@ -11,7 +11,7 @@ import (
 	"github.com/libp2p/go-libp2p-core/crypto"
 	"github.com/peterbourgon/ff/v3/ffcli"
 
-	"berty.tech/berty/v2/go/internal/cryptoutil"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 )
 

go/cmd/welcomebot/main.go

@@ -25,7 +25,7 @@ import (
 	"moul.io/u"
 	"moul.io/zapconfig"
 
-	"berty.tech/berty/v2/go/internal/bertylinks"
+	"berty.tech/berty/v2/go/pkg/bertylinks"
 	"berty.tech/berty/v2/go/pkg/bertyversion"
 	"berty.tech/berty/v2/go/pkg/messengertypes"
 )

go/internal/accountutils/utils.go

@@ -22,9 +22,9 @@ import (
 	"gorm.io/gorm"
 	"moul.io/zapgorm2"
 
-	"berty.tech/berty/v2/go/internal/cryptoutil"
 	"berty.tech/berty/v2/go/internal/logutil"
 	"berty.tech/berty/v2/go/pkg/accounttypes"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	encrepo "berty.tech/go-ipfs-repo-encrypted"
 )

go/internal/cryptoutil/attachment_crypto.go

@@ -15,6 +15,7 @@ import (
 	"golang.org/x/crypto/sha3"
 
 	"berty.tech/berty/v2/go/internal/streamutil"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/protocoltypes"
 )
@@ -36,7 +37,7 @@ type attachmentCipher struct {
 }
 
 func attachmentNewCipher(sk libp2pcrypto.PrivKey) (*attachmentCipher, error) {
-	key, err := SeedFromEd25519PrivateKey(sk)
+	key, err := cryptoutil.SeedFromEd25519PrivateKey(sk)
 	if err != nil {
 		return nil, errcode.ErrInvalidInput.Wrap(err)
 	}
@@ -128,35 +129,35 @@ func attachmentKeyUnmarshal(s []byte) (libp2pcrypto.PrivKey, error) {
 
 // - CID ENCRYPTION
 
-func attachmentCIDEncryptionKey(source *[KeySize]byte) (*[KeySize]byte, error) {
+func attachmentCIDEncryptionKey(source *[cryptoutil.KeySize]byte) (*[cryptoutil.KeySize]byte, error) {
 	hkdf := hkdf.New(sha3.New256, source[:], nil, []byte("cid encryption v0"))
 
-	var key [KeySize]byte
+	var key [cryptoutil.KeySize]byte
 	if _, err := io.ReadFull(hkdf, key[:]); err != nil {
 		return nil, errcode.ErrStreamRead.Wrap(err)
 	}
 
 	return &key, nil
 }
 
-func attachmentCIDEncrypt(sk *[KeySize]byte, cid []byte) ([]byte, error) {
-	nonce, err := GenerateNonce()
+func attachmentCIDEncrypt(sk *[cryptoutil.KeySize]byte, cid []byte) ([]byte, error) {
+	nonce, err := cryptoutil.GenerateNonce()
 	if err != nil {
 		return nil, errcode.ErrCryptoNonceGeneration.Wrap(err)
 	}
 
 	return append(nonce[:], secretbox.Seal(nil, cid, nonce, sk)...), nil
 }
 
-func attachmentCIDDecrypt(sk *[KeySize]byte, eCID []byte) ([]byte, error) {
-	if len(eCID) <= NonceSize {
-		return nil, errcode.ErrInvalidInput.Wrap(fmt.Errorf("encrypted cid too small, got %v, expected to be > %v", len(eCID), NonceSize))
+func attachmentCIDDecrypt(sk *[cryptoutil.KeySize]byte, eCID []byte) ([]byte, error) {
+	if len(eCID) <= cryptoutil.NonceSize {
+		return nil, errcode.ErrInvalidInput.Wrap(fmt.Errorf("encrypted cid too small, got %v, expected to be > %v", len(eCID), cryptoutil.NonceSize))
 	}
 
-	var nonce [NonceSize]byte
-	_ = copy(nonce[:], eCID[:NonceSize])
+	var nonce [cryptoutil.NonceSize]byte
+	_ = copy(nonce[:], eCID[:cryptoutil.NonceSize])
 
-	cid, ok := secretbox.Open(nil, eCID[NonceSize:], &nonce, sk)
+	cid, ok := secretbox.Open(nil, eCID[cryptoutil.NonceSize:], &nonce, sk)
 	if !ok {
 		return nil, errcode.ErrCryptoDecrypt
 	}

go/internal/cryptoutil/group.go

@@ -8,6 +8,7 @@ import (
 	"golang.org/x/crypto/hkdf"
 	"golang.org/x/crypto/sha3"
 
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 )
 
@@ -23,8 +24,8 @@ type GroupWithLinkKey interface {
 	GetLinkKey() []byte
 }
 
-func ComputeLinkKey(publicKey, secret []byte) (*[KeySize]byte, error) {
-	arr := [KeySize]byte{}
+func ComputeLinkKey(publicKey, secret []byte) (*[cryptoutil.KeySize]byte, error) {
+	arr := [cryptoutil.KeySize]byte{}
 
 	kdf := hkdf.New(sha3.New256, secret, nil, publicKey)
 	if _, err := io.ReadFull(kdf, arr[:]); err != nil {
@@ -34,9 +35,9 @@ func ComputeLinkKey(publicKey, secret []byte) (*[KeySize]byte, error) {
 	return &arr, nil
 }
 
-func GetLinkKeyArray(m GroupWithLinkKey) (*[KeySize]byte, error) {
-	if len(m.GetLinkKey()) == KeySize {
-		arr := [KeySize]byte{}
+func GetLinkKeyArray(m GroupWithLinkKey) (*[cryptoutil.KeySize]byte, error) {
+	if len(m.GetLinkKey()) == cryptoutil.KeySize {
+		arr := [cryptoutil.KeySize]byte{}
 
 		for i, c := range m.GetLinkKey() {
 			arr[i] = c
@@ -48,8 +49,8 @@ func GetLinkKeyArray(m GroupWithLinkKey) (*[KeySize]byte, error) {
 	return ComputeLinkKey(m.GetPublicKey(), m.GetSecret())
 }
 
-func GetSharedSecret(m GroupWithLinkKey) *[KeySize]byte {
-	sharedSecret := [KeySize]byte{}
+func GetSharedSecret(m GroupWithLinkKey) *[cryptoutil.KeySize]byte {
+	sharedSecret := [cryptoutil.KeySize]byte{}
 	copy(sharedSecret[:], m.GetSecret())
 
 	return &sharedSecret
@@ -60,7 +61,7 @@ func GetGroupPushSecret(m GroupWithSecret) ([]byte, error) {
 		return nil, errcode.ErrInvalidInput.Wrap(fmt.Errorf("no secret known for group"))
 	}
 
-	arr := [KeySize]byte{}
+	arr := [cryptoutil.KeySize]byte{}
 
 	kdf := hkdf.New(sha3.New256, m.GetSecret(), nil, []byte(PushSecretNamespace))
 	if _, err := io.ReadFull(kdf, arr[:]); err != nil {
@@ -71,7 +72,7 @@ func GetGroupPushSecret(m GroupWithSecret) ([]byte, error) {
 }
 
 func CreatePushGroupReference(sender []byte, counter uint64, secret []byte) ([]byte, error) {
-	arr := [KeySize]byte{}
+	arr := [cryptoutil.KeySize]byte{}
 
 	buf := make([]byte, 8)
 	binary.BigEndian.PutUint64(buf, counter)

go/internal/cryptoutil/group_store.go

@@ -14,6 +14,7 @@ import (
 	"golang.org/x/crypto/hkdf"
 
 	"berty.tech/berty/v2/go/internal/datastoreutil"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/protocoltypes"
 )
@@ -136,7 +137,7 @@ func GetGroupForContact(contactPairSK crypto.PrivKey) (*protocoltypes.Group, err
 		return nil, errcode.ErrSerialization.Wrap(err)
 	}
 
-	signingBytes, err := SeedFromEd25519PrivateKey(groupSecretSK)
+	signingBytes, err := cryptoutil.SeedFromEd25519PrivateKey(groupSecretSK)
 	if err != nil {
 		return nil, errcode.ErrSerialization.Wrap(err)
 	}
@@ -155,7 +156,7 @@ func GetGroupForAccount(priv, signing crypto.PrivKey) (*protocoltypes.Group, err
 		return nil, errcode.ErrSerialization.Wrap(err)
 	}
 
-	signingBytes, err := SeedFromEd25519PrivateKey(signing)
+	signingBytes, err := cryptoutil.SeedFromEd25519PrivateKey(signing)
 	if err != nil {
 		return nil, errcode.ErrSerialization.Wrap(err)
 	}

go/internal/cryptoutil/keystore_device.go

@@ -17,6 +17,7 @@ import (
 	"go.uber.org/zap"
 
 	"berty.tech/berty/v2/go/internal/logutil"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/protocoltypes"
 )
@@ -189,7 +190,7 @@ func (a *deviceKeystore) getOrComputeECDH(nameSpace string, pk crypto.PubKey, ow
 		return nil, err
 	}
 
-	skB, pkB, err := EdwardsToMontgomery(ownSK, pk)
+	skB, pkB, err := cryptoutil.EdwardsToMontgomery(ownSK, pk)
 	if err != nil {
 		return nil, err
 	}

go/internal/cryptoutil/keystore_message.go

@@ -12,6 +12,7 @@ import (
 	"github.com/libp2p/go-libp2p-core/crypto"
 	"golang.org/x/crypto/nacl/secretbox"
 
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/protocoltypes"
 )
@@ -316,7 +317,7 @@ func (m *MessageKeystore) getPrecomputedKey(ctx context.Context, groupPK, device
 		return nil, errcode.ErrMessageKeyPersistenceGet.Wrap(err)
 	}
 
-	keyArray, err := KeySliceToArray(key)
+	keyArray, err := cryptoutil.KeySliceToArray(key)
 	if err != nil {
 		return nil, errcode.ErrSerialization
 	}
@@ -514,7 +515,7 @@ func (m *MessageKeystore) GetKeyForCID(ctx context.Context, id cid.Cid) (*[32]by
 		return nil, errcode.ErrInvalidInput
 	}
 
-	keyArray, err := KeySliceToArray(key)
+	keyArray, err := cryptoutil.KeySliceToArray(key)
 	if err != nil {
 		return nil, errcode.ErrSerialization
 	}

go/internal/cryptoutil/keystore_message_utils.go

@@ -15,6 +15,7 @@ import (
 	"golang.org/x/crypto/hkdf"
 	"golang.org/x/crypto/nacl/secretbox"
 
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/protocoltypes"
 )
@@ -59,7 +60,7 @@ func SealEnvelope(payload []byte, ds *protocoltypes.DeviceSecret, deviceSK crypt
 		return nil, errcode.ErrSerialization.Wrap(err)
 	}
 
-	nonce, err := GenerateNonce()
+	nonce, err := cryptoutil.GenerateNonce()
 	if err != nil {
 		return nil, errcode.ErrCryptoNonceGeneration.Wrap(err)
 	}
@@ -91,7 +92,7 @@ func OpenEnvelopeHeaders(data []byte, g *protocoltypes.Group) (*protocoltypes.Me
 		return nil, nil, errcode.ErrDeserialization.Wrap(err)
 	}
 
-	nonce, err := NonceSliceToArray(env.Nonce)
+	nonce, err := cryptoutil.NonceSliceToArray(env.Nonce)
 	if err != nil {
 		return nil, nil, errcode.ErrSerialization.Wrap(err)
 	}

go/internal/handshake/handshake.go

@@ -8,7 +8,7 @@ import (
 	p2pcrypto "github.com/libp2p/go-libp2p-core/crypto"
 	"golang.org/x/crypto/nacl/box"
 
-	"berty.tech/berty/v2/go/internal/cryptoutil"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/tyber"
 )

go/internal/handshake/handshake_test.go

@@ -14,9 +14,9 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/crypto/nacl/box"
 
-	"berty.tech/berty/v2/go/internal/cryptoutil"
 	"berty.tech/berty/v2/go/internal/ipfsutil"
 	"berty.tech/berty/v2/go/internal/testutil"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 )
 

go/internal/handshake/request.go

@@ -9,7 +9,7 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/crypto/nacl/box"
 
-	"berty.tech/berty/v2/go/internal/cryptoutil"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/tyber"
 )

go/internal/handshake/response.go

@@ -9,7 +9,7 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/crypto/nacl/box"
 
-	"berty.tech/berty/v2/go/internal/cryptoutil"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/tyber"
 )

go/internal/initutil/node.go

@@ -24,6 +24,7 @@ import (
 	"berty.tech/berty/v2/go/internal/logutil"
 	"berty.tech/berty/v2/go/pkg/bertymessenger"
 	"berty.tech/berty/v2/go/pkg/bertyprotocol"
+	cryptoutil2 "berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/messengertypes"
 	"berty.tech/berty/v2/go/pkg/protocoltypes"
@@ -138,8 +139,8 @@ func (m *Manager) GetLocalProtocolServer() (bertyprotocol.Service, error) {
 	return m.getLocalProtocolServer()
 }
 
-func (m *Manager) getPushSecretKey() (*[cryptoutil.KeySize]byte, error) {
-	pushKey := &[cryptoutil.KeySize]byte{}
+func (m *Manager) getPushSecretKey() (*[cryptoutil2.KeySize]byte, error) {
+	pushKey := &[cryptoutil2.KeySize]byte{}
 	if m.Node.Protocol.DevicePushKeyPath != "" {
 		var err error
 

go/internal/omnisearch/berty-parser.go

@@ -1,7 +1,7 @@
 package omnisearch
 
 import (
-	"berty.tech/berty/v2/go/internal/bertylinks"
+	"berty.tech/berty/v2/go/pkg/bertylinks"
 	"berty.tech/berty/v2/go/pkg/messengertypes"
 )
 

go/pkg/bertyauth/auth_session.go

@@ -4,7 +4,7 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 
-	"berty.tech/berty/v2/go/internal/cryptoutil"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 )
 
 type AuthSession struct {

go/pkg/bertyauth/services_auth.go

@@ -14,8 +14,8 @@ import (
 	"google.golang.org/grpc/status"
 	"gopkg.in/square/go-jose.v2"
 
-	"berty.tech/berty/v2/go/internal/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/authtypes"
+	"berty.tech/berty/v2/go/pkg/cryptoutil"
 	"berty.tech/berty/v2/go/pkg/errcode"
 	"berty.tech/berty/v2/go/pkg/protocoltypes"
 )