lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复getMultistageReverseProxyIp未去除空格问题

Browse Source
This commit is contained in:
Looly 2022-12-05 23:42:00 +08:00
parent d8283fedb0
commit 0d495e34b3
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,7 +3,7 @@
-------------------------------------------------------------------------------------------------------------
# 5.8.11.M1 (2022-11-29)
# 5.8.11.M1 (2022-12-05)
### 🐣新特性
* 【core 】 CharUtil.isBlankChar增加\u180e（pr#2738@Github）
@ -18,6 +18,7 @@
* 【core 】 修复HexUtil.isHexNumber()判断逻辑超出long的精度问题（issue#I62H7K@Gitee）
* 【core 】 修复BiMap中未重写computeIfAbsent和putIfAbsent导致双向查找出问题（issue#I62X8O@Gitee）
* 【json 】 修复JSON解析栈溢出部分问题（issue#2746@Github）
* 【json 】 修复getMultistageReverseProxyIp未去除空格问题（issue#I64P9J@Gitee）
-------------------------------------------------------------------------------------------------------------

6
hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java
View File

@ -751,9 +751,9 @@ public class NetUtil {
*/
public static String getMultistageReverseProxyIp(String ip) {
// 多级反向代理检测
if (ip != null && ip.indexOf(",") > 0) {
final String[] ips = ip.trim().split(",");
for (String subIp : ips) {
if (ip != null && StrUtil.indexOf(ip, ',') > 0) {
final List<String> ips = StrUtil.splitTrim(ip, ',');
for (final String subIp : ips) {
if (false == isUnknown(subIp)) {
ip = subIp;
break;

7
hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java
View File

@ -112,4 +112,11 @@ public class NetUtilTest {
Assert.assertFalse(NetUtil.isInRange("114.114.114.114","192.168.3.4/32"));
}
@Test
public void issueI64P9JTest() {
// 获取结果应该去掉空格
final String ips = "unknown, 12.34.56.78, 23.45.67.89";
final String ip = NetUtil.getMultistageReverseProxyIp(ips);
Assert.assertEquals("12.34.56.78", ip);
}
}