open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed dead code

Browse Source
pull/702/head
Luke Pulverenti 11 years ago
parent 402e80dac3
commit 6e25c572fa
6 changed files with 86 additions and 146 deletions
Show Stats Download Patch File Download Diff File

8
MediaBrowser.Api/PluginService.cs
Unescape View File

@ -7,12 +7,12 @@ using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Plugins;
using MediaBrowser.Model.Serialization;
using ServiceStack;
using ServiceStack.Text.Controller;
using ServiceStack.Web;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using ServiceStack.Text.Controller;
using ServiceStack.Web;
namespace MediaBrowser.Api
{
@ -190,8 +190,7 @@ namespace MediaBrowser.Api
var result = new PluginSecurityInfo
{
IsMBSupporter = _securityManager.IsMBSupporter,
SupporterKey = _securityManager.SupporterKey,
LegacyKey = _securityManager.LegacyKey
SupporterKey = _securityManager.SupporterKey
};
return ToOptimizedSerializedResultUsingCache(result);
@ -206,7 +205,6 @@ namespace MediaBrowser.Api
var info = request;
_securityManager.SupporterKey = info.SupporterKey;
_securityManager.LegacyKey = info.LegacyKey;
}
/// <summary>

3
MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
Unescape View File

@ -99,7 +99,6 @@
<Compile Include="ScheduledTasks\Tasks\ReloadLoggerFileTask.cs" />
<Compile Include="ScheduledTasks\Tasks\SystemUpdateTask.cs" />
<Compile Include="Security\MBLicenseFile.cs" />
<Compile Include="Security\MBRegistration.cs" />
<Compile Include="Security\PluginSecurityManager.cs" />
<Compile Include="Security\RegRecord.cs" />
<Compile Include="Serialization\JsonSerializer.cs" />
@ -135,4 +134,4 @@ xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

99
MediaBrowser.Common.Implementations/Security/MBRegistration.cs
Unescape View File

@ -1,99 +0,0 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Serialization;
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
namespace MediaBrowser.Common.Implementations.Security
{
public static class MBRegistration
{
private static MBLicenseFile _licenseFile;
private const string MBValidateUrl = Constants.Constants.MbAdminUrl + "service/registration/validate";
private static IApplicationPaths _appPaths;
private static INetworkManager _networkManager;
private static ILogger _logger;
private static IApplicationHost _applicationHost;
private static MBLicenseFile LicenseFile
{
get { return _licenseFile ?? (_licenseFile = new MBLicenseFile(_appPaths)); }
}
public static string SupporterKey
{
get { return LicenseFile.RegKey; }
set { LicenseFile.RegKey = value; LicenseFile.Save(); }
}
public static string LegacyKey
{
get { return LicenseFile.LegacyKey; }
set { LicenseFile.LegacyKey = value; LicenseFile.Save(); }
}
public static void Init(IApplicationPaths appPaths, INetworkManager networkManager, ILogManager logManager, IApplicationHost appHost)
{
// Ugly alert (static init)
_appPaths = appPaths;
_networkManager = networkManager;
_logger = logManager.GetLogger("SecurityManager");
_applicationHost = appHost;
}
public static async Task<MBRegistrationRecord> GetRegistrationStatus(IHttpClient httpClient, IJsonSerializer jsonSerializer, string feature, string mb2Equivalent = null, string version = null)
{
//check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho
var reg = new RegRecord { registered = LicenseFile.LastChecked(feature) > DateTime.UtcNow.AddDays(-30) };
var success = reg.registered;
if (!reg.registered)
{
var mac = _networkManager.GetMacAddress();
var data = new Dictionary<string, string>
{
{ "feature", feature },
{ "key", SupporterKey },
{ "mac", mac },
{ "mb2equiv", mb2Equivalent },
{ "legacykey", LegacyKey },
{ "ver", version },
{ "platform", Environment.OSVersion.VersionString },
{ "isservice", _applicationHost.IsRunningAsService.ToString().ToLower() }
};
try
{
using (var json = await httpClient.Post(MBValidateUrl, data, CancellationToken.None).ConfigureAwait(false))
{
reg = jsonSerializer.DeserializeFromStream<RegRecord>(json);
success = true;
}
if (reg.registered)
{
LicenseFile.AddRegCheck(feature);
}
else
{
LicenseFile.RemoveRegCheck(feature);
}
}
catch (Exception e)
{
_logger.ErrorException("Error checking registration status of {0}", e, feature);
}
}
return new MBRegistrationRecord { IsRegistered = reg.registered, ExpirationDate = reg.expDate, RegChecked = true, RegError = !success};
}
}
}

