Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't expose hwaccel type for non-admin (#12663)

Browse Source
This commit is contained in:
gnattu 2024-09-18 21:25:28 +08:00 committed by GitHub
parent 97d2f778f8
commit 569a41fc2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ using MediaBrowser.Controller.Devices;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Session; using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Session; using MediaBrowser.Model.Session;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
@ -66,6 +67,7 @@ public class SessionController : BaseJellyfinApiController
[FromQuery] int? activeWithinSeconds) [FromQuery] int? activeWithinSeconds)
{ {
var result = _sessionManager.Sessions; var result = _sessionManager.Sessions;
var isRequestingFromAdmin = User.IsInRole(UserRoles.Administrator);
if (!string.IsNullOrEmpty(deviceId)) if (!string.IsNullOrEmpty(deviceId))
{ {
@ -106,7 +108,7 @@ public class SessionController : BaseJellyfinApiController
return true; return true;
}); });
} }
else if (!User.IsInRole(UserRoles.Administrator)) else if (!isRequestingFromAdmin)
{ {
// Request isn't from administrator, limit to "own" sessions. // Request isn't from administrator, limit to "own" sessions.
result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(User.GetUserId())); result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(User.GetUserId()));
@ -118,6 +120,16 @@ public class SessionController : BaseJellyfinApiController
result = result.Where(i => i.LastActivityDate >= minActiveDate); result = result.Where(i => i.LastActivityDate >= minActiveDate);
} }
// Request isn't from administrator, don't report acceleration type.
if (!isRequestingFromAdmin)
{
result = result.Select(r =>
{
r.TranscodingInfo.HardwareAccelerationType = HardwareAccelerationType.none;
return r;
});
}
return Ok(result); return Ok(result);
} }