Add version and platform to stats and don't hit server on every reg check

MediaBrowser.Common.Implementations/BaseApplicationHost.cs

@@ -383,7 +383,7 @@ namespace MediaBrowser.Common.Implementations
                 NetworkManager = CreateNetworkManager();
                 RegisterSingleInstance(NetworkManager);
 
-                SecurityManager = new PluginSecurityManager(this, HttpClient, JsonSerializer, ApplicationPaths, NetworkManager);
+                SecurityManager = new PluginSecurityManager(this, HttpClient, JsonSerializer, ApplicationPaths, NetworkManager, LogManager);
                 RegisterSingleInstance(SecurityManager);
 
                 InstallationManager = new InstallationManager(Logger, this, ApplicationPaths, HttpClient, JsonSerializer, SecurityManager, NetworkManager, ConfigurationManager);

MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj

@@ -92,6 +92,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScheduledTasks\ScheduledTaskWorker.cs" />
     <Compile Include="ScheduledTasks\TaskManager.cs" />
+    <Compile Include="ScheduledTasks\Tasks\StatisticsTask.cs" />
     <Compile Include="ScheduledTasks\Tasks\DeleteCacheFileTask.cs" />
     <Compile Include="ScheduledTasks\Tasks\DeleteLogFileTask.cs" />
     <Compile Include="ScheduledTasks\Tasks\PluginUpdateTask.cs" />

MediaBrowser.Common.Implementations/Security/MBLicenseFile.cs

@@ -56,6 +56,16 @@ namespace MediaBrowser.Common.Implementations.Security
 
         }
 
+        public void RemoveRegCheck(string featureId)
+        {
+            using (var provider = new MD5CryptoServiceProvider())
+            {
+                UpdateRecords.Remove(new Guid(provider.ComputeHash(Encoding.Unicode.GetBytes(featureId))));
+                Save();
+            }
+
+        }
+
         public DateTime LastChecked(string featureId)
         {
             using (var provider = new MD5CryptoServiceProvider())

MediaBrowser.Common.Implementations/Security/MBRegistration.cs

@@ -1,6 +1,7 @@
 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;
@@ -13,10 +14,11 @@ namespace MediaBrowser.Common.Implementations.Security
     {
 
         private static MBLicenseFile _licenseFile;
-        private const string MBValidateUrl = "http://mb3admin.com/admin/service/registration/validate";
+        private const string MBValidateUrl = Constants.Constants.MbAdminUrl+"service/registration/validate";
 
         private static IApplicationPaths _appPaths;
         private static INetworkManager _networkManager;
+        private static ILogger _logger;
 
         private static MBLicenseFile LicenseFile
         {
@@ -35,20 +37,25 @@ namespace MediaBrowser.Common.Implementations.Security
             set { LicenseFile.LegacyKey = value; LicenseFile.Save(); }
         }
 
-        public static void Init(IApplicationPaths appPaths, INetworkManager networkManager)
+        public static void Init(IApplicationPaths appPaths, INetworkManager networkManager, ILogManager logManager)
         {
             // Ugly alert (static init)
 
             _appPaths = appPaths;
             _networkManager = networkManager;
+            _logger = logManager.GetLogger("SecurityManager");
         }
 
-        public static async Task<MBRegistrationRecord> GetRegistrationStatus(IHttpClient httpClient, IJsonSerializer jsonSerializer, string feature, string mb2Equivalent = null)
+        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)*/};
+
+            if (!reg.registered)
             {
                 var mac = _networkManager.GetMacAddress();
-            var data = new Dictionary<string, string> {{"feature", feature}, {"key",SupporterKey}, {"mac",mac}, {"mb2equiv",mb2Equivalent}, {"legacykey", LegacyKey} };
+                var data = new Dictionary<string, string> { { "feature", feature }, { "key", SupporterKey }, { "mac", mac }, { "mb2equiv", mb2Equivalent }, { "legacykey", LegacyKey }, { "ver", version }, { "platform", Environment.OSVersion.VersionString } };
 
-            var reg = new RegRecord();
                 try
                 {
                     using (var json = await httpClient.Post(MBValidateUrl, data, CancellationToken.None).ConfigureAwait(false))
@@ -60,12 +67,16 @@ namespace MediaBrowser.Common.Implementations.Security
                     {
                         LicenseFile.AddRegCheck(feature);
                     }
+                    else
+                    {
+                        LicenseFile.RemoveRegCheck(feature);
+                    }
 
                 }
-            catch (Exception)
+                catch (Exception e)
                 {
-                //if we have trouble obtaining from web - allow it if we've validated in the past 30 days
+                    _logger.ErrorException("Error checking registration status of {0}", e, feature);
-                reg.registered = LicenseFile.LastChecked(feature) > DateTime.UtcNow.AddDays(-30);
+                }
             }
 
             return new MBRegistrationRecord {IsRegistered = reg.registered, ExpirationDate = reg.expDate, RegChecked = true};

MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs

@@ -2,6 +2,7 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Security;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
@@ -37,7 +38,7 @@ namespace MediaBrowser.Common.Implementations.Security
         {
             get
             {
-                LazyInitializer.EnsureInitialized(ref _isMbSupporter, ref _isMbSupporterInitialized, ref _isMbSupporterSyncLock, () => GetRegistrationStatus("MBSupporter").Result.IsRegistered);
+                LazyInitializer.EnsureInitialized(ref _isMbSupporter, ref _isMbSupporterInitialized, ref _isMbSupporterSyncLock, () => GetRegistrationStatus("MBSupporter", null, _appHost.ApplicationVersion.ToString()).Result.IsRegistered);
                 return _isMbSupporter.Value;
             }
         }
@@ -60,7 +61,8 @@ namespace MediaBrowser.Common.Implementations.Security
         /// <summary>
         /// Initializes a new instance of the <see cref="PluginSecurityManager" /> class.
         /// </summary>
-        public PluginSecurityManager(IApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer, IApplicationPaths appPaths, INetworkManager networkManager)
+        public PluginSecurityManager(IApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer,
+            IApplicationPaths appPaths, INetworkManager networkManager, ILogManager logManager)
         {
             if (httpClient == null)
             {
@@ -72,6 +74,7 @@ namespace MediaBrowser.Common.Implementations.Security
             _appHost = appHost;
             _httpClient = httpClient;
             _jsonSerializer = jsonSerializer;
+            MBRegistration.Init(_applciationPaths, _networkManager, logManager);
         }
 
         /// <summary>
@@ -92,13 +95,11 @@ namespace MediaBrowser.Common.Implementations.Security
         /// </summary>
         /// <param name="feature">The feature.</param>
         /// <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 = null)
+        public async Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent = null, string version = null)
         {
-            // Do this on demend instead of in the constructor to delay the external assembly load
+            return await MBRegistration.GetRegistrationStatus(_httpClient, _jsonSerializer, feature, mb2Equivalent, version).ConfigureAwait(false);
-            // Todo: Refactor external methods to take app paths as a param
-            MBRegistration.Init(_applciationPaths, _networkManager);
-            return await MBRegistration.GetRegistrationStatus(_httpClient, _jsonSerializer, feature, mb2Equivalent).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -109,16 +110,10 @@ namespace MediaBrowser.Common.Implementations.Security
         {
             get
             {
-                // Do this on demend instead of in the constructor to delay the external assembly load
-                // Todo: Refactor external methods to take app paths as a param
-                MBRegistration.Init(_applciationPaths, _networkManager);
                 return MBRegistration.SupporterKey;
             }
             set
             {
-                // Do this on demend instead of in the constructor to delay the external assembly load
-                // Todo: Refactor external methods to take app paths as a param
-                MBRegistration.Init(_applciationPaths, _networkManager);
                 if (value != MBRegistration.SupporterKey)
                 {
                     MBRegistration.SupporterKey = value;
@@ -136,16 +131,10 @@ namespace MediaBrowser.Common.Implementations.Security
         {
             get
             {
-                // Do this on demend instead of in the constructor to delay the external assembly load
-                // Todo: Refactor external methods to take app paths as a param
-                MBRegistration.Init(_applciationPaths, _networkManager);
                 return MBRegistration.LegacyKey;
             }
             set
             {
-                // Do this on demend instead of in the constructor to delay the external assembly load
-                // Todo: Refactor external methods to take app paths as a param
-                MBRegistration.Init(_applciationPaths, _networkManager);
                 if (value != MBRegistration.LegacyKey)
                 {
                     MBRegistration.LegacyKey = value;

MediaBrowser.Common/Security/ISecurityManager.cs

@@ -28,8 +28,9 @@ namespace MediaBrowser.Common.Security
         /// </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);
+        Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent = null, string version = null);
 
         /// <summary>
         /// Load all registration info for all entities that require registration