Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not recognize text files as audio #23355

Merged
merged 8 commits into from
Mar 8, 2023
Merged

Do not recognize text files as audio #23355

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7fdc26a
fix
wxiaoguang Mar 7, 2023
3568dd8
Update modules/typesniffer/typesniffer.go
wxiaoguang Mar 7, 2023
b4de06c
update comment
wxiaoguang Mar 7, 2023
58ef5c7
update comment
wxiaoguang Mar 7, 2023
7f40145
Merge branch 'main' into fix-id3-detection
techknowlogick Mar 7, 2023
e5d1134
Merge branch 'main' into fix-id3-detection
techknowlogick Mar 7, 2023
a2aba0f
Merge branch 'main' into fix-id3-detection
techknowlogick Mar 7, 2023
b2c689a
Merge branch 'main' into fix-id3-detection
lunny Mar 8, 2023
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
10 changes: 10 additions & 0 deletions modules/typesniffer/typesniffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@ func DetectContentType(data []byte) SniffedType {
}
}

if strings.HasPrefix(ct, "audio/") && bytes.HasPrefix(data, []byte("ID3")) {
// The MP3 detection is quite inaccurate, any content with "ID3" prefix will result in "audio/mpeg".
// So remove the "ID3" prefix and detect again, if result is text, then it must be text content.
// This works especially because audio files contain many unprintable/invalid characters like `0x00`
ct2 := http.DetectContentType(data[3:])
wxiaoguang marked this conversation as resolved.
Show resolved Hide resolved
if strings.HasPrefix(ct2, "text/") {
ct = ct2
}
}

return SniffedType{ct}
}

Expand Down
4 changes: 4 additions & 0 deletions modules/typesniffer/typesniffer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ func TestIsAudio(t *testing.T) {
mp3, _ := base64.StdEncoding.DecodeString("SUQzBAAAAAABAFRYWFgAAAASAAADbWFqb3JfYnJhbmQAbXA0MgBUWFhYAAAAEQAAA21pbm9yX3Zl")
assert.True(t, DetectContentType(mp3).IsAudio())
assert.False(t, DetectContentType([]byte("plain text")).IsAudio())

assert.True(t, DetectContentType([]byte("ID3Toy\000")).IsAudio())
assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi 🌞, ...")).IsText()) // test ID3 tag for plain text
assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi 🌞, ..."+"🌛"[0:2])).IsText()) // test ID3 tag with incomplete UTF8 char
}

func TestDetectContentTypeFromReader(t *testing.T) {
Expand Down