starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 06:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

update to jquery mobile 1.4.3

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-02 14:34:08 -04:00
parent 9bab99d4d8
commit 59dc591f66
63 changed files with 628 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
View File

@@ -51,13 +51,16 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
private void ValidateUser(IRequest req)
{
User user = null;
//This code is executed before the service
var auth = AuthorizationContext.GetAuthorizationInfo(req);
if (auth != null)
if (string.IsNullOrWhiteSpace(auth.Token))
{
// Legacy
// TODO: Deprecate this in Oct 2014
User user = null;
if (!string.IsNullOrWhiteSpace(auth.UserId))
{
var userId = auth.UserId;
@@ -65,22 +68,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
user = UserManager.GetUserById(new Guid(userId));
}
string deviceId = auth.DeviceId;
string device = auth.Device;
string client = auth.Client;
string version = auth.Version;
if (!string.IsNullOrEmpty(client) && !string.IsNullOrEmpty(deviceId) && !string.IsNullOrEmpty(device) && !string.IsNullOrEmpty(version))
if (user == null || user.Configuration.IsDisabled)
{
var remoteEndPoint = req.RemoteIp;
SessionManager.LogSessionActivity(client, version, deviceId, device, remoteEndPoint, user);
throw new UnauthorizedAccessException("Unauthorized access.");
}
}
if (user == null || user.Configuration.IsDisabled)
else
{
throw new UnauthorizedAccessException("Unauthorized access.");
SessionManager.ValidateSecurityToken(auth.Token);
}
}

3
MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
View File

@@ -42,7 +42,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
Device = device,
DeviceId = deviceId,
UserId = userId,
Version = version
Version = version,
Token = httpReq.Headers["X-AUTH-TOKEN"]
};
}