Merge pull request #5 from jellyfin/master

Merge up to latest master

8 files changed, 88 insertions, 67 deletions

diff --git a/MediaBrowser.Common/Extensions/BaseExtensions.cs b/MediaBrowser.Common/Extensions/BaseExtensions.cs
index db0514bb1..40c16b957 100644
--- a/MediaBrowser.Common/Extensions/BaseExtensions.cs
+++ b/MediaBrowser.Common/Extensions/BaseExtensions.cs
@@ -1,6 +1,7 @@
 using System;
+using System.Text;
 using System.Text.RegularExpressions;
-using MediaBrowser.Model.Cryptography;
+using System.Security.Cryptography;
 
 namespace MediaBrowser.Common.Extensions
 {
@@ -9,8 +10,6 @@ namespace MediaBrowser.Common.Extensions
     /// </summary>
     public static class BaseExtensions
     {
-        public static ICryptoProvider CryptographyProvider { get; set; }
-
         /// <summary>
         /// Strips the HTML.
         /// </summary>
@@ -31,7 +30,10 @@ namespace MediaBrowser.Common.Extensions
         /// <returns>Guid.</returns>
         public static Guid GetMD5(this string str)
         {
-            return CryptographyProvider.GetMD5(str);
+            using (var provider = MD5.Create())
+            {
+                return new Guid(provider.ComputeHash(Encoding.Unicode.GetBytes(str)));
+            }
         }
     }
 }
diff --git a/MediaBrowser.Common/Extensions/ResourceNotFoundException.cs b/MediaBrowser.Common/Extensions/ResourceNotFoundException.cs
index f62c65fd7..9f70ae7d8 100644
--- a/MediaBrowser.Common/Extensions/ResourceNotFoundException.cs
+++ b/MediaBrowser.Common/Extensions/ResourceNotFoundException.cs
@@ -26,6 +26,30 @@ namespace MediaBrowser.Common.Extensions
         }
     }
 
