Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion dataexchange.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"io"
"path/filepath"
"strings"
"unicode/utf8"
)

// Frame types for data exchange on port 1001.
Expand Down Expand Up @@ -117,7 +118,11 @@ func ReadFrame(r io.Reader) (*Frame, error) {
if nameLen > maxFilenameLen {
return nil, fmt.Errorf("filename too long: %d bytes (max %d)", nameLen, maxFilenameLen)
}
name := string(payload[2 : 2+nameLen])
nameBytes := payload[2 : 2+nameLen]
if !utf8.Valid(nameBytes) {
return nil, fmt.Errorf("filename contains invalid UTF-8")
}
name := string(nameBytes)
if strings.ContainsAny(name, "/\\") {
return nil, fmt.Errorf("invalid filename: path traversal characters not allowed")
}
Expand Down
28 changes: 28 additions & 0 deletions zz_frame_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,31 @@ func TestFrameFileEmptyName(t *testing.T) {
t.Fatalf("payload: expected %q, got %q", "data", string(got.Payload))
}
}

func TestFrameFileInvalidUTF8(t *testing.T) {
t.Parallel()
// Craft raw wire bytes for a FILE frame with invalid UTF-8 filename.
// Wire format: [4B type=FILE][4B payload_len][2B name_len][name_bytes][file_data]
invalidName := []byte{0xFF, 0xFE, 0xFD} // invalid UTF-8
fileData := []byte("hello")
innerPayload := make([]byte, 2+len(invalidName)+len(fileData))
innerPayload[0] = byte(len(invalidName) >> 8)
innerPayload[1] = byte(len(invalidName))
copy(innerPayload[2:], invalidName)
copy(innerPayload[2+len(invalidName):], fileData)

var buf bytes.Buffer
hdr := make([]byte, 8)
hdr[0], hdr[1], hdr[2], hdr[3] = 0, 0, 0, 4 // TypeFile
hdr[4] = byte(len(innerPayload) >> 24)
hdr[5] = byte(len(innerPayload) >> 16)
hdr[6] = byte(len(innerPayload) >> 8)
hdr[7] = byte(len(innerPayload))
buf.Write(hdr)
buf.Write(innerPayload)

_, err := dataexchange.ReadFrame(&buf)
if err == nil {
t.Fatal("expected error for invalid UTF-8 filename, got nil")
}
}
Loading