fix: additional permission check (#135)

jan-hajek · web-flow · commit 99f76e4bd007 · 2024-03-19T22:58:15.000+01:00
* fix: additional permission check

* update

* fix tests
diff --git a/src/cmd/root.go b/src/cmd/root.go
@@ -103,19 +103,19 @@ func rootCmd() *cmdBuilder.Cmd {
 }
 
 func guestInfoPart(tableBody *uxBlock.TableBody) {
-	cliDataFilePath, err := constants.CliDataFilePath()
+	cliDataFilePath, _, err := constants.CliDataFilePath()
 	if err != nil {
 		cliDataFilePath = err.Error()
 	}
 	tableBody.AddStringsRow(i18n.T(i18n.StatusInfoCliDataFilePath), cliDataFilePath)
 
-	logFilePath, err := constants.LogFilePath()
+	logFilePath, _, err := constants.LogFilePath()
 	if err != nil {
 		logFilePath = err.Error()
 	}
 	tableBody.AddStringsRow(i18n.T(i18n.StatusInfoLogFilePath), logFilePath)
 
-	wgConfigFilePath, err := constants.WgConfigFilePath()
+	wgConfigFilePath, _, err := constants.WgConfigFilePath()
 	if err != nil {
 		wgConfigFilePath = err.Error()
 	}
diff --git a/src/cmd/statusShowDebugLogs.go b/src/cmd/statusShowDebugLogs.go
@@ -6,8 +6,11 @@ import (
 	"io"
 	"os"
 
+	"github.com/pkg/errors"
+
 	"github.com/zeropsio/zcli/src/cmdBuilder"
 	"github.com/zeropsio/zcli/src/constants"
+	"github.com/zeropsio/zcli/src/file"
 	"github.com/zeropsio/zcli/src/i18n"
 	"github.com/zeropsio/zcli/src/uxBlock/styles"
 )
@@ -18,15 +21,16 @@ func statusShowDebugLogsCmd() *cmdBuilder.Cmd {
 		Short(i18n.T(i18n.CmdStatusShowDebugLogs)).
 		HelpFlag(i18n.T(i18n.StatusShowDebugLogsHelp)).
 		GuestRunFunc(func(ctx context.Context, cmdData *cmdBuilder.GuestCmdData) error {
-			logFilePath, err := constants.LogFilePath()
+			logFilePath, fileMode, err := constants.LogFilePath()
 			if err != nil {
 				return err
 			}
 
-			f, err := os.OpenFile(logFilePath, os.O_RDONLY, 0777)
+			f, err := file.Open(logFilePath, os.O_RDONLY, fileMode)
 			if err != nil {
 				return err
 			}
+			defer f.Close()
 
 			line := ""
 			var cursor int64 = 0
@@ -43,13 +47,13 @@ func statusShowDebugLogsCmd() *cmdBuilder.Cmd {
 				cursor -= 1
 				_, err = f.Seek(cursor, io.SeekEnd)
 				if err != nil {
-					return err
+					return errors.WithStack(err)
 				}
 
 				char := make([]byte, 1)
 				_, err = f.Read(char)
 				if err != nil {
-					return err
+					return errors.WithStack(err)
 				}
 
 				if cursor != -1 && (char[0] == 10 || char[0] == 13) { // stop if we find a line
diff --git a/src/cmd/vpnDown.go b/src/cmd/vpnDown.go
@@ -10,6 +10,7 @@ import (
 	"github.com/zeropsio/zcli/src/cmdBuilder"
 	"github.com/zeropsio/zcli/src/cmdRunner"
 	"github.com/zeropsio/zcli/src/constants"
+	"github.com/zeropsio/zcli/src/file"
 	"github.com/zeropsio/zcli/src/i18n"
 	"github.com/zeropsio/zcli/src/uxBlock"
 	"github.com/zeropsio/zcli/src/uxBlock/styles"
@@ -31,13 +32,13 @@ func disconnectVpn(ctx context.Context, uxBlocks uxBlock.UxBlocks) error {
 		return errors.New(i18n.T(i18n.VpnWgQuickIsNotInstalled))
 	}
 
-	filePath, err := constants.WgConfigFilePath()
+	filePath, fileMode, err := constants.WgConfigFilePath()
 	if err != nil {
 		return err
 	}
 
 	// create empty file if not exists, only thing wg-quick needs is a proper file name
-	f, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE, 0666)
+	f, err := file.Open(filePath, os.O_RDWR|os.O_CREATE, fileMode)
 	if err != nil {
 		return err
 	}
diff --git a/src/cmd/vpnUp.go b/src/cmd/vpnUp.go
@@ -16,6 +16,7 @@ import (
 	"github.com/zeropsio/zcli/src/cmdRunner"
 	"github.com/zeropsio/zcli/src/constants"
 	"github.com/zeropsio/zcli/src/entity"
+	"github.com/zeropsio/zcli/src/file"
 	"github.com/zeropsio/zcli/src/i18n"
 	"github.com/zeropsio/zcli/src/nettools"
 	"github.com/zeropsio/zcli/src/uxBlock"
@@ -92,12 +93,12 @@ func vpnUpCmd() *cmdBuilder.Cmd {
 				return err
 			}
 
-			filePath, err := constants.WgConfigFilePath()
+			filePath, fileMode, err := constants.WgConfigFilePath()
 			if err != nil {
 				return err
 			}
 
-			f, err := os.Create(filePath)
+			f, err := file.Open(filePath, os.O_RDWR|os.O_CREATE, fileMode)
 			if err != nil {
 				return err
 			}
diff --git a/src/cmdBuilder/executeRootCmd.go b/src/cmdBuilder/executeRootCmd.go
@@ -9,6 +9,9 @@ import (
 
 	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
+	"golang.org/x/term"
+	"gopkg.in/yaml.v3"
+
 	"github.com/zeropsio/zcli/src/cliStorage"
 	"github.com/zeropsio/zcli/src/constants"
 	"github.com/zeropsio/zcli/src/errorsx"
@@ -20,8 +23,6 @@ import (
 	"github.com/zeropsio/zcli/src/uxBlock"
 	"github.com/zeropsio/zcli/src/uxBlock/styles"
 	"github.com/zeropsio/zerops-go/apiError"
-	"golang.org/x/term"
-	"gopkg.in/yaml.v3"
 )
 
 func ExecuteRootCmd(rootCmd *Cmd) (err error) {
@@ -121,13 +122,14 @@ func createLoggers(isTerminal bool) (*logger.Handler, *logger.Handler) {
 		IsTerminal: isTerminal,
 	})
 
-	loggerFilePath, err := constants.LogFilePath()
+	loggerFilePath, fileMode, err := constants.LogFilePath()
 	if err != nil {
 		outputLogger.Warning(styles.WarningLine(err.Error()))
 	}
 
 	debugFileLogger := logger.NewDebugFileLogger(logger.DebugFileConfig{
 		FilePath: loggerFilePath,
+		FileMode: fileMode,
 	})
 
 	return outputLogger, debugFileLogger
@@ -145,13 +147,14 @@ func regSignals(contextCancel func()) {
 }
 
 func createCliStorage() (*cliStorage.Handler, error) {
-	filePath, err := constants.CliDataFilePath()
+	filePath, fileMode, err := constants.CliDataFilePath()
 	if err != nil {
 		return nil, err
 	}
 	s, err := storage.New[cliStorage.Data](
 		storage.Config{
 			FilePath: filePath,
+			FileMode: fileMode,
 		},
 	)
 	return &cliStorage.Handler{Handler: s}, err
diff --git a/src/constants/darwin.go b/src/constants/darwin.go
@@ -13,6 +13,8 @@ func getDataFilePathsReceivers() []pathReceiver {
 		receiverFromEnv(CliDataFilePathEnvVar),
 		receiverFromOsFunc(os.UserConfigDir, ZeropsDir, CliDataFileName),
 		receiverFromOsFunc(os.UserHomeDir, ZeropsDir, CliDataFileName),
+		receiverFromOsFunc(os.UserHomeDir, "zerops."+CliDataFileName),
+		receiverFromOsTemp("zerops." + CliDataFileName),
 	}
 }
 
@@ -22,6 +24,8 @@ func getLogFilePathReceivers() []pathReceiver {
 		receiverFromPath(path.Join("/usr/local/var/log/", ZeropsLogFile)),
 		receiverFromOsFunc(os.UserConfigDir, ZeropsDir, ZeropsLogFile),
 		receiverFromOsFunc(os.UserHomeDir, ZeropsDir, ZeropsLogFile),
+		receiverFromOsFunc(os.UserHomeDir, "zerops."+ZeropsLogFile),
+		receiverFromOsTemp("zerops." + ZeropsLogFile),
 	}
 }
 
@@ -33,5 +37,7 @@ func getWgConfigFilePathReceivers() []pathReceiver {
 		receiverFromPath(path.Join("/opt/homebrew/etc/wireguard/", WgConfigFile)),
 		receiverFromOsFunc(os.UserConfigDir, ZeropsDir, WgConfigFile),
 		receiverFromOsFunc(os.UserHomeDir, ZeropsDir, WgConfigFile),
+		receiverFromOsFunc(os.UserHomeDir, WgConfigFile),
+		receiverFromOsTemp("zerops." + WgConfigFile),
 	}
 }
diff --git a/src/constants/linux.go b/src/constants/linux.go
@@ -13,6 +13,8 @@ func getDataFilePathsReceivers() []pathReceiver {
 		receiverFromEnv(CliDataFilePathEnvVar),
 		receiverFromOsFunc(os.UserConfigDir, ZeropsDir, CliDataFileName),
 		receiverFromOsFunc(os.UserHomeDir, ZeropsDir, CliDataFileName),
+		receiverFromOsFunc(os.UserHomeDir, "zerops."+CliDataFileName),
+		receiverFromOsTemp("zerops." + CliDataFileName),
 	}
 }
 
@@ -22,6 +24,8 @@ func getLogFilePathReceivers() []pathReceiver {
 		receiverFromPath(path.Join("/var/log/", ZeropsLogFile)),
 		receiverFromOsFunc(os.UserConfigDir, ZeropsDir, ZeropsLogFile),
 		receiverFromOsFunc(os.UserHomeDir, ZeropsDir, ZeropsLogFile),
+		receiverFromOsFunc(os.UserHomeDir, "zerops."+ZeropsLogFile),
+		receiverFromOsTemp("zerops." + ZeropsLogFile),
 	}
 }
 
@@ -33,5 +37,7 @@ func getWgConfigFilePathReceivers() []pathReceiver {
 		receiverFromPath(path.Join("/opt/homebrew/etc/wireguard/", WgConfigFile)),
 		receiverFromOsFunc(os.UserConfigDir, ZeropsDir, WgConfigFile),
 		receiverFromOsFunc(os.UserHomeDir, ZeropsDir, WgConfigFile),
+		receiverFromOsFunc(os.UserHomeDir, WgConfigFile),
+		receiverFromOsTemp("zerops." + WgConfigFile),
 	}
 }
diff --git a/src/constants/windows.go b/src/constants/windows.go
@@ -16,6 +16,8 @@ func getDataFilePathsReceivers() []pathReceiver {
 		receiverFromEnv(CliDataFilePathEnvVar),
 		receiverFromOsFunc(os.UserConfigDir, "Zerops", CliDataFileName),
 		receiverFromOsFunc(os.UserHomeDir, "Zerops", CliDataFileName),
+		receiverFromOsFunc(os.UserHomeDir, "zerops."+CliDataFileName),
+		receiverFromOsTemp("zerops." + CliDataFileName),
 	}
 }
 
@@ -24,6 +26,8 @@ func getLogFilePathReceivers() []pathReceiver {
 		receiverFromEnv(CliLogFilePathEnvVar),
 		receiverFromOsFunc(os.UserConfigDir, "Zerops", ZeropsLogFile),
 		receiverFromOsFunc(os.UserHomeDir, "Zerops", ZeropsLogFile),
+		receiverFromOsFunc(os.UserHomeDir, "zerops."+ZeropsLogFile),
+		receiverFromOsTemp("zerops." + ZeropsLogFile),
 	}
 }
 
@@ -32,5 +36,7 @@ func getWgConfigFilePathReceivers() []pathReceiver {
 		receiverFromEnv(CliWgConfigPathEnvVar),
 		receiverFromOsFunc(os.UserConfigDir, "Zerops", WgConfigFile),
 		receiverFromOsFunc(os.UserHomeDir, "Zerops", WgConfigFile),
+		receiverFromOsFunc(os.UserHomeDir, WgConfigFile),
+		receiverFromOsTemp("zerops." + WgConfigFile),
 	}
 }
diff --git a/src/constants/zerops.go b/src/constants/zerops.go
@@ -7,6 +7,8 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+
+	"github.com/zeropsio/zcli/src/file"
 	"github.com/zeropsio/zcli/src/i18n"
 )
 
