Merge pull request #801 from ersonp/remove-json-dmsgpty

Remove Config Whitelist dmsgpty
skycoin · Jun 8, 2021 · 37f0cd1 · 37f0cd1
2 parents 1b0c38d + a340041
commit 37f0cd1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/pkg/visor/init_unix.go b/pkg/visor/init_unix.go
@@ -34,15 +34,7 @@ func initDmsgpty(ctx context.Context, v *Visor, log *logging.Logger) error {
 		}
 	}
 
-	var wl dmsgpty.Whitelist
-	if conf.AuthFile == "" {
-		wl = dmsgpty.NewMemoryWhitelist()
-	} else {
-		var err error
-		if wl, err = dmsgpty.NewConfigWhitelist(v.conf.Dmsgpty.AuthFile); err != nil {
-			return err
-		}
-	}
+	wl := dmsgpty.NewMemoryWhitelist()
 
 	// Ensure hypervisors are added to the whitelist.
 	if err := wl.Add(v.conf.Hypervisors...); err != nil {

diff --git a/pkg/visor/visorconfig/config.go b/pkg/visor/visorconfig/config.go
@@ -71,10 +71,9 @@ func defaultConfigFromCommon(cc *Common, hypervisor bool) (*V1, error) {
 	conf := MakeBaseConfig(cc)
 
 	conf.Dmsgpty = &V1Dmsgpty{
-		Port:     skyenv.DmsgPtyPort,
-		AuthFile: skyenv.DefaultDmsgPtyWhitelist,
-		CLINet:   skyenv.DefaultDmsgPtyCLINet,
-		CLIAddr:  skyenv.DefaultDmsgPtyCLIAddr,
+		Port:    skyenv.DmsgPtyPort,
+		CLINet:  skyenv.DefaultDmsgPtyCLINet,
+		CLIAddr: skyenv.DefaultDmsgPtyCLIAddr,
 	}
 
 	conf.STCP = &snet.STCPConfig{
@@ -157,10 +156,9 @@ func MakePackageConfig(log *logging.MasterLogger, confPath string, sk *cipher.Se
 	}
 
 	conf.Dmsgpty = &V1Dmsgpty{
-		Port:     skyenv.DmsgPtyPort,
-		AuthFile: skyenv.PackageDmsgPtyWhiteList,
-		CLINet:   skyenv.DefaultDmsgPtyCLINet,
-		CLIAddr:  skyenv.DefaultDmsgPtyCLIAddr,
+		Port:    skyenv.DmsgPtyPort,
+		CLINet:  skyenv.DefaultDmsgPtyCLINet,
+		CLIAddr: skyenv.DefaultDmsgPtyCLIAddr,
 	}
 
 	conf.Transport.LogStore = &V1LogStore{

diff --git a/pkg/visor/visorconfig/v1.go b/pkg/visor/visorconfig/v1.go
@@ -61,10 +61,9 @@ type V1 struct {
 
 // V1Dmsgpty configures the dmsgpty-host.
 type V1Dmsgpty struct {
-	Port     uint16 `json:"port"`
-	AuthFile string `json:"authorization_file"`
-	CLINet   string `json:"cli_network"`
-	CLIAddr  string `json:"cli_address"`
+	Port    uint16 `json:"port"`
+	CLINet  string `json:"cli_network"`
+	CLIAddr string `json:"cli_address"`
 }
 
 // V1Transport defines a transport config.