|
|
|
@ -1,13 +1,11 @@
|
|
|
|
using MediaBrowser.Controller.Configuration;
|
|
|
|
using MediaBrowser.Controller.Configuration;
|
|
|
|
using MediaBrowser.Controller.Connect;
|
|
|
|
using MediaBrowser.Controller.Connect;
|
|
|
|
|
|
|
|
using MediaBrowser.Controller.Entities;
|
|
|
|
using MediaBrowser.Controller.Library;
|
|
|
|
using MediaBrowser.Controller.Library;
|
|
|
|
using MediaBrowser.Controller.Net;
|
|
|
|
using MediaBrowser.Controller.Net;
|
|
|
|
using MediaBrowser.Controller.Session;
|
|
|
|
using MediaBrowser.Controller.Security;
|
|
|
|
using ServiceStack;
|
|
|
|
|
|
|
|
using ServiceStack.Auth;
|
|
|
|
|
|
|
|
using ServiceStack.Web;
|
|
|
|
|
|
|
|
using System;
|
|
|
|
using System;
|
|
|
|
using System.Collections.Specialized;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Linq;
|
|
|
|
using System.Linq;
|
|
|
|
|
|
|
|
|
|
|
|
namespace MediaBrowser.Server.Implementations.HttpServer.Security
|
|
|
|
namespace MediaBrowser.Server.Implementations.HttpServer.Security
|
|
|
|
@ -16,61 +14,43 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
|
|
|
|
{
|
|
|
|
{
|
|
|
|
private readonly IServerConfigurationManager _config;
|
|
|
|
private readonly IServerConfigurationManager _config;
|
|
|
|
|
|
|
|
|
|
|
|
public AuthService(IUserManager userManager, ISessionManager sessionManager, IAuthorizationContext authorizationContext, IServerConfigurationManager config, IConnectManager connectManager)
|
|
|
|
public AuthService(IUserManager userManager, IAuthorizationContext authorizationContext, IServerConfigurationManager config, IConnectManager connectManager)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
AuthorizationContext = authorizationContext;
|
|
|
|
AuthorizationContext = authorizationContext;
|
|
|
|
_config = config;
|
|
|
|
_config = config;
|
|
|
|
ConnectManager = connectManager;
|
|
|
|
ConnectManager = connectManager;
|
|
|
|
SessionManager = sessionManager;
|
|
|
|
|
|
|
|
UserManager = userManager;
|
|
|
|
UserManager = userManager;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public IUserManager UserManager { get; private set; }
|
|
|
|
public IUserManager UserManager { get; private set; }
|
|
|
|
public ISessionManager SessionManager { get; private set; }
|
|
|
|
|
|
|
|
public IAuthorizationContext AuthorizationContext { get; private set; }
|
|
|
|
public IAuthorizationContext AuthorizationContext { get; private set; }
|
|
|
|
public IConnectManager ConnectManager { get; private set; }
|
|
|
|
public IConnectManager ConnectManager { get; private set; }
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
|
|
/// Restrict authentication to a specific <see cref="IAuthProvider"/>.
|
|
|
|
|
|
|
|
/// For example, if this attribute should only permit access
|
|
|
|
|
|
|
|
/// if the user is authenticated with <see cref="BasicAuthProvider"/>,
|
|
|
|
|
|
|
|
/// you should set this property to <see cref="BasicAuthProvider.Name"/>.
|
|
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
public string Provider { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// Redirect the client to a specific URL if authentication failed.
|
|
|
|
/// Redirect the client to a specific URL if authentication failed.
|
|
|
|
/// If this property is null, simply `401 Unauthorized` is returned.
|
|
|
|
/// If this property is null, simply `401 Unauthorized` is returned.
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public string HtmlRedirect { get; set; }
|
|
|
|
public string HtmlRedirect { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
public void Authenticate(IRequest request,
|
|
|
|
public void Authenticate(IServiceRequest request,
|
|
|
|
IResponse response,
|
|
|
|
IAuthenticationAttributes authAttribtues)
|
|
|
|
object requestDto,
|
|
|
|
|
|
|
|
IAuthenticated authAttribtues)
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (HostContext.HasValidAuthSecret(request))
|
|
|
|
ValidateUser(request, authAttribtues);
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//ExecuteBasic(req, res, requestDto); //first check if session is authenticated
|
|
|
|
|
|
|
|
//if (res.IsClosed) return; //AuthenticateAttribute already closed the request (ie auth failed)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ValidateUser(request, response, authAttribtues);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void ValidateUser(IRequest req, IResponse response, IAuthenticated authAttribtues)
|
|
|
|
private void ValidateUser(IServiceRequest request,
|
|
|
|
|
|
|
|
IAuthenticationAttributes authAttribtues)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// This code is executed before the service
|
|
|
|
// This code is executed before the service
|
|
|
|
var auth = AuthorizationContext.GetAuthorizationInfo(req);
|
|
|
|
var auth = AuthorizationContext.GetAuthorizationInfo(request);
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(auth.Token) ||
|
|
|
|
if (!IsExemptFromAuthenticationToken(auth, authAttribtues))
|
|
|
|
!_config.Configuration.InsecureApps6.Contains(auth.Client ?? string.Empty, StringComparer.OrdinalIgnoreCase))
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var valid = IsValidConnectKey(auth.Token);
|
|
|
|
var valid = IsValidConnectKey(auth.Token);
|
|
|
|
|
|
|
|
|
|
|
|
if (!valid)
|
|
|
|
if (!valid)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
SessionManager.ValidateSecurityToken(auth.Token);
|
|
|
|
ValidateSecurityToken(request, auth.Token);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -80,45 +60,83 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
|
|
|
|
|
|
|
|
|
|
|
|
if (user == null & !string.IsNullOrWhiteSpace(auth.UserId))
|
|
|
|
if (user == null & !string.IsNullOrWhiteSpace(auth.UserId))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
throw new ArgumentException("User with Id " + auth.UserId + " not found");
|
|
|
|
throw new SecurityException("User with Id " + auth.UserId + " not found");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (user != null)
|
|
|
|
if (user != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (user.Configuration.IsDisabled)
|
|
|
|
if (user.Configuration.IsDisabled)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
throw new AuthenticationException("User account has been disabled.");
|
|
|
|
throw new SecurityException("User account has been disabled.")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
SecurityExceptionType = SecurityExceptionType.Unauthenticated
|
|
|
|
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!user.Configuration.IsAdministrator &&
|
|
|
|
if (!user.Configuration.IsAdministrator &&
|
|
|
|
!authAttribtues.EscapeParentalControl &&
|
|
|
|
!authAttribtues.EscapeParentalControl &&
|
|
|
|
!user.IsParentalScheduleAllowed())
|
|
|
|
!user.IsParentalScheduleAllowed())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
response.AddHeader("X-Application-Error-Code", "ParentalControl");
|
|
|
|
request.AddResponseHeader("X-Application-Error-Code", "ParentalControl");
|
|
|
|
throw new AuthenticationException("This user account is not allowed access at this time.");
|
|
|
|
throw new SecurityException("This user account is not allowed access at this time.")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
SecurityExceptionType = SecurityExceptionType.ParentalControl
|
|
|
|
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var roles = authAttribtues.GetRoles().ToList();
|
|
|
|
if (!IsExemptFromRoles(auth, authAttribtues))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
var roles = authAttribtues.GetRoles().ToList();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ValidateRoles(roles, user);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private bool IsExemptFromAuthenticationToken(AuthorizationInfo auth, IAuthenticationAttributes authAttribtues)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (!_config.Configuration.IsStartupWizardCompleted &&
|
|
|
|
|
|
|
|
authAttribtues.AllowBeforeStartupWizard)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return _config.Configuration.InsecureApps7.Contains(auth.Client ?? string.Empty,
|
|
|
|
|
|
|
|
StringComparer.OrdinalIgnoreCase);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private bool IsExemptFromRoles(AuthorizationInfo auth, IAuthenticationAttributes authAttribtues)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (!_config.Configuration.IsStartupWizardCompleted &&
|
|
|
|
|
|
|
|
authAttribtues.AllowBeforeStartupWizard)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void ValidateRoles(List<string> roles, User user)
|
|
|
|
|
|
|
|
{
|
|
|
|
if (roles.Contains("admin", StringComparer.OrdinalIgnoreCase))
|
|
|
|
if (roles.Contains("admin", StringComparer.OrdinalIgnoreCase))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (user == null || !user.Configuration.IsAdministrator)
|
|
|
|
if (user == null || !user.Configuration.IsAdministrator)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
throw new ArgumentException("Administrative access is required for this request.");
|
|
|
|
throw new SecurityException("User does not have admin access.")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
SecurityExceptionType = SecurityExceptionType.Unauthenticated
|
|
|
|
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (roles.Contains("delete", StringComparer.OrdinalIgnoreCase))
|
|
|
|
if (!string.IsNullOrWhiteSpace(auth.DeviceId) &&
|
|
|
|
|
|
|
|
!string.IsNullOrWhiteSpace(auth.Client) &&
|
|
|
|
|
|
|
|
!string.IsNullOrWhiteSpace(auth.Device))
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
SessionManager.LogSessionActivity(auth.Client,
|
|
|
|
if (user == null || !user.Configuration.EnableContentDeletion)
|
|
|
|
auth.Version,
|
|
|
|
{
|
|
|
|
auth.DeviceId,
|
|
|
|
throw new SecurityException("User does not have delete access.")
|
|
|
|
auth.Device,
|
|
|
|
{
|
|
|
|
req.RemoteIp,
|
|
|
|
SecurityExceptionType = SecurityExceptionType.Unauthenticated
|
|
|
|
user);
|
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -132,40 +150,34 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
|
|
|
|
return ConnectManager.IsAuthorizationTokenValid(token);
|
|
|
|
return ConnectManager.IsAuthorizationTokenValid(token);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
protected bool DoHtmlRedirectIfConfigured(IRequest req, IResponse res, bool includeRedirectParam = false)
|
|
|
|
private void ValidateSecurityToken(IServiceRequest request, string token)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var htmlRedirect = this.HtmlRedirect ?? AuthenticateService.HtmlRedirect;
|
|
|
|
if (string.IsNullOrWhiteSpace(token))
|
|
|
|
if (htmlRedirect != null && req.ResponseContentType.MatchesContentType(MimeTypes.Html))
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
DoHtmlRedirect(htmlRedirect, req, res, includeRedirectParam);
|
|
|
|
throw new SecurityException("Access token is invalid or expired.");
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public static void DoHtmlRedirect(string redirectUrl, IRequest req, IResponse res, bool includeRedirectParam)
|
|
|
|
var info = (AuthenticationInfo)request.Items["OriginalAuthenticationInfo"];
|
|
|
|
{
|
|
|
|
|
|
|
|
var url = req.ResolveAbsoluteUrl(redirectUrl);
|
|
|
|
if (info == null)
|
|
|
|
if (includeRedirectParam)
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var absoluteRequestPath = req.ResolveAbsoluteUrl("~" + req.PathInfo + ToQueryString(req.QueryString));
|
|
|
|
throw new SecurityException("Access token is invalid or expired.");
|
|
|
|
url = url.AddQueryParam(HostContext.ResolveLocalizedString(LocalizedStrings.Redirect), absoluteRequestPath);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
res.RedirectToUrl(url);
|
|
|
|
if (!info.IsActive)
|
|
|
|
}
|
|
|
|
{
|
|
|
|
|
|
|
|
throw new SecurityException("Access token has expired.");
|
|
|
|
private static string ToQueryString(INameValueCollection queryStringCollection)
|
|
|
|
}
|
|
|
|
{
|
|
|
|
|
|
|
|
return ToQueryString((NameValueCollection)queryStringCollection.Original);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static string ToQueryString(NameValueCollection queryStringCollection)
|
|
|
|
//if (!string.IsNullOrWhiteSpace(info.UserId))
|
|
|
|
{
|
|
|
|
//{
|
|
|
|
if (queryStringCollection == null || queryStringCollection.Count == 0)
|
|
|
|
// var user = _userManager.GetUserById(info.UserId);
|
|
|
|
return String.Empty;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return "?" + queryStringCollection.ToFormUrlEncoded();
|
|
|
|
// if (user == null || user.Configuration.IsDisabled)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// throw new SecurityException("User account has been disabled.");
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
//}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Luke Pulverenti
10 years ago