chore: return 550 when file path is a dir in handleSIZE

handle_files.go

@@ -407,7 +407,11 @@ func (c *clientHandler) handleSIZE(param string) error {
 
 	path := c.absPath(param)
 	if info, err := c.driver.Stat(path); err == nil {
-		c.writeMessage(StatusFileStatus, strconv.FormatInt(info.Size(), 10))
+		if info.IsDir() {
+			c.writeMessage(StatusActionNotTaken, fmt.Sprintf("%s is a directory", path))
+		} else {
+			c.writeMessage(StatusFileStatus, strconv.FormatInt(info.Size(), 10))
+		}
 	} else {
 		c.writeMessage(StatusActionNotTaken, fmt.Sprintf("Couldn't access %s: %v", path, err))
 	}

handle_files_test.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
+	"math/rand"
 	"os"
 	"regexp"
 	"strconv"
@@ -890,6 +891,47 @@ func TestSIZE(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, StatusActionNotTaken, returnCode, response)
 	require.Equal(t, "SIZE not allowed in ASCII mode", response)
+
+	// case of directory
+
+	returnCode, response, err = raw.SendCommand("TYPE I")
+	require.NoError(t, err)
+	require.Equal(t, StatusOK, returnCode, response)
+
+	_, err = client.Mkdir("a-dir")
+	require.NoError(t, err)
+
+	returnCode, response, err = raw.SendCommand("SIZE a-dir")
+	require.NoError(t, err)
+	require.Equal(t, StatusActionNotTaken, returnCode, response)
+	require.True(t, strings.HasSuffix(response, "is a directory"))
+
+	fileSize := 11 + rand.Intn(10)
+	ftpUpload(t, client, createTemporaryFile(t, fileSize), "a-dir/file.bin")
+
+	returnCode, response, err = raw.SendCommand("SIZE a-dir/file.bin")
+	require.NoError(t, err)
+	require.Equal(t, StatusFileStatus, returnCode, response)
+	require.Equal(t, fmt.Sprintf("%d", fileSize), response)
+
+	returnCode, response, err = raw.SendCommand("SIZE b-dir/file.bin")
+	require.NoError(t, err)
+	require.Equal(t, StatusActionNotTaken, returnCode, response)
+	require.True(t, strings.HasSuffix(response, "no such file or directory"))
+
+	returnCode, response, err = raw.SendCommand("TYPE A")
+	require.NoError(t, err)
+	require.Equal(t, StatusOK, returnCode, response)
+
+	returnCode, response, err = raw.SendCommand("SIZE a-dir")
+	require.NoError(t, err)
+	require.Equal(t, StatusActionNotTaken, returnCode, response)
+	require.Equal(t, "SIZE not allowed in ASCII mode", response)
+
+	returnCode, response, err = raw.SendCommand("SIZE a-dir/file.bin")
+	require.NoError(t, err)
+	require.Equal(t, StatusActionNotTaken, returnCode, response)
+	require.Equal(t, "SIZE not allowed in ASCII mode", response)
 }
 
 func TestCOMBErrors(t *testing.T) {

transfer_test.go

@@ -94,7 +94,7 @@ func ftpUpload(t *testing.T, ftp *goftp.Client, file io.ReadSeeker, filename str
 		t.Log("Couldn't stat file:", err)
 	} else {
 		found := false
-		if strings.HasSuffix(stats.Name(), filename) {
+		if strings.HasSuffix(stats.Name(), filename) || strings.HasSuffix(filename, stats.Name()) {
 			found = true
 		}