+    /// <summary>
+    /// Class MethodNotAllowedException
+    /// </summary>
+    public class MethodNotAllowedException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MethodNotAllowedException" /> class.
+        /// </summary>
+        public MethodNotAllowedException()
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MethodNotAllowedException" /> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        public MethodNotAllowedException(string message)
+            : base(message)
+        {
+
+        }
+    }
+
     public class RemoteServiceUnavailableException : Exception
     {
         public RemoteServiceUnavailableException()
diff --git a/MediaBrowser.Common/IApplicationHost.cs b/MediaBrowser.Common/IApplicationHost.cs
index 2925a3efd..cb7343440 100644
--- a/MediaBrowser.Common/IApplicationHost.cs
+++ b/MediaBrowser.Common/IApplicationHost.cs
@@ -26,11 +26,6 @@ namespace MediaBrowser.Common
         string SystemId { get; }
 
         /// <summary>
-        /// Occurs when [application updated].
-        /// </summary>
-        event EventHandler<GenericEventArgs<PackageVersionInfo>> ApplicationUpdated;
-
-        /// <summary>
         /// Gets or sets a value indicating whether this instance has pending kernel reload.
         /// </summary>
         /// <value><c>true</c> if this instance has pending kernel reload; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Common/Net/CustomHeaderNames.cs b/MediaBrowser.Common/Net/CustomHeaderNames.cs
new file mode 100644
index 000000000..ff148dc80
--- /dev/null
+++ b/MediaBrowser.Common/Net/CustomHeaderNames.cs
@@ -0,0 +1,11 @@
+namespace MediaBrowser.Common.Net
+{
+    public static class CustomHeaderNames
+    {
+        // Other Headers
+        public const string XForwardedFor = "X-Forwarded-For";
+        public const string XForwardedPort = "X-Forwarded-Port";
+        public const string XForwardedProto = "X-Forwarded-Proto";
+        public const string XRealIP = "X-Real-IP";
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Common/Net/HttpRequestOptions.cs b/MediaBrowser.Common/Net/HttpRequestOptions.cs
index bea178517..76bd35e57 100644
--- a/MediaBrowser.Common/Net/HttpRequestOptions.cs
+++ b/MediaBrowser.Common/Net/HttpRequestOptions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using Microsoft.Net.Http.Headers;
 
@@ -17,7 +16,7 @@ namespace MediaBrowser.Common.Net
         /// <value>The URL.</value>
         public string Url { get; set; }
 
-        public CompressionMethod? DecompressionMethod { get; set; }
+        public CompressionMethod DecompressionMethod { get; set; }
 
         /// <summary>
         /// Gets or sets the accept header.
@@ -28,6 +27,7 @@ namespace MediaBrowser.Common.Net
             get => GetHeaderValue(HeaderNames.Accept);
             set => RequestHeaders[HeaderNames.Accept] = value;
         }
+
         /// <summary>
         /// Gets or sets the cancellation token.
         /// </summary>
@@ -35,12 +35,6 @@ namespace MediaBrowser.Common.Net
         public CancellationToken CancellationToken { get; set; }
 
         /// <summary>
-        /// Gets or sets the resource pool.
-        /// </summary>
-        /// <value>The resource pool.</value>
-        public SemaphoreSlim ResourcePool { get; set; }
-
-        /// <summary>
         /// Gets or sets the user agent.
         /// </summary>
         /// <value>The user agent.</value>
@@ -54,13 +48,21 @@ namespace MediaBrowser.Common.Net
         /// Gets or sets the referrer.
         /// </summary>
         /// <value>The referrer.</value>
-        public string Referer { get; set; }
+        public string Referer
+        {
+            get => GetHeaderValue(HeaderNames.Referer);
+            set => RequestHeaders[HeaderNames.Referer] = value;
+        }
 
         /// <summary>
         /// Gets or sets the host.
         /// </summary>
         /// <value>The host.</value>
-        public string Host { get; set; }
+        public string Host
+        {
+            get => GetHeaderValue(HeaderNames.Host);
+            set => RequestHeaders[HeaderNames.Host] = value;
+        }
 
         /// <summary>
         /// Gets or sets the progress.
@@ -68,12 +70,6 @@ namespace MediaBrowser.Common.Net
         /// <value>The progress.</value>
         public IProgress<double> Progress { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable HTTP compression].
-        /// </summary>
-        /// <value><c>true</c> if [enable HTTP compression]; otherwise, <c>false</c>.</value>
-        public bool EnableHttpCompression { get; set; }
-
         public Dictionary<string, string> RequestHeaders { get; private set; }
 
         public string RequestContentType { get; set; }
@@ -86,8 +82,6 @@ namespace MediaBrowser.Common.Net
         public bool LogRequest { get; set; }
         public bool LogRequestAsDebug { get; set; }
         public bool LogErrors { get; set; }
-        public bool LogResponse { get; set; }
-        public bool LogResponseHeaders { get; set; }
 
         public bool LogErrorResponseBody { get; set; }
         public bool EnableKeepAlive { get; set; }
@@ -95,12 +89,8 @@ namespace MediaBrowser.Common.Net
         public CacheMode CacheMode { get; set; }
         public TimeSpan CacheLength { get; set; }
 
-        public int TimeoutMs { get; set; }
         public bool EnableDefaultUserAgent { get; set; }
 
-        public bool AppendCharsetToMimeType { get; set; }
-        public string DownloadFilePath { get; set; }
-
         private string GetHeaderValue(string name)
         {
             RequestHeaders.TryGetValue(name, out var value);
@@ -113,24 +103,12 @@ namespace MediaBrowser.Common.Net
         /// </summary>
         public HttpRequestOptions()
         {
-            EnableHttpCompression = true;
-
             RequestHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
             LogRequest = true;
             LogErrors = true;
             CacheMode = CacheMode.None;
-
-            TimeoutMs = 20000;
-        }
-
-        public void SetPostData(IDictionary<string, string> values)
-        {
-            var strings = values.Keys.Select(key => string.Format("{0}={1}", key, values[key]));
-            var postContent = string.Join("&", strings.ToArray());
-
-            RequestContent = postContent;
-            RequestContentType = "application/x-www-form-urlencoded";
+            DecompressionMethod = CompressionMethod.Deflate;
         }
     }
 
@@ -140,9 +118,11 @@ namespace MediaBrowser.Common.Net
         Unconditional = 1
     }
 
+    [Flags]
     public enum CompressionMethod
     {
-        Deflate,
-        Gzip
+        None = 0b00000001,
+        Deflate = 0b00000010,
+        Gzip = 0b00000100
     }
 }
