The Free Software Media System - Server Backend & API
Add additional validations
Shadowghostb846958f2c99
diff --git a/Jellyfin.Api/Controllers/AudioController.cs b/Jellyfin.Api/Controllers/AudioController.csindex 4be79ff5a0..b6b3e8fe95 100644--- a/Jellyfin.Api/Controllers/AudioController.cs+++ b/Jellyfin.Api/Controllers/AudioController.cs@@ -91,18 +91,18 @@ public class AudioController : BaseJellyfinApiController[ProducesAudioFile]public async Task<ActionResult> GetAudioStream([FromRoute, Required] Guid itemId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? container,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? container,[FromQuery] bool? @static,[FromQuery] string? @params,[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -131,8 +131,8 @@ public class AudioController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,@@ -255,18 +255,18 @@ public class AudioController : BaseJellyfinApiController[ProducesAudioFile]public async Task<ActionResult> GetAudioStreamByContainer([FromRoute, Required] Guid itemId,- [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string container,+ [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string container,[FromQuery] bool? @static,[FromQuery] string? @params,[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -295,8 +295,8 @@ public class AudioController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.csindex acd5dd64ec..2044710978 100644--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs@@ -166,18 +166,18 @@ public class DynamicHlsController : BaseJellyfinApiController[ProducesPlaylistFile]public async Task<ActionResult> GetLiveHlsStream([FromRoute, Required] Guid itemId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? container,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? container,[FromQuery] bool? @static,[FromQuery] string? @params,[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -206,8 +206,8 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,@@ -412,12 +412,12 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery, Required] string mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -448,8 +448,8 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,@@ -585,12 +585,12 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery, Required] string mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -620,8 +620,8 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,@@ -752,12 +752,12 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -788,8 +788,8 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,@@ -921,12 +921,12 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -956,8 +956,8 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,@@ -1091,7 +1091,7 @@ public class DynamicHlsController : BaseJellyfinApiController[FromRoute, Required] Guid itemId,[FromRoute, Required] string playlistId,[FromRoute, Required] int segmentId,- [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string container,+ [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string container,[FromQuery, Required] long runtimeTicks,[FromQuery, Required] long actualSegmentLengthTicks,[FromQuery] bool? @static,@@ -1099,12 +1099,12 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -1135,8 +1135,8 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,@@ -1273,7 +1273,7 @@ public class DynamicHlsController : BaseJellyfinApiController[FromRoute, Required] Guid itemId,[FromRoute, Required] string playlistId,[FromRoute, Required] int segmentId,- [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string container,+ [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string container,[FromQuery, Required] long runtimeTicks,[FromQuery, Required] long actualSegmentLengthTicks,[FromQuery] bool? @static,@@ -1281,12 +1281,12 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -1316,8 +1316,8 @@ public class DynamicHlsController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,diff --git a/Jellyfin.Api/Controllers/LiveTvController.cs b/Jellyfin.Api/Controllers/LiveTvController.csindex 94f62a0713..3600a79621 100644--- a/Jellyfin.Api/Controllers/LiveTvController.cs+++ b/Jellyfin.Api/Controllers/LiveTvController.cs@@ -1185,7 +1185,7 @@ public class LiveTvController : BaseJellyfinApiController[ProducesVideoFile]public ActionResult GetLiveStreamFile([FromRoute, Required] string streamId,- [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string container)+ [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string container){var liveStreamInfo = _mediaSourceManager.GetLiveStreamInfoByUniqueId(streamId);if (liveStreamInfo is null)diff --git a/Jellyfin.Api/Controllers/UniversalAudioController.cs b/Jellyfin.Api/Controllers/UniversalAudioController.csindex b1a91ae70f..f4e0c86143 100644--- a/Jellyfin.Api/Controllers/UniversalAudioController.cs+++ b/Jellyfin.Api/Controllers/UniversalAudioController.cs@@ -101,13 +101,13 @@ public class UniversalAudioController : BaseJellyfinApiController[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,[FromQuery] Guid? userId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] int? maxAudioChannels,[FromQuery] int? transcodingAudioChannels,[FromQuery] int? maxStreamingBitrate,[FromQuery] int? audioBitRate,[FromQuery] long? startTimeTicks,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? transcodingContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? transcodingContainer,[FromQuery] MediaStreamProtocol? transcodingProtocol,[FromQuery] int? maxAudioSampleRate,[FromQuery] int? maxAudioBitDepth,diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.csindex ccf8e90632..afae756e48 100644--- a/Jellyfin.Api/Controllers/VideosController.cs+++ b/Jellyfin.Api/Controllers/VideosController.cs@@ -313,18 +313,18 @@ public class VideosController : BaseJellyfinApiController[ProducesVideoFile]public async Task<ActionResult> GetVideoStream([FromRoute, Required] Guid itemId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? container,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? container,[FromQuery] bool? @static,[FromQuery] string? @params,[FromQuery] string? tag,[FromQuery, ParameterObsolete] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -355,8 +355,8 @@ public class VideosController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,@@ -551,18 +551,18 @@ public class VideosController : BaseJellyfinApiController[ProducesVideoFile]public Task<ActionResult> GetVideoStreamByContainer([FromRoute, Required] Guid itemId,- [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string container,+ [FromRoute, Required] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string container,[FromQuery] bool? @static,[FromQuery] string? @params,[FromQuery] string? tag,[FromQuery] string? deviceProfileId,[FromQuery] string? playSessionId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? segmentContainer,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? segmentContainer,[FromQuery] int? segmentLength,[FromQuery] int? minSegments,[FromQuery] string? mediaSourceId,[FromQuery] string? deviceId,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? audioCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? audioCodec,[FromQuery] bool? enableAutoStreamCopy,[FromQuery] bool? allowVideoStreamCopy,[FromQuery] bool? allowAudioStreamCopy,@@ -593,8 +593,8 @@ public class VideosController : BaseJellyfinApiController[FromQuery] int? cpuCoreLimit,[FromQuery] string? liveStreamId,[FromQuery] bool? enableMpegtsM2TsMode,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? videoCodec,- [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegex)] string? subtitleCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? videoCodec,+ [FromQuery] [RegularExpression(EncodingHelper.ContainerValidationRegexStr)] string? subtitleCodec,[FromQuery] string? transcodeReasons,[FromQuery] int? audioStreamIndex,[FromQuery] int? videoStreamIndex,diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.csindex c6823fa807..047d4ed867 100644--- a/Jellyfin.Api/Helpers/StreamingHelpers.cs+++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs@@ -422,14 +422,18 @@ public static class StreamingHelpersrequest.Static = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);break;case 4:- if (videoRequest is not null)+ if (videoRequest is not null && IsValidCodecName(val)){videoRequest.VideoCodec = val;}break;case 5:- request.AudioCodec = val;+ if (IsValidCodecName(val))+ {+ request.AudioCodec = val;+ }+break;case 6:if (videoRequest is not null)@@ -504,7 +508,7 @@ public static class StreamingHelpersbreak;case 18:- if (videoRequest is not null)+ if (videoRequest is not null && IsValidCodecName(val)){videoRequest.Profile = val;}@@ -563,7 +567,11 @@ public static class StreamingHelpersbreak;case 30:- request.SubtitleCodec = val;+ if (IsValidCodecName(val))+ {+ request.SubtitleCodec = val;+ }+break;case 31:if (videoRequest is not null)@@ -586,6 +594,11 @@ public static class StreamingHelpers}}+ private static bool IsValidCodecName(string val)+ {+ return EncodingHelper.ContainerValidationRegex().IsMatch(val);+ }+/// <summary>/// Parses the container into its file extension./// </summary>diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.csindex f2468782ff..559f763ada 100644--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs@@ -33,12 +33,12 @@ namespace MediaBrowser.Controller.MediaEncodingpublic partial class EncodingHelper{/// <summary>- /// The codec validation regex.+ /// The codec validation regex string./// This regular expression matches strings that consist of alphanumeric characters, hyphens,/// periods, underscores, commas, and vertical bars, with a length between 0 and 40 characters./// This should matches all common valid codecs./// </summary>- public const string ContainerValidationRegex = @"^[a-zA-Z0-9\-\._,|]{0,40}$";+ public const string ContainerValidationRegexStr = @"^[a-zA-Z0-9\-\._,|]{0,40}$";/// <summary>/// The level validation regex.@@ -87,8 +87,6 @@ namespace MediaBrowser.Controller.MediaEncodingprivate readonly Version _minFFmpegRkmppHevcDecDoviRpu = new Version(7, 1, 1);private readonly Version _minFFmpegReadrateCatchupOption = new Version(8, 0);- private static readonly Regex _containerValidationRegex = new(ContainerValidationRegex, RegexOptions.Compiled);-private static readonly string[] _videoProfilesH264 =["ConstrainedBaseline",@@ -181,6 +179,15 @@ namespace MediaBrowser.Controller.MediaEncodingRemoveHdr10Plus,}+ /// <summary>+ /// The codec validation regex.+ /// This regular expression matches strings that consist of alphanumeric characters, hyphens,+ /// periods, underscores, commas, and vertical bars, with a length between 0 and 40 characters.+ /// This should matches all common valid codecs.+ /// </summary>+ [GeneratedRegex(@"^[a-zA-Z0-9\-\._,|]{0,40}$")]+ public static partial Regex ContainerValidationRegex();+[GeneratedRegex(@"\s+")]private static partial Regex WhiteSpaceRegex();@@ -477,7 +484,7 @@ namespace MediaBrowser.Controller.MediaEncodingreturn GetMjpegEncoder(state, encodingOptions);}- if (_containerValidationRegex.IsMatch(codec))+ if (ContainerValidationRegex().IsMatch(codec)){return codec.ToLowerInvariant();}@@ -518,7 +525,7 @@ namespace MediaBrowser.Controller.MediaEncodingpublic static string GetInputFormat(string container){- if (string.IsNullOrEmpty(container) || !_containerValidationRegex.IsMatch(container))+ if (string.IsNullOrEmpty(container) || !ContainerValidationRegex().IsMatch(container)){return null;}@@ -736,7 +743,7 @@ namespace MediaBrowser.Controller.MediaEncoding{var codec = state.OutputAudioCodec;- if (!_containerValidationRegex.IsMatch(codec))+ if (!ContainerValidationRegex().IsMatch(codec)){codec = "aac";}diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.csindex 9f95a9d959..a78ec995cf 100644--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs@@ -205,7 +205,13 @@ namespace MediaBrowser.Providers.Subtitles}var savePaths = new List<string>();- var saveFileName = Path.GetFileNameWithoutExtension(video.Path) + "." + response.Language.ToLowerInvariant();+ var language = response.Language.ToLowerInvariant();+ if (language.AsSpan().IndexOfAny(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) >= 0)+ {+ throw new ArgumentException("Language contains invalid characters.");+ }++ var saveFileName = Path.GetFileNameWithoutExtension(video.Path) + "." + language;if (response.IsForced){@@ -245,15 +251,17 @@ namespace MediaBrowser.Providers.Subtitlesvar path = Path.GetFullPath(savePath + "." + extension);try{- if (path.StartsWith(video.ContainingFolderPath, StringComparison.Ordinal)- || path.StartsWith(video.GetInternalMetadataPath(), StringComparison.Ordinal))+ var containingFolder = video.ContainingFolderPath + Path.DirectorySeparatorChar;+ var metadataFolder = video.GetInternalMetadataPath() + Path.DirectorySeparatorChar;+ if (path.StartsWith(containingFolder, StringComparison.Ordinal)+ || path.StartsWith(metadataFolder, StringComparison.Ordinal)){var fileExists = File.Exists(path);var counter = 0;while (fileExists){- path = Path.GetFullPath(string.Format(CultureInfo.InvariantCulture, "{0}.{1}.{2}", savePath, counter, extension));+ path = string.Format(CultureInfo.InvariantCulture, "{0}.{1}.{2}", savePath, counter, extension);fileExists = File.Exists(path);counter++;}