From 8702e309aed34b4ca72f173b634244da1233c255 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 13:14:51 -0700
Subject: [PATCH] Fix bug in default config / user config merging: Some arrays
 should be replaced while others should be merged

---
 core/config.js | 48 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/core/config.js b/core/config.js
index 97091be5..3799d538 100644
--- a/core/config.js
+++ b/core/config.js
@@ -42,17 +42,53 @@ function hasMessageConferenceAndArea(config) {
     return result;
 }
 
+const ArrayReplaceKeyPaths = [
+    'loginServers.ssh.algorithms.kex',
+    'loginServers.ssh.algorithms.cipher',
+    'loginServers.ssh.algorithms.hmac',
+    'loginServers.ssh.algorithms.compress',
+];
+
+const ArrayReplaceKeys = [
+    'args',
+    'sendArgs', 'recvArgs', 'recvArgsNonBatch',
+];
+
 function mergeValidateAndFinalize(config, cb) {
+    const defaultConfig = getDefaultConfig();
+
+    const arrayReplaceKeyPathsMutable = _.clone(ArrayReplaceKeyPaths);
+    const shouldReplaceArray = (arr, key) => {
+        if(ArrayReplaceKeys.includes(key)) {
+            return true;
+        }
+        for(let i = 0; i < arrayReplaceKeyPathsMutable.length; ++i) {
+            const o = _.get(defaultConfig, arrayReplaceKeyPathsMutable[i]);
+            if(_.isEqual(o, arr)) {
+                arrayReplaceKeyPathsMutable.splice(i, 1);
+                return true;
+            }
+        }
+        return false;
+    };
+
     async.waterfall(
         [
             function mergeWithDefaultConfig(callback) {
                 const mergedConfig = _.mergeWith(
-                    getDefaultConfig(),
-                    config, (conf1, conf2) => {
-                        //  Arrays should always concat
-                        if(_.isArray(conf1)) {
-                            //  :TODO: look for collisions & override dupes
-                            return conf1.concat(conf2);
+                    defaultConfig,
+                    config,
+                    (defConfig, userConfig, key) => {
+                        if(Array.isArray(defConfig) && Array.isArray(userConfig)) {
+                            //
+                            //  Arrays are special: Some we merge, while others
+                            //  we simply replace.
+                            //
+                            if(shouldReplaceArray(defConfig, key)) {
+                                return userConfig;
+                            } else {
+                                return _.uniq(defConfig.concat(userConfig));
+                            }
                         }
                     }
                 );