make validation stricter and fix test

Signed-off-by: Justin Alvarez <[email protected]>
runfinch · Nov 2, 2023 · ec53bee · ec53bee
1 parent 568fdf0
commit ec53bee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/pkg/path/finch_windows.go b/pkg/path/finch_windows.go
@@ -8,7 +8,6 @@ package path
 
 import (
 	"fmt"
-	"path/filepath"
 	"strings"
 
 	"golang.org/x/sys/windows/registry"
@@ -23,9 +22,8 @@ func (Finch) FinchRootDir(ffd FinchFinderDeps) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	// reject any paths that end with unexpected characters
-	fileName := filepath.Base(expandedPath)
-	if strings.Contains(fileName, "&") || strings.Contains(fileName, `"`) {
+	// reject any paths that contain unexpected characters
+	if strings.Contains(expandedPath, "&") || strings.Contains(expandedPath, `"`) {
 		return "", fmt.Errorf("unexpected LOCALAPPDATA path %q", expandedPath)
 	}
 

diff --git a/pkg/path/finch_windows_test.go b/pkg/path/finch_windows_test.go
@@ -8,12 +8,12 @@ package path
 
 import (
 	"fmt"
-	"path/filepath"
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/runfinch/finch/pkg/mocks"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/runfinch/finch/pkg/mocks"
 )
 
 func TestFinch_RootDir(t *testing.T) {
@@ -28,7 +28,7 @@ func TestFinch_RootDir(t *testing.T) {
 		{
 			name:    "happy path",
 			wantErr: nil,
-			want:    `C:\Users\User\AppData\`,
+			want:    Finch(`C:\Users\User\AppData\`),
 			mockSvc: func(deps *mocks.FinchFinderDeps) {
 				deps.EXPECT().Env("LOCALAPPDATA").Return(`C:\Users\User\AppData\`)
 			},
@@ -52,7 +52,7 @@ func TestFinch_RootDir(t *testing.T) {
 			deps := mocks.NewFinchFinderDeps(ctrl)
 			tc.mockSvc(deps)
 			res, err := mockFinch.FinchRootDir(deps)
-			assert.Equal(t, res, filepath.Join("", "", ""))
+			assert.Equal(t, Finch(res), tc.want)
 			assert.Equal(t, err, tc.wantErr)
 		})
 	}