106
MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
Unescape View File

@ -17,6 +17,8 @@ namespace MediaBrowser.Common.Implementations.Security
/// </summary>
public class PluginSecurityManager : ISecurityManager
{
private const string MBValidateUrl = Constants.Constants.MbAdminUrl + "service/registration/validate";
/// <summary>
/// The _is MB supporter
/// </summary>
@ -38,16 +40,23 @@ namespace MediaBrowser.Common.Implementations.Security
{
get
{
LazyInitializer.EnsureInitialized(ref _isMbSupporter, ref _isMbSupporterInitialized, ref _isMbSupporterSyncLock, () => GetRegistrationStatus("MBSupporter", null, _appHost.ApplicationVersion.ToString()).Result.IsRegistered);
LazyInitializer.EnsureInitialized(ref _isMbSupporter, ref _isMbSupporterInitialized, ref _isMbSupporterSyncLock, () => GetSupporterRegistrationStatus().Result.IsRegistered);
return _isMbSupporter.Value;
}
}
private MBLicenseFile _licenseFile;
private MBLicenseFile LicenseFile
{
get { return _licenseFile ?? (_licenseFile = new MBLicenseFile(_appPaths)); }
}
private readonly IHttpClient _httpClient;
private readonly IJsonSerializer _jsonSerializer;
private readonly IApplicationHost _appHost;
private readonly IApplicationPaths _applciationPaths;
private readonly ILogger _logger;
private readonly INetworkManager _networkManager;
private readonly IApplicationPaths _appPaths;
private IEnumerable<IRequiresRegistration> _registeredEntities;
protected IEnumerable<IRequiresRegistration> RegisteredEntities
@ -69,12 +78,12 @@ namespace MediaBrowser.Common.Implementations.Security
throw new ArgumentNullException("httpClient");
}
_applciationPaths = appPaths;
_networkManager = networkManager;
_appHost = appHost;
_httpClient = httpClient;
_jsonSerializer = jsonSerializer;
MBRegistration.Init(_applciationPaths, _networkManager, logManager, _appHost);
_networkManager = networkManager;
_appPaths = appPaths;
_logger = logManager.GetLogger("SecurityManager");
}
/// <summary>
@ -97,9 +106,9 @@ namespace MediaBrowser.Common.Implementations.Security
/// <param name="feature">The feature.</param>
/// <param name="mb2Equivalent">The MB2 equivalent.</param>
/// <returns>Task{MBRegistrationRecord}.</returns>
public async Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent = null)
public Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent = null)
{
return await MBRegistration.GetRegistrationStatus(_httpClient, _jsonSerializer, feature, mb2Equivalent).ConfigureAwait(false);
return GetRegistrationStatusInternal(feature, mb2Equivalent);
}
/// <summary>
@ -109,9 +118,14 @@ namespace MediaBrowser.Common.Implementations.Security
/// <param name="mb2Equivalent">The MB2 equivalent.</param>
/// <param name="version">The version of this feature</param>
/// <returns>Task{MBRegistrationRecord}.</returns>
public async Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent, string version)
public Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent, string version)
{
return GetRegistrationStatusInternal(feature, mb2Equivalent, version);
}
public Task<MBRegistrationRecord> GetSupporterRegistrationStatus()
{
return await MBRegistration.GetRegistrationStatus(_httpClient, _jsonSerializer, feature, mb2Equivalent, version).ConfigureAwait(false);
return GetRegistrationStatusInternal("MBSupporter", null, _appHost.ApplicationVersion.ToString());
}
/// <summary>
@ -122,40 +136,80 @@ namespace MediaBrowser.Common.Implementations.Security
{
get
{
return MBRegistration.SupporterKey;
return LicenseFile.RegKey;
}
set
{
if (value != MBRegistration.SupporterKey)
if (value != LicenseFile.RegKey)
{
MBRegistration.SupporterKey = value;
LicenseFile.RegKey = value;
LicenseFile.Save();
// re-load registration info
Task.Run(() => LoadAllRegistrationInfo());
}
}
}
/// <summary>
/// Gets or sets the legacy key.
/// </summary>
/// <value>The legacy key.</value>
public string LegacyKey
private async Task<MBRegistrationRecord> GetRegistrationStatusInternal(string feature,
string mb2Equivalent = null,
string version = null)
{
get
//check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho
var reg = new RegRecord
{
return MBRegistration.LegacyKey;
}
set
registered = LicenseFile.LastChecked(feature) > DateTime.UtcNow.AddDays(-15)
};
var success = reg.registered;
if (!reg.registered)
{
if (value != MBRegistration.LegacyKey)
var mac = _networkManager.GetMacAddress();
var data = new Dictionary<string, string>
{
MBRegistration.LegacyKey = value;
// re-load registration info
Task.Run(() => LoadAllRegistrationInfo());
{ "feature", feature },
{ "key", SupporterKey },
{ "mac", mac },
{ "mb2equiv", mb2Equivalent },
{ "ver", version },
{ "platform", Environment.OSVersion.VersionString },
{ "isservice", _appHost.IsRunningAsService.ToString().ToLower() }
};
try
{
using (var json = await _httpClient.Post(MBValidateUrl, data, CancellationToken.None).ConfigureAwait(false))
{
reg = _jsonSerializer.DeserializeFromStream<RegRecord>(json);
success = true;
}
if (reg.registered)
{
LicenseFile.AddRegCheck(feature);
}
else
{
LicenseFile.RemoveRegCheck(feature);
}
}
catch (Exception e)
{
_logger.ErrorException("Error checking registration status of {0}", e, feature);
}
}
}
return new MBRegistrationRecord
{
IsRegistered = reg.registered,
ExpirationDate = reg.expDate,
RegChecked = true,
RegError = !success
};
}
/// <summary>
/// Resets the supporter info.
/// </summary>

