Fix dummy log messages when we are processing xlink href with data

Eugene Bochilo · Eugene Bochilo · commit c1be07cc49b4 · 2020-12-12T21:09:30.000+03:00
DEVSIX-4840

Autoported commit.
Original commit hash: [194d087a2]
Manual files:
styled-xml-parser/src/test/java/com/itextpdf/styledxmlparser/resolver/resource/ResourceResolverTest.java
svg/src/test/java/com/itextpdf/svg/css/XLinkTest.java
diff --git a/itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/resolver/resource/ResourceResolverTest.cs b/itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/resolver/resource/ResourceResolverTest.cs
@@ -186,15 +186,15 @@ public virtual void RetrieveImageExtendedBase64Test() {
         }
         
         [Test]
-        [LogMessage(LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI)]
+        [LogMessage(LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI)]
         public virtual void RetrieveImageExtendedIncorrectBase64Test() {
             ResourceResolver resourceResolver = new ResourceResolver(baseUri);
             PdfXObject image = resourceResolver.RetrieveImageExtended(bLogoCorruptedData);
             Assert.Null(image);
         }
 
         [Test]
-        [LogMessage(LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI,
+        [LogMessage(LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI,
             LogLevel = LogLevelConstants.ERROR)]
         public virtual void RetrieveImageExtendedCorruptedDataBase64Test() {
             ResourceResolver resourceResolver = new ResourceResolver(baseUri);
diff --git a/itext.tests/itext.svg.tests/itext/svg/css/XLinkTest.cs b/itext.tests/itext.svg.tests/itext/svg/css/XLinkTest.cs
@@ -56,12 +56,41 @@ public virtual void SvgCssResolveMalformedXlinkTest() {
             iText.StyledXmlParser.Jsoup.Nodes.Element jsoupImage = new iText.StyledXmlParser.Jsoup.Nodes.Element(iText.StyledXmlParser.Jsoup.Parser.Tag
                 .ValueOf("image"), "");
             iText.StyledXmlParser.Jsoup.Nodes.Attributes imageAttributes = jsoupImage.Attributes();
-            String value = "http:://are";
+            String value = "http://are::";
             imageAttributes.Put(new iText.StyledXmlParser.Jsoup.Nodes.Attribute("xlink:href", value));
             JsoupElementNode node = new JsoupElementNode(jsoupImage);
             SvgStyleResolver sr = new SvgStyleResolver(new SvgProcessorContext(new SvgConverterProperties()));
             IDictionary<String, String> attr = sr.ResolveStyles(node, new SvgCssContext());
             NUnit.Framework.Assert.AreEqual(value, attr.Get("xlink:href"));
         }
+        
+        [NUnit.Framework.Test]
+        public virtual void SvgCssResolveDataXlinkTest() {
+            iText.StyledXmlParser.Jsoup.Nodes.Element jsoupImage = new iText.StyledXmlParser.Jsoup.Nodes.Element(iText.StyledXmlParser.Jsoup.Parser.Tag
+                .ValueOf("image"), "");
+            iText.StyledXmlParser.Jsoup.Nodes.Attributes imageAttributes = jsoupImage.Attributes();
+            JsoupElementNode node = new JsoupElementNode(jsoupImage);
+
+            String value1 = "data:image/png;base64,iVBORw0KGgoAAAANSU";
+            imageAttributes.Put(new iText.StyledXmlParser.Jsoup.Nodes.Attribute("xlink:href", value1));
+
+            SvgStyleResolver sr = new SvgStyleResolver(new SvgProcessorContext(new SvgConverterProperties()));
+            IDictionary<String, String> attr = sr.ResolveStyles(node, new SvgCssContext());
+            NUnit.Framework.Assert.AreEqual(value1, attr.Get("xlink:href"));
+
+            String value2 = "data:...,.";
+            imageAttributes.Put(new iText.StyledXmlParser.Jsoup.Nodes.Attribute("xlink:href", value2));
+
+            sr = new SvgStyleResolver(new SvgProcessorContext(new SvgConverterProperties()));
+            attr = sr.ResolveStyles(node, new SvgCssContext());
+            NUnit.Framework.Assert.AreEqual(value2, attr.Get("xlink:href"));
+
+            String value3 = "dAtA:...,.";
+            imageAttributes.Put(new iText.StyledXmlParser.Jsoup.Nodes.Attribute("xlink:href", value3));
+
+            sr = new SvgStyleResolver(new SvgProcessorContext(new SvgConverterProperties()));
+            attr = sr.ResolveStyles(node, new SvgCssContext());
+            NUnit.Framework.Assert.AreEqual(value3, attr.Get("xlink:href"));
+        }
     }
 }
diff --git a/itext.tests/itext.svg.tests/itext/svg/renderers/impl/XLinkDataTest.cs b/itext.tests/itext.svg.tests/itext/svg/renderers/impl/XLinkDataTest.cs
@@ -0,0 +1,30 @@
+using System;
+using iText.Svg.Renderers;
+using iText.Test;
+using iText.Test.Attributes;
+
+namespace iText.Svg.Renderers.Impl {
+    public class XLinkDataTest : SvgIntegrationTest {
+        private static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/svg/renderers/impl/XLinkDataTest/";
+
+        private static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
+             + "/test/itext/svg/renderers/impl/XLinkDataTest/";
+
+        [NUnit.Framework.OneTimeSetUp]
+        public static void BeforeClass() {
+            ITextTest.CreateDestinationFolder(DESTINATION_FOLDER);
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void CorrectImageWithDataTest() {
+            ConvertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "correctImageWithData");
+        }
+
+        [NUnit.Framework.Test]
+        [LogMessage(iText.StyledXmlParser.LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI)]
+        public virtual void IncorrectImageWithDataTest() {
+            ConvertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "incorrectImageWithData");
+        }
+    }
+}
diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/XLinkDataTest/cmp_correctImageWithData.pdf b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/XLinkDataTest/cmp_correctImageWithData.pdf
diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/XLinkDataTest/cmp_incorrectImageWithData.pdf b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/XLinkDataTest/cmp_incorrectImageWithData.pdf
diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/XLinkDataTest/correctImageWithData.svg b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/XLinkDataTest/correctImageWithData.svg
@@ -0,0 +1,5 @@
+<svg width="200" height="200"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+    <image x="0" y="0" width="64" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAfSURBVChTYwCC/wQww39kgIVPDQUEMDWsQAao/P//AW0Aq1UnsAGlAAAAAElFTkSuQmCC"/>
+</svg>
diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/XLinkDataTest/incorrectImageWithData.svg b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/XLinkDataTest/incorrectImageWithData.svg
@@ -0,0 +1,5 @@
+<svg width="200" height="200"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+    <image x="0" y="0" width="64" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAfSURBVChTYwCC/wQww39kgIVPDQUEMDWsQAao/P//AW0Aq1UnsAGlAAAAAElFTkSuQmCC"/>
+</svg>
diff --git a/itext/itext.styledxmlparser/itext/styledxmlparser/LogMessageConstant.cs b/itext/itext.styledxmlparser/itext/styledxmlparser/LogMessageConstant.cs
@@ -103,6 +103,9 @@ public sealed class LogMessageConstant {
         /// <summary>The Constant RESOURCE_WITH_GIVEN_URL_WAS_FILTERED_OUT.</summary>
         public const String RESOURCE_WITH_GIVEN_URL_WAS_FILTERED_OUT = "Resource with given URL ({0}) was filtered out.";
 
+        /// <summary>The Constant UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI.</summary>
+        public const String UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI = "Unable to retrieve image with data URI {0}";
+
         /// <summary>The Constant UNABLE_TO_RETRIEVE_RESOURCE_WITH_GIVEN_RESOURCE_SIZE_BYTE_LIMIT.</summary>
         public const String UNABLE_TO_RETRIEVE_RESOURCE_WITH_GIVEN_RESOURCE_SIZE_BYTE_LIMIT = "Unable to retrieve resource with given URL ({0}) and resource size byte limit ({1}).";
 
diff --git a/itext/itext.styledxmlparser/itext/styledxmlparser/resolver/resource/ResourceResolver.cs b/itext/itext.styledxmlparser/itext/styledxmlparser/resolver/resource/ResourceResolver.cs
@@ -201,8 +201,14 @@ public virtual PdfXObject RetrieveImageExtended(String src) {
                     return imageXObject_1;
                 }
             }
