Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-26 03:31:34 +01:00
Code Issues Projects Releases Wiki Activity

manually handle redirects for android blocks

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-21 21:48:11 -04:00
parent b102152133
commit 82635f20c9
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,6 @@
using System; using System;
using System.Linq;
using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using Bit.Icons.Models; using Bit.Icons.Models;
@ -11,7 +13,10 @@ namespace Bit.Icons.Controllers
[Route("")] [Route("")]
public class IconsController : Controller public class IconsController : Controller
{ {
private static readonly HttpClient _httpClient = new HttpClient(); private static readonly HttpClient _httpClient = new HttpClient(new HttpClientHandler
{
AllowAutoRedirect = false
});
private readonly IMemoryCache _memoryCache; private readonly IMemoryCache _memoryCache;
private readonly IDomainMappingService _domainMappingService; private readonly IDomainMappingService _domainMappingService;
private readonly IconsSettings _iconsSettings; private readonly IconsSettings _iconsSettings;
@ -47,6 +52,32 @@ namespace Bit.Icons.Controllers
var iconUrl = $"{_iconsSettings.BestIconBaseUrl}/icon?url={mappedDomain}&size=16..24..32" + var iconUrl = $"{_iconsSettings.BestIconBaseUrl}/icon?url={mappedDomain}&size=16..24..32" +
$"&fallback_icon_url=https://raw.githubusercontent.com/bitwarden/web/master/src/images/fa-globe.png"; $"&fallback_icon_url=https://raw.githubusercontent.com/bitwarden/web/master/src/images/fa-globe.png";
var response = await _httpClient.GetAsync(iconUrl); var response = await _httpClient.GetAsync(iconUrl);
if(response.StatusCode == HttpStatusCode.Redirect && response.Headers.Contains("Location"))
{
var locationHeader = response.Headers.GetValues("Location").FirstOrDefault();
if(!string.IsNullOrWhiteSpace(locationHeader) &&
Uri.TryCreate(locationHeader, UriKind.Absolute, out Uri location))
{
var message = new HttpRequestMessage
{
RequestUri = location,
Method = HttpMethod.Get
};
// Let's add some headers to look like we're coming from a web browser request. Some websites
// will block our request without these.
message.Headers.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36");
message.Headers.Add("Accept-Language", "en-US,en;q=0.8");
message.Headers.Add("Cache-Control", "no-cache");
message.Headers.Add("Pragma", "no-cache");
message.Headers.Add("Accept", "image/webp,image/apng,image/*,*/*;q=0.8");
response = await _httpClient.SendAsync(message);
}
}
if(!response.IsSuccessStatusCode) if(!response.IsSuccessStatusCode)
{ {
return new NotFoundResult(); return new NotFoundResult();