Remove symlink check

Author: sean-breen

internal/config/types.go

@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -484,13 +483,6 @@ func isAllowedDir(path string, allowedDirs []string) (bool, error) {
 		directoryPath = filepath.Dir(directoryPath)
 	}
 
-	fInfo, _ := os.Stat(directoryPath)
-	if fInfo != nil {
-		if isSymlink(directoryPath) {
-			return false, errors.New("path is a symlink, skipping " + directoryPath)
-		}
-	}
-
 	for _, allowedDirectory := range allowedDirs {
 		// Check if the directoryPath starts with the allowedDirectory
 		// This allows for subdirectories within the allowed directories.
@@ -501,13 +493,3 @@ func isAllowedDir(path string, allowedDirs []string) (bool, error) {
 
 	return false, nil
 }
-
-func isSymlink(path string) bool {
-	// check if it contains a symlink
-	lInfo, _ := os.Lstat(path)
-	if lInfo != nil && lInfo.Mode()&os.ModeSymlink != 0 {
-		return true
-	}
-
-	return false
-}

internal/config/types_test.go

@@ -6,7 +6,6 @@
 package config
 
 import (
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -77,53 +76,3 @@ func TestTypes_isAllowedDir(t *testing.T) {
 		})
 	}
 }
-
-func TestTypes_isAllowedDirWithSymlink(t *testing.T) {
-	t.Run("Test 1: Symlink in allowed directory is not allowed", func(t *testing.T) {
-		allowedDirs := []string{"/etc/nginx"}
-		filePath := "file.conf"
-		symlinkPath := "file_link"
-
-		// Create a temp directory for the symlink
-		tempDir := t.TempDir()
-		defer os.RemoveAll(tempDir) // Clean up the temp directory after the test
-
-		// Ensure the temp directory is in the allowedDirs
-		allowedDirs = append(allowedDirs, tempDir)
-
-		filePath = tempDir + "/" + filePath
-		defer os.RemoveAll(filePath)
-		err := os.WriteFile(filePath, []byte("test content"), 0o600)
-		require.NoError(t, err)
-
-		// Create a symlink for testing
-		symlinkPath = tempDir + "/" + symlinkPath
-		defer os.Remove(symlinkPath)
-		err = os.Symlink(filePath, symlinkPath)
-		require.NoError(t, err)
-
-		result, err := isAllowedDir(symlinkPath, allowedDirs)
-		require.Error(t, err)
-		require.False(t, result, "Symlink in allowed directory should return false")
-	})
-}
-
-func TestTypes_isSymlink(t *testing.T) {
-	// create temp dir
-	tempDir := t.TempDir()
-	tempConf := tempDir + "test.conf"
-	defer os.RemoveAll(tempDir)
-
-	t.Run("Test 1: File is not a symlink", func(t *testing.T) {
-		filePath := tempConf
-		err := os.WriteFile(filePath, []byte("test content"), 0o600)
-		require.NoError(t, err)
-		require.False(t, isSymlink(filePath), "File is not a symlink")
-	})
-	t.Run("Test 2: File is a symlink", func(t *testing.T) {
-		filePath := tempDir + "test_conf_link"
-		err := os.Symlink(tempConf, filePath)
-		require.NoError(t, err)
-		require.True(t, isSymlink(filePath), "File is a symlink")
-	})
-}

internal/watcher/file/file_watcher_service_test.go

@@ -266,7 +266,7 @@ func TestFileWatcherService_Watch(t *testing.T) {
 
 		select {
 		case <-channel:
-			t.Fatalf("Expected file to be skipped")
+			t.Fatalf("Expected file to be skipped: %v", skippableFile.Name())
 		case <-time.After(150 * time.Millisecond):
 			return
 		}