@@ -22,64 +24,69 @@ const (
 	CliTerminalMode       = "ZEROPS_CLI_TERMINAL_MODE"
 )
 
-type pathReceiver func() (path string, err error)
+type pathReceiver func(fileMode os.FileMode) (path string, err error)
 
-func CliDataFilePath() (string, error) {
-	return checkReceivers(getDataFilePathsReceivers(), i18n.UnableToWriteCliData)
+func CliDataFilePath() (string, os.FileMode, error) {
+	return checkReceivers(getDataFilePathsReceivers(), 0600, i18n.UnableToWriteCliData)
 }
 
-func LogFilePath() (string, error) {
-	return checkReceivers(getLogFilePathReceivers(), i18n.UnableToWriteLogFile)
+func LogFilePath() (string, os.FileMode, error) {
+	return checkReceivers(getLogFilePathReceivers(), 0666, i18n.UnableToWriteLogFile)
 }
 
-func WgConfigFilePath() (string, error) {
-	return checkReceivers(getWgConfigFilePathReceivers(), i18n.UnableToWriteLogFile)
+func WgConfigFilePath() (string, os.FileMode, error) {
+	return checkReceivers(getWgConfigFilePathReceivers(), 0600, i18n.UnableToWriteLogFile)
 }
 
-func checkReceivers(pathReceivers []pathReceiver, errorText string) (string, error) {
-	path := findFirstWritablePath(pathReceivers)
+func checkReceivers(pathReceivers []pathReceiver, fileMode os.FileMode, errorText string) (string, os.FileMode, error) {
+	path := findFirstWritablePath(pathReceivers, fileMode)
 	if path == "" {
 		paths := make([]string, 0, len(pathReceivers))
 		for _, p := range pathReceivers {
-			_, err := p()
+			_, err := p(fileMode)
 			paths = append(paths, err.Error())
 		}
-		return "", errors.New(i18n.T(errorText, "\n"+strings.Join(paths, "\n")+"\n"))
+		return "", 0, errors.New(i18n.T(errorText, "\n"+strings.Join(paths, "\n")+"\n"))
 	}
-	return path, nil
+	return path, fileMode, nil
 }
 
 func receiverFromPath(path string) pathReceiver {
-	return func() (string, error) {
-		return checkPath(path)
+	return func(fileMode os.FileMode) (string, error) {
+		return checkPath(path, fileMode)
 	}
 }
 
 func receiverFromEnv(envName string) pathReceiver {
-	return func() (string, error) {
+	return func(fileMode os.FileMode) (string, error) {
 		env := os.Getenv(envName)
 		if env == "" {
 			return "", errors.Errorf("env %s is empty", envName)
 		}
-		return checkPath(env)
+		return checkPath(env, fileMode)
 	}
 }
 
 func receiverFromOsFunc(osFunc func() (string, error), elem ...string) pathReceiver {
-	return func() (string, error) {
+	return func(fileMode os.FileMode) (string, error) {
 		dir, err := osFunc()
 		if err != nil {
 			return "", err
 		}
-		elem = append([]string{dir}, elem...)
 
-		return filepath.Join(elem...), nil
+		return checkPath(filepath.Join(append([]string{dir}, elem...)...), fileMode)
+	}
+}
+
+func receiverFromOsTemp(elem ...string) pathReceiver {
+	return func(fileMode os.FileMode) (string, error) {
+		return checkPath(filepath.Join(append([]string{os.TempDir()}, elem...)...), fileMode)
 	}
 }
 
-func findFirstWritablePath(paths []pathReceiver) string {
+func findFirstWritablePath(paths []pathReceiver, fileMode os.FileMode) string {
 	for _, p := range paths {
-		path, err := p()
+		path, err := p(fileMode)
 		if err == nil {
 			return path
 		}
@@ -88,14 +95,14 @@ func findFirstWritablePath(paths []pathReceiver) string {
 	return ""
 }
 
-func checkPath(filePath string) (string, error) {
+func checkPath(filePath string, fileMode os.FileMode) (string, error) {
 	dir := path.Dir(filePath)
 
-	if err := os.MkdirAll(dir, 0775); err != nil {
+	if err := os.MkdirAll(dir, 0755); err != nil {
 		return "", err
 	}
 
-	f, err := os.OpenFile(filePath, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0666)
+	f, err := file.Open(filePath, os.O_RDWR|os.O_CREATE, fileMode)
 	if err != nil {
 		return "", err
 	}
diff --git a/src/file/file.go b/src/file/file.go
@@ -0,0 +1,20 @@
+package file
+
+import (
+	"os"
+
+	"github.com/pkg/errors"
+)
+
+func Open(filePath string, flag int, fileMode os.FileMode) (*os.File, error) {
+	f, err := os.OpenFile(filePath, flag, fileMode)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	err = os.Chmod(filePath, fileMode)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	return f, nil
+}
diff --git a/src/flagParams/handler.go b/src/flagParams/handler.go
diff --git a/src/logger/handler.go b/src/logger/handler.go
diff --git a/src/logger/hooks.go b/src/logger/hooks.go
diff --git a/src/storage/handler.go b/src/storage/handler.go
diff --git a/src/storage/handler_test.go b/src/storage/handler_test.go

Original file line number	Diff line number	Diff line change
`@@ -103,19 +103,19 @@ func rootCmd() *cmdBuilder.Cmd {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`func guestInfoPart(tableBody *uxBlock.TableBody) {`
`106`		`- cliDataFilePath, err := constants.CliDataFilePath()`
	`106`	`+ cliDataFilePath, _, err := constants.CliDataFilePath()`
`107`	`107`	`if err != nil {`
`108`	`108`	`cliDataFilePath = err.Error()`
`109`	`109`	`}`
`110`	`110`	`tableBody.AddStringsRow(i18n.T(i18n.StatusInfoCliDataFilePath), cliDataFilePath)`
`111`	`111`
`112`		`- logFilePath, err := constants.LogFilePath()`
	`112`	`+ logFilePath, _, err := constants.LogFilePath()`
`113`	`113`	`if err != nil {`
`114`	`114`	`logFilePath = err.Error()`
`115`	`115`	`}`
`116`	`116`	`tableBody.AddStringsRow(i18n.T(i18n.StatusInfoLogFilePath), logFilePath)`
`117`	`117`
`118`		`- wgConfigFilePath, err := constants.WgConfigFilePath()`
	`118`	`+ wgConfigFilePath, _, err := constants.WgConfigFilePath()`
`119`	`119`	`if err != nil {`
`120`	`120`	`wgConfigFilePath = err.Error()`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ func getDataFilePathsReceivers() []pathReceiver {`
`13`	`13`	`receiverFromEnv(CliDataFilePathEnvVar),`
`14`	`14`	`receiverFromOsFunc(os.UserConfigDir, ZeropsDir, CliDataFileName),`
`15`	`15`	`receiverFromOsFunc(os.UserHomeDir, ZeropsDir, CliDataFileName),`
	`16`	`+ receiverFromOsFunc(os.UserHomeDir, "zerops."+CliDataFileName),`
	`17`	`+ receiverFromOsTemp("zerops." + CliDataFileName),`
`16`	`18`	`}`
`17`	`19`	`}`
`18`	`20`
`@@ -22,6 +24,8 @@ func getLogFilePathReceivers() []pathReceiver {`
`22`	`24`	`receiverFromPath(path.Join("/usr/local/var/log/", ZeropsLogFile)),`
`23`	`25`	`receiverFromOsFunc(os.UserConfigDir, ZeropsDir, ZeropsLogFile),`
`24`	`26`	`receiverFromOsFunc(os.UserHomeDir, ZeropsDir, ZeropsLogFile),`
	`27`	`+ receiverFromOsFunc(os.UserHomeDir, "zerops."+ZeropsLogFile),`
	`28`	`+ receiverFromOsTemp("zerops." + ZeropsLogFile),`
`25`	`29`	`}`
`26`	`30`	`}`
`27`	`31`
`@@ -33,5 +37,7 @@ func getWgConfigFilePathReceivers() []pathReceiver {`
`33`	`37`	`receiverFromPath(path.Join("/opt/homebrew/etc/wireguard/", WgConfigFile)),`
`34`	`38`	`receiverFromOsFunc(os.UserConfigDir, ZeropsDir, WgConfigFile),`
`35`	`39`	`receiverFromOsFunc(os.UserHomeDir, ZeropsDir, WgConfigFile),`
	`40`	`+ receiverFromOsFunc(os.UserHomeDir, WgConfigFile),`
	`41`	`+ receiverFromOsTemp("zerops." + WgConfigFile),`
`36`	`42`	`}`
`37`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ func getDataFilePathsReceivers() []pathReceiver {`
`16`	`16`	`receiverFromEnv(CliDataFilePathEnvVar),`
`17`	`17`	`receiverFromOsFunc(os.UserConfigDir, "Zerops", CliDataFileName),`
`18`	`18`	`receiverFromOsFunc(os.UserHomeDir, "Zerops", CliDataFileName),`
	`19`	`+ receiverFromOsFunc(os.UserHomeDir, "zerops."+CliDataFileName),`
	`20`	`+ receiverFromOsTemp("zerops." + CliDataFileName),`
`19`	`21`	`}`
`20`	`22`	`}`
`21`	`23`
`@@ -24,6 +26,8 @@ func getLogFilePathReceivers() []pathReceiver {`
`24`	`26`	`receiverFromEnv(CliLogFilePathEnvVar),`
`25`	`27`	`receiverFromOsFunc(os.UserConfigDir, "Zerops", ZeropsLogFile),`
`26`	`28`	`receiverFromOsFunc(os.UserHomeDir, "Zerops", ZeropsLogFile),`
	`29`	`+ receiverFromOsFunc(os.UserHomeDir, "zerops."+ZeropsLogFile),`
	`30`	`+ receiverFromOsTemp("zerops." + ZeropsLogFile),`
`27`	`31`	`}`
`28`	`32`	`}`
`29`	`33`
`@@ -32,5 +36,7 @@ func getWgConfigFilePathReceivers() []pathReceiver {`
`32`	`36`	`receiverFromEnv(CliWgConfigPathEnvVar),`
`33`	`37`	`receiverFromOsFunc(os.UserConfigDir, "Zerops", WgConfigFile),`
`34`	`38`	`receiverFromOsFunc(os.UserHomeDir, "Zerops", WgConfigFile),`
	`39`	`+ receiverFromOsFunc(os.UserHomeDir, WgConfigFile),`
	`40`	`+ receiverFromOsTemp("zerops." + WgConfigFile),`
`35`	`41`	`}`
`36`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ import (`
`7`	`7`	`"strings"`
`8`	`8`
`9`	`9`	`"github.com/pkg/errors"`
	`10`	`+`
	`11`	`+ "github.com/zeropsio/zcli/src/file"`
`10`	`12`	`"github.com/zeropsio/zcli/src/i18n"`
`11`	`13`	`)`
`12`	`14`
`@@ -22,64 +24,69 @@ const (`
`22`	`24`	`CliTerminalMode = "ZEROPS_CLI_TERMINAL_MODE"`
`23`	`25`	`)`
`24`	`26`
`25`		`-type pathReceiver func() (path string, err error)`
	`27`	`+type pathReceiver func(fileMode os.FileMode) (path string, err error)`
`26`	`28`
`27`		`-func CliDataFilePath() (string, error) {`
`28`		`- return checkReceivers(getDataFilePathsReceivers(), i18n.UnableToWriteCliData)`
	`29`	`+func CliDataFilePath() (string, os.FileMode, error) {`
	`30`	`+ return checkReceivers(getDataFilePathsReceivers(), 0600, i18n.UnableToWriteCliData)`
`29`	`31`	`}`
`30`	`32`
`31`		`-func LogFilePath() (string, error) {`
`32`		`- return checkReceivers(getLogFilePathReceivers(), i18n.UnableToWriteLogFile)`
	`33`	`+func LogFilePath() (string, os.FileMode, error) {`
	`34`	`+ return checkReceivers(getLogFilePathReceivers(), 0666, i18n.UnableToWriteLogFile)`
`33`	`35`	`}`
`34`	`36`
`35`		`-func WgConfigFilePath() (string, error) {`
`36`		`- return checkReceivers(getWgConfigFilePathReceivers(), i18n.UnableToWriteLogFile)`
	`37`	`+func WgConfigFilePath() (string, os.FileMode, error) {`
	`38`	`+ return checkReceivers(getWgConfigFilePathReceivers(), 0600, i18n.UnableToWriteLogFile)`
`37`	`39`	`}`
`38`	`40`
`39`		`-func checkReceivers(pathReceivers []pathReceiver, errorText string) (string, error) {`
`40`		`- path := findFirstWritablePath(pathReceivers)`
	`41`	`+func checkReceivers(pathReceivers []pathReceiver, fileMode os.FileMode, errorText string) (string, os.FileMode, error) {`
	`42`	`+ path := findFirstWritablePath(pathReceivers, fileMode)`
`41`	`43`	`if path == "" {`
`42`	`44`	`paths := make([]string, 0, len(pathReceivers))`
`43`	`45`	`for _, p := range pathReceivers {`
`44`		`- _, err := p()`
	`46`	`+ _, err := p(fileMode)`
`45`	`47`	`paths = append(paths, err.Error())`
`46`	`48`	`}`
`47`		`- return "", errors.New(i18n.T(errorText, "\n"+strings.Join(paths, "\n")+"\n"))`
	`49`	`+ return "", 0, errors.New(i18n.T(errorText, "\n"+strings.Join(paths, "\n")+"\n"))`
`48`	`50`	`}`
`49`		`- return path, nil`
	`51`	`+ return path, fileMode, nil`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`func receiverFromPath(path string) pathReceiver {`
`53`		`- return func() (string, error) {`
`54`		`- return checkPath(path)`
	`55`	`+ return func(fileMode os.FileMode) (string, error) {`
	`56`	`+ return checkPath(path, fileMode)`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`func receiverFromEnv(envName string) pathReceiver {`
`59`		`- return func() (string, error) {`
	`61`	`+ return func(fileMode os.FileMode) (string, error) {`
`60`	`62`	`env := os.Getenv(envName)`
`61`	`63`	`if env == "" {`
`62`	`64`	`return "", errors.Errorf("env %s is empty", envName)`
`63`	`65`	`}`
`64`		`- return checkPath(env)`
	`66`	`+ return checkPath(env, fileMode)`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`func receiverFromOsFunc(osFunc func() (string, error), elem ...string) pathReceiver {`
`69`		`- return func() (string, error) {`
	`71`	`+ return func(fileMode os.FileMode) (string, error) {`
`70`	`72`	`dir, err := osFunc()`
`71`	`73`	`if err != nil {`
`72`	`74`	`return "", err`
`73`	`75`	`}`
`74`		`- elem = append([]string{dir}, elem...)`
`75`	`76`
`76`		`- return filepath.Join(elem...), nil`
	`77`	`+ return checkPath(filepath.Join(append([]string{dir}, elem...)...), fileMode)`
	`78`	`+ }`
	`79`	`+}`
	`80`	`+`
	`81`	`+func receiverFromOsTemp(elem ...string) pathReceiver {`
	`82`	`+ return func(fileMode os.FileMode) (string, error) {`
	`83`	`+ return checkPath(filepath.Join(append([]string{os.TempDir()}, elem...)...), fileMode)`
`77`	`84`	`}`
`78`	`85`	`}`
`79`	`86`
`80`		`-func findFirstWritablePath(paths []pathReceiver) string {`
	`87`	`+func findFirstWritablePath(paths []pathReceiver, fileMode os.FileMode) string {`
`81`	`88`	`for _, p := range paths {`
`82`		`- path, err := p()`
	`89`	`+ path, err := p(fileMode)`
`83`	`90`	`if err == nil {`
`84`	`91`	`return path`
`85`	`92`	`}`
`@@ -88,14 +95,14 @@ func findFirstWritablePath(paths []pathReceiver) string {`
`88`	`95`	`return ""`
`89`	`96`	`}`
`90`	`97`
`91`		`-func checkPath(filePath string) (string, error) {`
	`98`	`+func checkPath(filePath string, fileMode os.FileMode) (string, error) {`
`92`	`99`	`dir := path.Dir(filePath)`
`93`	`100`
`94`		`- if err := os.MkdirAll(dir, 0775); err != nil {`
	`101`	`+ if err := os.MkdirAll(dir, 0755); err != nil {`
`95`	`102`	`return "", err`
`96`	`103`	`}`
`97`	`104`
`98`		`- f, err := os.OpenFile(filePath, os.O_APPEND\|os.O_CREATE\|os.O_RDWR, 0666)`
	`105`	`+ f, err := file.Open(filePath, os.O_RDWR\|os.O_CREATE, fileMode)`
`99`	`106`	`if err != nil {`
`100`	`107`	`return "", err`
`101`	`108`	`}`