diff --git a/backend/utils/files/fileinfo.go b/backend/utils/files/fileinfo.go index ebe027d63..3d3e7be81 100644 --- a/backend/utils/files/fileinfo.go +++ b/backend/utils/files/fileinfo.go @@ -7,6 +7,7 @@ import ( "github.com/1Panel-dev/1Panel/backend/buserr" "github.com/1Panel-dev/1Panel/backend/constant" "io/fs" + "net/http" "os" "os/exec" "path" @@ -335,17 +336,21 @@ func (f *FileInfo) getContent() error { } func DetectBinary(buf []byte) bool { - whiteByte := 0 - n := min(1024, len(buf)) - for i := 0; i < n; i++ { - if (buf[i] >= 0x20) || buf[i] == 9 || buf[i] == 10 || buf[i] == 13 { - whiteByte++ - } else if buf[i] <= 6 || (buf[i] >= 14 && buf[i] <= 31) { - return true + mimeType := http.DetectContentType(buf) + if !strings.HasPrefix(mimeType, "text/") { + whiteByte := 0 + n := min(1024, len(buf)) + for i := 0; i < n; i++ { + if (buf[i] >= 0x20) || buf[i] == 9 || buf[i] == 10 || buf[i] == 13 { + whiteByte++ + } else if buf[i] <= 6 || (buf[i] >= 14 && buf[i] <= 31) { + return true + } } + return whiteByte < 1 } + return false - return whiteByte < 1 } func min(x, y int) int {