Merge pull request #2273 from MediaBrowser/dev

Dev

5 files changed, 3 insertions, 517 deletions

diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
index 386c16513..1febcdd40 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
@@ -1,10 +1,10 @@
-using MediaBrowser.Common.Net;
+using System;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Server.Implementations.Udp;
-using System.Net.Sockets;
 
 namespace MediaBrowser.Server.Implementations.EntryPoints
 {
@@ -60,7 +60,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
 
                 UdpServer = udpServer;
             }
-            catch (SocketException ex)
+            catch (Exception ex)
             {
                 _logger.ErrorException("Failed to start UDP Server", ex);
             }
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 9af765c23..d6223c465 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -171,9 +171,6 @@
     <Compile Include="Persistence\DataExtensions.cs" />
     <Compile Include="Persistence\IDbConnector.cs" />
     <Compile Include="Persistence\MediaStreamColumns.cs" />
-    <Compile Include="Security\MBLicenseFile.cs" />
-    <Compile Include="Security\PluginSecurityManager.cs" />
-    <Compile Include="Security\RegRecord.cs" />
     <Compile Include="Serialization\JsonSerializer.cs" />
     <Compile Include="Social\SharingManager.cs" />
     <Compile Include="Social\SharingRepository.cs" />
diff --git a/MediaBrowser.Server.Implementations/Security/MBLicenseFile.cs b/MediaBrowser.Server.Implementations/Security/MBLicenseFile.cs
deleted file mode 100644
index 7b37925ba..000000000
--- a/MediaBrowser.Server.Implementations/Security/MBLicenseFile.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using MediaBrowser.Common.Configuration;
-
-namespace MediaBrowser.Server.Implementations.Security
-{
-    internal class MBLicenseFile
-    {
-        private readonly IApplicationPaths _appPaths;
-
-        public string RegKey
-        {
-            get { return _regKey; }
-            set
-            {
-                if (value != _regKey)
-                {
-                    //if key is changed - clear out our saved validations
-                    _updateRecords.Clear();
-                    _regKey = value;
-                }
-            }
-        }
-
-        private string Filename
-        {
-            get
-            {
-                return Path.Combine(_appPaths.ConfigurationDirectoryPath, "mb.lic");
-            }
-        }
-
-        private readonly ConcurrentDictionary<Guid, DateTime> _updateRecords = new ConcurrentDictionary<Guid, DateTime>();
-        private readonly object _fileLock = new object();
-        private string _regKey;
-
-        public MBLicenseFile(IApplicationPaths appPaths)
-        {
-            _appPaths = appPaths;
-
-            Load();
-        }
-
-        private void SetUpdateRecord(Guid key, DateTime value)
-        {
-            _updateRecords.AddOrUpdate(key, value, (k, v) => value);
-        }
-
-        public void AddRegCheck(string featureId)
-        {
-            using (var provider = new MD5CryptoServiceProvider())
-            {
-                var key = new Guid(provider.ComputeHash(Encoding.Unicode.GetBytes(featureId)));
-                var value = DateTime.UtcNow;
-
-                SetUpdateRecord(key, value);
-                Save();
-            }
-
-        }
-
-        public void RemoveRegCheck(string featureId)
-        {
-            using (var provider = new MD5CryptoServiceProvider())
-            {
-                var key = new Guid(provider.ComputeHash(Encoding.Unicode.GetBytes(featureId)));
-                DateTime val;
-
-                _updateRecords.TryRemove(key, out val);
-
-                Save();
-            }
-
-        }
-
-        public DateTime LastChecked(string featureId)
-        {
-            using (var provider = new MD5CryptoServiceProvider())
-            {
-                DateTime last;
-                _updateRecords.TryGetValue(new Guid(provider.ComputeHash(Encoding.Unicode.GetBytes(featureId))), out last);
-
-                // guard agains people just putting a large number in the file
-                return last < DateTime.UtcNow ? last : DateTime.MinValue;  
-            }
-        }
-
-        private void Load()
-        {
-            string[] contents = null;
-            var licenseFile = Filename;
-            lock (_fileLock)
-            {
-                try
-                {
-					contents = File.ReadAllLines(licenseFile);
-                }
-                catch (DirectoryNotFoundException)
-                {
-                    File.Create(licenseFile).Close();
-                }
-                catch (FileNotFoundException)
-                {
-					File.Create(licenseFile).Close();
-                }
-            }
-            if (contents != null && contents.Length > 0)
-            {
-                //first line is reg key
-                RegKey = contents[0];
-
-                //next is legacy key
-                if (contents.Length > 1)
-                {
-                    // Don't need this anymore
-                }
-
-                //the rest of the lines should be pairs of features and timestamps
-                for (var i = 2; i < contents.Length; i = i + 2)
-                {
-                    var feat = Guid.Parse(contents[i]);
-
-                    SetUpdateRecord(feat, new DateTime(Convert.ToInt64(contents[i + 1])));
-                }
-            }
-        }
-
-        public void Save()
-        {
-            //build our array
-            var lines = new List<string>
-            {
-                RegKey, 
-
-                // Legacy key
-                string.Empty
-            };
-
-            foreach (var pair in _updateRecords
-                .ToList())
-            {
-                lines.Add(pair.Key.ToString());
-                lines.Add(pair.Value.Ticks.ToString(CultureInfo.InvariantCulture));
-            }
-
-            var licenseFile = Filename;
-			Directory.CreateDirectory(Path.GetDirectoryName(licenseFile));
-			lock (_fileLock) File.WriteAllLines(licenseFile, lines);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Security/PluginSecurityManager.cs b/MediaBrowser.Server.Implementations/Security/PluginSecurityManager.cs
deleted file mode 100644
index 7dc78a3af..000000000
--- a/MediaBrowser.Server.Implementations/Security/PluginSecurityManager.cs
+++ /dev/null
@@ -1,342 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Security;
-using MediaBrowser.Controller;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Serialization;
-
-namespace MediaBrowser.Server.Implementations.Security
-{
-    /// <summary>
-    /// Class PluginSecurityManager
-    /// </summary>
-    public class PluginSecurityManager : ISecurityManager
-    {
-        private const string MBValidateUrl = "https://mb3admin.com/admin/service/registration/validate";
-        private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "https://mb3admin.com/admin/service/appstore/register";
-
-        /// <summary>
-        /// The _is MB supporter
-        /// </summary>
-        private bool? _isMbSupporter;
-        /// <summary>
-        /// The _is MB supporter initialized
-        /// </summary>
-        private bool _isMbSupporterInitialized;
-        /// <summary>
-        /// The _is MB supporter sync lock
-        /// </summary>
-        private object _isMbSupporterSyncLock = new object();
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is MB supporter.
-        /// </summary>
-        /// <value><c>true</c> if this instance is MB supporter; otherwise, <c>false</c>.</value>
-        public bool IsMBSupporter
-        {
-            get
-            {
-                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 IServerApplicationHost _appHost;
-        private readonly ILogger _logger;
-        private readonly IApplicationPaths _appPaths;
-        private readonly IFileSystem _fileSystem;
-
-        private IEnumerable<IRequiresRegistration> _registeredEntities;
-        protected IEnumerable<IRequiresRegistration> RegisteredEntities
-        {
-            get
-            {
-                return _registeredEntities ?? (_registeredEntities = _appHost.GetExports<IRequiresRegistration>());
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PluginSecurityManager" /> class.
-        /// </summary>
-        public PluginSecurityManager(IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer,
-            IApplicationPaths appPaths, ILogManager logManager, IFileSystem fileSystem)
-        {
-            if (httpClient == null)
-            {
-                throw new ArgumentNullException("httpClient");
-            }
-
-            _appHost = appHost;
-            _httpClient = httpClient;
-            _jsonSerializer = jsonSerializer;
-            _appPaths = appPaths;
-            _fileSystem = fileSystem;
-            _logger = logManager.GetLogger("SecurityManager");
-        }
-
-        /// <summary>
-        /// Load all registration info for all entities that require registration
-        /// </summary>
-        /// <returns></returns>
-        public async Task LoadAllRegistrationInfo()
-        {
-            var tasks = new List<Task>();
-
-            ResetSupporterInfo();
-            tasks.AddRange(RegisteredEntities.Select(i => i.LoadRegistrationInfoAsync()));
-            await Task.WhenAll(tasks);
-        }
-
-        /// <summary>
-        /// Gets the registration status.
-        /// This overload supports existing plug-ins.
-        /// </summary>
-        /// <param name="feature">The feature.</param>
-        /// <param name="mb2Equivalent">The MB2 equivalent.</param>
-        /// <returns>Task{MBRegistrationRecord}.</returns>
-        public Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent = null)
-        {
-            return GetRegistrationStatusInternal(feature, mb2Equivalent);
-        }
-
-        /// <summary>
-        /// Gets the registration status.
-        /// </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 Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent, string version)
-        {
-            return GetRegistrationStatusInternal(feature, mb2Equivalent, version);
-        }
-
-        private Task<MBRegistrationRecord> GetSupporterRegistrationStatus()
-        {
-            return GetRegistrationStatusInternal("MBSupporter", null, _appHost.ApplicationVersion.ToString());
-        }
-
-        /// <summary>
-        /// Gets or sets the supporter key.
-        /// </summary>
-        /// <value>The supporter key.</value>
-        public string SupporterKey
-        {
-            get
-            {
-                return LicenseFile.RegKey;
-            }
-            set
-            {
-                var newValue = value;
-                if (newValue != null)
-                {
-                    newValue = newValue.Trim();
-                }
-
-                if (newValue != LicenseFile.RegKey)
-                {
-                    LicenseFile.RegKey = newValue;
-                    LicenseFile.Save();
-
-                    // re-load registration info
-                    Task.Run(() => LoadAllRegistrationInfo());
-                }
-            }
-        }
-
-        /// <summary>
-        /// Register an app store sale with our back-end.  It will validate the transaction with the store
-        /// and then register the proper feature and then fill in the supporter key on success.
-        /// </summary>
-        /// <param name="parameters">Json parameters to send to admin server</param>
-        public async Task RegisterAppStoreSale(string parameters)
-        {
-            var options = new HttpRequestOptions()
-            {
-                Url = AppstoreRegUrl,
-                CancellationToken = CancellationToken.None,
-                BufferContent = false
-            };
-            options.RequestHeaders.Add("X-Emby-Token", _appHost.SystemId);
-            options.RequestContent = parameters;
-            options.RequestContentType = "application/json";
-
-            try
-            {
-                using (var response = await _httpClient.Post(options).ConfigureAwait(false))
-                {
-                    var reg = _jsonSerializer.DeserializeFromStream<RegRecord>(response.Content);
-
-                    if (reg == null)
-                    {
-                        var msg = "Result from appstore registration was null.";
-                        _logger.Error(msg);
-                        throw new ApplicationException(msg);
-                    }
-                    if (!String.IsNullOrEmpty(reg.key))
-                    {
-                        SupporterKey = reg.key;
-                    }
-                }
-
-            }
-            catch (ApplicationException)
-            {
-                SaveAppStoreInfo(parameters);
-                throw;
-            }
-            catch (HttpException e)
-            {
-                _logger.ErrorException("Error registering appstore purchase {0}", e, parameters ?? "NO PARMS SENT");
-
-                if (e.StatusCode.HasValue && e.StatusCode.Value == HttpStatusCode.PaymentRequired)
-                {
-                    throw new PaymentRequiredException();
-                }
-                throw new ApplicationException("Error registering store sale");
-            }
-            catch (Exception e)
-            {
-                _logger.ErrorException("Error registering appstore purchase {0}", e, parameters ?? "NO PARMS SENT");
-                SaveAppStoreInfo(parameters);
-                //TODO - could create a re-try routine on start-up if this file is there.  For now we can handle manually.
-                throw new ApplicationException("Error registering store sale");
-            }
-
-        }
-
-        private void SaveAppStoreInfo(string info)
-        {
-            // Save all transaction information to a file
-
-            try
-            {
-                _fileSystem.WriteAllText(Path.Combine(_appPaths.ProgramDataPath, "apptrans-error.txt"), info);
-            }
-            catch (IOException)
-            {
-
-            }
-        }
-
-        private async Task<MBRegistrationRecord> GetRegistrationStatusInternal(string feature,
-            string mb2Equivalent = null,
-            string version = null)
-        {
-            var lastChecked = LicenseFile.LastChecked(feature);
-
-            //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
-            {
-                // Cache the result for up to a week
-                registered = lastChecked > DateTime.UtcNow.AddDays(-7)
-            };
-
-            var success = reg.registered;
-
-            if (!(lastChecked > DateTime.UtcNow.AddDays(-1)))
-            {
-                var data = new Dictionary<string, string>
-                {
-                    { "feature", feature }, 
-                    { "key", SupporterKey }, 
-                    { "mac", _appHost.SystemId }, 
-                    { "systemid", _appHost.SystemId }, 
-                    { "mb2equiv", mb2Equivalent }, 
-                    { "ver", version }, 
-                    { "platform", _appHost.OperatingSystemDisplayName }, 
-                    { "isservice", _appHost.IsRunningAsService.ToString().ToLower() }
-                };
-
-                try
-                {
-                    var options = new HttpRequestOptions
-                    {
-                        Url = MBValidateUrl,
-
-                        // Seeing block length errors
-                        EnableHttpCompression = false,
-                        BufferContent = false
-                    };
-
-                    options.SetPostData(data);
-
-                    using (var json = (await _httpClient.Post(options).ConfigureAwait(false)).Content)
-                    {
-                        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);
-                }
-            }
-
-            var record = new MBRegistrationRecord
-            {
-                IsRegistered = reg.registered,
-                ExpirationDate = reg.expDate,
-                RegChecked = true,
-                RegError = !success
-            };
-
-            record.TrialVersion = IsInTrial(reg.expDate, record.RegChecked, record.IsRegistered);
-            record.IsValid = !record.RegChecked || record.IsRegistered || record.TrialVersion;
-
-            return record;
-        }
-
-        private bool IsInTrial(DateTime expirationDate, bool regChecked, bool isRegistered)
-        {
-            //don't set this until we've successfully obtained exp date
-            if (!regChecked)
-            {
-                return false;
-            }
-
-            var isInTrial = expirationDate > DateTime.UtcNow;
-
-            return isInTrial && !isRegistered;
-        }
-
-        /// <summary>
-        /// Resets the supporter info.
-        /// </summary>
-        private void ResetSupporterInfo()
-        {
-            _isMbSupporter = null;
-            _isMbSupporterInitialized = false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Security/RegRecord.cs b/MediaBrowser.Server.Implementations/Security/RegRecord.cs
deleted file mode 100644
index 947ec629f..000000000
--- a/MediaBrowser.Server.Implementations/Security/RegRecord.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace MediaBrowser.Server.Implementations.Security
-{
-    class RegRecord
-    {
-        public string featId { get; set; }
-        public bool registered { get; set; }
-        public DateTime expDate { get; set; }
-        public string key { get; set; }
-    }
-}
\ No newline at end of file