From 6f8d97826884fa628abacc9de548d1413522a720 Mon Sep 17 00:00:00 2001 From: Benny~ Date: Sat, 23 May 2020 12:38:47 +0800 Subject: [PATCH] isSafari test case --- helper.go | 37 ++++--------------------------------- helper_test.go | 42 ++++++++++++++++++++++++++++++++++++++++-- router.go | 6 ++++-- webp-server.go | 2 +- 4 files changed, 49 insertions(+), 38 deletions(-) diff --git a/helper.go b/helper.go index 324bab8..5e63526 100644 --- a/helper.go +++ b/helper.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "github.com/gofiber/fiber" log "github.com/sirupsen/logrus" "net/http" "os" @@ -62,34 +61,8 @@ func GenWebpAbs(RawImagePath string, ExhaustPath string, ImgFilename string, req return cwd, WebpAbsolutePath } -func CheckUA(c *fiber.Ctx, RawImageAbs string) (string, bool) { - // reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent/Firefox - // https://developer.chrome.com/multidevice/user-agent#chrome_for_ios_user_agent - // Chrome - // ✅ Windows: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36 - // ✅ macOS: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36 - // ✅ Linux: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36 - // ✅ iOS: Mozilla/5.0 (iPhone; CPU iPhone OS 13_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/83.0.4103.63 Mobile/15E148 Safari/604.1 - // ✅ Android: Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.60 Mobile Safari/537.36 - - // Firefox - // ✅ Windows: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:76.0) Gecko/20100101 Firefox/76.0 - // ✅ macOS: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:76.0) Gecko/20100101 Firefox/76.0 - // ✅ Linux: Mozilla/5.0 (X11; Linux i686; rv:76.0) Gecko/20100101 Firefox/76.0 - // ✅ iOS: Mozilla/5.0 (iPad; CPU OS 10_15_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/25.0 Mobile/15E148 Safari/605.1.15 - // ✅ Android: Mozilla/5.0 (Android 10; Mobile; rv:68.0) Gecko/68.0 Firefox/68.0 - - // Safari - // ❎ macOS: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1 Safari/605.1.15 - // ❎ iOS: Mozilla/5.0 (iPad; CPU OS 13_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.1 Mobile/15E148 Safari/604.1 - - // WeChat - // ❎ iOS: Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Mobile/14G60 wxwork/2.1.5 MicroMessenger/6.3.22 - // ✅ Windows: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36 MicroMessenger/6.5.2.501 NetType/WIFI WindowsWechat QBCore/3.43.691.400 QQBrowser/9.0.2524.400 - // ✅ Android: Mozilla/5.0 (Linux; Android 7.0; LG-H831 Build/NRD90U; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36 MicroMessenger/6.6.7.1303(0x26060743) NetType/WIFI Language/zh_TW - - UA := c.Get("User-Agent") - +func isSafari(UA string) bool { + // for more information, please check test case if strings.Contains(UA, "Firefox") || strings.Contains(UA, "Chrome") { // Chrome or firefox on macOS Windows } else if strings.Contains(UA, "Android") || strings.Contains(UA, "Windows") || strings.Contains(UA, "Linux") { @@ -97,9 +70,7 @@ func CheckUA(c *fiber.Ctx, RawImageAbs string) (string, bool) { } else if strings.Contains(UA, "FxiOS") || strings.Contains(UA, "CriOS") { //firefox and Chrome on iOS } else { - log.Infof("A Safari user has arrived...%s", UA) - c.SendFile(RawImageAbs) - return "", true + return true } - return UA, false + return false } diff --git a/helper_test.go b/helper_test.go index 9896a39..33b2170 100644 --- a/helper_test.go +++ b/helper_test.go @@ -5,7 +5,7 @@ import ( "testing" ) -// test this file: go test helper_test.go helper.go -v +// test this file: go test -v -cover helper_test.go helper.go // test one function: go test -run TestGetFileContentType helper_test.go helper.go -v func TestGetFileContentType(t *testing.T) { var data = []byte("hello") @@ -34,7 +34,7 @@ func TestImageExists(t *testing.T) { var result = !ImageExists(data) if result { - t.Errorf("Result: [%v], Expected: [%v]", result, true) + t.Errorf("Result: [%v], Expected: [%v]", result, false) } data = ".pics/empty2.jpg" result = ImageExists(data) @@ -57,3 +57,41 @@ func TestGenWebpAbs(t *testing.T) { } } + +func TestisSafari(t *testing.T) { + // reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent/Firefox + // https://developer.chrome.com/multidevice/user-agent#chrome_for_ios_user_agent + + var testCase = map[string]bool{ + // Chrome on Windows, macOS, linux, iOS and Android + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36": false, + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36": false, + "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36": false, + "Mozilla/5.0 (iPhone; CPU iPhone OS 13_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/83.0.4103.63 Mobile/15E148 Safari/604.1": false, + "Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.60 Mobile Safari/537.36": false, + + // Firefox on Windows, macOS, linux, iOS and Android + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:76.0) Gecko/20100101 Firefox/76.0": false, + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:76.0) Gecko/20100101 Firefox/76.0": false, + "Mozilla/5.0 (X11; Linux i686; rv:76.0) Gecko/20100101 Firefox/76.0": false, + "Mozilla/5.0 (iPad; CPU OS 10_15_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/25.0 Mobile/15E148 Safari/605.1.15": false, + "Mozilla/5.0 (Android 10; Mobile; rv:68.0) Gecko/68.0 Firefox/68.0": false, + + // Safari on macOS and iOS + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1 Safari/605.1.15": true, + "Mozilla/5.0 (iPad; CPU OS 13_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.1 Mobile/15E148 Safari/604.1": true, + + // WeChat on iOS, Windows, and Android + "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Mobile/14G60 wxwork/2.1.5 MicroMessenger/6.3.22": true, + "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36 MicroMessenger/6.5.2.501 NetType/WIFI WindowsWechat QBCore/3.43.691.400 QQBrowser/9.0.2524.400": false, + "Mozilla/5.0 (Linux; Android 7.0; LG-H831 Build/NRD90U; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36 MicroMessenger/6.6.7.1303(0x26060743) NetType/WIFI Language/zh_TW": false, + } + + for browser, is := range testCase { + + if is != isSafari(browser) { + t.Errorf("[%v]:[%s]", is, browser) + } + } + +} diff --git a/router.go b/router.go index a99f1b1..abeda26 100644 --- a/router.go +++ b/router.go @@ -19,9 +19,11 @@ func Convert(ImgPath string, ExhaustPath string, AllowedTypes []string, QUALITY var RawImageAbs = path.Join(ImgPath, reqURI) // /home/xxx/mypic/123.jpg var ImgFilename = path.Base(reqURI) // pure filename, 123.jpg var finalFile string // We'll only need one c.sendFile() - - UA, done := CheckUA(c, RawImageAbs) + var UA = c.Get("User-Agent") + done := isSafari(UA) if done { + log.Infof("A Safari user has arrived...%s", UA) + c.SendFile(RawImageAbs) return } log.Debugf("Incoming connection from %s@%s with %s", UA, c.IP(), ImgFilename) diff --git a/webp-server.go b/webp-server.go index 46125e5..a56bee5 100644 --- a/webp-server.go +++ b/webp-server.go @@ -21,7 +21,7 @@ type Config struct { ExhaustPath string `json:"EXHAUST_PATH"` } -const version = "0.1.2" +const version = "0.1.3" var configPath string var prefetch bool