diff options
| author | Bond-009 <bond.009@outlook.com> | 2022-12-07 16:39:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 16:39:40 +0100 |
| commit | f3c57e6a0ae015dc51cf548a0380d1bed33959c2 (patch) | |
| tree | 1052ce5b7646e4fea7b20768213e89c0e38126ec /Jellyfin.Api/Auth | |
| parent | 681be595cea8254cbac5bbb3bdc9083c4780db21 (diff) | |
| parent | 52194f56b5f07e3ae01e2fb6d121452e37d1e93f (diff) | |
Merge pull request #8511 from Bond-009/isnull
Diffstat (limited to 'Jellyfin.Api/Auth')
| -rw-r--r-- | Jellyfin.Api/Auth/AnonymousLanAccessPolicy/AnonymousLanAccessHandler.cs | 2 | ||||
| -rw-r--r-- | Jellyfin.Api/Auth/BaseAuthorizationHandler.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Jellyfin.Api/Auth/AnonymousLanAccessPolicy/AnonymousLanAccessHandler.cs b/Jellyfin.Api/Auth/AnonymousLanAccessPolicy/AnonymousLanAccessHandler.cs index 88af08dd33..d4b1ffb060 100644 --- a/Jellyfin.Api/Auth/AnonymousLanAccessPolicy/AnonymousLanAccessHandler.cs +++ b/Jellyfin.Api/Auth/AnonymousLanAccessPolicy/AnonymousLanAccessHandler.cs @@ -32,7 +32,7 @@ namespace Jellyfin.Api.Auth.AnonymousLanAccessPolicy var ip = _httpContextAccessor.HttpContext?.Connection.RemoteIpAddress; // Loopback will be on LAN, so we can accept null. - if (ip == null || _networkManager.IsInLocalNetwork(ip)) + if (ip is null || _networkManager.IsInLocalNetwork(ip)) { context.Succeed(requirement); } diff --git a/Jellyfin.Api/Auth/BaseAuthorizationHandler.cs b/Jellyfin.Api/Auth/BaseAuthorizationHandler.cs index 92ee1dd59a..8e5e66d64a 100644 --- a/Jellyfin.Api/Auth/BaseAuthorizationHandler.cs +++ b/Jellyfin.Api/Auth/BaseAuthorizationHandler.cs @@ -67,7 +67,7 @@ namespace Jellyfin.Api.Auth // Ensure userId links to a valid user. var user = _userManager.GetUserById(userId); - if (user == null) + if (user is null) { return false; } @@ -78,7 +78,7 @@ namespace Jellyfin.Api.Auth return false; } - var isInLocalNetwork = _httpContextAccessor.HttpContext != null + var isInLocalNetwork = _httpContextAccessor.HttpContext is not null && _networkManager.IsInLocalNetwork(_httpContextAccessor.HttpContext.GetNormalizedRemoteIp()); // User cannot access remotely and user is remote |