Merge pull request #42 from TRON-US/v0.5.3

BTFS-1971 Ensure config show and config set cannot read or change user wallet credentials

identity.go

@@ -8,12 +8,18 @@ import (
 
 const IdentityTag = "Identity"
 const PrivKeyTag = "PrivKey"
+const MnemonicTag = "Mnemonic"
+const Password = "Password"
 const PrivKeySelector = IdentityTag + "." + PrivKeyTag
+const MnemonicSelector = IdentityTag + "." + MnemonicTag
+const PasswordSelector = IdentityTag + "." + Password
 
 // Identity tracks the configuration of the local node's identity.
 type Identity struct {
-	PeerID  string
-	PrivKey string `json:",omitempty"`
+	PeerID   string
+	PrivKey  string `json:",omitempty"`
+	Mnemonic string `json:",omitempty"`
+	Password string `json:",omitempty"`
 }
 
 // DecodePrivateKey is a helper to decode the users PrivateKey

init.go

@@ -14,8 +14,8 @@ import (
 	peer "github.com/libp2p/go-libp2p-core/peer"
 )
 
-func Init(out io.Writer, nBitsForKeypair int, keyType string, importKey string, rmOnUnpin bool) (*Config, error) {
-	identity, err := identityConfig(out, nBitsForKeypair, keyType, importKey)
+func Init(out io.Writer, nBitsForKeypair int, keyType string, importKey string, mnemonic string, rmOnUnpin bool) (*Config, error) {
+	identity, err := identityConfig(out, nBitsForKeypair, keyType, importKey, mnemonic)
 	if err != nil {
 		return nil, err
 	}
@@ -246,7 +246,7 @@ func DefaultServicesConfigTestnet() Services {
 }
 
 // identityConfig initializes a new identity.
-func identityConfig(out io.Writer, nbits int, keyType string, importKey string) (Identity, error) {
+func identityConfig(out io.Writer, nbits int, keyType string, importKey string, mnemonic string) (Identity, error) {
 	// TODO guard higher up
 	ident := Identity{}
 
@@ -298,6 +298,7 @@ func identityConfig(out io.Writer, nbits int, keyType string, importKey string)
 		return ident, err
 	}
 	ident.PrivKey = base64.StdEncoding.EncodeToString(skbytes)
+	ident.Mnemonic = mnemonic
 
 	id, err := peer.IDFromPublicKey(pk)
 	if err != nil {