From 53bfe0e77de6b3d9e8bb4b9740c8fbe009b145c5 Mon Sep 17 00:00:00 2001 From: BaronGreenback Date: Sat, 15 May 2021 20:24:41 +0100 Subject: Changes as requested --- .../Controllers/EncoderController.cs | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs (limited to 'tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs') diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs new file mode 100644 index 000000000..98ea00de6 --- /dev/null +++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs @@ -0,0 +1,35 @@ +using System.Collections.Generic; +using System.Linq; +using Jellyfin.Api.Constants; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace Jellyfin.Api.Controllers +{ + /// + /// Controller for testing the encoded url. + /// + public class EncoderController : BaseJellyfinApiController + { + /// + /// Tests the url decoding. + /// + /// Parameters to echo back in the response. + /// An . + /// Information retrieved. + [HttpGet("UrlDecode")] + [ProducesResponseType(StatusCodes.Status200OK)] + public ContentResult TestUrlDecoding([FromQuery]Dictionary? @params = null) + { + return new ContentResult() + { + Content = (@params != null && @params.Count > 0) + ? string.Join("&", @params.Select(x => x.Key + "=" + x.Value)) + : string.Empty, + ContentType = "text/plain; charset=utf-8", + StatusCode = 200 + }; + } + } +} -- cgit v1.2.3 From e71c10df46f80085bcae98dba821785f0cc6351a Mon Sep 17 00:00:00 2001 From: BaronGreenback Date: Mon, 7 Jun 2021 16:21:22 +0100 Subject: Update tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs Co-authored-by: Claus Vium --- .../Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs') diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs index 98ea00de6..be9c13890 100644 --- a/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs +++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; using System.Linq; -using Jellyfin.Api.Constants; -using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -- cgit v1.2.3 From 133ce65e2892ef0f5628c3dad7a0f49f4558812a Mon Sep 17 00:00:00 2001 From: BaronGreenback Date: Mon, 7 Jun 2021 16:21:30 +0100 Subject: Update tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs Co-authored-by: Claus Vium --- .../Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs') diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs index be9c13890..14f92f0d8 100644 --- a/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs +++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs @@ -18,7 +18,7 @@ namespace Jellyfin.Api.Controllers /// Information retrieved. [HttpGet("UrlDecode")] [ProducesResponseType(StatusCodes.Status200OK)] - public ContentResult TestUrlDecoding([FromQuery]Dictionary? @params = null) + public ContentResult TestUrlDecoding([FromQuery] Dictionary? @params = null) { return new ContentResult() { -- cgit v1.2.3 From 06401ffa0d8ae98fa42c750847f97c3c291b06ae Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Tue, 8 Jun 2021 22:26:59 +0200 Subject: Fix duplicate keys causing an exception --- Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs | 11 ++++++++--- .../Controllers/EncoderController.cs | 20 ++++++++++++++++++++ .../EncodedQueryStringTest.cs | 15 +++++++++++++++ .../UrlDecodeQueryFeatureTests.cs | 3 ++- 4 files changed, 45 insertions(+), 4 deletions(-) (limited to 'tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs') diff --git a/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs b/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs index f1b47ce33..310a3d31a 100644 --- a/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs +++ b/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs @@ -68,15 +68,20 @@ namespace Jellyfin.Server.Middleware foreach (var pair in queryString) { var i = pair.IndexOf('='); - if (i == -1) { // encoded is an equals. - pairs.Add(pair.ToString(), StringValues.Empty); + // We use TryAdd so duplicate keys get ignored + pairs.TryAdd(pair.ToString(), StringValues.Empty); continue; } - pairs.Add(pair[..i].ToString(), new StringValues(pair[(i + 1)..].ToString())); + var k = pair[..i].ToString(); + var v = pair[(i + 1)..].ToString(); + if (!pairs.TryAdd(k, new StringValues(v))) + { + pairs[k] = StringValues.Concat(pairs[k], v); + } } _store = new QueryCollection(pairs); diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs index 14f92f0d8..c8ce58047 100644 --- a/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs +++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs @@ -29,5 +29,25 @@ namespace Jellyfin.Api.Controllers StatusCode = 200 }; } + + /// + /// Tests the url decoding. + /// + /// Parameters to echo back in the response. + /// An . + /// Information retrieved. + [HttpGet("UrlArrayDecode")] + [ProducesResponseType(StatusCodes.Status200OK)] + public ContentResult TestUrlArrayDecoding([FromQuery] Dictionary? @params = null) + { + return new ContentResult() + { + Content = (@params != null && @params.Count > 0) + ? string.Join("&", @params.Select(x => x.Key + "=" + string.Join(',', x.Value))) + : string.Empty, + ContentType = "text/plain; charset=utf-8", + StatusCode = 200 + }; + } } } diff --git a/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs b/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs index 29d3fe33d..732b4f050 100644 --- a/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs +++ b/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs @@ -20,6 +20,8 @@ namespace Jellyfin.Server.Integration.Tests [InlineData("a=1&b=2&c=3", "a=1&b=2&c=3")] // won't be processed as there is more than 1. [InlineData("a=1", "a=1")] // won't be processed as it has a value [InlineData("a%3D1%26b%3D2%26c%3D3", "a=1&b=2&c=3")] // will be processed. + [InlineData("a=b&a=c", "a=b")] + [InlineData("a%3Db%26a%3Dc", "a=b")] public async Task Ensure_Decoding_Of_Urls_Is_Working(string sourceUrl, string unencodedUrl) { var client = _factory.CreateClient(); @@ -29,5 +31,18 @@ namespace Jellyfin.Server.Integration.Tests string reply = await response.Content.ReadAsStringAsync().ConfigureAwait(false); Assert.Equal(unencodedUrl, reply); } + + [Theory] + [InlineData("a=b&a=c", "a=b,c")] + [InlineData("a%3Db%26a%3Dc", "a=b,c")] + public async Task Ensure_Array_Decoding_Of_Urls_Is_Working(string sourceUrl, string unencodedUrl) + { + var client = _factory.CreateClient(); + + var response = await client.GetAsync("Encoder/UrlArrayDecode?" + sourceUrl).ConfigureAwait(false); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + string reply = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + Assert.Equal(unencodedUrl, reply); + } } } diff --git a/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs b/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs index d0eac138a..419afb2dc 100644 --- a/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs +++ b/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs @@ -14,6 +14,7 @@ namespace Jellyfin.Server.Tests [InlineData("e0a72cb2a2c7", "e0a72cb2a2c7")] // isn't encoded [InlineData("random+test", "random test")] // encoded [InlineData("random%20test", "random test")] // encoded + [InlineData("++", " ")] // encoded public static void EmptyValueTest(string query, string key) { var dict = new Dictionary @@ -23,7 +24,7 @@ namespace Jellyfin.Server.Tests var test = new UrlDecodeQueryFeature(new QueryFeature(new QueryCollection(dict))); Assert.Single(test.Query); var (k, v) = test.Query.First(); - Assert.Equal(k, key); + Assert.Equal(key, k); Assert.Empty(v); } } -- cgit v1.2.3 From d32bbf181a4560542ab91c5a7c4d5dcb453259e2 Mon Sep 17 00:00:00 2001 From: crobibero Date: Sun, 13 Jun 2021 06:30:28 -0600 Subject: Ignore all test controllers --- .../Controllers/BaseJellyfinTestController.cs | 14 ++++++++++++++ .../Controllers/EncoderController.cs | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 tests/Jellyfin.Server.Integration.Tests/Controllers/BaseJellyfinTestController.cs (limited to 'tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs') diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/BaseJellyfinTestController.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/BaseJellyfinTestController.cs new file mode 100644 index 000000000..9db8689a7 --- /dev/null +++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/BaseJellyfinTestController.cs @@ -0,0 +1,14 @@ +using Jellyfin.Api; +using Microsoft.AspNetCore.Mvc; + +namespace Jellyfin.Server.Integration.Tests.Controllers +{ + /// + /// Base controller for testing infrastructure. + /// Automatically ignored in generated openapi spec. + /// + [ApiExplorerSettings(IgnoreApi = true)] + public class BaseJellyfinTestController : BaseJellyfinApiController + { + } +} diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs index c8ce58047..1a720c2f6 100644 --- a/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs +++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs @@ -3,12 +3,12 @@ using System.Linq; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -namespace Jellyfin.Api.Controllers +namespace Jellyfin.Server.Integration.Tests.Controllers { /// /// Controller for testing the encoded url. /// - public class EncoderController : BaseJellyfinApiController + public class EncoderController : BaseJellyfinTestController { /// /// Tests the url decoding. -- cgit v1.2.3