Browse Source

auto update script executed

Toby Chui 1 year ago
parent
commit
bc7ddd8141
2 changed files with 6 additions and 12 deletions
  1. 5 11
      mod/ganserv/authkey.go
  2. 1 1
      start.go

+ 5 - 11
mod/ganserv/authkey.go

@@ -1,8 +1,7 @@
 package ganserv
 
 import (
-	"bufio"
-	"fmt"
+	"errors"
 	"log"
 	"os"
 	"os/exec"
@@ -11,13 +10,13 @@ import (
 	"strings"
 )
 
-func TryLoadorAskUserForAuthkey() string {
+func TryLoadorAskUserForAuthkey() (string, error) {
 	//Check for zt auth token
 	value, exists := os.LookupEnv("ZT_AUTH")
 	if !exists {
 		log.Println("Environment variable ZT_AUTH not defined. Trying to load authtoken from file.")
 	} else {
-		return value
+		return value, nil
 	}
 
 	authKey := ""
@@ -63,14 +62,10 @@ func TryLoadorAskUserForAuthkey() string {
 	authKey = strings.TrimSpace(authKey)
 
 	if authKey == "" {
-		//Ask user for input
-		reader := bufio.NewReader(os.Stdin)
-		fmt.Println("Please enter the Zerotier authtoken manually: ")
-		input, _ := reader.ReadString('\n')
-		return strings.TrimSpace(input)
+		return "", errors.New("Unable to load authkey from file")
 	}
 
-	return ""
+	return authKey, nil
 }
 
 //Use sudo to read auth token on linux like systems
@@ -80,7 +75,6 @@ func readAuthTokenAsRoot() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	fmt.Println("CMDOUTPUT", string(output))
 	return string(output), nil
 }
 

+ 1 - 1
start.go

@@ -132,7 +132,7 @@ func startupSequence() {
 	//Create GAN Manager
 	usingZtAuthToken := *ztAuthToken
 	if usingZtAuthToken == "" {
-		usingZtAuthToken = ganserv.TryLoadorAskUserForAuthkey()
+		usingZtAuthToken, err = ganserv.TryLoadorAskUserForAuthkey()
 	}
 	ganManager = ganserv.NewNetworkManager(&ganserv.NetworkManagerOptions{
 		AuthToken: usingZtAuthToken,