nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-13 13:47:30 -05:00
Code Activity

Run formatting (#2230)

Browse Source
This commit is contained in:
Justin Baur
2022-08-29 16:06:55 -04:00
committed by GitHub
parent 9b7aef0763
commit 7f5f010e1e
1205 changed files with 73813 additions and 75022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
src/Icons/Controllers/IconsController.cs
View File

@ -3,106 +3,105 @@ using Bit.Icons.Services;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Caching.Memory;
namespace Bit.Icons.Controllers
namespace Bit.Icons.Controllers;
[Route("")]
public class IconsController : Controller
{
[Route("")]
public class IconsController : Controller
// Basic bwi-globe icon
private static readonly byte[] _notFoundImage = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUg" +
"AAABMAAAATCAQAAADYWf5HAAABu0lEQVR42nXSvWuTURTH8R+t0heI9Y04aJycdBLNJNrBFBU7OFgUER3q21I0bXK+JwZ" +
"pXISm/QdcRB3EgqBBsNihsUbbgODQQSKCuKSDOApJuuhj8tCYQj/jvYfD795z1MZ+nBKrNKhSwrMxbZTrtRnqlEjZkB/x" +
"C/xmhZrlc71qS0Up8yVzTCGucFNKD1JhORVd70SZNU4okNx5d4+U2UXRIpJFWLClsR79YzN88wQvLWNzzPKEeS/wkQGpW" +
"VhhqhW8TtDJD3Mm1x/23zLSrZCdpBY8BueTNjHSbc+8wC9HlHgU5Aj5AW5zPdcVdpq0UcknWBSr/pjixO4gfp899Kd23p" +
"M2qQCH7LkCnqAqGh73OK/8NPOcaibr90LrW/yWAnaUhqjaOSl9nFR2r5rsqo22ypn1B5IN8VOUMHVgOnNQIX+d62plcz6" +
"rg1/jskK8CMb4we4pG6OWHtR/LBJkC2E4a7ZPkuX5ntumAOM2xxveclEhLvGH6XCmLPs735Eetrw63NnOgr9P9q1viC3x" +
"lRUGOjImqFDuOBvrYYoaZU9z1uPpYae5NfdvbNVG2ZjDIlXq/oMi46lo++4vjjPBl2Dlg00AAAAASUVORK5CYII=");
private readonly IMemoryCache _memoryCache;
private readonly IDomainMappingService _domainMappingService;
private readonly IIconFetchingService _iconFetchingService;
private readonly ILogger<IconsController> _logger;
private readonly IconsSettings _iconsSettings;
public IconsController(
IMemoryCache memoryCache,
IDomainMappingService domainMappingService,
IIconFetchingService iconFetchingService,
ILogger<IconsController> logger,
IconsSettings iconsSettings)
{
// Basic bwi-globe icon
private static readonly byte[] _notFoundImage = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUg" +
"AAABMAAAATCAQAAADYWf5HAAABu0lEQVR42nXSvWuTURTH8R+t0heI9Y04aJycdBLNJNrBFBU7OFgUER3q21I0bXK+JwZ" +
"pXISm/QdcRB3EgqBBsNihsUbbgODQQSKCuKSDOApJuuhj8tCYQj/jvYfD795z1MZ+nBKrNKhSwrMxbZTrtRnqlEjZkB/x" +
"C/xmhZrlc71qS0Up8yVzTCGucFNKD1JhORVd70SZNU4okNx5d4+U2UXRIpJFWLClsR79YzN88wQvLWNzzPKEeS/wkQGpW" +
"VhhqhW8TtDJD3Mm1x/23zLSrZCdpBY8BueTNjHSbc+8wC9HlHgU5Aj5AW5zPdcVdpq0UcknWBSr/pjixO4gfp899Kd23p" +
"M2qQCH7LkCnqAqGh73OK/8NPOcaibr90LrW/yWAnaUhqjaOSl9nFR2r5rsqo22ypn1B5IN8VOUMHVgOnNQIX+d62plcz6" +
"rg1/jskK8CMb4we4pG6OWHtR/LBJkC2E4a7ZPkuX5ntumAOM2xxveclEhLvGH6XCmLPs735Eetrw63NnOgr9P9q1viC3x" +
"lRUGOjImqFDuOBvrYYoaZU9z1uPpYae5NfdvbNVG2ZjDIlXq/oMi46lo++4vjjPBl2Dlg00AAAAASUVORK5CYII=");
_memoryCache = memoryCache;
_domainMappingService = domainMappingService;
_iconFetchingService = iconFetchingService;
_logger = logger;
_iconsSettings = iconsSettings;
}
private readonly IMemoryCache _memoryCache;
private readonly IDomainMappingService _domainMappingService;
private readonly IIconFetchingService _iconFetchingService;
private readonly ILogger<IconsController> _logger;
private readonly IconsSettings _iconsSettings;
public IconsController(
IMemoryCache memoryCache,
IDomainMappingService domainMappingService,
IIconFetchingService iconFetchingService,
ILogger<IconsController> logger,
IconsSettings iconsSettings)
[HttpGet("~/config")]
public IActionResult GetConfig()
{
return new JsonResult(new
{
_memoryCache = memoryCache;
_domainMappingService = domainMappingService;
_iconFetchingService = iconFetchingService;
_logger = logger;
_iconsSettings = iconsSettings;
CacheEnabled = _iconsSettings.CacheEnabled,
CacheHours = _iconsSettings.CacheHours,
CacheSizeLimit = _iconsSettings.CacheSizeLimit
});
}
[HttpGet("{hostname}/icon.png")]
public async Task<IActionResult> Get(string hostname)
{
if (string.IsNullOrWhiteSpace(hostname) || !hostname.Contains("."))
{
return new BadRequestResult();
}
[HttpGet("~/config")]
public IActionResult GetConfig()
var url = $"http://{hostname}";
if (!Uri.TryCreate(url, UriKind.Absolute, out var uri))
{
return new JsonResult(new
{
CacheEnabled = _iconsSettings.CacheEnabled,
CacheHours = _iconsSettings.CacheHours,
CacheSizeLimit = _iconsSettings.CacheSizeLimit
});
return new BadRequestResult();
}
[HttpGet("{hostname}/icon.png")]
public async Task<IActionResult> Get(string hostname)
var domain = uri.Host;
// Convert sub.domain.com => domain.com
//if(DomainName.TryParseBaseDomain(domain, out var baseDomain))
//{
// domain = baseDomain;
//}
var mappedDomain = _domainMappingService.MapDomain(domain);
if (!_iconsSettings.CacheEnabled || !_memoryCache.TryGetValue(mappedDomain, out Icon icon))
{
if (string.IsNullOrWhiteSpace(hostname) || !hostname.Contains("."))
var result = await _iconFetchingService.GetIconAsync(domain);
if (result == null)
{
return new BadRequestResult();
_logger.LogWarning("Null result returned for {0}.", domain);
icon = null;
}
else
{
icon = result.Icon;
}
var url = $"http://{hostname}";
if (!Uri.TryCreate(url, UriKind.Absolute, out var uri))
// Only cache not found and smaller images (<= 50kb)
if (_iconsSettings.CacheEnabled && (icon == null || icon.Image.Length <= 50012))
{
return new BadRequestResult();
}
var domain = uri.Host;
// Convert sub.domain.com => domain.com
//if(DomainName.TryParseBaseDomain(domain, out var baseDomain))
//{
// domain = baseDomain;
//}
var mappedDomain = _domainMappingService.MapDomain(domain);
if (!_iconsSettings.CacheEnabled || !_memoryCache.TryGetValue(mappedDomain, out Icon icon))
{
var result = await _iconFetchingService.GetIconAsync(domain);
if (result == null)
_logger.LogInformation("Cache icon for {0}.", domain);
_memoryCache.Set(mappedDomain, icon, new MemoryCacheEntryOptions
{
_logger.LogWarning("Null result returned for {0}.", domain);
icon = null;
}
else
{
icon = result.Icon;
}
// Only cache not found and smaller images (<= 50kb)
if (_iconsSettings.CacheEnabled && (icon == null || icon.Image.Length <= 50012))
{
_logger.LogInformation("Cache icon for {0}.", domain);
_memoryCache.Set(mappedDomain, icon, new MemoryCacheEntryOptions
{
AbsoluteExpirationRelativeToNow = new TimeSpan(_iconsSettings.CacheHours, 0, 0),
Size = icon?.Image.Length ?? 0,
Priority = icon == null ? CacheItemPriority.High : CacheItemPriority.Normal
});
}
AbsoluteExpirationRelativeToNow = new TimeSpan(_iconsSettings.CacheHours, 0, 0),
Size = icon?.Image.Length ?? 0,
Priority = icon == null ? CacheItemPriority.High : CacheItemPriority.Normal
});
}
if (icon == null)
{
return new FileContentResult(_notFoundImage, "image/png");
}
return new FileContentResult(icon.Image, icon.Format);
}
if (icon == null)
{
return new FileContentResult(_notFoundImage, "image/png");
}
return new FileContentResult(icon.Image, icon.Format);
}
}

29
src/Icons/Controllers/InfoController.cs
View File

@ -1,21 +1,20 @@
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Icons.Controllers
{
public class InfoController : Controller
{
[HttpGet("~/alive")]
[HttpGet("~/now")]
public DateTime GetAlive()
{
return DateTime.UtcNow;
}
namespace Bit.Icons.Controllers;
[HttpGet("~/version")]
public JsonResult GetVersion()
{
return Json(CoreHelpers.GetVersion());
}
public class InfoController : Controller
{
[HttpGet("~/alive")]
[HttpGet("~/now")]
public DateTime GetAlive()
{
return DateTime.UtcNow;
}
[HttpGet("~/version")]
public JsonResult GetVersion()
{
return Json(CoreHelpers.GetVersion());
}
}