🐛 Ensure that there is an explicit check that a path is not a directory before unlinking

Author: joshjennings98

changes/20260529095325.bugfix

@@ -0,0 +1 @@
+:bug: Ensure that there is an explicit check that a path is not a directory before unlinking

utils/filesystem/extendedosfs.go

@@ -22,14 +22,21 @@ type ExtendedOsFs struct {
 }
 
 func (c *ExtendedOsFs) Remove(name string) (err error) {
-	// The following is to ensure sockets are correctly removed
-	// https://stackoverflow.com/questions/16681944/how-to-reliably-unlink-a-unix-domain-socket-in-go-programming-language
-	err = commonerrors.Ignore(ConvertFileSystemError(syscall.Unlink(name)), commonerrors.ErrNotFound)
-	err = commonerrors.IgnoreCorrespondTo(err, "is a directory")
+	info, err := c.OsFs.Stat(name)
 	if err != nil {
+		err = ConvertFileSystemError(err)
 		return
 	}
 
+	if !info.IsDir() {
+		// The following is to ensure sockets are correctly removed
+		// https://stackoverflow.com/questions/16681944/how-to-reliably-unlink-a-unix-domain-socket-in-go-programming-language
+		err = commonerrors.Ignore(ConvertFileSystemError(syscall.Unlink(name)), commonerrors.ErrNotFound)
+		if err != nil {
+			return
+		}
+	}
+
 	err = commonerrors.Ignore(ConvertFileSystemError(c.OsFs.Remove(name)), commonerrors.ErrNotFound)
 	return
 }