Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-01 04:34:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Limit sessions per user (#11370)

Browse Source
This commit is contained in:
Cody Robibero 2024-04-21 10:54:49 -06:00 committed by GitHub
parent 43569082f9
commit 27fae3dd04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jellyfin.Api/Controllers/SessionController.cs
View File

@ -84,7 +84,8 @@ public class SessionController : BaseJellyfinApiController
if (!user.HasPermission(PermissionKind.EnableRemoteControlOfOtherUsers)) if (!user.HasPermission(PermissionKind.EnableRemoteControlOfOtherUsers))
{ {
result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(controllableByUserId.Value)); // User cannot control other user's sessions, validate user id.
result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(RequestHelpers.GetUserId(User, controllableByUserId)));
} }
if (!user.HasPermission(PermissionKind.EnableSharedDeviceControl)) if (!user.HasPermission(PermissionKind.EnableSharedDeviceControl))
@ -105,6 +106,11 @@ public class SessionController : BaseJellyfinApiController
return true; return true;
}); });
} }
else if (!User.IsInRole(UserRoles.Administrator))
{
// Request isn't from administrator, limit to "own" sessions.
result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(User.GetUserId()));
}
if (activeWithinSeconds.HasValue && activeWithinSeconds.Value > 0) if (activeWithinSeconds.HasValue && activeWithinSeconds.Value > 0)
{ {

2
tests/Jellyfin.Server.Integration.Tests/Controllers/SessionControllerTests.cs
View File

@ -21,7 +21,7 @@ public class SessionControllerTests : IClassFixture<JellyfinApplicationFactory>
var client = _factory.CreateClient(); var client = _factory.CreateClient();
client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client)); client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
using var response = await client.GetAsync($"Session/Sessions?userId={Guid.NewGuid()}"); using var response = await client.GetAsync($"Sessions?controllableByUserId={Guid.NewGuid()}");
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
} }
} }