From a591833dbf8a5c00920f7d6b0ebef59b4eb2c64b Mon Sep 17 00:00:00 2001
From: Zack <zack.scholl@gmail.com>
Date: Mon, 20 May 2024 08:38:36 -0700
Subject: [PATCH] fix: filter escape sequences in filenames

---
 src/croc/croc.go   |  4 ++++
 src/utils/utils.go | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/croc/croc.go b/src/croc/croc.go
index f3f6895..7badda7 100644
--- a/src/croc/croc.go
+++ b/src/croc/croc.go
@@ -1102,7 +1102,11 @@ func (c *Client) processMessageFileInfo(m message.Message) (done bool, err error
 		if strings.Contains(c.FilesToTransfer[i].FolderRemote, ".ssh") {
 			return true, fmt.Errorf("invalid path detected: '%s'", fi.FolderRemote)
 		}
+		// Issue #595 - disallow filenames with anything but 0-9a-zA-Z.-_. and / characters
 
+		if !utils.ValidFileName(path.Join(c.FilesToTransfer[i].FolderRemote, fi.Name)) {
+			return true, fmt.Errorf("invalid filename detected: '%s'", fi.Name)
+		}
 	}
 	c.TotalNumberOfContents = 0
 	if c.FilesToTransfer != nil {
diff --git a/src/utils/utils.go b/src/utils/utils.go
index 4b6cf8a..e117c8a 100644
--- a/src/utils/utils.go
+++ b/src/utils/utils.go
@@ -473,3 +473,18 @@ func UnzipDirectory(destination string, source string) error {
 	fmt.Fprintf(os.Stderr, "\n")
 	return nil
 }
+
+// ValidFileName checks if a filename is valid
+// and returns true only if it all of the characters are either
+// 0-9, a-z, A-Z, ., _, -, space, or /
+func ValidFileName(fname string) bool {
+	for _, r := range fname {
+		if !((r >= '0' && r <= '9') ||
+			(r >= 'a' && r <= 'z') ||
+			(r >= 'A' && r <= 'Z') ||
+			r == '.' || r == '_' || r == '-' || r == ' ' || r == '/') {
+			return false
+		}
+	}
+	return true
+}