eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(webhooks): fix error when DNS entry has non-ipv4 addresses

Browse source
This commit is contained in:
spiral 2021-11-19 10:58:12 -05:00
parent 00b7f76a5b
commit e8beb245da
No known key found for this signature in database
GPG key ID: A6059F0CA0E1BD31
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
PluralKit.Core/Dispatch/DispatchModels.cs
View file

@ -1,6 +1,8 @@
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Net.Sockets;
using System.Threading.Tasks;
using Newtonsoft.Json;
@ -78,22 +80,24 @@ namespace PluralKit.Core
public static async Task<bool> ValidateUri(string url)
{
var uri = new Uri(url);
IPHostEntry host = null;
try
{
var uri = new Uri(url);
host = await Dns.GetHostEntryAsync(uri.DnsSafeHost);
}
catch (Exception) { }
catch (Exception)
{
return false;
}
if (host == null || host.AddressList.Length == 0)
return false;
#pragma warning disable CS0618
foreach (var address in host.AddressList)
foreach (var address in host.AddressList.Where(address => address.AddressFamily is AddressFamily.InterNetwork))
{
if ((address.Address & 0x7f000000) == 0x7f000000) // 127.0/8
return false;
@ -105,7 +109,11 @@ namespace PluralKit.Core
return false;
}
return true;
if (host.AddressList.Any(address => address.IsIPv6LinkLocal))
return false;
// we only support IPv4 in prod :(
return host.AddressList.Any(address => address.AddressFamily is AddressFamily.InterNetwork);
}
}
}