Fix opened connections outside ResourceRetriever

DEVSIX-5037

Autoported commit.
Original commit hash: [0847044]
Manual files:
io/src/main/java/com/itextpdf/io/util/UrlUtil.java
io/src/test/java/com/itextpdf/io/util/UrlUtilTest.java

Author: Egor Martsynkovsky

itext.tests/itext.io.tests/itext/io/util/UrlUtilTest.cs

@@ -42,9 +42,11 @@ source product.
 */
 using System;
 using System.IO;
+using System.Net;
 using System.Text;
 using iText.Commons.Utils;
 using iText.Test;
+using NUnit.Framework;
 
 namespace iText.IO.Util {
     public class UrlUtilTest : ExtendedITextTest {
@@ -64,6 +66,27 @@ public virtual void GetFinalURLDoesNotLockFileTest() {
             NUnit.Framework.Assert.IsTrue(FileUtil.DeleteFile(tempFile));
         }
 
+        // This test checks that when we pass invalid url and trying get stream related to final redirected url,exception
+        // would be thrown.
+        [NUnit.Framework.Test]
+        public virtual void GetInputStreamOfFinalConnectionThrowExceptionTest() {
+            Uri invalidUrl = new Uri("http://itextpdf");
+            
+            NUnit.Framework.Assert.That(() => {
+                    UrlUtil.GetInputStreamOfFinalConnection(invalidUrl);
+                }, NUnit.Framework.Throws.InstanceOf<WebException>());
+        }
+        
+        // This test checks that when we pass valid url and trying get stream related to final redirected url, it would
+        // not be null.
+        [NUnit.Framework.Test]
+        public virtual void GetInputStreamOfFinalConnectionTest() {
+            Uri initialUrl = new Uri("http://itextpdf.com");
+            Stream streamOfFinalConnectionOfInvalidUrl = UrlUtil.GetInputStreamOfFinalConnection(initialUrl);
+            
+            NUnit.Framework.Assert.NotNull(streamOfFinalConnectionOfInvalidUrl);
+        }
+
         [NUnit.Framework.Test]
         public void GetBaseUriTest() {
             String absolutePathRoot = new Uri(new Uri("file://"), destinationFolder).AbsoluteUri;

itext/itext.io/itext/io/util/UrlUtil.cs

@@ -114,8 +114,10 @@ public static Uri ToNormalizedURI(FileInfo file) {
         /// <summary>
         /// This method gets the last redirected url.
         /// </summary>
-        /// <param name="uri">an initial url</param>
-        /// <returns>the last redirected url</returns>
+        /// <param name="uri">an initial url.</param>
+        /// 
+        /// <returns>the last redirected url.</returns>
+        [Obsolete]
         public static Uri GetFinalURL(Uri uri) {
             return uri;
         }
@@ -139,5 +141,16 @@ public static String GetNormalizedFileUriString(String filename)
         {
             return "file://" + UrlUtil.ToNormalizedURI(filename).AbsolutePath;
         }
+
+        /// <summary>
+        /// Gets the input stream of connection related to last redirected url. You should manually close input stream after
+        /// calling this method to not hold any open resources.
+        /// </summary>
+        /// <param name="url">an initial URL.</param>
+        /// 
+        /// <returns>an input stream of connection related to the last redirected url.</returns>
+        public static Stream GetInputStreamOfFinalConnection(Uri url) {
+            return UrlUtil.OpenStream(url);
+        }
     }
 }

itext/itext.styledxmlparser/itext/styledxmlparser/resolver/resource/DefaultResourceRetriever.cs

@@ -96,7 +96,7 @@ public virtual Stream GetInputStreamByUrl(Uri url) {
                     , url));
                 return null;
             }
-            return new LimitedInputStream(UrlUtil.OpenStream(url), resourceSizeByteLimit);
+            return new LimitedInputStream(UrlUtil.GetInputStreamOfFinalConnection(url), resourceSizeByteLimit);
         }
 
         /// <summary>Gets the byte array that are retrieved from the source URL.</summary>

itext/itext.styledxmlparser/itext/styledxmlparser/resolver/resource/ResourceResolver.cs

@@ -46,7 +46,6 @@ source product.
 using iText.Commons;
 using iText.Commons.Utils;
 using iText.IO.Image;
-using iText.IO.Util;
 using iText.Kernel.Pdf.Xobject;
 
 namespace iText.StyledXmlParser.Resolver.Resource {
@@ -278,7 +277,6 @@ protected internal virtual PdfXObject TryResolveBase64ImageSource(String src) {
         protected internal virtual PdfXObject TryResolveUrlImageSource(String uri) {
             try {
                 Uri url = uriResolver.ResolveAgainstBaseUri(uri);
-                url = UrlUtil.GetFinalURL(url);
                 String imageResolvedSrc = url.ToExternalForm();
                 PdfXObject imageXObject = imageCache.GetImage(imageResolvedSrc);
                 if (imageXObject == null) {
@@ -295,11 +293,11 @@ protected internal virtual PdfXObject TryResolveUrlImageSource(String uri) {
         }
 
         /// <summary>Create a iText XObject based on the image stored at the passed location.</summary>
-        /// <param name="url">location of the Image file</param>
+        /// <param name="url">location of the Image file.</param>
         /// <returns>
         /// 
         /// <see cref="iText.Kernel.Pdf.Xobject.PdfXObject"/>
-        /// containing the Image loaded in
+        /// containing the Image loaded in.
         /// </returns>
         protected internal virtual PdfXObject CreateImageByUrl(Uri url) {
             byte[] bytes = retriever.GetByteArrayByUrl(url);

port-hash

@@ -1 +1 @@
-22758a9a14a188fe166c90befcc99fdbde473415
+0847044410e8b1c1eb0f1536d1ff2e282bc9d62d