fix lint

Author: sean-breen

internal/config/types.go

@@ -436,19 +436,14 @@ func isAllowedDir(path string, allowedDirs []string) bool {
 		slog.Debug("File path detected, checking parent directory is allowed", "path", directoryPath)
 	}
 
-	fInfo, err := os.Stat(directoryPath)
-	if err != nil {
-		slog.Warn("Path error", "path", path, "error", err)
+	fInfo, statErr := os.Stat(directoryPath)
+	if statErr != nil {
+		slog.Warn("Stat: Path error", "path", path, "error", statErr)
 	}
 
 	if fInfo != nil {
-		//check if it contains a symlink
-		lInfo, err := os.Lstat(directoryPath)
-		if err != nil {
-			slog.Warn("Lstat error", "path", path, "error", err)
-		}
-		if lInfo != nil && lInfo.Mode()&os.ModeSymlink != 0 {
-			slog.Warn("Path is a symlink, not allowed", "path", path)
+		if isSymlink(directoryPath) {
+			slog.Warn("Path is a symlink, skipping allowed directory check", "path", directoryPath)
 			return false
 		}
 	}
@@ -463,3 +458,17 @@ func isAllowedDir(path string, allowedDirs []string) bool {
 
 	return false
 }
+
+func isSymlink(path string) bool {
+	// check if it contains a symlink
+	lInfo, err := os.Lstat(path)
+	if err != nil {
+		slog.Warn("Lstat error", "path", path, "error", err)
+		return false
+	}
+	if lInfo != nil && lInfo.Mode()&os.ModeSymlink != 0 {
+		slog.Warn("Path is a symlink", "path", path)
+		return true
+	}
+	return false
+}

internal/config/types_test.go

@@ -6,10 +6,11 @@
 package config
 
 import (
-	"github.com/stretchr/testify/require"
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -84,25 +85,24 @@ func TestTypes_isAllowedDir(t *testing.T) {
 
 		// Create a temp directory for the symlink
 		tempDir, err := os.MkdirTemp("", "symlink_test")
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		defer os.RemoveAll(tempDir) // Clean up the temp directory after the test
 
 		// Ensure the temp directory is in the allowedDirs
 		allowedDirs = append(allowedDirs, tempDir)
 
-		//create filePath
 		filePath = tempDir + "/" + filePath
 		defer os.RemoveAll(filePath)
-		err = os.WriteFile(filePath, []byte("test content"), 0644)
+		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)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		result := isAllowedDir(symlinkPath, allowedDirs)
-		assert.False(t, result, "Symlink in allowed directory should return false")
+		require.False(t, result, "Symlink in allowed directory should return false")
 	})
 }