diff options
| -rw-r--r-- | Emby.Server.Implementations/Session/SessionManager.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index 6f185bc81..97506cdef 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -1406,11 +1406,19 @@ namespace Emby.Server.Implementations.Session .FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase)); } - if (user != null && !string.IsNullOrWhiteSpace(request.DeviceId)) + if (user != null) { - if (!_deviceManager.CanAccessDevice(user.Id.ToString("N"), request.DeviceId)) + if (!user.IsParentalScheduleAllowed()) + { + throw new SecurityException("User is not allowed access at this time."); + } + + if (!string.IsNullOrWhiteSpace(request.DeviceId)) { - throw new SecurityException("User is not allowed access from this device."); + if (!_deviceManager.CanAccessDevice(user.Id.ToString("N"), request.DeviceId)) + { + throw new SecurityException("User is not allowed access from this device."); + } } } |