diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2021-05-08 17:11:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 17:11:21 +0100 |
| commit | 97c2c523a89dabead25b5b0d028acbd92d136660 (patch) | |
| tree | 483cb880c5fb5067a0c1e0dfaf79134dc8115b92 /Jellyfin.Api/Auth/BaseAuthorizationHandler.cs | |
| parent | e682c230bd978a47ffd42d0cb8013ef8705b66ba (diff) | |
| parent | d4a50be22c3c4b9bb0adfb957ee558287fd219d9 (diff) | |
Merge branch 'master' into comparisons
Diffstat (limited to 'Jellyfin.Api/Auth/BaseAuthorizationHandler.cs')
| -rw-r--r-- | Jellyfin.Api/Auth/BaseAuthorizationHandler.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Jellyfin.Api/Auth/BaseAuthorizationHandler.cs b/Jellyfin.Api/Auth/BaseAuthorizationHandler.cs index 7d68aecf9..392498c53 100644 --- a/Jellyfin.Api/Auth/BaseAuthorizationHandler.cs +++ b/Jellyfin.Api/Auth/BaseAuthorizationHandler.cs @@ -77,8 +77,9 @@ namespace Jellyfin.Api.Auth return false; } - var ip = _httpContextAccessor.HttpContext.GetNormalizedRemoteIp(); - var isInLocalNetwork = _networkManager.IsInLocalNetwork(ip); + var isInLocalNetwork = _httpContextAccessor.HttpContext != null + && _networkManager.IsInLocalNetwork(_httpContextAccessor.HttpContext.GetNormalizedRemoteIp()); + // User cannot access remotely and user is remote if (!user.HasPermission(PermissionKind.EnableRemoteAccess) && !isInLocalNetwork) { |