diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/HttpServer')
3 files changed, 14 insertions, 12 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs index 4972736ef..a750dd82e 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -235,14 +235,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer { return; } - + var errorResponse = new ErrorResponse { ResponseStatus = new ResponseStatus { ErrorCode = ex.GetType().GetOperationName(), Message = ex.Message, - StackTrace = ex.StackTrace, + StackTrace = ex.StackTrace } }; diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs index e0a5764d5..23ecde191 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs @@ -94,7 +94,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer /// </summary> /// <param name="inString">The in string.</param> /// <returns>System.String.</returns> - private static string RemoveControlCharacters(string inString) + public static string RemoveControlCharacters(string inString) { if (inString == null) return null; diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs index a1a68586b..3a2bd7b75 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using MediaBrowser.Controller.Configuration; +using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Session; @@ -45,8 +44,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security public void Authenticate(IRequest request, IResponse response, object requestDto, - bool allowLocal, - string[] roles) + IAuthenticated authAttribtues) { if (HostContext.HasValidAuthSecret(request)) return; @@ -54,16 +52,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security //ExecuteBasic(req, res, requestDto); //first check if session is authenticated //if (res.IsClosed) return; //AuthenticateAttribute already closed the request (ie auth failed) - ValidateUser(request, allowLocal, roles); + ValidateUser(request, response, authAttribtues); } - private void ValidateUser(IRequest req, bool allowLocal, - IEnumerable<string> roles) + private void ValidateUser(IRequest req, IResponse response, IAuthenticated authAttribtues) { // This code is executed before the service var auth = AuthorizationContext.GetAuthorizationInfo(req); - if (!allowLocal || !req.IsLocal) + if (!authAttribtues.AllowLocal || !req.IsLocal) { if (!string.IsNullOrWhiteSpace(auth.Token) || !_config.Configuration.InsecureApps2.Contains(auth.Client ?? string.Empty, StringComparer.OrdinalIgnoreCase)) @@ -91,12 +88,17 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security throw new AuthenticationException("User account has been disabled."); } - if (!user.Configuration.IsAdministrator && !user.IsParentalScheduleAllowed()) + if (!user.Configuration.IsAdministrator && + !authAttribtues.EscapeParentalControl && + !user.IsParentalScheduleAllowed()) { + response.AddHeader("X-Application-Error-Code", "ParentalControl"); throw new AuthenticationException("This user account is not allowed access at this time."); } } + var roles = authAttribtues.GetRoles().ToList(); + if (roles.Contains("admin", StringComparer.OrdinalIgnoreCase)) { if (user == null || !user.Configuration.IsAdministrator) |