dtourolle
b4134dd744
Previously the shared account's libraries were chosen independently of its members, so a group could see a library that one of its members was blocked from - joining a group became a way to gain access. That was especially sharp with auto-created groups, where no admin is in the loop. A shared account is now granted exactly the libraries every member can already reach. If one member is blocked from a library, no group containing them can see it. The account is therefore always a subset of what each member could reach alone, which is what makes creating groups at the login screen safe to leave on by default. Details: - "Enable all folders" is expanded to concrete library ids before intersecting, since it cannot otherwise be compared with an explicit list. Shared accounts are always given an explicit list, never the all-folders permission, so newly added libraries do not silently widen an existing group. - Explicitly blocked folders are subtracted even for members who otherwise have access to everything. - Fails closed: an unresolvable member contributes no access rather than being treated as unrestricted. - Recomputed when membership changes, and re-applied to every group at startup so narrowing a member's own access narrows their groups. Drops the now-meaningless EnableAllFolders/EnabledFolders provisioning inputs and the DynamicGroupsEnableAllFolders setting. Adds 8 tests covering the intersection rules.
30 lines
1.2 KiB
C#
30 lines
1.2 KiB
C#
using Jellyfin.Plugin.WatchedTogether.Auth;
|
|
using Jellyfin.Plugin.WatchedTogether.Services;
|
|
using MediaBrowser.Controller;
|
|
using MediaBrowser.Controller.Authentication;
|
|
using MediaBrowser.Controller.Plugins;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
namespace Jellyfin.Plugin.WatchedTogether;
|
|
|
|
/// <summary>
|
|
/// Registers the plugin's services with the host.
|
|
/// </summary>
|
|
public class ServiceRegistrator : IPluginServiceRegistrator
|
|
{
|
|
/// <inheritdoc />
|
|
public void RegisterServices(IServiceCollection serviceCollection, IServerApplicationHost applicationHost)
|
|
{
|
|
serviceCollection.AddSingleton<IGroupService, GroupService>();
|
|
serviceCollection.AddSingleton<ILibraryAccessService, LibraryAccessService>();
|
|
serviceCollection.AddSingleton<IProvisioningService, ProvisioningService>();
|
|
serviceCollection.AddSingleton<IDynamicGroupService, DynamicGroupService>();
|
|
|
|
// Discovered by Jellyfin and matched to shared accounts via User.AuthenticationProviderId.
|
|
serviceCollection.AddSingleton<IAuthenticationProvider, SharedAccountAuthenticationProvider>();
|
|
|
|
serviceCollection.AddHostedService<WatchedStateSyncService>();
|
|
serviceCollection.AddHostedService<UserLifecycleService>();
|
|
}
|
|
}
|