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

Backport pull request #13499 from jellyfin/release-10.10.z

Browse Source 
Allow api key to subscribe to admin websockets

Original-merge: 03082e90f9

Merged-by: joshuaboniface <joshua@boniface.me>

Backported-by: Bond_009 <bond.009@outlook.com>
This commit is contained in:
crobibero
2025-02-09 08:50:53 -05:00
committed by Bond_009
parent f4a2679177
commit b11de39c34
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs
View File

@@ -70,8 +70,9 @@ public class ActivityLogWebSocketListener : BasePeriodicWebSocketListener<Activi
/// <param name="message">The message.</param> /// <param name="message">The message.</param>
protected override void Start(WebSocketMessageInfo message) protected override void Start(WebSocketMessageInfo message)
{ {
if (message.Connection.AuthorizationInfo.User is null if (!message.Connection.AuthorizationInfo.IsApiKey
|| !message.Connection.AuthorizationInfo.User.HasPermission(PermissionKind.IsAdministrator)) && (message.Connection.AuthorizationInfo.User is null
|| !message.Connection.AuthorizationInfo.User.HasPermission(PermissionKind.IsAdministrator)))
{ {
throw new AuthenticationException("Only admin users can retrieve the activity log."); throw new AuthenticationException("Only admin users can retrieve the activity log.");
} }

5
Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs
View File

@@ -79,8 +79,9 @@ public class SessionInfoWebSocketListener : BasePeriodicWebSocketListener<IEnume
/// <param name="message">The message.</param> /// <param name="message">The message.</param>
protected override void Start(WebSocketMessageInfo message) protected override void Start(WebSocketMessageInfo message)
{ {
if (message.Connection.AuthorizationInfo.User is null if (!message.Connection.AuthorizationInfo.IsApiKey
|| !message.Connection.AuthorizationInfo.User.HasPermission(PermissionKind.IsAdministrator)) && (message.Connection.AuthorizationInfo.User is null
|| !message.Connection.AuthorizationInfo.User.HasPermission(PermissionKind.IsAdministrator)))
{ {
throw new AuthenticationException("Only admin users can subscribe to session information."); throw new AuthenticationException("Only admin users can subscribe to session information.");
} }