|
1 | | -using System.Net; |
| 1 | +using System.Net; |
2 | 2 | using System.Net.NetworkInformation; |
3 | 3 | using System.Net.Sockets; |
4 | 4 |
|
@@ -34,7 +34,23 @@ public static bool IsValidIpAddress(string ipAddress, out IPAddress value) |
34 | 34 | { |
35 | 35 | ArgumentNullException.ThrowIfNull(ipAddress, nameof(ipAddress)); |
36 | 36 |
|
37 | | - return IPAddress.TryParse(ipAddress, out value); |
| 37 | + value = null; |
| 38 | + |
| 39 | + // 首先尝试解析IP地址 |
| 40 | + if (!IPAddress.TryParse(ipAddress, out var parsedIp)) |
| 41 | + { |
| 42 | + return false; |
| 43 | + } |
| 44 | + |
| 45 | + // 验证解析后的IP地址字符串表示是否与原始输入完全匹配 |
| 46 | + // 这可以防止IPAddress.TryParse自动补全不完整的IP地址(如"192.168.1"被解析为"192.168.0.1") |
| 47 | + if (parsedIp.ToString() != ipAddress) |
| 48 | + { |
| 49 | + return false; |
| 50 | + } |
| 51 | + |
| 52 | + value = parsedIp; |
| 53 | + return true; |
38 | 54 | } |
39 | 55 |
|
40 | 56 | /// <summary> |
@@ -321,6 +337,7 @@ public static List<int> GetAvailablePorts(int startPort, int endPort, int maxCou |
321 | 337 | /// <param name="timeout">超时时间(毫秒),默认10000毫秒</param> |
322 | 338 | /// <returns>公网IP地址字符串,获取失败返回null</returns> |
323 | 339 | /// <exception cref="ArgumentOutOfRangeException">当timeout小于0时抛出此异常</exception> |
| 340 | +#nullable enable |
324 | 341 | public static async Task<string?> GetPublicIpAddressAsync(int timeout = 10000) |
325 | 342 | { |
326 | 343 | ArgumentOutOfRangeException.ThrowIfNegative(timeout, nameof(timeout)); |
@@ -365,7 +382,7 @@ public static bool IsPrivateIpAddress(string ipAddress) |
365 | 382 | { |
366 | 383 | ArgumentException.ThrowIfNullOrEmpty(ipAddress, nameof(ipAddress)); |
367 | 384 |
|
368 | | - if (!IPAddress.TryParse(ipAddress, out var ip)) |
| 385 | + if (!IsValidIpAddress(ipAddress, out var ip)) |
369 | 386 | { |
370 | 387 | throw new ArgumentException("无效的IP地址格式", nameof(ipAddress)); |
371 | 388 | } |
|
0 commit comments