Merge remote-tracking branch 'origin/dev' into dev

tmenier · Sep 12, 2023 · da3694b · da3694b
2 parents 48256ed + e35478c
commit da3694b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/...rl.Test/Http/NewtonsoftJsonSerializer .cs → ...url.Test/Http/NewtonsoftJsonSerializer.cs b/...rl.Test/Http/NewtonsoftJsonSerializer .cs → ...url.Test/Http/NewtonsoftJsonSerializer.cs
diff --git a/Test/Flurl.Test/Http/RealHttpTests.cs b/Test/Flurl.Test/Http/RealHttpTests.cs
@@ -40,6 +40,7 @@ public async Task decompresses_automatically(string encoding, string jsonKey) {
 		[TestCase("https://httpbin.org/response-headers", "attachment", null, "response-headers")]
 		public async Task can_download_file(string url, string contentDisposition, string suppliedFilename, string expectedFilename) {
 			var folder = Path.Combine(Path.GetTempPath(), $"flurl-test-{Guid.NewGuid()}"); // random so parallel tests don't trip over each other
+			Directory.CreateDirectory(folder);
 
 			try {
 				var path = await url.SetQueryParam("Content-Disposition", contentDisposition).DownloadFileAsync(folder, suppliedFilename);

diff --git a/Test/Flurl.Test/UrlBuilder/UtilityMethodTests.cs b/Test/Flurl.Test/UrlBuilder/UtilityMethodTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -74,6 +74,10 @@ public void can_encode_and_decode_very_long_value() {
 		[TestCase("blah", false)]
 		[TestCase("http:/www.mysite.com", false)]
 		[TestCase("www.mysite.com", false)]
+		[TestCase("https://example.com/%C3%A5%2A", true)]
+		[TestCase("https://example.com/%E0%B8%95%E0%B8%B1%2A", true)]
+		[TestCase("https://example.com:999/api/path.cgi?u=uname&p=P%C3%B3%5E78", true)]
+		[TestCase("https://example.com:999/api/path.cgi?u=uname&p=P%C378", true)]
 		public void IsValid_works(string s, bool isValid) {
 			Assert.AreEqual(isValid, Url.IsValid(s));
 		}

diff --git a/src/Flurl/Url.cs b/src/Flurl/Url.cs
@@ -679,7 +679,19 @@ public static string EncodeIllegalCharacters(string s, bool encodeSpaceAsPlus =
 		/// </summary>
 		/// <param name="url">The string to check</param>
 		/// <returns>true if the string is a well-formed absolute URL</returns>
-		public static bool IsValid(string url) => url != null && Uri.IsWellFormedUriString(url, UriKind.Absolute);
+		public static bool IsValid(string url) {
+			if (url is null)
+				return false;
+
+			if (!Uri.TryCreate(url, UriKind.Absolute, out var result))
+				return false;
+
+			//Non-Ascii characters combined with URI reserved characters make IsWellFormedUriString return false
+			//even though url is correct https://stackoverflow.com/a/62411610/2380881
+			//IsWellFormedUriString is only needed to check if there is no path and query in url
+			return !string.IsNullOrEmpty(result?.PathAndQuery) || Uri.IsWellFormedUriString(url, UriKind.Absolute);
+		}
+
 		#endregion
 	}
 }