!1044 修复issues:I7OTCU (IOS系统下，chrome 浏览器的解析规则有误)

Merge pull request !1044 from 啦啦啦/v5-dev
dromara · Jul 29, 2023 · 04b5cc9 · 04b5cc9
2 parents 1af3851 + e1d2926
commit 04b5cc9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java b/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java
@@ -54,7 +54,7 @@ public class Browser extends UserAgentInfo {
 			// 联想浏览器
 			new Browser("Lenovo", "SLBrowser", "SLBrowser/([\\d\\w\\.\\-]+)"),
 			new Browser("MSEdge", "Edge|Edg", "(?:edge|Edg|EdgA)\\/([\\d\\w\\.\\-]+)"),
-			new Browser("Chrome", "chrome", Other_Version),
+			new Browser("Chrome", "chrome|(iphone.*crios.*safari)", "(?:Chrome|CriOS)\\/([\\d\\w\\.\\-]+)"),
 			new Browser("Firefox", "firefox", Other_Version),
 			new Browser("IEMobile", "iemobile", Other_Version),
 			new Browser("Android Browser", "android", "version\\/([\\d\\w\\.\\-]+)"),

diff --git a/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java b/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
@@ -426,4 +426,34 @@ public void issueI60UOPTest() {
 		Assert.assertEquals("Windows", ua.getPlatform().toString());
 		Assert.assertFalse(ua.isMobile());
 	}
+
+	/**
+	 * <a href="https://gitee.com/dromara/hutool/issues/I7OTCU">fix : issues I7OTCU </a>
+	 */
+	@Test
+	public void issuseI7OTCUTest() {
+		// MAC Chrome 浏览器 ua
+		final String uaStr = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36";
+		final UserAgent ua = UserAgentUtil.parse(uaStr);
+		Assert.assertEquals("Chrome", ua.getBrowser().toString());
+		Assert.assertEquals("114.0.0.0", ua.getVersion());
+		Assert.assertEquals("Webkit", ua.getEngine().toString());
+		Assert.assertEquals("537.36", ua.getEngineVersion());
+		Assert.assertEquals("OSX", ua.getOs().toString());
+		Assert.assertEquals("10_15_7", ua.getOsVersion());
+		Assert.assertEquals("Mac", ua.getPlatform().toString());
+		Assert.assertFalse(ua.isMobile());
+
+		// iphone Chrome 浏览器ua
+		final String uaStr2 = "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1";
+		final UserAgent ua2 = UserAgentUtil.parse(uaStr2);
+		Assert.assertEquals("Chrome", ua2.getBrowser().toString());
+		Assert.assertEquals("56.0.2924.75", ua2.getVersion());
+		Assert.assertEquals("Webkit", ua2.getEngine().toString());
+		Assert.assertEquals("602.1.50", ua2.getEngineVersion());
+		Assert.assertEquals("iPhone", ua2.getOs().toString());
+		Assert.assertEquals("10_3", ua2.getOsVersion());
+		Assert.assertEquals("iPhone", ua2.getPlatform().toString());
+		Assert.assertTrue(ua2.isMobile());
+	}
 }