set root home if exists when getting home user dirs

openclarity · Aug 30, 2023 · 9bfae09 · 9bfae09
1 parent 90f54e5
commit 9bfae09
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/pkg/shared/families/infofinder/sshtopology/scanner.go b/pkg/shared/families/infofinder/sshtopology/scanner.go
@@ -160,6 +160,13 @@ func (s *Scanner) Run(sourceType utils.SourceType, userInput string) error {
 
 func getHomeUserDirs(rootDir string) ([]string, error) {
 	var dirs []string
+
+	// Set root home if exists.
+	rootHome := path.Join(rootDir, "root")
+	if _, err := os.Stat(rootHome); err == nil {
+		dirs = append(dirs, rootHome)
+	}
+
 	homeDirPath := path.Join(rootDir, "home")
 	files, err := os.ReadDir(homeDirPath)
 	if err != nil {

diff --git a/pkg/shared/families/infofinder/sshtopology/scanner_test.go b/pkg/shared/families/infofinder/sshtopology/scanner_test.go
@@ -46,6 +46,14 @@ func Test_getHomeUserDirs(t *testing.T) {
 			want:    []string{"../testdata/rootfolder/home/dir1", "../testdata/rootfolder/home/dir2"},
 			wantErr: false,
 		},
+		{
+			name: "root folder with root home folder",
+			args: args{
+				rootDir: "../testdata/rootfolderwithroothome",
+			},
+			want:    []string{"../testdata/rootfolderwithroothome/root", "../testdata/rootfolderwithroothome/home/dir1", "../testdata/rootfolderwithroothome/home/dir2"},
+			wantErr: false,
+		},
 		{
 			name: "missing dir",
 			args: args{

diff --git a/pkg/shared/families/infofinder/testdata/rootfolderwithroothome/home/dir1/private_key b/pkg/shared/families/infofinder/testdata/rootfolderwithroothome/home/dir1/private_key
@@ -0,0 +1,3 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+NOT REALLY A KEY
+-----END OPENSSH PRIVATE KEY-----
diff --git a/pkg/shared/families/infofinder/testdata/rootfolderwithroothome/home/dir2/private_key b/pkg/shared/families/infofinder/testdata/rootfolderwithroothome/home/dir2/private_key
@@ -0,0 +1,3 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+NOT REALLY A KEY
+-----END OPENSSH PRIVATE KEY-----
diff --git a/pkg/shared/families/infofinder/testdata/rootfolderwithroothome/root/dir1/private_key b/pkg/shared/families/infofinder/testdata/rootfolderwithroothome/root/dir1/private_key
@@ -0,0 +1,3 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+NOT REALLY A KEY
+-----END OPENSSH PRIVATE KEY-----