mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-04-22 18:14:42 +01:00
Mayor code cleanup
Add Argument*Exceptions now use proper nameof operators. Added exception messages to quite a few Argument*Exceptions. Fixed rethorwing to be proper syntax. Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling) Added some TODOs to log certain exceptions. Fix sln again. Fixed all AssemblyInfo's and added proper copyright (where I could find them) We live in *current year*. Fixed the use of braces. Fixed a ton of properties, and made a fair amount of functions static that should be and can be static. Made more Methods that should be static static. You can now use static to find bad functions! Removed unused variable. And added one more proper XML comment.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
@@ -91,7 +91,7 @@ namespace Emby.Server.Implementations.Security
|
||||
{
|
||||
if (info == null)
|
||||
{
|
||||
throw new ArgumentNullException("info");
|
||||
throw new ArgumentNullException(nameof(info));
|
||||
}
|
||||
|
||||
using (WriteLock.Write())
|
||||
@@ -126,7 +126,7 @@ namespace Emby.Server.Implementations.Security
|
||||
{
|
||||
if (info == null)
|
||||
{
|
||||
throw new ArgumentNullException("entry");
|
||||
throw new ArgumentNullException(nameof(info));
|
||||
}
|
||||
|
||||
using (WriteLock.Write())
|
||||
@@ -161,7 +161,7 @@ namespace Emby.Server.Implementations.Security
|
||||
{
|
||||
if (info == null)
|
||||
{
|
||||
throw new ArgumentNullException("entry");
|
||||
throw new ArgumentNullException(nameof(info));
|
||||
}
|
||||
|
||||
using (WriteLock.Write())
|
||||
@@ -183,7 +183,7 @@ namespace Emby.Server.Implementations.Security
|
||||
|
||||
private const string BaseSelectText = "select Tokens.Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, UserName, DateCreated, DateLastActivity, Devices.CustomName from Tokens left join Devices on Tokens.DeviceId=Devices.Id";
|
||||
|
||||
private void BindAuthenticationQueryParams(AuthenticationInfoQuery query, IStatement statement)
|
||||
private static void BindAuthenticationQueryParams(AuthenticationInfoQuery query, IStatement statement)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(query.AccessToken))
|
||||
{
|
||||
@@ -205,7 +205,7 @@ namespace Emby.Server.Implementations.Security
|
||||
{
|
||||
if (query == null)
|
||||
{
|
||||
throw new ArgumentNullException("query");
|
||||
throw new ArgumentNullException(nameof(query));
|
||||
}
|
||||
|
||||
var commandText = BaseSelectText;
|
||||
@@ -306,7 +306,7 @@ namespace Emby.Server.Implementations.Security
|
||||
}
|
||||
}
|
||||
|
||||
private AuthenticationInfo Get(IReadOnlyList<IResultSetValue> reader)
|
||||
private static AuthenticationInfo Get(IReadOnlyList<IResultSetValue> reader)
|
||||
{
|
||||
var info = new AuthenticationInfo
|
||||
{
|
||||
@@ -397,7 +397,7 @@ namespace Emby.Server.Implementations.Security
|
||||
{
|
||||
if (options == null)
|
||||
{
|
||||
throw new ArgumentNullException("options");
|
||||
throw new ArgumentNullException(nameof(options));
|
||||
}
|
||||
|
||||
using (WriteLock.Write())
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using MediaBrowser.Controller.Security;
|
||||
using MediaBrowser.Controller.Security;
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
@@ -14,7 +14,10 @@ namespace Emby.Server.Implementations.Security
|
||||
/// <exception cref="System.ArgumentNullException">value</exception>
|
||||
public string EncryptString(string value)
|
||||
{
|
||||
if (value == null) throw new ArgumentNullException("value");
|
||||
if (value == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(value));
|
||||
}
|
||||
|
||||
return EncryptStringUniversal(value);
|
||||
}
|
||||
@@ -27,12 +30,15 @@ namespace Emby.Server.Implementations.Security
|
||||
/// <exception cref="System.ArgumentNullException">value</exception>
|
||||
public string DecryptString(string value)
|
||||
{
|
||||
if (value == null) throw new ArgumentNullException("value");
|
||||
if (value == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(value));
|
||||
}
|
||||
|
||||
return DecryptStringUniversal(value);
|
||||
}
|
||||
|
||||
private string EncryptStringUniversal(string value)
|
||||
private static string EncryptStringUniversal(string value)
|
||||
{
|
||||
// Yes, this isn't good, but ProtectedData in mono is throwing exceptions, so use this for now
|
||||
|
||||
@@ -40,7 +46,7 @@ namespace Emby.Server.Implementations.Security
|
||||
return Convert.ToBase64String(bytes);
|
||||
}
|
||||
|
||||
private string DecryptStringUniversal(string value)
|
||||
private static string DecryptStringUniversal(string value)
|
||||
{
|
||||
// Yes, this isn't good, but ProtectedData in mono is throwing exceptions, so use this for now
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace Emby.Server.Implementations.Security
|
||||
|
||||
public string RegKey
|
||||
{
|
||||
get { return _regKey; }
|
||||
get => _regKey;
|
||||
set
|
||||
{
|
||||
_updateRecords.Clear();
|
||||
@@ -27,13 +27,7 @@ namespace Emby.Server.Implementations.Security
|
||||
}
|
||||
}
|
||||
|
||||
private string Filename
|
||||
{
|
||||
get
|
||||
{
|
||||
return Path.Combine(_appPaths.ConfigurationDirectoryPath, "mb.lic");
|
||||
}
|
||||
}
|
||||
private string Filename => Path.Combine(_appPaths.ConfigurationDirectoryPath, "mb.lic");
|
||||
|
||||
private readonly ConcurrentDictionary<Guid, FeatureRegInfo> _updateRecords = new ConcurrentDictionary<Guid, FeatureRegInfo>();
|
||||
private readonly object _fileLock = new object();
|
||||
|
||||
@@ -34,10 +34,7 @@ namespace Emby.Server.Implementations.Security
|
||||
}
|
||||
|
||||
private MBLicenseFile _licenseFile;
|
||||
private MBLicenseFile LicenseFile
|
||||
{
|
||||
get { return _licenseFile ?? (_licenseFile = new MBLicenseFile(_appPaths, _fileSystem, _cryptographyProvider)); }
|
||||
}
|
||||
private MBLicenseFile LicenseFile => _licenseFile ?? (_licenseFile = new MBLicenseFile(_appPaths, _fileSystem, _cryptographyProvider));
|
||||
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly IJsonSerializer _jsonSerializer;
|
||||
@@ -55,7 +52,7 @@ namespace Emby.Server.Implementations.Security
|
||||
{
|
||||
if (httpClient == null)
|
||||
{
|
||||
throw new ArgumentNullException("httpClient");
|
||||
throw new ArgumentNullException(nameof(httpClient));
|
||||
}
|
||||
|
||||
_appHost = appHost;
|
||||
@@ -82,14 +79,8 @@ namespace Emby.Server.Implementations.Security
|
||||
/// <value>The supporter key.</value>
|
||||
public string SupporterKey
|
||||
{
|
||||
get
|
||||
{
|
||||
return LicenseFile.RegKey;
|
||||
}
|
||||
set
|
||||
{
|
||||
throw new Exception("Please call UpdateSupporterKey");
|
||||
}
|
||||
get => LicenseFile.RegKey;
|
||||
set => throw new Exception("Please call UpdateSupporterKey");
|
||||
}
|
||||
|
||||
public async Task UpdateSupporterKey(string newValue)
|
||||
@@ -138,7 +129,7 @@ namespace Emby.Server.Implementations.Security
|
||||
_logger.LogError(msg);
|
||||
throw new ArgumentException(msg);
|
||||
}
|
||||
if (!String.IsNullOrEmpty(reg.key))
|
||||
if (!string.IsNullOrEmpty(reg.key))
|
||||
{
|
||||
await UpdateSupporterKey(reg.key).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user