Merge pull request #2350 from MediaBrowser/beta

Beta

1 files changed, 0 insertions, 246 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
deleted file mode 100644
index d8f7d889c..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Connect;
-using MediaBrowser.Controller.Devices;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Security;
-using MediaBrowser.Controller.Session;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace MediaBrowser.Server.Implementations.HttpServer.Security
-{
-    public class AuthService : IAuthService
-    {
-        private readonly IServerConfigurationManager _config;
-
-        public AuthService(IUserManager userManager, IAuthorizationContext authorizationContext, IServerConfigurationManager config, IConnectManager connectManager, ISessionManager sessionManager, IDeviceManager deviceManager)
-        {
-            AuthorizationContext = authorizationContext;
-            _config = config;
-            DeviceManager = deviceManager;
-            SessionManager = sessionManager;
-            ConnectManager = connectManager;
-            UserManager = userManager;
-        }
-
-        public IUserManager UserManager { get; private set; }
-        public IAuthorizationContext AuthorizationContext { get; private set; }
-        public IConnectManager ConnectManager { get; private set; }
-        public ISessionManager SessionManager { get; private set; }
-        public IDeviceManager DeviceManager { get; private set; }
-
-        /// <summary>
-        /// Redirect the client to a specific URL if authentication failed.
-        /// If this property is null, simply `401 Unauthorized` is returned.
-        /// </summary>
-        public string HtmlRedirect { get; set; }
-
-        public void Authenticate(IServiceRequest request,
-            IAuthenticationAttributes authAttribtues)
-        {
-            ValidateUser(request, authAttribtues);
-        }
-
-        private void ValidateUser(IServiceRequest request,
-            IAuthenticationAttributes authAttribtues)
-        {
-            // This code is executed before the service
-            var auth = AuthorizationContext.GetAuthorizationInfo(request);
-
-            if (!IsExemptFromAuthenticationToken(auth, authAttribtues))
-            {
-                var valid = IsValidConnectKey(auth.Token);
-
-                if (!valid)
-                {
-                    ValidateSecurityToken(request, auth.Token);
-                }
-            }
-
-            var user = string.IsNullOrWhiteSpace(auth.UserId)
-                ? null
-                : UserManager.GetUserById(auth.UserId);
-
-            if (user == null & !string.IsNullOrWhiteSpace(auth.UserId))
-            {
-                throw new SecurityException("User with Id " + auth.UserId + " not found");
-            }
-
-            if (user != null)
-            {
-                ValidateUserAccess(user, request, authAttribtues, auth);
-            }
-
-            var info = GetTokenInfo(request);
-
-            if (!IsExemptFromRoles(auth, authAttribtues, info))
-            {
-                var roles = authAttribtues.GetRoles().ToList();
-
-                ValidateRoles(roles, user);
-            }
-
-            if (!string.IsNullOrWhiteSpace(auth.DeviceId) &&
-                !string.IsNullOrWhiteSpace(auth.Client) &&
-                !string.IsNullOrWhiteSpace(auth.Device))
-            {
-                SessionManager.LogSessionActivity(auth.Client,
-                    auth.Version,
-                    auth.DeviceId,
-                    auth.Device,
-                    request.RemoteIp,
-                    user);
-            }
-        }
-
-        private void ValidateUserAccess(User user, IServiceRequest request,
-            IAuthenticationAttributes authAttribtues,
-            AuthorizationInfo auth)
-        {
-            if (user.Policy.IsDisabled)
-            {
-                throw new SecurityException("User account has been disabled.")
-                {
-                    SecurityExceptionType = SecurityExceptionType.Unauthenticated
-                };
-            }
-
-            if (!user.Policy.IsAdministrator &&
-                !authAttribtues.EscapeParentalControl &&
-                !user.IsParentalScheduleAllowed())
-            {
-                request.AddResponseHeader("X-Application-Error-Code", "ParentalControl");
-
-                throw new SecurityException("This user account is not allowed access at this time.")
-                {
-                    SecurityExceptionType = SecurityExceptionType.ParentalControl
-                };
-            }
-
-            if (!string.IsNullOrWhiteSpace(auth.DeviceId))
-            {
-                if (!DeviceManager.CanAccessDevice(user.Id.ToString("N"), auth.DeviceId))
-                {
-                    throw new SecurityException("User is not allowed access from this device.")
-                    {
-                        SecurityExceptionType = SecurityExceptionType.ParentalControl
-                    };
-                }
-            }
-        }
-
-        private bool IsExemptFromAuthenticationToken(AuthorizationInfo auth, IAuthenticationAttributes authAttribtues)
-        {
-            if (!_config.Configuration.IsStartupWizardCompleted && authAttribtues.AllowBeforeStartupWizard)
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private bool IsExemptFromRoles(AuthorizationInfo auth, IAuthenticationAttributes authAttribtues, AuthenticationInfo tokenInfo)
-        {
-            if (!_config.Configuration.IsStartupWizardCompleted && authAttribtues.AllowBeforeStartupWizard)
-            {
-                return true;
-            }
-
-            if (string.IsNullOrWhiteSpace(auth.Token))
-            {
-                return true;
-            }
-
-            if (tokenInfo != null && string.IsNullOrWhiteSpace(tokenInfo.UserId))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private void ValidateRoles(List<string> roles, User user)
-        {
-            if (roles.Contains("admin", StringComparer.OrdinalIgnoreCase))
-            {
-                if (user == null || !user.Policy.IsAdministrator)
-                {
-                    throw new SecurityException("User does not have admin access.")
-                    {
-                        SecurityExceptionType = SecurityExceptionType.Unauthenticated
-                    };
-                }
-            }
-            if (roles.Contains("delete", StringComparer.OrdinalIgnoreCase))
-            {
-                if (user == null || !user.Policy.EnableContentDeletion)
-                {
-                    throw new SecurityException("User does not have delete access.")
-                    {
-                        SecurityExceptionType = SecurityExceptionType.Unauthenticated
-                    };
-                }
-            }
-            if (roles.Contains("download", StringComparer.OrdinalIgnoreCase))
-            {
-                if (user == null || !user.Policy.EnableContentDownloading)
-                {
-                    throw new SecurityException("User does not have download access.")
-                    {
-                        SecurityExceptionType = SecurityExceptionType.Unauthenticated
-                    };
-                }
-            }
-        }
-
-        private AuthenticationInfo GetTokenInfo(IServiceRequest request)
-        {
-            object info;
-            request.Items.TryGetValue("OriginalAuthenticationInfo", out info);
-            return info as AuthenticationInfo;
-        }
-
-        private bool IsValidConnectKey(string token)
-        {
-            if (string.IsNullOrEmpty(token))
-            {
-                return false;
-            }
-
-            return ConnectManager.IsAuthorizationTokenValid(token);
-        }
-
-        private void ValidateSecurityToken(IServiceRequest request, string token)
-        {
-            if (string.IsNullOrWhiteSpace(token))
-            {
-                throw new SecurityException("Access token is required.");
-            }
-
-            var info = GetTokenInfo(request);
-
-            if (info == null)
-            {
-                throw new SecurityException("Access token is invalid or expired.");
-            }
-
-            if (!info.IsActive)
-            {
-                throw new SecurityException("Access token has expired.");
-            }
-
-            //if (!string.IsNullOrWhiteSpace(info.UserId))
-            //{
-            //    var user = _userManager.GetUserById(info.UserId);
-
-            //    if (user == null || user.Configuration.IsDisabled)
-            //    {
-            //        throw new SecurityException("User account has been disabled.");
-            //    }
-            //}
-        }
-    }
-}