diff --git a/MediaBrowser.Common/Net/HttpResponseInfo.cs b/MediaBrowser.Common/Net/HttpResponseInfo.cs
index 186674167..d65ce897a 100644
--- a/MediaBrowser.Common/Net/HttpResponseInfo.cs
+++ b/MediaBrowser.Common/Net/HttpResponseInfo.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
+using System.Net.Http.Headers;
 
 namespace MediaBrowser.Common.Net
 {
@@ -50,26 +50,28 @@ namespace MediaBrowser.Common.Net
         /// Gets or sets the headers.
         /// </summary>
         /// <value>The headers.</value>
-        public Dictionary<string, string> Headers { get; set; }
+        public HttpResponseHeaders Headers { get; set; }
 
-        private readonly IDisposable _disposable;
+        /// <summary>
+        /// Gets or sets the content headers.
+        /// </summary>
+        /// <value>The content headers.</value>
+        public HttpContentHeaders ContentHeaders { get; set; }
 
-        public HttpResponseInfo(IDisposable disposable)
+        public HttpResponseInfo()
         {
-            _disposable = disposable;
-            Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
         }
-        public HttpResponseInfo()
+
+        public HttpResponseInfo(HttpResponseHeaders headers, HttpContentHeaders contentHeader)
         {
-            Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            Headers = headers;
+            ContentHeaders = contentHeader;
         }
 
         public void Dispose()
         {
-            if (_disposable != null)
-            {
-                _disposable.Dispose();
-            }
+            // Only IDisposable for backwards compatibility
         }
     }
 }
diff --git a/MediaBrowser.Common/Net/IHttpClient.cs b/MediaBrowser.Common/Net/IHttpClient.cs
index 5aaf7e0be..db69c6f2c 100644
--- a/MediaBrowser.Common/Net/IHttpClient.cs
+++ b/MediaBrowser.Common/Net/IHttpClient.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Threading.Tasks;
+using System.Net.Http;
 
 namespace MediaBrowser.Common.Net
 {
@@ -23,6 +24,8 @@ namespace MediaBrowser.Common.Net
         Task<Stream> Get(HttpRequestOptions options);
 
         /// <summary>
+        /// Warning: Deprecated function,
+        /// use 'Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, HttpMethod httpMethod);' instead
         /// Sends the asynchronous.
         /// </summary>
         /// <param name="options">The options.</param>
@@ -31,6 +34,14 @@ namespace MediaBrowser.Common.Net
         Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, string httpMethod);
 
         /// <summary>
+        /// Sends the asynchronous.
+        /// </summary>
+        /// <param name="options">The options.</param>
+        /// <param name="httpMethod">The HTTP method.</param>
+        /// <returns>Task{HttpResponseInfo}.</returns>
+        Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, HttpMethod httpMethod);
+
+        /// <summary>
         /// Posts the specified options.
         /// </summary>
         /// <param name="options">The options.</param>
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 34c6f5866..61f2bc2f9 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
@@ -53,17 +54,12 @@ namespace MediaBrowser.Common.Net
         /// <returns><c>true</c> if [is in local network] [the specified endpoint]; otherwise, <c>false</c>.</returns>
         bool IsInLocalNetwork(string endpoint);
 
-        IpAddressInfo[] GetLocalIpAddresses(bool ignoreVirtualInterface);
-
-        IpAddressInfo ParseIpAddress(string ipAddress);
-
-        bool TryParseIpAddress(string ipAddress, out IpAddressInfo ipAddressInfo);
-
-        Task<IpAddressInfo[]> GetHostAddressesAsync(string host);
+        IPAddress[] GetLocalIpAddresses(bool ignoreVirtualInterface);
 
         bool IsAddressInSubnets(string addressString, string[] subnets);
 
-        bool IsInSameSubnet(IpAddressInfo address1, IpAddressInfo address2, IpAddressInfo subnetMask);
-        IpAddressInfo GetLocalIpSubnetMask(IpAddressInfo address);
+        bool IsInSameSubnet(IPAddress address1, IPAddress address2, IPAddress subnetMask);
+
+        IPAddress GetLocalIpSubnetMask(IPAddress address);
     }
 }