Fix: crash when authenticator is nil

flexboy · Jun 27, 2019 · 53528f8 · 53528f8
1 parent 1c792b4
commit 53528f8
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/hub/executor/executor.go b/hub/executor/executor.go
@@ -35,15 +35,22 @@ func ApplyConfig(cfg *config.Config, force bool) {
 
 func GetGeneral() *config.General {
 	ports := P.GetPorts()
-	return &config.General{
+	authenticator := []string{}
+	if auth := authStore.Authenticator(); auth != nil {
+		authenticator = auth.Users()
+	}
+
+	general := &config.General{
 		Port:           ports.Port,
 		SocksPort:      ports.SocksPort,
 		RedirPort:      ports.RedirPort,
-		Authentication: authStore.Authenticator().Users(),
+		Authentication: authenticator,
 		AllowLan:       P.AllowLan(),
 		Mode:           T.Instance().Mode(),
 		LogLevel:       log.Level(),
 	}
+
+	return general
 }
 
 func updateExperimental(c *config.Experimental) {