Merge pull request #299 from manifoldco/fix-value-ref-in-cred-set

Fix bug copying same value for each cred
manifoldco · Oct 28, 2017 · 97654b2 · 97654b2
2 parents a23f4cd + 0500955
commit 97654b2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/cmd/import.go b/cmd/import.go
@@ -50,9 +50,11 @@ func importCmd(ctx *cli.Context) error {
 
 	makers := valueMakers{}
 	for _, secret := range secrets {
-		makers[secret.key] = func() *apitypes.CredentialValue {
-			return apitypes.NewStringCredentialValue(secret.value)
-		}
+		makers[secret.key] = func(value string) valueMaker {
+			return func() *apitypes.CredentialValue {
+				return apitypes.NewStringCredentialValue(value)
+			}
+		}(secret.value)
 	}
 
 	creds, err := setCredentials(ctx, path, makers)

diff --git a/cmd/set.go b/cmd/set.go
@@ -155,7 +155,8 @@ func determinePathFromFlags(ctx *cli.Context) (*pathexp.PathExp, error) {
 	)
 }
 
-type valueMakers map[string](func() *apitypes.CredentialValue)
+type valueMaker func() *apitypes.CredentialValue
+type valueMakers map[string]valueMaker
 
 func setCredentials(ctx *cli.Context, pe *pathexp.PathExp, makers valueMakers) ([]apitypes.CredentialEnvelope, error) {
 	cfg, err := config.LoadConfig()

diff --git a/daemon/logic/engine.go b/daemon/logic/engine.go
@@ -173,7 +173,7 @@ func (e *Engine) AppendCredentials(ctx context.Context, notifier *observer.Notif
 		// Derive a key for the credential using the keyring master key
 		// and use the derived key to encrypt the credential
 		cekNonce, ctNonce, ct, err := e.crypto.BoxCredential(
-			ctx, []byte(cred.Body.Value), *mekshare.Key.Value, *mekshare.Key.Nonce,
+			ctx, []byte(c.Body.Value), *mekshare.Key.Value, *mekshare.Key.Nonce,
 			&kp.Encryption, *encryptingKey.Key.Value)
 		if err != nil {
 			log.Printf("Error encrypting credential: %s", err)