timothyandClaude Opus 4.8
c617a01e83
New JellyfinMediaSourcesController (/api/media-sources/jellyfin, J1-J9) and EmbyMediaSourcesController (/api/media-sources/emby, E1-E9), wrapping the existing Jellyfin/Emby MediatR commands per the #202 design doc §A.3/§A.4. Secure connection contract (§C3/§B, finding 1): the connection GET returns only { address, hasApiKey } — the API key never crosses the wire. The PUT retains the existing key when the incoming key is blank, sets a new one when non-blank, and 422s "API key is required" on a blank first connect. Finding 7 (lock-release discipline): DisconnectJellyfinHandler and DisconnectEmbyHandler now wrap their work in try/finally so a throw from any awaited dependency (repo delete, search-index commit, secret store) still releases the family lock instead of wedging every future disconnect at 409. Findings 2c/8 (path-replacement cross-source guard): UpdateJellyfinPathReplacementsHandler and UpdateEmbyPathReplacementsHandler now reject, before any write, an incoming positive Id that isn't owned by the route's media source, a null item, or a blank RemotePath/LocalPath — all 422 with no partial mutation. Defense-in-depth repo fix: the Jellyfin/Emby path-replacement UPDATE SQL in MediaSourceRepository now scopes by {Jellyfin,Emby}MediaSourceId (was previously unscoped by Id alone, allowing a PUT to one source to silently overwrite another source's row). The Plex path-replacement method (~line 397) is untouched — that's slice S2's file. Library preferences (§C4a): the controller validates the incoming id set against the source's known libraries (reject foreign ids, require full coverage, no Id=0) before dispatch, then — for §C7 — LockLibrary + enqueues the SynchronizeXLibraries/SynchronizeXLibraryByIdIfNeeded pair per enabled library (compensating unlock if the enqueue throws), and returns the reloaded list (ids are not stable across a disable). 404s on id-taking endpoints come from a controller pre-check (GetXMediaSourceById is None), not a handler NotFoundError, since Either.Apply/ToEitherAsync join any NotFoundError into a flat 422 (finding 9). Tests: controller route/404/409/422 tests for both families; disconnect fault-injection tests proving the lock releases even when a dependency throws; path-replacement handler tests for cross-source-id/blank/null-item rejection and correct add/update/delete merge; a repository-level test proving the SQL fix stops a same-family cross-source path-replacement overwrite. No new commands, no DB migration, no OpenAPI regen (gated until S1-S3 merge per the design doc's build-slice plan). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
51 lines
1.7 KiB
C#
51 lines
1.7 KiB
C#
using ErsatzTV.Core;
|
|
using ErsatzTV.Core.Domain;
|
|
using ErsatzTV.Core.Interfaces.Emby;
|
|
using ErsatzTV.Core.Interfaces.Locking;
|
|
using ErsatzTV.Core.Interfaces.Repositories;
|
|
using ErsatzTV.Core.Interfaces.Search;
|
|
|
|
namespace ErsatzTV.Application.Emby;
|
|
|
|
public class DisconnectEmbyHandler : IRequestHandler<DisconnectEmby, Either<BaseError, Unit>>
|
|
{
|
|
private readonly IEmbySecretStore _embySecretStore;
|
|
private readonly IEntityLocker _entityLocker;
|
|
private readonly IMediaSourceRepository _mediaSourceRepository;
|
|
private readonly ISearchIndex _searchIndex;
|
|
|
|
public DisconnectEmbyHandler(
|
|
IMediaSourceRepository mediaSourceRepository,
|
|
IEmbySecretStore embySecretStore,
|
|
IEntityLocker entityLocker,
|
|
ISearchIndex searchIndex)
|
|
{
|
|
_mediaSourceRepository = mediaSourceRepository;
|
|
_embySecretStore = embySecretStore;
|
|
_entityLocker = entityLocker;
|
|
_searchIndex = searchIndex;
|
|
}
|
|
|
|
public async Task<Either<BaseError, Unit>> Handle(
|
|
DisconnectEmby request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
// This is a terminal handler with no lock handoff (unlike the Plex pin-flow handlers) —
|
|
// release unconditionally so a throw from any awaited dependency (repo delete, search-index
|
|
// commit, secret store) can't wedge the Emby lock until restart (design #202 finding 7).
|
|
try
|
|
{
|
|
List<int> ids = await _mediaSourceRepository.DeleteAllEmby();
|
|
await _searchIndex.RemoveItems(ids);
|
|
_searchIndex.Commit();
|
|
await _embySecretStore.DeleteAll();
|
|
|
|
return Unit.Default;
|
|
}
|
|
finally
|
|
{
|
|
_entityLocker.UnlockRemoteMediaSource<EmbyMediaSource>();
|
|
}
|
|
}
|
|
}
|