Moved dir safety check logging to per-OS code

Pcharlesme · Mar 10, 2021 · 4135b81 · 4135b81
1 parent 51e808d
commit 4135b81
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/nodecontrol/kmdControl.go b/nodecontrol/kmdControl.go
@@ -200,8 +200,7 @@ func (kc *KMDController) StartKMD(args KMDStartArgs) (alreadyRunning bool, err e
 			logging.Base().Errorf("%s: kmd data dir exists but is not a directory", kc.kmdDataDir)
 			return false, errors.New("bad kmd data dir")
 		}
-		if !isDirectorySafe(dataDirStat) {
-			logging.Base().Errorf("%s: kmd data dir exists but is too permissive (%o), change to (%o)", kc.kmdDataDir, dataDirStat.Mode()&0777, DefaultKMDDataDirPerms)
+		if !kc.isDirectorySafe(dataDirStat) {
 			return false, errors.New("kmd data dir not secure")
 		}
 	} else {

diff --git a/nodecontrol/kmdControl_common.go b/nodecontrol/kmdControl_common.go
@@ -20,10 +20,13 @@ package nodecontrol
 
 import (
 	"os"
+
+	"github.com/algorand/go-algorand/logging"
 )
 
-func isDirectorySafe(dirStats os.FileInfo) bool {
+func (kc *KMDController) isDirectorySafe(dirStats os.FileInfo) bool {
 	if (dirStats.Mode() & 0077) != 0 {
+		logging.Base().Errorf("%s: kmd data dir exists but is too permissive (%o), change to (%o)", kc.kmdDataDir, dataDirStat.Mode()&0777, DefaultKMDDataDirPerms)
 		return false
 	}
 	return true

diff --git a/nodecontrol/kmdControl_windows.go b/nodecontrol/kmdControl_windows.go
@@ -20,6 +20,6 @@ import (
 	"os"
 )
 
-func isDirectorySafe(_ os.FileInfo) bool {
+func (kc *KMDController) isDirectorySafe(_ os.FileInfo) bool {
 	return true
-}
+}