mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 20:12:41 +02:00
Support for digest auth with HttpRequests
[common]
This commit is contained in:
parent
655017e1ed
commit
1e2d931f9a
12
src/NzbDrone.Common/Http/BasicNetworkCredential.cs
Normal file
12
src/NzbDrone.Common/Http/BasicNetworkCredential.cs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
using System.Net;
|
||||||
|
|
||||||
|
namespace NzbDrone.Common.Http
|
||||||
|
{
|
||||||
|
public class BasicNetworkCredential : NetworkCredential
|
||||||
|
{
|
||||||
|
public BasicNetworkCredential(string user, string pass)
|
||||||
|
: base(user, pass)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -2,6 +2,7 @@
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using System.Text;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NLog.Fluent;
|
using NLog.Fluent;
|
||||||
using NzbDrone.Common.EnvironmentInfo;
|
using NzbDrone.Common.EnvironmentInfo;
|
||||||
@ -52,6 +53,22 @@ public HttpResponse GetResponse(HttpRequest request, CookieContainer cookies)
|
|||||||
webRequest.AllowAutoRedirect = false;
|
webRequest.AllowAutoRedirect = false;
|
||||||
webRequest.CookieContainer = cookies;
|
webRequest.CookieContainer = cookies;
|
||||||
|
|
||||||
|
if (request.Credentials != null)
|
||||||
|
{
|
||||||
|
if (request.Credentials is BasicNetworkCredential nc)
|
||||||
|
{
|
||||||
|
// Manually set header to avoid initial challenge response
|
||||||
|
var authInfo = nc.UserName + ":" + nc.Password;
|
||||||
|
authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(authInfo));
|
||||||
|
webRequest.Headers.Add("Authorization", "Basic " + authInfo);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
webRequest.PreAuthenticate = true;
|
||||||
|
webRequest.Credentials = request.Credentials;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (request.RequestTimeout != TimeSpan.Zero)
|
if (request.RequestTimeout != TimeSpan.Zero)
|
||||||
{
|
{
|
||||||
webRequest.Timeout = (int)Math.Ceiling(request.RequestTimeout.TotalMilliseconds);
|
webRequest.Timeout = (int)Math.Ceiling(request.RequestTimeout.TotalMilliseconds);
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Net;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using NzbDrone.Common.EnvironmentInfo;
|
using NzbDrone.Common.EnvironmentInfo;
|
||||||
using NzbDrone.Common.Extensions;
|
using NzbDrone.Common.Extensions;
|
||||||
@ -33,6 +34,7 @@ public HttpRequest(string url, HttpAccept httpAccept = null)
|
|||||||
public HttpHeader Headers { get; set; }
|
public HttpHeader Headers { get; set; }
|
||||||
public byte[] ContentData { get; set; }
|
public byte[] ContentData { get; set; }
|
||||||
public string ContentSummary { get; set; }
|
public string ContentSummary { get; set; }
|
||||||
|
public ICredentials Credentials { get; set; }
|
||||||
public bool SuppressHttpError { get; set; }
|
public bool SuppressHttpError { get; set; }
|
||||||
public bool UseSimplifiedUserAgent { get; set; }
|
public bool UseSimplifiedUserAgent { get; set; }
|
||||||
public bool AllowAutoRedirect { get; set; }
|
public bool AllowAutoRedirect { get; set; }
|
||||||
@ -80,12 +82,5 @@ public void SetContent(string data)
|
|||||||
var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
|
var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
|
||||||
ContentData = encoding.GetBytes(data);
|
ContentData = encoding.GetBytes(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddBasicAuthentication(string username, string password)
|
|
||||||
{
|
|
||||||
var authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes($"{username}:{password}"));
|
|
||||||
|
|
||||||
Headers.Set("Authorization", "Basic " + authInfo);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,10 +24,9 @@ public class HttpRequestBuilder
|
|||||||
public bool ConnectionKeepAlive { get; set; }
|
public bool ConnectionKeepAlive { get; set; }
|
||||||
public TimeSpan RateLimit { get; set; }
|
public TimeSpan RateLimit { get; set; }
|
||||||
public bool LogResponseContent { get; set; }
|
public bool LogResponseContent { get; set; }
|
||||||
public NetworkCredential NetworkCredential { get; set; }
|
public ICredentials NetworkCredential { get; set; }
|
||||||
public Dictionary<string, string> Cookies { get; private set; }
|
public Dictionary<string, string> Cookies { get; private set; }
|
||||||
public List<HttpFormData> FormData { get; private set; }
|
public List<HttpFormData> FormData { get; private set; }
|
||||||
|
|
||||||
public Action<HttpRequest> PostProcess { get; set; }
|
public Action<HttpRequest> PostProcess { get; set; }
|
||||||
|
|
||||||
public HttpRequestBuilder(string baseUrl)
|
public HttpRequestBuilder(string baseUrl)
|
||||||
@ -105,13 +104,7 @@ protected virtual void Apply(HttpRequest request)
|
|||||||
request.ConnectionKeepAlive = ConnectionKeepAlive;
|
request.ConnectionKeepAlive = ConnectionKeepAlive;
|
||||||
request.RateLimit = RateLimit;
|
request.RateLimit = RateLimit;
|
||||||
request.LogResponseContent = LogResponseContent;
|
request.LogResponseContent = LogResponseContent;
|
||||||
|
request.Credentials = NetworkCredential;
|
||||||
if (NetworkCredential != null)
|
|
||||||
{
|
|
||||||
var authInfo = NetworkCredential.UserName + ":" + NetworkCredential.Password;
|
|
||||||
authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(authInfo));
|
|
||||||
request.Headers.Set("Authorization", "Basic " + authInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var header in Headers)
|
foreach (var header in Headers)
|
||||||
{
|
{
|
||||||
|
@ -39,7 +39,7 @@ private IWebProxy CreateWebProxy(HttpProxySettings proxySettings)
|
|||||||
case ProxyType.Http:
|
case ProxyType.Http:
|
||||||
if (proxySettings.Username.IsNotNullOrWhiteSpace() && proxySettings.Password.IsNotNullOrWhiteSpace())
|
if (proxySettings.Username.IsNotNullOrWhiteSpace() && proxySettings.Password.IsNotNullOrWhiteSpace())
|
||||||
{
|
{
|
||||||
return new WebProxy(proxySettings.Host + ":" + proxySettings.Port, proxySettings.BypassLocalAddress, proxySettings.BypassListAsArray, new NetworkCredential(proxySettings.Username, proxySettings.Password));
|
return new WebProxy(proxySettings.Host + ":" + proxySettings.Port, proxySettings.BypassLocalAddress, proxySettings.BypassListAsArray, new BasicNetworkCredential(proxySettings.Username, proxySettings.Password));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -74,7 +74,7 @@ private T ProcessRequest<T>(HadoukenSettings settings, string method, params obj
|
|||||||
|
|
||||||
var requestBuilder = new JsonRpcRequestBuilder(baseUrl, method, parameters);
|
var requestBuilder = new JsonRpcRequestBuilder(baseUrl, method, parameters);
|
||||||
requestBuilder.LogResponseContent = true;
|
requestBuilder.LogResponseContent = true;
|
||||||
requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
|
requestBuilder.NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password);
|
||||||
requestBuilder.Headers.Add("Accept-Encoding", "gzip,deflate");
|
requestBuilder.Headers.Add("Accept-Encoding", "gzip,deflate");
|
||||||
|
|
||||||
var httpRequest = requestBuilder.Build();
|
var httpRequest = requestBuilder.Build();
|
||||||
|
@ -229,7 +229,7 @@ private T ProcessRequest<T>(NzbgetSettings settings, string method, params objec
|
|||||||
|
|
||||||
var requestBuilder = new JsonRpcRequestBuilder(baseUrl, method, parameters);
|
var requestBuilder = new JsonRpcRequestBuilder(baseUrl, method, parameters);
|
||||||
requestBuilder.LogResponseContent = true;
|
requestBuilder.LogResponseContent = true;
|
||||||
requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
|
requestBuilder.NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password);
|
||||||
|
|
||||||
var httpRequest = requestBuilder.Build();
|
var httpRequest = requestBuilder.Build();
|
||||||
|
|
||||||
|
@ -261,7 +261,7 @@ private HttpRequestBuilder BuildRequest(QBittorrentSettings settings)
|
|||||||
var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.UrlBase)
|
var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.UrlBase)
|
||||||
{
|
{
|
||||||
LogResponseContent = true,
|
LogResponseContent = true,
|
||||||
NetworkCredential = new NetworkCredential(settings.Username, settings.Password)
|
NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password)
|
||||||
};
|
};
|
||||||
return requestBuilder;
|
return requestBuilder;
|
||||||
}
|
}
|
||||||
|
@ -270,7 +270,7 @@ private HttpRequestBuilder BuildRequest(QBittorrentSettings settings)
|
|||||||
var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.UrlBase)
|
var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.UrlBase)
|
||||||
{
|
{
|
||||||
LogResponseContent = true,
|
LogResponseContent = true,
|
||||||
NetworkCredential = new NetworkCredential(settings.Username, settings.Password)
|
NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password)
|
||||||
};
|
};
|
||||||
return requestBuilder;
|
return requestBuilder;
|
||||||
}
|
}
|
||||||
|
@ -200,7 +200,7 @@ private HttpRequestBuilder BuildRequest(TransmissionSettings settings)
|
|||||||
.Accept(HttpAccept.Json);
|
.Accept(HttpAccept.Json);
|
||||||
|
|
||||||
requestBuilder.LogResponseContent = true;
|
requestBuilder.LogResponseContent = true;
|
||||||
requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
|
requestBuilder.NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password);
|
||||||
requestBuilder.AllowAutoRedirect = false;
|
requestBuilder.AllowAutoRedirect = false;
|
||||||
|
|
||||||
return requestBuilder;
|
return requestBuilder;
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
using CookComputing.XmlRpc;
|
using CookComputing.XmlRpc;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Common.Extensions;
|
using NzbDrone.Common.Extensions;
|
||||||
|
using NzbDrone.Common.Http;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Download.Clients.RTorrent
|
namespace NzbDrone.Core.Download.Clients.RTorrent
|
||||||
{
|
{
|
||||||
@ -246,7 +247,7 @@ private IRTorrent BuildClient(RTorrentSettings settings)
|
|||||||
|
|
||||||
if (!settings.Username.IsNullOrWhiteSpace())
|
if (!settings.Username.IsNullOrWhiteSpace())
|
||||||
{
|
{
|
||||||
client.Credentials = new NetworkCredential(settings.Username, settings.Password);
|
client.Credentials = new BasicNetworkCredential(settings.Username, settings.Password);
|
||||||
}
|
}
|
||||||
|
|
||||||
return client;
|
return client;
|
||||||
|
@ -196,7 +196,7 @@ private HttpRequestBuilder BuildRequest(UTorrentSettings settings)
|
|||||||
.Accept(HttpAccept.Json);
|
.Accept(HttpAccept.Json);
|
||||||
|
|
||||||
requestBuilder.LogResponseContent = true;
|
requestBuilder.LogResponseContent = true;
|
||||||
requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
|
requestBuilder.NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password);
|
||||||
|
|
||||||
return requestBuilder;
|
return requestBuilder;
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net;
|
|
||||||
using System.Net.Mail;
|
using System.Net.Mail;
|
||||||
using FluentValidation.Results;
|
using FluentValidation.Results;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
using NzbDrone.Common.Http;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Notifications.Email
|
namespace NzbDrone.Core.Notifications.Email
|
||||||
{
|
{
|
||||||
@ -44,11 +44,11 @@ public void SendEmail(EmailSettings settings, string subject, string body, bool
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NetworkCredential credentials = null;
|
BasicNetworkCredential credentials = null;
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(settings.Username))
|
if (!string.IsNullOrWhiteSpace(settings.Username))
|
||||||
{
|
{
|
||||||
credentials = new NetworkCredential(settings.Username, settings.Password);
|
credentials = new BasicNetworkCredential(settings.Username, settings.Password);
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
@ -63,7 +63,7 @@ public void SendEmail(EmailSettings settings, string subject, string body, bool
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Send(MailMessage email, string server, int port, bool ssl, NetworkCredential credentials)
|
private void Send(MailMessage email, string server, int port, bool ssl, BasicNetworkCredential credentials)
|
||||||
{
|
{
|
||||||
var smtp = new SmtpClient(server, port);
|
var smtp = new SmtpClient(server, port);
|
||||||
smtp.EnableSsl = ssl;
|
smtp.EnableSsl = ssl;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using System.Net;
|
||||||
using NzbDrone.Common.Extensions;
|
using NzbDrone.Common.Extensions;
|
||||||
using NzbDrone.Common.Http;
|
using NzbDrone.Common.Http;
|
||||||
using NzbDrone.Common.Serializer;
|
using NzbDrone.Common.Serializer;
|
||||||
@ -33,7 +34,7 @@ public void SendWebhook(WebhookPayload body, WebhookSettings settings)
|
|||||||
|
|
||||||
if (settings.Username.IsNotNullOrWhiteSpace() || settings.Password.IsNotNullOrWhiteSpace())
|
if (settings.Username.IsNotNullOrWhiteSpace() || settings.Password.IsNotNullOrWhiteSpace())
|
||||||
{
|
{
|
||||||
request.AddBasicAuthentication(settings.Username, settings.Password);
|
request.Credentials = new BasicNetworkCredential(settings.Username, settings.Password);
|
||||||
}
|
}
|
||||||
|
|
||||||
_httpClient.Execute(request);
|
_httpClient.Execute(request);
|
||||||
|
Loading…
Reference in New Issue
Block a user