10
MediaBrowser.Common/Security/ISecurityManager.cs
Unescape View File

@ -1,5 +1,5 @@
using System.Threading.Tasks;
using MediaBrowser.Model.Entities;
using System.Threading.Tasks;
namespace MediaBrowser.Common.Security
{
@ -17,18 +17,11 @@ namespace MediaBrowser.Common.Security
/// <value>The supporter key.</value>
string SupporterKey { get; set; }
/// <summary>
/// Gets or sets the legacy key.
/// </summary>
/// <value>The legacy key.</value>
string LegacyKey { get; set; }
/// <summary>
/// Gets the registration status. Overload to support existing plug-ins.
/// </summary>
/// <param name="feature">The feature.</param>
/// <param name="mb2Equivalent">The MB2 equivalent.</param>
/// <param name="version">The version of the feature</param>
/// <returns>Task{MBRegistrationRecord}.</returns>
Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent = null);
@ -40,6 +33,7 @@ namespace MediaBrowser.Common.Security
/// <param name="version">The version of the feature</param>
/// <returns>Task{MBRegistrationRecord}.</returns>
Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent, string version);
/// <summary>
/// Load all registration info for all entities that require registration
/// </summary>

6
MediaBrowser.Model/Entities/PluginSecurityInfo.cs
Unescape View File

@ -12,12 +12,6 @@ namespace MediaBrowser.Model.Entities
/// <value>The supporter key.</value>
public string SupporterKey { get; set; }
/// <summary>
/// Gets or sets the legacy supporter key.
/// </summary>
/// <value><c>The legacy supporter key</value>
public string LegacyKey { get; set; }
/// <summary>
/// Gets or sets a value indicating whether this instance is MB supporter.
/// </summary>

Write Preview
Loading…
Cancel
Save