From 6ea0a96f96fbfeb4bce538d9ed6ef34a188208bf Mon Sep 17 00:00:00 2001 From: Niels Basjes Date: Fri, 24 Nov 2017 11:33:27 +0100 Subject: [PATCH] Fixed UCBrowser webview effect --- .../resources/UserAgents/GoogleChrome.yaml | 33 +++++++++++++++++++ .../src/main/resources/UserAgents/Huawei.yaml | 8 ++--- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/analyzer/src/main/resources/UserAgents/GoogleChrome.yaml b/analyzer/src/main/resources/UserAgents/GoogleChrome.yaml index 970ccca685..61f6eccbfa 100644 --- a/analyzer/src/main/resources/UserAgents/GoogleChrome.yaml +++ b/analyzer/src/main/resources/UserAgents/GoogleChrome.yaml @@ -298,6 +298,9 @@ config: - 'WebviewAppVersion : 11:@WebViewProduct.version' - matcher: + require: + - 'agent.product.(1)name="Version"' + - 'agent.product.(1)name="Chrome"' variable: - 'WebViewProduct: agent.product.(1)name="Version"^>>.name="Chrome"^<' extract: @@ -307,6 +310,35 @@ config: - 'WebviewAppName : 12:LookUp[SpecialChromeBrowserNames;@WebViewProduct.name]' - 'WebviewAppVersion : 12:@WebViewProduct.version' + +- matcher: + require: + - 'agent.product.(1)name="Version"' + - 'agent.product.(1)name="Chrome"' + - 'agent.product.(1)name="Safari"' + variable: + - 'WebViewProduct: agent.product.(1)name="Version"^>.name="Chrome"^>>.name="Safari"^<' + extract: + - 'AgentClass : 2500:"Browser Webview"' + - 'AgentName : 2500:"Chrome Webview"' + - 'AgentVersion : 2500:agent.product.(1)name="Chrome"^.version' + - 'WebviewAppName : 12:LookUp[SpecialChromeBrowserNames;@WebViewProduct.name]' + - 'WebviewAppVersion : 12:@WebViewProduct.version' + +- matcher: + require: + - 'agent.product.(1)name="Version"' + - 'agent.product.(1)name="Chrome"' + - 'agent.product.(1)name="Mobile Safari"' + variable: + - 'WebViewProduct: agent.product.(1)name="Version"^>.name="Chrome"^>>.name="Mobile Safari"^<' + extract: + - 'AgentClass : 2500:"Browser Webview"' + - 'AgentName : 2500:"Chrome Webview"' + - 'AgentVersion : 2500:agent.product.(1)name="Chrome"^.version' + - 'WebviewAppName : 12:LookUp[SpecialChromeBrowserNames;@WebViewProduct.name]' + - 'WebviewAppVersion : 12:@WebViewProduct.version' + - lookup: name: 'KnownWebviewAppNames' map: @@ -515,6 +547,7 @@ config: "Chromium" : "Chromium" "Ubuntu Chromium" : "Chromium" "Epiphany" : "Epiphany" + "UCBrowser" : "UCBrowser" - matcher: variable: diff --git a/analyzer/src/main/resources/UserAgents/Huawei.yaml b/analyzer/src/main/resources/UserAgents/Huawei.yaml index b33f0b1cb5..bd32cb0cee 100644 --- a/analyzer/src/main/resources/UserAgents/Huawei.yaml +++ b/analyzer/src/main/resources/UserAgents/Huawei.yaml @@ -105,10 +105,10 @@ config: AgentLanguage : 'Chinese (S)' AgentLanguageCode : 'zh-cn' AgentSecurity : 'Strong security' - WebviewAppName : 'Mobile Safari' # It is impossible!!! - WebviewAppNameVersionMajor : 'Mobile Safari 537' # - WebviewAppVersion : '537.36' # FIXME: This must be UCBrowser! - WebviewAppVersionMajor : '537' # To understand and fix. + WebviewAppName : 'UCBrowser' + WebviewAppNameVersionMajor : 'UCBrowser 11' + WebviewAppVersion : '11.6.6.951' + WebviewAppVersionMajor : '11' - test: input: