[tor-commits] [check/master] Match Tor Browser and (new) Orfox UAS together

[arlo at torproject.org]

commit aa25675a220bc91104fd887216d09314ca26c822
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Tue Mar 20 22:45:55 2018 +0000

    Match Tor Browser and (new) Orfox UAS together
    
    The two user agent strings are now nearly identical, we should try
    combining the patterns (again). There are also new unit test strings
    for this.
    
    This roughly combines the pattern matching introduced in
    749fd988c32e764e7fc8dde1f59ab7f06a63f0cd and
    644e1c21b682a911acbea567f55d156a084a8c5f.
    
    We can remove the old Orfox-specific pattern (Gecko/38) after
    users have a few weeks for upgrading to the new version.
---
 utils.go      | 2 +-
 utils_test.go | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/utils.go b/utils.go
index 4d438d2..bbba5fe 100644
--- a/utils.go
+++ b/utils.go
@@ -55,7 +55,7 @@ func GetHost(r *http.Request) (host string, err error) {
 	return
 }
 
-var TBBUserAgents = regexp.MustCompile(`^Mozilla/5\.0 \(Windows NT 6\.1; rv:[\d]+\.0\) Gecko/20100101 Firefox/[\d]+\.0$`)
+var TBBUserAgents = regexp.MustCompile(`^Mozilla/5\.0 \(((Windows NT 6\.1)|(Android; Mobile)); rv:[\d]+\.0\) Gecko/20100101 Firefox/[\d]+\.0$`)
 var OrfoxUserAgents = regexp.MustCompile(`^Mozilla/5\.0 \(Android; Mobile; rv:38.0\) Gecko/38.0 Firefox/38.0$`)
 
 func LikelyTBB(ua string) bool {
diff --git a/utils_test.go b/utils_test.go
index aa47df9..096a48c 100644
--- a/utils_test.go
+++ b/utils_test.go
@@ -12,6 +12,8 @@ var UserAgents = map[string]bool{
 	"Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0":                                                        true,
 	"Mozilla/5.0 (Android; Mobile; rv:31.0) Gecko/31.0 Firefox/31.0":                                                           false,
 	"Mozilla/5.0 (Android; Mobile; rv:38.0) Gecko/38.0 Firefox/38.0":                                                           true,
+	"Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0":                                                        true,
+	"Mozilla/5.0 (Android; Mobile; rv:52.0) Gecko/20100101 Firefox/52.0":                                                       true,
 }
 
 func TestLikelyTBB(t *testing.T) {