Merge pull request #65 from snackmgmg/add-support-bingbot

add more support for bingbot
mssola · Apr 15, 2020 · 80733e9 · 80733e9
2 parents 7269cce + c6402a7
commit 80733e9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/all_test.go b/all_test.go
@@ -44,6 +44,21 @@ var uastrings = []struct {
 		ua:       "Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)",
 		expected: "Mozilla:5.0 Browser:bingbot-2.0 Bot:true Mobile:false",
 	},
+	{
+		title:    "BingBotSmartphone(iPhone)",
+		ua:       "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)",
+		expected: "Mozilla:5.0 Browser:bingbot-2.0 Bot:true Mobile:true",
+	},
+	{
+		title:    "BingBotSmartphone(Android)",
+		ua:       "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.96 Mobile Safari/537.36 Edg/80.0.345.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)",
+		expected: "Mozilla:5.0 Browser:bingbot-2.0 Bot:true Mobile:true",
+	},
+	{
+		title:    "BingBotEmulateMozilla",
+		ua:       "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm) Chrome/41.0.2272.96 Mobile Safari/537.36 Edg/80.0.345.0",
+		expected: "Mozilla:5.0 Browser:bingbot-2.0 Bot:true Mobile:true",
+	},
 	{
 		title:    "BaiduBot",
 		ua:       "Mozilla/5.0 (compatible; Baiduspider/2.0; +http://www.baidu.com/search/spider.html)",

diff --git a/bot.go b/bot.go
@@ -42,12 +42,15 @@ func getFromSite(comment []string) string {
 }
 
 // Returns true if the info that we currently have corresponds to the Google
-// mobile bot. This function also modifies some attributes in the receiver
+// or Bing mobile bot. This function also modifies some attributes in the receiver
 // accordingly.
-func (p *UserAgent) googleBot() bool {
-	// This is a hackish way to detect Google's mobile bot (Googlebot, AdsBot-Google-Mobile, etc.).
-	// See https://support.google.com/webmasters/answer/1061943
-	if strings.Index(p.ua, "Google") != -1 {
+func (p *UserAgent) googleOrBingBot() bool {
+	// This is a hackish way to detect
+	// Google's mobile bot (Googlebot, AdsBot-Google-Mobile, etc.)
+	// (See https://support.google.com/webmasters/answer/1061943)
+	// and Bing's mobile bot
+	// (See https://www.bing.com/webmaster/help/which-crawlers-does-bing-use-8c184ec0)
+	if strings.Index(p.ua, "Google") != -1 || strings.Index(p.ua, "bingbot") != -1{
 		p.platform = ""
 		p.undecided = true
 	}

diff --git a/browser.go b/browser.go
@@ -93,7 +93,8 @@ func (p *UserAgent) detectBrowser(sections []section) {
 					}
 					// It's possible the google-bot emulates these now
 					for _, comment := range engine.comment {
-						if len(comment) > 5 && strings.HasPrefix(comment, "Googlebot") {
+						if len(comment) > 5 &&
+							(strings.HasPrefix(comment, "Googlebot") || strings.HasPrefix(comment, "bingbot"))  {
 							p.undecided = true
 							break
 						}

diff --git a/operating_systems.go b/operating_systems.go
@@ -89,7 +89,7 @@ func webkit(p *UserAgent, comment []string) {
 		if len(comment) > 3 {
 			p.localization = comment[3]
 		} else if len(comment) == 3 {
-			_ = p.googleBot()
+			_ = p.googleOrBingBot()
 		}
 	} else if len(comment) > 0 {
 		if len(comment) > 3 {
@@ -100,7 +100,7 @@ func webkit(p *UserAgent, comment []string) {
 		} else if len(comment) < 2 {
 			p.localization = comment[0]
 		} else if len(comment) < 3 {
-			if !p.googleBot() {
+			if !p.googleOrBingBot() {
 				p.os = normalizeOS(comment[1])
 			}
 		} else {