IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-22167] Add mmctl to the User-Agent parser (#13894)

Browse Source
This commit is contained in:
Miguel de la Cruz
2020-03-19 11:18:17 +01:00
committed by GitHub
parent 3e2175f897
commit 1c06d25d9d
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/user_agent.go
View File

@@ -89,6 +89,11 @@ func getBrowserVersion(ua *uasurfer.UserAgent, userAgentString string) string {
return strings.Fields(afterVersion)[0]
}
if index := strings.Index(userAgentString, "mmctl/"); index != -1 {
afterVersion := userAgentString[index+len("mmctl/"):]
return strings.Fields(afterVersion)[0]
}
if index := strings.Index(userAgentString, "Franz/"); index != -1 {
afterVersion := userAgentString[index+len("Franz/"):]
return strings.Fields(afterVersion)[0]
@@ -122,6 +127,10 @@ func getBrowserName(ua *uasurfer.UserAgent, userAgentString string) string {
return "Desktop App"
}
if strings.Contains(userAgentString, "mmctl") {
return "mmctl"
}
if browser == uasurfer.BrowserIE && ua.Browser.Version.Major > 11 {
return "Edge"
}

5
app/user_agent_test.go
View File

@@ -21,6 +21,7 @@ var testUserAgents = []testUserAgent{
{"Chrome 60", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36"},
{"Chrome Mobile", "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Mobile Safari/537.36"},
{"MM Classic App", "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 5X Build/OPR6.170623.013; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.81 Mobile Safari/537.36 Web-Atoms-Mobile-WebView"},
{"mmctl", "mmctl/5.20.0 (linux)"},
{"MM App 3.7.1", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Mattermost/3.7.1 Chrome/56.0.2924.87 Electron/1.6.11 Safari/537.36"},
{"Franz 4.0.4", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Franz/4.0.4 Chrome/52.0.2743.82 Electron/1.3.1 Safari/537.36"},
{"Edge 14", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393"},
@@ -40,6 +41,7 @@ func TestGetPlatformName(t *testing.T) {
"Macintosh",
"Linux",
"Linux",
"Linux",
"Macintosh",
"Macintosh",
"Windows",
@@ -69,6 +71,7 @@ func TestGetOSName(t *testing.T) {
"Mac OS",
"Android",
"Android",
"Linux",
"Mac OS",
"Mac OS",
"Windows 10",
@@ -98,6 +101,7 @@ func TestGetBrowserName(t *testing.T) {
"Chrome",
"Chrome",
"Chrome",
"mmctl",
"Desktop App",
"Chrome",
"Edge",
@@ -127,6 +131,7 @@ func TestGetBrowserVersion(t *testing.T) {
"60.0.3112", // Doesn't report the fourth part of the version
"60.0.3112", // Doesn't report the fourth part of the version
"61.0.3163",
"5.20.0",
"3.7.1",
"4.0.4",
"14.14393",