Cherry pick branch 'genexuslabs:fix/crop-scale-signed-url-filename' into beta

Author: claudiamurialdo

dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs

@@ -6195,7 +6195,7 @@ public static string Save(Image bitmap, string imageFile, ImageFormat format)
 				ms.Position = 0;
 				try
 				{
-					if ((imageFile.StartsWith("http://") || imageFile.StartsWith("https://")) && ServiceFactory.GetExternalProvider() == null)
+					if (imageFile.StartsWith("http://") || imageFile.StartsWith("https://"))
 					{
 						Uri uri = new Uri(imageFile);
 						imageFile = Path.GetFileName(uri.AbsolutePath);

dotnet/test/DotNetUnitTest/ImageUtils/ImageUtilTest.cs

@@ -117,9 +117,31 @@ public void TestImageFileSize()
 		{
 			string fileName = Initialize();
 			long fileSize = GxImageUtil.GetFileSize(fileName);
-			
+
 			Assert.Equal(113974, fileSize);
 
 		}
+
+		[Fact]
+		public void TestImageSaveFromSignedUrlDoesNotEmbedQueryString()
+		{
+			string signedUrl = "https://bucket.s3.amazonaws.com/folder/bird-thumbnail.jpg?X-Amz-Expires=86400&X-Amz-Signature=abc123def456&X-Amz-Algorithm=AWS4-HMAC-SHA256";
+
+			string destinationPath;
+			using (System.Drawing.Image image = System.Drawing.Image.FromFile(IMAGE_FILE_PATH))
+			{
+				destinationPath = GxImageUtil.Save(image, signedUrl, System.Drawing.Imaging.ImageFormat.Jpeg);
+			}
+
+			Assert.False(string.IsNullOrEmpty(destinationPath));
+			string destinationFileName = Path.GetFileName(destinationPath);
+			Assert.DoesNotContain("?", destinationFileName);
+			Assert.DoesNotContain("%3F", destinationFileName);
+			Assert.DoesNotContain("X-Amz-Expires", destinationFileName);
+			Assert.DoesNotContain("X-Amz-Signature", destinationFileName);
+
+			Assert.Equal(IMAGE_HEIGHT, GxImageUtil.GetImageHeight(destinationPath));
+			Assert.Equal(IMAGE_WIDTH, GxImageUtil.GetImageWidth(destinationPath));
+		}
 	}
 }