waveterm/wails
0
0
Fork 0
mirror of https://github.com/wavetermdev/wails.git synced 2026-08-05 13:53:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Feature #1300] mime check for bom and comments (#1302)

Browse Source 
* check for BOM and SVG comments
This commit is contained in:
Florent
2022-04-01 08:39:54 +11:00
committed by GitHub
parent f734d26adb
commit 8f860c9ea6
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2/go.mod
+1
View File
@@ -6,6 +6,7 @@ require (
github.com/Masterminds/semver v1.5.0
github.com/flytam/filenamify v1.0.0
github.com/fsnotify/fsnotify v1.4.9
github.com/wailsapp/mimetype v1.4.1-beta.1.0.20220331112158-6df7e41671fe
github.com/go-git/go-billy/v5 v5.2.0 // indirect
github.com/go-git/go-git/v5 v5.3.0
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
v2/internal/frontend/assetserver/mimecache.go
+6 -5
View File
@@ -17,12 +17,13 @@ func GetMimetype(filename string, data []byte) string {
mutex.Lock()
defer mutex.Unlock()
if filepath.Ext(filename) == ".js" {
// short-circuit .js, .css to ensure the
// browser evaluates them in the right context
switch filepath.Ext(filename) {
case ".js":
return "application/javascript"
}
if filepath.Ext(filename) == ".css" {
return "text/css"
case ".css":
return "text/css; charset=utf-8"
}
result := cache[filename]
v2/internal/frontend/assetserver/mimecache_test.go
+24 -4
View File
@@ -1,25 +1,45 @@
package assetserver
import "testing"
import (
"testing"
)
func TestGetMimetype(t *testing.T) {
type args struct {
filename string
data []byte
}
bomUTF8 := []byte{0xef, 0xbb, 0xbf}
var emptyMsg []byte
css := []byte("body{margin:0;padding:0;background-color:#d579b2}#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;color:#2c3e50;background-color:#ededed}#nav{padding:30px}#nav a{font-weight:700;color:#2c\n3e50}#nav a.router-link-exact-active{color:#42b983}.hello[data-v-4e26ad49]{margin:10px 0}")
html := []byte("<!DOCTYPE html><html><head>title</head><body></body></html>")
bomHtml := append(bomUTF8, html...)
svg := []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" viewBox=\"0 0 16 16\"><path d=\"M15.707 14.293l-4.822-4.822a6.019 6.019 0 1 0-1.414 1.414l4.822 4.822a1 1 0 0 0 1.414-1.414zM6 10a4 4 0 1 1 4-4 4 4 0 0 1-4 4z\"></path></svg>")
svgWithComment := append([]byte("<!-- this is a comment -->"), svg...)
svgWithCommentAndControlChars := append([]byte(" \r\n "), svgWithComment...)
svgWithBomCommentAndControlChars := append(bomUTF8, append([]byte(" \r\n "), svgWithComment...)...)
tests := []struct {
name string
args args
want string
}{
// TODO: Add test cases.
{"css", args{"test.css", []byte("body{margin:0;padding:0;background-color:#d579b2}#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;color:#2c3e50;background-color:#ededed}#nav{padding:30px}#nav a{font-weight:700;color:#2c\n3e50}#nav a.router-link-exact-active{color:#42b983}.hello[data-v-4e26ad49]{margin:10px 0}")}, "text/css; charset=utf-8"},
{"js", args{"test.js", []byte("let foo = 'bar'; console.log(foo);")}, "text/javascript; charset=utf-8"},
{"nil data", args{"nil.svg", nil}, "text/plain"},
{"empty data", args{"empty.html", emptyMsg}, "text/plain"},
{"css", args{"test.css", css}, "text/css; charset=utf-8"},
{"js", args{"test.js", []byte("let foo = 'bar'; console.log(foo);")}, "application/javascript"},
{"html-utf8", args{"test_utf8.html", html}, "text/html; charset=utf-8"},
{"html-bom-utf8", args{"test_bom_utf8.html", bomHtml}, "text/html; charset=utf-8"},
{"svg", args{"test.svg", svg}, "image/svg+xml"},
{"svg-w-comment", args{"test_comment.svg", svgWithComment}, "image/svg+xml"},
{"svg-w-control-comment", args{"test_control_comment.svg", svgWithCommentAndControlChars}, "image/svg+xml"},
{"svg-w-bom-control-comment", args{"test_bom_control_comment.svg", svgWithBomCommentAndControlChars}, "image/svg+xml"},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := GetMimetype(tt.args.filename, tt.args.data); got != tt.want {
t.Errorf("GetMimetype() = %v, want %v", got, tt.want)
t.Errorf("GetMimetype() = '%v', want '%v'", got, tt.want)
}
})
}