schollz/croc
1
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2024-11-27 12:34:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #686 from a1lu/readonly

Browse Source 
Avoid to create config dir if not required
This commit is contained in:
Zack 2024-04-01 12:28:36 -07:00 committed by GitHub
commit eaffc6dcac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cli/cli.go
View File

@ -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
@ -455,12 +455,13 @@ func receive(c *cli.Context) (err error) {
// load options here
setDebugLevel(c)
configFile, err := getReceiveConfigFile()
if err != nil && c.Bool("remember") {
doRemember := c.Bool("remember")
configFile, err := getReceiveConfigFile(doRemember)
if err != nil && doRemember {
return
}
b, errOpen := os.ReadFile(configFile)
if errOpen == nil && !c.Bool("remember") {
if errOpen == nil && !doRemember {
var rememberedOptions croc.Options
err = json.Unmarshal(b, &rememberedOptions)
if err != nil {
@ -519,7 +520,7 @@ func receive(c *cli.Context) (err error) {
}
// save the config
if c.Bool("remember") {
if doRemember {
log.Debug("saving config file")
var bConfig []byte
bConfig, err = json.MarshalIndent(crocOptions, "", " ")

8
src/models/constants.go
View File

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

12
src/utils/utils.go
View File

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