mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
Style fixes
This commit is contained in:
parent
449074e73f
commit
3a5bbcf2a8
3 changed files with 67 additions and 50 deletions
|
@ -69,7 +69,7 @@ namespace Jellyfin.Server.SocketSharp
|
||||||
{
|
{
|
||||||
if (_listener == null)
|
if (_listener == null)
|
||||||
{
|
{
|
||||||
_listener = new HttpListener(_logger, _cryptoProvider, _socketFactory, _networkManager, _streamHelper, _fileSystem, _environment);
|
_listener = new HttpListener(_logger, _cryptoProvider, _socketFactory, _streamHelper, _fileSystem, _environment);
|
||||||
}
|
}
|
||||||
|
|
||||||
_listener.EnableDualMode = _enableDualMode;
|
_listener.EnableDualMode = _enableDualMode;
|
||||||
|
|
|
@ -3,7 +3,6 @@ using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Security.Cryptography.X509Certificates;
|
using System.Security.Cryptography.X509Certificates;
|
||||||
using MediaBrowser.Common.Net;
|
|
||||||
using MediaBrowser.Model.Cryptography;
|
using MediaBrowser.Model.Cryptography;
|
||||||
using MediaBrowser.Model.IO;
|
using MediaBrowser.Model.IO;
|
||||||
using MediaBrowser.Model.Net;
|
using MediaBrowser.Model.Net;
|
||||||
|
@ -18,47 +17,55 @@ namespace SocketHttpListener.Net
|
||||||
internal ISocketFactory SocketFactory { get; private set; }
|
internal ISocketFactory SocketFactory { get; private set; }
|
||||||
internal IFileSystem FileSystem { get; private set; }
|
internal IFileSystem FileSystem { get; private set; }
|
||||||
internal IStreamHelper StreamHelper { get; private set; }
|
internal IStreamHelper StreamHelper { get; private set; }
|
||||||
internal INetworkManager NetworkManager { get; private set; }
|
|
||||||
internal IEnvironmentInfo EnvironmentInfo { get; private set; }
|
internal IEnvironmentInfo EnvironmentInfo { get; private set; }
|
||||||
|
|
||||||
public bool EnableDualMode { get; set; }
|
public bool EnableDualMode { get; set; }
|
||||||
|
|
||||||
AuthenticationSchemes auth_schemes;
|
private AuthenticationSchemes auth_schemes;
|
||||||
HttpListenerPrefixCollection prefixes;
|
private HttpListenerPrefixCollection prefixes;
|
||||||
AuthenticationSchemeSelector auth_selector;
|
private AuthenticationSchemeSelector auth_selector;
|
||||||
string realm;
|
private string realm;
|
||||||
bool unsafe_ntlm_auth;
|
private bool unsafe_ntlm_auth;
|
||||||
bool listening;
|
private bool listening;
|
||||||
bool disposed;
|
private bool disposed;
|
||||||
|
|
||||||
Dictionary<HttpListenerContext, HttpListenerContext> registry; // Dictionary<HttpListenerContext,HttpListenerContext>
|
private Dictionary<HttpListenerContext, HttpListenerContext> registry;
|
||||||
Dictionary<HttpConnection, HttpConnection> connections;
|
private Dictionary<HttpConnection, HttpConnection> connections;
|
||||||
private ILogger _logger;
|
private ILogger _logger;
|
||||||
private X509Certificate _certificate;
|
private X509Certificate _certificate;
|
||||||
|
|
||||||
public Action<HttpListenerContext> OnContext { get; set; }
|
public Action<HttpListenerContext> OnContext { get; set; }
|
||||||
|
|
||||||
public HttpListener(ILogger logger, ICryptoProvider cryptoProvider, ISocketFactory socketFactory,
|
public HttpListener(
|
||||||
INetworkManager networkManager, IStreamHelper streamHelper, IFileSystem fileSystem,
|
ILogger logger,
|
||||||
|
ICryptoProvider cryptoProvider,
|
||||||
|
ISocketFactory socketFactory,
|
||||||
|
IStreamHelper streamHelper,
|
||||||
|
IFileSystem fileSystem,
|
||||||
IEnvironmentInfo environmentInfo)
|
IEnvironmentInfo environmentInfo)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
CryptoProvider = cryptoProvider;
|
CryptoProvider = cryptoProvider;
|
||||||
SocketFactory = socketFactory;
|
SocketFactory = socketFactory;
|
||||||
NetworkManager = networkManager;
|
|
||||||
StreamHelper = streamHelper;
|
StreamHelper = streamHelper;
|
||||||
FileSystem = fileSystem;
|
FileSystem = fileSystem;
|
||||||
EnvironmentInfo = environmentInfo;
|
EnvironmentInfo = environmentInfo;
|
||||||
|
|
||||||
prefixes = new HttpListenerPrefixCollection(logger, this);
|
prefixes = new HttpListenerPrefixCollection(logger, this);
|
||||||
registry = new Dictionary<HttpListenerContext, HttpListenerContext>();
|
registry = new Dictionary<HttpListenerContext, HttpListenerContext>();
|
||||||
connections = new Dictionary<HttpConnection, HttpConnection>();
|
connections = new Dictionary<HttpConnection, HttpConnection>();
|
||||||
auth_schemes = AuthenticationSchemes.Anonymous;
|
auth_schemes = AuthenticationSchemes.Anonymous;
|
||||||
}
|
}
|
||||||
|
|
||||||
public HttpListener(ILogger logger, X509Certificate certificate, ICryptoProvider cryptoProvider,
|
public HttpListener(
|
||||||
ISocketFactory socketFactory, INetworkManager networkManager, IStreamHelper streamHelper,
|
ILogger logger,
|
||||||
IFileSystem fileSystem, IEnvironmentInfo environmentInfo)
|
X509Certificate certificate,
|
||||||
: this(logger, cryptoProvider, socketFactory, networkManager, streamHelper, fileSystem, environmentInfo)
|
ICryptoProvider cryptoProvider,
|
||||||
|
ISocketFactory socketFactory,
|
||||||
|
IStreamHelper streamHelper,
|
||||||
|
IFileSystem fileSystem,
|
||||||
|
IEnvironmentInfo environmentInfo)
|
||||||
|
: this(logger, cryptoProvider, socketFactory, streamHelper, fileSystem, environmentInfo)
|
||||||
{
|
{
|
||||||
_certificate = certificate;
|
_certificate = certificate;
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,18 +7,18 @@ namespace SocketHttpListener.Net
|
||||||
{
|
{
|
||||||
public class HttpListenerPrefixCollection : ICollection<string>, IEnumerable<string>, IEnumerable
|
public class HttpListenerPrefixCollection : ICollection<string>, IEnumerable<string>, IEnumerable
|
||||||
{
|
{
|
||||||
List<string> prefixes = new List<string>();
|
private List<string> _prefixes = new List<string>();
|
||||||
HttpListener listener;
|
private HttpListener _listener;
|
||||||
|
|
||||||
private ILogger _logger;
|
private ILogger _logger;
|
||||||
|
|
||||||
internal HttpListenerPrefixCollection(ILogger logger, HttpListener listener)
|
internal HttpListenerPrefixCollection(ILogger logger, HttpListener listener)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
this.listener = listener;
|
_listener = listener;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int Count => prefixes.Count;
|
public int Count => _prefixes.Count;
|
||||||
|
|
||||||
public bool IsReadOnly => false;
|
public bool IsReadOnly => false;
|
||||||
|
|
||||||
|
@ -26,80 +26,90 @@ namespace SocketHttpListener.Net
|
||||||
|
|
||||||
public void Add(string uriPrefix)
|
public void Add(string uriPrefix)
|
||||||
{
|
{
|
||||||
listener.CheckDisposed();
|
_listener.CheckDisposed();
|
||||||
//ListenerPrefix.CheckUri(uriPrefix);
|
//ListenerPrefix.CheckUri(uriPrefix);
|
||||||
if (prefixes.Contains(uriPrefix))
|
if (_prefixes.Contains(uriPrefix))
|
||||||
|
{
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
prefixes.Add(uriPrefix);
|
_prefixes.Add(uriPrefix);
|
||||||
if (listener.IsListening)
|
if (_listener.IsListening)
|
||||||
HttpEndPointManager.AddPrefix(_logger, uriPrefix, listener);
|
{
|
||||||
|
HttpEndPointManager.AddPrefix(_logger, uriPrefix, _listener);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddRange(IEnumerable<string> uriPrefixes)
|
public void AddRange(IEnumerable<string> uriPrefixes)
|
||||||
{
|
{
|
||||||
listener.CheckDisposed();
|
_listener.CheckDisposed();
|
||||||
//ListenerPrefix.CheckUri(uriPrefix);
|
|
||||||
foreach (var uriPrefix in uriPrefixes)
|
foreach (var uriPrefix in uriPrefixes)
|
||||||
{
|
{
|
||||||
if (prefixes.Contains(uriPrefix))
|
if (_prefixes.Contains(uriPrefix))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
prefixes.Add(uriPrefix);
|
_prefixes.Add(uriPrefix);
|
||||||
if (listener.IsListening)
|
if (_listener.IsListening)
|
||||||
{
|
{
|
||||||
HttpEndPointManager.AddPrefix(_logger, uriPrefix, listener);
|
HttpEndPointManager.AddPrefix(_logger, uriPrefix, _listener);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Clear()
|
public void Clear()
|
||||||
{
|
{
|
||||||
listener.CheckDisposed();
|
_listener.CheckDisposed();
|
||||||
prefixes.Clear();
|
_prefixes.Clear();
|
||||||
if (listener.IsListening)
|
if (_listener.IsListening)
|
||||||
HttpEndPointManager.RemoveListener(_logger, listener);
|
{
|
||||||
|
HttpEndPointManager.RemoveListener(_logger, _listener);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Contains(string uriPrefix)
|
public bool Contains(string uriPrefix)
|
||||||
{
|
{
|
||||||
listener.CheckDisposed();
|
_listener.CheckDisposed();
|
||||||
return prefixes.Contains(uriPrefix);
|
return _prefixes.Contains(uriPrefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CopyTo(string[] array, int offset)
|
public void CopyTo(string[] array, int offset)
|
||||||
{
|
{
|
||||||
listener.CheckDisposed();
|
_listener.CheckDisposed();
|
||||||
prefixes.CopyTo(array, offset);
|
_prefixes.CopyTo(array, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CopyTo(Array array, int offset)
|
public void CopyTo(Array array, int offset)
|
||||||
{
|
{
|
||||||
listener.CheckDisposed();
|
_listener.CheckDisposed();
|
||||||
((ICollection)prefixes).CopyTo(array, offset);
|
((ICollection)_prefixes).CopyTo(array, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerator<string> GetEnumerator()
|
public IEnumerator<string> GetEnumerator()
|
||||||
{
|
{
|
||||||
return prefixes.GetEnumerator();
|
return _prefixes.GetEnumerator();
|
||||||
}
|
}
|
||||||
|
|
||||||
IEnumerator IEnumerable.GetEnumerator()
|
IEnumerator IEnumerable.GetEnumerator()
|
||||||
{
|
{
|
||||||
return prefixes.GetEnumerator();
|
return _prefixes.GetEnumerator();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Remove(string uriPrefix)
|
public bool Remove(string uriPrefix)
|
||||||
{
|
{
|
||||||
listener.CheckDisposed();
|
_listener.CheckDisposed();
|
||||||
if (uriPrefix == null)
|
if (uriPrefix == null)
|
||||||
|
{
|
||||||
throw new ArgumentNullException(nameof(uriPrefix));
|
throw new ArgumentNullException(nameof(uriPrefix));
|
||||||
|
}
|
||||||
|
|
||||||
bool result = prefixes.Remove(uriPrefix);
|
bool result = _prefixes.Remove(uriPrefix);
|
||||||
if (result && listener.IsListening)
|
if (result && _listener.IsListening)
|
||||||
HttpEndPointManager.RemovePrefix(_logger, uriPrefix, listener);
|
{
|
||||||
|
HttpEndPointManager.RemovePrefix(_logger, uriPrefix, _listener);
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue