From 494fefbdd681f8f266a92e012e9f053b4f5145ca Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Fri, 16 Oct 2020 08:20:04 -0700
Subject: [PATCH] [keystore_cli] parse values as JSON before adding to keystore

---
 src/cli_keystore/add.js                     | 10 +++++++++-
 src/cli_keystore/add.test.js                | 11 +++++++++++
 src/legacy/server/keystore/keystore.test.js |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/cli_keystore/add.js b/src/cli_keystore/add.js
index 232392f34c63b..d88256da1aa59 100644
--- a/src/cli_keystore/add.js
+++ b/src/cli_keystore/add.js
@@ -59,7 +59,15 @@ export async function add(keystore, key, options = {}) {
     value = await question(`Enter value for ${key}`, { mask: '*' });
   }
 
-  keystore.add(key, value.trim());
+  const parsedValue = value.trim();
+  let parsedJsonValue;
+  try {
+    parsedJsonValue = JSON.parse(parsedValue);
+  } catch {
+    // noop, only treat value as json if it parses as JSON
+  }
+
+  keystore.add(key, parsedJsonValue ?? parsedValue);
   keystore.save();
 }
 
diff --git a/src/cli_keystore/add.test.js b/src/cli_keystore/add.test.js
index f1adee8879bc2..ba381ca2f3e14 100644
--- a/src/cli_keystore/add.test.js
+++ b/src/cli_keystore/add.test.js
@@ -129,6 +129,17 @@ describe('Kibana keystore', () => {
       expect(keystore.data.foo).toEqual('bar');
     });
 
+    it('parses JSON values', async () => {
+      prompt.question.returns(Promise.resolve('["bar"]\n'));
+
+      const keystore = new Keystore('/data/test.keystore');
+      sandbox.stub(keystore, 'save');
+
+      await add(keystore, 'foo');
+
+      expect(keystore.data.foo).toEqual(['bar']);
+    });
+
     it('persists updated keystore', async () => {
       prompt.question.returns(Promise.resolve('bar\n'));
 
diff --git a/src/legacy/server/keystore/keystore.test.js b/src/legacy/server/keystore/keystore.test.js
index 0897ce55d086b..e35edd1859484 100644
--- a/src/legacy/server/keystore/keystore.test.js
+++ b/src/legacy/server/keystore/keystore.test.js
@@ -157,11 +157,13 @@ describe('Keystore', () => {
     it('adds a key/value pair', () => {
       const keystore = new Keystore('/data/unprotected.keystore');
       keystore.add('a3', 'baz');
+      keystore.add('a4', [1, 'a', 2, 'b']);
 
       expect(keystore.data).toEqual({
         'a1.b2.c3': 'foo',
         a2: 'bar',
         a3: 'baz',
+        a4: [1, 'a', 2, 'b'],
       });
     });
   });