Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update ip IsInternal() to account for missed ranges #827

Merged
merged 2 commits into from Jul 18, 2020
+15 −2
Merged

update ip IsInternal() to account for missed ranges #827

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52554d0
update ip IsInternal() to account for missed ranges
kspearrin Jul 17, 2020
129af9d
update with `::`
kspearrin Jul 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/Icons/Services/IconFetchingService.cs
View file
Open in desktop
Expand Up @@ -419,15 +419,28 @@ public static bool IsInternal(IPAddress ip)
{
return true;
}
else if (ip.ToString() == "::1")

var ipString = ip.ToString();
if (ipString == "::1")
{
return false;
}

// IPv6
if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6)
{
return ipString.StartsWith("fc") || ipString.StartsWith("fd") ||
ipString.StartsWith("fe") || ipString.StartsWith("ff");
}

// IPv4
var bytes = ip.GetAddressBytes();
return (bytes[0]) switch
{
0 => true,
10 => true,
127 => true,
169 => bytes[1] == 254, // Cloud environments, such as AWS
172 => bytes[1] < 32 && bytes[1] >= 16,
192 => bytes[1] == 168,
_ => false,
Expand Down