diff --git a/src/cli/cli.go b/src/cli/cli.go index 38f2b5f..d4d010b 100644 --- a/src/cli/cli.go +++ b/src/cli/cli.go @@ -153,8 +153,8 @@ func setDebugLevel(c *cli.Context) { } } -func getSendConfigFile() string { - configFile, err := utils.GetConfigDir() +func getSendConfigFile(requireValidPath bool) string { + configFile, err := utils.GetConfigDir(requireValidPath) if err != nil { log.Error(err) return "" @@ -162,8 +162,8 @@ func getSendConfigFile() string { return path.Join(configFile, "send.json") } -func getReceiveConfigFile() (string, error) { - configFile, err := utils.GetConfigDir() +func getReceiveConfigFile(requireValidPath bool) (string, error) { + configFile, err := utils.GetConfigDir(requireValidPath) if err != nil { log.Error(err) return "", err @@ -228,7 +228,7 @@ func send(c *cli.Context) (err error) { } else if crocOptions.RelayAddress6 != models.DEFAULT_RELAY6 { crocOptions.RelayAddress = "" } - b, errOpen := os.ReadFile(getSendConfigFile()) + b, errOpen := os.ReadFile(getSendConfigFile(false)) if errOpen == nil && !c.Bool("remember") { var rememberedOptions croc.Options err = json.Unmarshal(b, &rememberedOptions) @@ -364,7 +364,7 @@ func makeTempFileWithString(s string) (fnames []string, err error) { func saveConfig(c *cli.Context, crocOptions croc.Options) { if c.Bool("remember") { - configFile := getSendConfigFile() + configFile := getSendConfigFile(true) log.Debug("saving config file") var bConfig []byte // if the code wasn't set, don't save it diff --git a/src/models/constants.go b/src/models/constants.go index 6e114e6..a185c92 100644 --- a/src/models/constants.go +++ b/src/models/constants.go @@ -44,8 +44,8 @@ var publicDNS = []string{ "[2620:119:53::53]", // Cisco OpenDNS } -func getConfigFile() (fname string, err error) { - configFile, err := utils.GetConfigDir() +func getConfigFile(requireValidPath bool) (fname string, err error) { + configFile, err := utils.GetConfigDir(requireValidPath) if err != nil { return } @@ -66,14 +66,14 @@ func init() { } if doRemember { // save in config file - fname, err := getConfigFile() + fname, err := getConfigFile(true) if err == nil { f, _ := os.Create(fname) f.Close() } } if !INTERNAL_DNS { - fname, err := getConfigFile() + fname, err := getConfigFile(false) if err == nil { INTERNAL_DNS = utils.Exists(fname) } diff --git a/src/utils/utils.go b/src/utils/utils.go index 7df077c..75a1f12 100644 --- a/src/utils/utils.go +++ b/src/utils/utils.go @@ -31,7 +31,7 @@ const NbPinNumbers = 4 const NbBytesWords = 4 // Get or create home directory -func GetConfigDir() (homedir string, err error) { +func GetConfigDir(requireValidPath bool) (homedir string, err error) { if envHomedir, isSet := os.LookupEnv("CROC_CONFIG_DIR"); isSet { homedir = envHomedir } else if xdgConfigHome, isSet := os.LookupEnv("XDG_CONFIG_HOME"); isSet { @@ -39,13 +39,19 @@ func GetConfigDir() (homedir string, err error) { } else { homedir, err = os.UserHomeDir() if err != nil { + if !requireValidPath { + err = nil + homedir = "" + } return } homedir = path.Join(homedir, ".config", "croc") } - if _, err = os.Stat(homedir); os.IsNotExist(err) { - err = os.MkdirAll(homedir, 0o700) + if requireValidPath { + if _, err = os.Stat(homedir); os.IsNotExist(err) { + err = os.MkdirAll(homedir, 0o700) + } } return }