taiqane/UmlautAdaptarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for known hosts before logging https warning

Browse Source
This commit is contained in:
pcjones
2024-04-15 19:25:53 +02:00
parent 530cbed2d3
commit a4abb31ea1
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
UmlautAdaptarr/Services/HttpProxyService.cs
View File

@@ -10,11 +10,15 @@ namespace UmlautAdaptarr.Services
private readonly ILogger<HttpProxyService> _logger; private readonly ILogger<HttpProxyService> _logger;
private readonly int _proxyPort = 5006; // TODO move to appsettings.json private readonly int _proxyPort = 5006; // TODO move to appsettings.json
private readonly IHttpClientFactory _clientFactory; private readonly IHttpClientFactory _clientFactory;
private HashSet<string> _knownHosts = [];
private readonly object _hostsLock = new object();
public HttpProxyService(ILogger<HttpProxyService> logger, IHttpClientFactory clientFactory) public HttpProxyService(ILogger<HttpProxyService> logger, IHttpClientFactory clientFactory)
{ {
_logger = logger; _logger = logger;
_clientFactory = clientFactory; _clientFactory = clientFactory;
_knownHosts.Add("prowlarr.servarr.com");
} }
private async Task HandleRequests(CancellationToken stoppingToken) private async Task HandleRequests(CancellationToken stoppingToken)
@@ -47,16 +51,18 @@ namespace UmlautAdaptarr.Services
private async Task HandleHttpsConnect(string requestString, NetworkStream clientStream, Socket clientSocket) private async Task HandleHttpsConnect(string requestString, NetworkStream clientStream, Socket clientSocket)
{ {
var targetInfo = ParseTargetInfo(requestString); var (host, port) = ParseTargetInfo(requestString);
if (targetInfo.host != "prowlarr.servarr.com")
// Prowlarr will send grab requests via https which cannot be changed
if (!_knownHosts.Contains(host))
{ {
_logger.LogWarning($"IMPORTANT! {Environment.NewLine} Indexer {targetInfo.host} needs to be set to http:// instead of https:// {Environment.NewLine}" + _logger.LogWarning($"IMPORTANT! {Environment.NewLine} Indexer {host} needs to be set to http:// instead of https:// {Environment.NewLine}" +
$"UmlautAdaptarr will not work for {targetInfo.host}!"); $"UmlautAdaptarr will not work for {host}!");
} }
using var targetSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); using var targetSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
try try
{ {
await targetSocket.ConnectAsync(targetInfo.host, targetInfo.port); await targetSocket.ConnectAsync(host, port);
await clientStream.WriteAsync(Encoding.ASCII.GetBytes("HTTP/1.1 200 Connection Established\r\n\r\n")); await clientStream.WriteAsync(Encoding.ASCII.GetBytes("HTTP/1.1 200 Connection Established\r\n\r\n"));
using var targetStream = new NetworkStream(targetSocket, ownsSocket: true); using var targetStream = new NetworkStream(targetSocket, ownsSocket: true);
await RelayTraffic(clientStream, targetStream); await RelayTraffic(clientStream, targetStream);
@@ -74,8 +80,17 @@ namespace UmlautAdaptarr.Services
{ {
var headers = ParseHeaders(buffer, bytesRead); var headers = ParseHeaders(buffer, bytesRead);
string userAgent = headers.FirstOrDefault(h => h.Key == "User-Agent").Value; string userAgent = headers.FirstOrDefault(h => h.Key == "User-Agent").Value;
var uri = new Uri(requestString.Split(' ')[1]); var uri = new Uri(requestString.Split(' ')[1]);
// Add to known hosts if not already present
lock (_hostsLock)
{
if (!_knownHosts.Contains(uri.Host))
{
_knownHosts.Add(uri.Host);
}
}
var modifiedUri = $"http://localhost:5005/_/{uri.Host}{uri.PathAndQuery}"; // TODO read port from appsettings? var modifiedUri = $"http://localhost:5005/_/{uri.Host}{uri.PathAndQuery}"; // TODO read port from appsettings?
using var client = _clientFactory.CreateClient(); using var client = _clientFactory.CreateClient();
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, modifiedUri); var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, modifiedUri);