Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-25 12:45:18 +01:00
Code Issues Projects Releases Wiki Activity

replace ip regex with IPAddress.Parse

Browse Source
This commit is contained in:
Kyle Spearrin 2020-05-01 11:08:47 -04:00
parent 3462613f49
commit 7abfefd167
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Icons/Services/IconFetchingService.cs
View File

@ -36,16 +36,10 @@ namespace Bit.Icons.Services
private readonly HashSet<string> _allowedMediaTypes; private readonly HashSet<string> _allowedMediaTypes;
private readonly HttpClient _httpClient; private readonly HttpClient _httpClient;
private readonly ILogger<IIconFetchingService> _logger; private readonly ILogger<IIconFetchingService> _logger;
private readonly Regex _ipRegex;
public IconFetchingService(ILogger<IIconFetchingService> logger) public IconFetchingService(ILogger<IIconFetchingService> logger)
{ {
_logger = logger; _logger = logger;
_ipRegex = new Regex("^" +
"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$");
_allowedMediaTypes = new HashSet<string> _allowedMediaTypes = new HashSet<string>
{ {
_pngMediaType, _pngMediaType,
@ -64,7 +58,7 @@ namespace Bit.Icons.Services
public async Task<IconResult> GetIconAsync(string domain) public async Task<IconResult> GetIconAsync(string domain)
{ {
if (_ipRegex.IsMatch(domain)) if (IPAddress.TryParse(domain, out _))
{ {
_logger.LogWarning("IP address: {0}.", domain); _logger.LogWarning("IP address: {0}.", domain);
return null; return null;
@ -292,7 +286,7 @@ namespace Bit.Icons.Services
} }
// Prevent local hosts (localhost, bobs-pc, etc), IPv4, and IPv6 (which contain ":" in the host) // Prevent local hosts (localhost, bobs-pc, etc), IPv4, and IPv6 (which contain ":" in the host)
if (!uri.Host.Contains(".") || _ipRegex.IsMatch(uri.Host) || uri.Host.Contains(":")) if (!uri.Host.Contains(".") || IPAddress.TryParse(uri.Host, out _))
{ {
return null; return null;
} }