Merge pull request #905 from ipfs/fix/trust-all

Fix: trust-all remained enabled always
ipfs-cluster · Aug 28, 2019 · a958d81 · a958d81
2 parents 1cfea47 + 8ca0f57
commit a958d81
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/consensus/crdt/config.go b/consensus/crdt/config.go
@@ -105,6 +105,10 @@ func (cfg *Config) LoadJSON(raw []byte) error {
 
 func (cfg *Config) applyJSONConfig(jcfg *jsonConfig) error {
 	config.SetIfNotDefault(jcfg.ClusterName, &cfg.ClusterName)
+
+	// Whenever we parse JSON, TrustAll is false unless an '*' peer exists
+	cfg.TrustAll = false
+
 	for _, p := range jcfg.TrustedPeers {
 		if p == "*" {
 			cfg.TrustAll = true

diff --git a/consensus/crdt/config_test.go b/consensus/crdt/config_test.go
@@ -18,8 +18,8 @@ func TestLoadJSON(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if cfg.TrustAll != DefaultTrustAll {
-		t.Error("expected TrustAll to be the default")
+	if cfg.TrustAll {
+		t.Error("TrustAll should not be enabled when peers in trusted peers")
 	}
 
 	cfg = &Config{}
@@ -36,6 +36,16 @@ func TestLoadJSON(t *testing.T) {
 	cfg = &Config{}
 	err = cfg.LoadJSON([]byte(`
 {
+    "cluster_name": "test",
+    "trusted_peers": []
+}`))
+	if cfg.TrustAll {
+		t.Error("TrustAll is only enabled with '*'")
+	}
+
+	cfg = &Config{}
+	err = cfg.LoadJSON([]byte(`
+{
     "cluster_name": "test",
     "trusted_peers": ["QmUZ13osndQ5uL4tPWHXe3iBgBgq9gfewcBMSCAuMBsDJ6", "*"]
 }`))