timothyandClaude Opus 4.8
cf834d8b60
Build ErsatzTV Image / Docs update reminder (pull_request) Successful in 5s
Build ErsatzTV Image / Build & test (.NET) (pull_request) Successful in 8m33s
Build ErsatzTV Image / EF migration integrity (SQLite + MySql) (pull_request) Successful in 10m40s
Build ErsatzTV Image / Build & push image (amd64) (pull_request) Has been skipped
S4 stored-XSS + S9 upload-size DoS from the #197 cold API review. The artwork path trusted client-supplied content types at both ends: upload validated only the declared multipart Content-Type (never decoded the bytes), and serving reflected a client `?contentType=` straight into the response Content-Type on unauthenticated GET sinks (/iptv/logos, /artwork/watermarks). Chain: upload <script> bytes as image/png -> GET ...?contentType=text/html serves them as HTML in-origin. nosniff (#279) does not help because the server explicitly declares text/html. - Upload: derive the content type from the bytes via SkiaSharp SKCodec (header-only, no decode -> no decompression-bomb path); reject non-images 422. New ErsatzTV.Core/Images/ImageContentTypes as the single allow-list source. Dropped the untrusted declared Content-Type from the UploadArtwork command. - Serve: removed the ?contentType= reflection structurally -- dropped ContentType from GetCachedImagePath and the [FromQuery] binding on GetImage/GetWatermark; the handler always sniffs the file, defaulting application/octet-stream. ArtworkContentTypeModel.UrlWithContentType is now the bare path; SPA previews no longer append the query. - Defense-in-depth: channel-logo / watermark {path, contentType} DTOs run through ArtworkContentTypeModel.Sanitized(), blanking non-allow-listed types on write. - S9: Kestrel MaxRequestBodySize from ETV_MAXIMUM_UPLOAD_MB rejects oversized bodies during read (controller file.Length check kept as friendly-error backstop). Both serve sinks are IgnoreApi, so no OpenAPI change. Tests: byte-sniff accept/ reject, Sanitized() allow-list, Location no longer carries ?contentType=. Docs: api-conventions §4a + decisions.md 2026-07-12. Refs #283 #197 #66 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
118 lines
3.8 KiB
C#
118 lines
3.8 KiB
C#
#nullable enable
|
|
|
|
using ErsatzTV.Application.Artworks;
|
|
using ErsatzTV.Application.Channels;
|
|
using ErsatzTV.Core.Api.LibraryBrowse;
|
|
using ErsatzTV.Core.Domain;
|
|
using ErsatzTV.Core.Scheduling;
|
|
|
|
namespace ErsatzTV.Controllers.Api.Requests;
|
|
|
|
/// <summary>
|
|
/// Composite request to create a channel, its generated schedule/playlist and a classic playout in one call.
|
|
/// Template defaults are stamped at create time; any value set in <see cref="Advanced" /> overrides the template.
|
|
/// A single-item lineup references its target directly; a multi-item lineup is played in order via a generated
|
|
/// system playlist.
|
|
/// </summary>
|
|
public record CreateChannelFromLineupRequest(
|
|
string Name,
|
|
string Number,
|
|
string Group,
|
|
string Categories,
|
|
ArtworkContentTypeModel Logo,
|
|
bool IsEnabled,
|
|
bool ShowInEpg,
|
|
int TemplateId,
|
|
CreateChannelFromLineupAdvancedOptionsRequest? Advanced,
|
|
List<CreateChannelFromLineupItemRequest> Lineup)
|
|
{
|
|
public CreateChannelFromLineup ToCommand() =>
|
|
new(
|
|
Name,
|
|
Number,
|
|
Group,
|
|
Categories,
|
|
(Logo ?? ArtworkContentTypeModel.None).Sanitized(),
|
|
IsEnabled,
|
|
ShowInEpg,
|
|
TemplateId,
|
|
Advanced?.ToCommand() ?? new CreateChannelFromLineupAdvancedOptions(),
|
|
Lineup.Map(i => i.ToCommand()).ToList());
|
|
}
|
|
|
|
public record CreateChannelFromLineupAdvancedOptionsRequest(
|
|
PlaybackOrder? PlaybackOrder = null,
|
|
int? FFmpegProfileId = null,
|
|
int? WatermarkId = null,
|
|
int? FallbackFillerId = null,
|
|
int? PreRollFillerId = null,
|
|
int? MidRollFillerId = null,
|
|
int? PostRollFillerId = null,
|
|
ChannelStreamSelectorMode? StreamSelectorMode = null,
|
|
string? StreamSelector = null,
|
|
string? PreferredAudioLanguageCode = null,
|
|
string? PreferredAudioTitle = null,
|
|
ChannelPlayoutSource? PlayoutSource = null,
|
|
ChannelPlayoutMode? PlayoutMode = null,
|
|
StreamingMode? StreamingMode = null,
|
|
string? PreferredSubtitleLanguageCode = null,
|
|
ChannelSubtitleMode? SubtitleMode = null,
|
|
ChannelMusicVideoCreditsMode? MusicVideoCreditsMode = null,
|
|
string? MusicVideoCreditsTemplate = null,
|
|
ChannelSongVideoMode? SongVideoMode = null,
|
|
ChannelTranscodeMode? TranscodeMode = null,
|
|
ChannelIdleBehavior? IdleBehavior = null,
|
|
bool? ShuffleScheduleItems = null,
|
|
bool? RandomStartPoint = null,
|
|
FixedStartTimeBehavior? FixedStartTimeBehavior = null)
|
|
{
|
|
public CreateChannelFromLineupAdvancedOptions ToCommand() =>
|
|
new(
|
|
PlaybackOrder,
|
|
FFmpegProfileId,
|
|
WatermarkId,
|
|
FallbackFillerId,
|
|
PreRollFillerId,
|
|
MidRollFillerId,
|
|
PostRollFillerId,
|
|
StreamSelectorMode,
|
|
StreamSelector,
|
|
PreferredAudioLanguageCode,
|
|
PreferredAudioTitle,
|
|
PlayoutSource,
|
|
PlayoutMode,
|
|
StreamingMode,
|
|
PreferredSubtitleLanguageCode,
|
|
SubtitleMode,
|
|
MusicVideoCreditsMode,
|
|
MusicVideoCreditsTemplate,
|
|
SongVideoMode,
|
|
TranscodeMode,
|
|
IdleBehavior,
|
|
ShuffleScheduleItems,
|
|
RandomStartPoint,
|
|
FixedStartTimeBehavior);
|
|
}
|
|
|
|
public record CreateChannelFromLineupItemRequest(
|
|
LibraryBrowseMediaType MediaType,
|
|
CollectionType CollectionType,
|
|
int? CollectionId,
|
|
int? MultiCollectionId,
|
|
int? SmartCollectionId,
|
|
int? RerunCollectionId,
|
|
int? MediaItemId,
|
|
int? PlaylistId)
|
|
{
|
|
public CreateChannelFromLineupItem ToCommand() =>
|
|
new(
|
|
MediaType,
|
|
CollectionType,
|
|
CollectionId,
|
|
MultiCollectionId,
|
|
SmartCollectionId,
|
|
RerunCollectionId,
|
|
MediaItemId,
|
|
PlaylistId);
|
|
}
|