CLI | Add check to symbolicLink value (AST-45529) (#786)

* add symbolincLink value check

* refactor addDirFiles

* add test files

---------

Co-authored-by: AlvoBen <alvo@post.bgu.ac.il>

internal/commands/scan.go

@@ -1106,16 +1106,23 @@ func addDirFilesIgnoreFilter(zipWriter *zip.Writer, baseDir, parentDir string) e
 }
 
 func addDirFiles(zipWriter *zip.Writer, baseDir, parentDir string, filters, includeFilters []string) error {
-	files, err := ioutil.ReadDir(parentDir)
+	fileEntries, err := os.ReadDir(parentDir)
 	if err != nil {
 		return err
 	}
-	for _, file := range files {
-		if file.IsDir() {
-			err = handleDir(zipWriter, baseDir, parentDir, filters, includeFilters, file)
+
+	for _, entry := range fileEntries {
+		fileInfo, err := entry.Info()
+		if err != nil {
+			return err
+		}
+
+		if util.IsDirOrSymLinkToDir(parentDir, fileInfo) {
+			err = handleDir(zipWriter, baseDir, parentDir, filters, includeFilters, fileInfo)
 		} else {
-			err = handleFile(zipWriter, baseDir, parentDir, filters, includeFilters, file)
+			err = handleFile(zipWriter, baseDir, parentDir, filters, includeFilters, fileInfo)
 		}
+
 		if err != nil {
 			return err
 		}

internal/commands/util/utils.go

@@ -2,7 +2,9 @@ package util
 
 import (
 	"fmt"
+	"io/fs"
 	"os"
+	"path/filepath"
 	"regexp"
 
 	"github.com/MakeNowJust/heredoc"
@@ -136,3 +138,28 @@ func ReadFileAsString(path string) (string, error) {
 
 	return string(content), nil
 }
+
+// IsDirOrSymLinkToDir Check if provided DirEntry is a directory or symbolic link to a directory
+func IsDirOrSymLinkToDir(parentDir string, fileInfo fs.FileInfo) bool {
+	if fileInfo.IsDir() {
+		return true
+	}
+
+	if fileInfo.Mode()&os.ModeSymlink != 0 {
+		symlinkPath := filepath.Join(parentDir, fileInfo.Name())
+		realPath, err := os.Readlink(symlinkPath)
+		if err != nil {
+			fmt.Println("Error reading symlink:", err)
+			return false
+		}
+
+		targetInfo, err := os.Stat(realPath)
+		if err != nil {
+			fmt.Println("Error getting target info:", err)
+			return false
+		}
+		return targetInfo.IsDir()
+	}
+
+	return false
+}

test/integration/data/project-with-directory-symlink/check/originalFolder.html/csharp-no-vul.cs

@@ -0,0 +1,44 @@
+namespace EvidenceResolver.Tests.Contract
+{
+    public static class MockProviderServiceExtenstion
+    {
+        public static IMockProviderService WithRequest(this IMockProviderService mockProviderService,
+            HttpVerb method, object path, object body = null, Dictionary<string, object> headers = null)
+        {
+            var providerServiceRequest = new ProviderServiceRequest
+            {
+                Method = method,
+                Path = path
+            };
+
+            providerServiceRequest.Headers = headers ?? new Dictionary<string, object>
+            {
+                {"Content-Type", "application/json"}
+            };
+
+            if (body != null) {
+                providerServiceRequest.Body = PactNet.Matchers.Match.Type(body);
+            }
+
+            return mockProviderService.With(providerServiceRequest);
+        }
+
+        public static void WillRespondParameters(this IMockProviderService mockProviderService,
+            int status, dynamic body = null, Dictionary<string, object> headers = null)
+        {
+            if (body == null) {
+                body = new { };
+            }
+
+            var expectedResponse = new ProviderServiceResponse
+            {
+                Status = status,
+                Headers = headers ?? new Dictionary<string, object>
+                    {{"Content-Type", "application/json; charset=utf-8"}},
+                Body = PactNet.Matchers.Match.Type(body)
+            };
+
+            mockProviderService.WillRespondWith(expectedResponse);
+        }
+    }
+}

test/integration/data/project-with-directory-symlink/originalFolder.html

@@ -0,0 +1 @@
+/Users/benalvo/CxDev/workspace/Pheonix-workspace/ast-cli/test/integration/data/project-with-directory-symlink/check/originalFolder.html

test/integration/scan_test.go

@@ -300,6 +300,19 @@ func TestScanCreate_ExistingApplicationAndExistingProject_CreateScanSuccessfully
 	assert.NilError(t, err)
 }
 
+func TestScanCreate_FolderWithSymbolicLink_CreateScanSuccessfully(t *testing.T) {
+	args := []string{
+		"scan", "create",
+		flag(params.ProjectName), "my-project",
+		flag(params.SourcesFlag), "data/project-with-directory-symlink",
+		flag(params.ScanTypes), "iac-security",
+		flag(params.BranchFlag), "dummy_branch",
+	}
+
+	err, _ := executeCommand(t, args...)
+	assert.NilError(t, err)
+}
+
 func TestScanCreate_ExistingApplicationAndNotExistingProject_CreatingNewProjectAndCreateScanSuccessfully(t *testing.T) {
 	args := []string{
 		"scan", "create",