fixes #2903 - MediaBrowser.Controller.Net.SecurityException: This user account is not allowed access at this time

This commit is contained in:
Luke Pulverenti 2017-10-01 15:26:58 -04:00
parent 3cdc6c5a52
commit 8d4373af5e

View File

@ -1406,13 +1406,21 @@ namespace Emby.Server.Implementations.Session
.FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase)); .FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
} }
if (user != null && !string.IsNullOrWhiteSpace(request.DeviceId)) if (user != null)
{
if (!user.IsParentalScheduleAllowed())
{
throw new SecurityException("User is not allowed access at this time.");
}
if (!string.IsNullOrWhiteSpace(request.DeviceId))
{ {
if (!_deviceManager.CanAccessDevice(user.Id.ToString("N"), request.DeviceId)) if (!_deviceManager.CanAccessDevice(user.Id.ToString("N"), request.DeviceId))
{ {
throw new SecurityException("User is not allowed access from this device."); throw new SecurityException("User is not allowed access from this device.");
} }
} }
}
if (enforcePassword) if (enforcePassword)
{ {