Bläddra i källkod

修正IP地址判断私有地址的bug

懒得勤快 4 år sedan
förälder
incheckning
82f1bd0bfe

+ 2 - 12
Masuit.Tools.Abstractions/Extensions/BaseType/IPAddressExtensions.cs

@@ -26,18 +26,8 @@ namespace Masuit.Tools
                 AddressFamily.InterNetwork when bytes[0] == 198 && bytes[1] == 18 => true,
                 AddressFamily.InterNetwork when bytes[0] == 198 && bytes[1] == 18 => true,
                 AddressFamily.InterNetwork when bytes[0] == 198 && bytes[1] == 51 && bytes[2] == 100 => true,
                 AddressFamily.InterNetwork when bytes[0] == 198 && bytes[1] == 51 && bytes[2] == 100 => true,
                 AddressFamily.InterNetwork when bytes[0] == 203 && bytes[1] == 0 && bytes[2] == 113 => true,
                 AddressFamily.InterNetwork when bytes[0] == 203 && bytes[1] == 0 && bytes[2] == 113 => true,
-                AddressFamily.InterNetworkV6 when ip.IsIPv6Teredo || ip.IsIPv6LinkLocal || ip.IsIPv6Multicast || ip.IsIPv6SiteLocal => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("::") => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("64:ff9b::") => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("100::") => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("2001::") => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("2001:2") => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("2001:db8:") => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("2002:") => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("fc") => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("fd") => true,
-                AddressFamily.InterNetworkV6 when ip.ToString().StartsWith("fe") => true,
-                AddressFamily.InterNetworkV6 when bytes[0] == 255 => true,
+                AddressFamily.InterNetwork when bytes[0] >= 233 => true,
+                AddressFamily.InterNetworkV6 when ip.IsIPv6Teredo || ip.IsIPv6LinkLocal || ip.IsIPv6Multicast || ip.IsIPv6SiteLocal || bytes[0] == 0 || bytes[0] >= 252 => true,
                 _ => false
                 _ => false
             };
             };
         }
         }

+ 3 - 3
Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj

@@ -4,7 +4,7 @@
     <LangVersion>latest</LangVersion>
     <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet />
     <CodeAnalysisRuleSet />
-    <Version>2.4.4</Version>
+    <Version>2.4.4.1</Version>
     <Authors>懒得勤快</Authors>
     <Authors>懒得勤快</Authors>
     <Description>Masuit.Tools基础公共库,包含一些常用的操作类,大都是静态类,加密解密,反射操作,Excel简单导出,权重随机筛选算法,分布式短id,表达式树,linq扩展,文件压缩,多线程下载和FTP客户端,硬件信息,字符串扩展方法,日期时间扩展操作,中国农历,大文件拷贝,图像裁剪,验证码,断点续传,集合扩展等常用封装。</Description>
     <Description>Masuit.Tools基础公共库,包含一些常用的操作类,大都是静态类,加密解密,反射操作,Excel简单导出,权重随机筛选算法,分布式短id,表达式树,linq扩展,文件压缩,多线程下载和FTP客户端,硬件信息,字符串扩展方法,日期时间扩展操作,中国农历,大文件拷贝,图像裁剪,验证码,断点续传,集合扩展等常用封装。</Description>
     <Copyright>懒得勤快,长空X</Copyright>
     <Copyright>懒得勤快,长空X</Copyright>
@@ -17,9 +17,9 @@
     <RepositoryType>Github</RepositoryType>
     <RepositoryType>Github</RepositoryType>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <FileVersion>2.4.4</FileVersion>
+    <FileVersion>2.4.4.1</FileVersion>
     <Company>masuit.com</Company>
     <Company>masuit.com</Company>
-    <AssemblyVersion>2.4.4</AssemblyVersion>
+    <AssemblyVersion>2.4.4.1</AssemblyVersion>
     <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
     <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <IncludeSymbols>true</IncludeSymbols>

+ 3 - 3
Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -18,10 +18,10 @@ github:https://github.com/ldqk/Masuit.Tools
         <UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
         <UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
         <RepositoryType>Github</RepositoryType>
         <RepositoryType>Github</RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Version>2.4.4</Version>
-        <FileVersion>2.4.4</FileVersion>
+        <Version>2.4.4.1</Version>
+        <FileVersion>2.4.4.1</FileVersion>
         <Company>masuit.com</Company>
         <Company>masuit.com</Company>
-        <AssemblyVersion>2.4.4</AssemblyVersion>
+        <AssemblyVersion>2.4.4.1</AssemblyVersion>
         <Authors>懒得勤快X</Authors>
         <Authors>懒得勤快X</Authors>
         <RepositoryUrl>https://github.com/ldqk/Masuit.Tools</RepositoryUrl>
         <RepositoryUrl>https://github.com/ldqk/Masuit.Tools</RepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>

BIN
Masuit.Tools.Net45/Properties/AssemblyInfo.cs


+ 1 - 1
Masuit.Tools.Net45/package.nuspec

@@ -4,7 +4,7 @@
     <!--*-->
     <!--*-->
     <id>Masuit.Tools.Net45</id>
     <id>Masuit.Tools.Net45</id>
     <!--*-->
     <!--*-->
-    <version>2.4.4</version>
+    <version>2.4.4.1</version>
     <title>Masuit.Tools</title>
     <title>Masuit.Tools</title>
     <!--*-->
     <!--*-->
     <authors>懒得勤快</authors>
     <authors>懒得勤快</authors>

BIN
Masuit.Tools/Properties/AssemblyInfo.cs


+ 1 - 1
Masuit.Tools/package.nuspec

@@ -4,7 +4,7 @@
     <!--*-->
     <!--*-->
     <id>Masuit.Tools.Net</id>
     <id>Masuit.Tools.Net</id>
     <!--*-->
     <!--*-->
-    <version>2.4.4</version>
+    <version>2.4.4.1</version>
     <title>Masuit.Tools</title>
     <title>Masuit.Tools</title>
     <!--*-->
     <!--*-->
     <authors>懒得勤快</authors>
     <authors>懒得勤快</authors>