-            logger.Error(MessageFormatUtil.Format(iText.StyledXmlParser.LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI
-                , uriResolver.GetBaseUri(), src));
+            if (IsDataSrc(src)) {
+                logger.Error(MessageFormatUtil.Format(iText.StyledXmlParser.LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI
+                    , src));
+            }
+            else {
+                logger.Error(MessageFormatUtil.Format(iText.StyledXmlParser.LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI
+                    , uriResolver.GetBaseUri(), src));
+            }
             return null;
         }
 
@@ -290,7 +296,7 @@ public virtual Stream RetrieveResourceAsInputStream(String src) {
         /// <param name="src">string to test</param>
         /// <returns>true if source is under data URI scheme</returns>
         public virtual bool IsDataSrc(String src) {
-            return src.StartsWith(DATA_SCHEMA_PREFIX) && src.Contains(",");
+            return src != null && src.ToLowerInvariant().StartsWith(DATA_SCHEMA_PREFIX) && src.Contains(",");
         }
 
         /// <summary>Resolves a given URI against the base URI.</summary>
diff --git a/itext/itext.svg/itext/svg/css/impl/SvgStyleResolver.cs b/itext/itext.svg/itext/svg/css/impl/SvgStyleResolver.cs
@@ -297,7 +297,7 @@ private IDictionary<String, String> ResolveStyles(INode element, SvgCssContext c
         /// <param name="attributesMap">the element styles map</param>
         private void ProcessXLink(IAttribute attr, IDictionary<String, String> attributesMap) {
             String xlinkValue = attr.GetValue();
-            if (!IsStartedWithHash(xlinkValue)) {
+            if (!IsStartedWithHash(xlinkValue) && !new ResourceResolver("").IsDataSrc(xlinkValue)) {
                 try {
                     xlinkValue = this.resourceResolver.ResolveAgainstBaseUri(attr.GetValue()).ToExternalForm();
                 }
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-aa468ca5b908d00757ebee9e3163935487d35fec
+194d087a26b935f0a350b0a8d830694fe44a1958

Original file line number	Diff line number	Diff line change
`@@ -201,8 +201,14 @@ public virtual PdfXObject RetrieveImageExtended(String src) {`
`201`	`201`	`return imageXObject_1;`
`202`	`202`	`}`
`203`	`203`	`}`
`204`		`- logger.Error(MessageFormatUtil.Format(iText.StyledXmlParser.LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI`
`205`		`- , uriResolver.GetBaseUri(), src));`
	`204`	`+ if (IsDataSrc(src)) {`
	`205`	`+ logger.Error(MessageFormatUtil.Format(iText.StyledXmlParser.LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI`
	`206`	`+ , src));`
	`207`	`+ }`
	`208`	`+ else {`
	`209`	`+ logger.Error(MessageFormatUtil.Format(iText.StyledXmlParser.LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI`
	`210`	`+ , uriResolver.GetBaseUri(), src));`
	`211`	`+ }`
`206`	`212`	`return null;`
`207`	`213`	`}`
`208`	`214`
`@@ -290,7 +296,7 @@ public virtual Stream RetrieveResourceAsInputStream(String src) {`
`290`	`296`	`/// <param name="src">string to test</param>`
`291`	`297`	`/// <returns>true if source is under data URI scheme</returns>`
`292`	`298`	`public virtual bool IsDataSrc(String src) {`
`293`		`- return src.StartsWith(DATA_SCHEMA_PREFIX) && src.Contains(",");`
	`299`	`+ return src != null && src.ToLowerInvariant().StartsWith(DATA_SCHEMA_PREFIX) && src.Contains(",");`
`294`	`300`	`}`
`295`	`301`
`296`	`302`	`/// <summary>Resolves a given URI against the base URI.</summary>`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ private IDictionary<String, String> ResolveStyles(INode element, SvgCssContext c`
`297`	`297`	`/// <param name="attributesMap">the element styles map</param>`
`298`	`298`	`private void ProcessXLink(IAttribute attr, IDictionary<String, String> attributesMap) {`
`299`	`299`	`String xlinkValue = attr.GetValue();`
`300`		`- if (!IsStartedWithHash(xlinkValue)) {`
	`300`	`+ if (!IsStartedWithHash(xlinkValue) && !new ResourceResolver("").IsDataSrc(xlinkValue)) {`
`301`	`301`	`try {`
`302`	`302`	`xlinkValue = this.resourceResolver.ResolveAgainstBaseUri(attr.GetValue()).ToExternalForm();`
`303`	`303`	`}`