|
@@ -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
|
|
|
}
|
|
|
|