From d6102e642400b7abae15ec41e48b5c28cfef9503 Mon Sep 17 00:00:00 2001 From: "paul.gartner@flarehr.com" Date: Tue, 2 Jun 2020 12:12:47 +1000 Subject: [PATCH 1/2] Modified Http.AppendQueryToUrl to use Uri.EscapeDataString Modified unit failing unit test Added new unit test --- src/Net/Http.fs | 7 +------ tests/FSharp.Data.Tests/Http.fs | 13 ++++++++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Net/Http.fs b/src/Net/Http.fs index afd462892..ddf1a3474 100644 --- a/src/Net/Http.fs +++ b/src/Net/Http.fs @@ -1505,11 +1505,6 @@ type Http private() = static member internal EncodeFormData (query:string) = (WebUtility.UrlEncode query).Replace("+","%20") - // EscapeUriString doesn't encode the & and # characters which cause issues, but EscapeDataString encodes too much making the url hard to read - // So we use EscapeUriString and manually replace the two problematic characters - static member private EncodeUrlParam (param: string) = - (Uri.EscapeUriString param).Replace("&", "%26").Replace("#", "%23") - /// Appends the query parameters to the url, taking care of proper escaping static member internal AppendQueryToUrl(url:string, query) = match query with @@ -1517,7 +1512,7 @@ type Http private() = | query -> url + if url.Contains "?" then "&" else "?" - + String.concat "&" [ for k, v in query -> Http.EncodeUrlParam k + "=" + Http.EncodeUrlParam v ] + + String.concat "&" [ for k, v in query -> Uri.EscapeDataString k + "=" + Uri.EscapeDataString v ] static member private InnerRequest ( diff --git a/tests/FSharp.Data.Tests/Http.fs b/tests/FSharp.Data.Tests/Http.fs index 979eef69b..3b6ceeede 100644 --- a/tests/FSharp.Data.Tests/Http.fs +++ b/tests/FSharp.Data.Tests/Http.fs @@ -185,4 +185,15 @@ let ``escaping of url parameters`` () = ] Http.AppendQueryToUrl(url, queryParams) - |> should equal "https://graph.microsoft.com/beta/me/insights/shared?$select=Property1,Property2/SubProperty,*&$filter=Subject%20eq%20'A?%20%26%20%23B%20=%20C/D'&$top=10&$expand=ExtendedProperties($filter=PropertyId%20eq%20'String%20%7B36FF76DC-215F-4246-9544-DAB709259CE8%7D%20Name%20Some/Property2.0')&$orderby=Property2%20desc" + |> should equal "https://graph.microsoft.com/beta/me/insights/shared?%24select=Property1%2CProperty2%2FSubProperty%2C%2A&%24filter=Subject%20eq%20%27A%3F%20%26%20%23B%20%3D%20C%2FD%27&%24top=10&%24expand=ExtendedProperties%28%24filter%3DPropertyId%20eq%20%27String%20%7B36FF76DC-215F-4246-9544-DAB709259CE8%7D%20Name%20Some%2FProperty2.0%27%29&%24orderby=Property2%20desc" + +[] +let ``escaping of reserve characters in query`` () = + let url = "http://nevermind.com" + let queryParams = [ + "key!", "v@lue1" + "key#", "value2&(value:/?#[]@*+,;=)" + ] + + Http.AppendQueryToUrl(url, queryParams) + |> should equal "http://nevermind.com?key%21=v%40lue1&key%23=value2%26%28value%3A%2F%3F%23%5B%5D%40%2A%2B%2C%3B%3D%29" From 9c73063ad289a42242cc6efe8dd94dad316b3040 Mon Sep 17 00:00:00 2001 From: "paul.gartner@flarehr.com" Date: Tue, 2 Jun 2020 19:02:01 +1000 Subject: [PATCH 2/2] Removed failing reference to 'http://europa.eu/rapid/conf/RSS20.xsd' sever returns 404 --- tests/FSharp.Data.DesignTime.Tests/SignatureTestCases.config | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/FSharp.Data.DesignTime.Tests/SignatureTestCases.config b/tests/FSharp.Data.DesignTime.Tests/SignatureTestCases.config index 5ee671124..a7b3894c1 100644 --- a/tests/FSharp.Data.DesignTime.Tests/SignatureTestCases.config +++ b/tests/FSharp.Data.DesignTime.Tests/SignatureTestCases.config @@ -33,7 +33,6 @@ Xml,TypeInference.xml,false,false,,false, Xml,SampleAzureServiceManagement.xml,false,false,,true, Xml,TimeSpans.xml,false,false,,true, Xml,,false,false,,false,po.xsd -Xml,,false,false,,false,http://europa.eu/rapid/conf/RSS20.xsd Xml,,false,false,,false,homonim.xsd Xml,,false,false,,false,IncludeFromWeb.xsd Json,WorldBank.json,false,WorldBank,,true