diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-06-16 11:49:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 11:49:42 +0200 |
| commit | 4d91060c25662774c6f57941c78fcb73df6fdefa (patch) | |
| tree | 59110387f0253714dd575972c51ed0356fcc5f5b /Emby.Server.Implementations/HttpServer/Security | |
| parent | ebfd1e7c47c62e2aa3d4653af3f6622fc7544d19 (diff) | |
| parent | ab3dece9f1160e6f08be12796a8a952e36213da5 (diff) | |
Merge pull request #3341 from telans/brace-spacing
Add newlines after closing braces (SA1513/SA1516)
Diffstat (limited to 'Emby.Server.Implementations/HttpServer/Security')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/Security/AuthService.cs | 1 | ||||
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs index 72959003a..2e6ff65a6 100644 --- a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs +++ b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs @@ -140,6 +140,7 @@ namespace Emby.Server.Implementations.HttpServer.Security { return true; } + if (authAttribtues.AllowLocalOnly && request.IsLocal) { return true; diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs index 4dffcd92d..bbade00ff 100644 --- a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs +++ b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs @@ -71,6 +71,7 @@ namespace Emby.Server.Implementations.HttpServer.Security { token = httpReq.Headers["X-MediaBrowser-Token"]; } + if (string.IsNullOrEmpty(token)) { token = httpReq.QueryString["api_key"]; @@ -160,6 +161,7 @@ namespace Emby.Server.Implementations.HttpServer.Security _authRepo.Update(tokenInfo); } } + httpReq.Items["OriginalAuthenticationInfo"] = tokenInfo; } |
