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

DEVSIX-4840

Author: Eugene Bochilo

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/LogMessageConstant.java

@@ -93,6 +93,9 @@ public final class LogMessageConstant {
     public static final String NAN = "The passed value (@{0}) is not a number";
     /** The Constant RESOURCE_WITH_GIVEN_URL_WAS_FILTERED_OUT. */
     public static final String RESOURCE_WITH_GIVEN_URL_WAS_FILTERED_OUT = "Resource with given URL ({0}) was filtered out.";
+    /** The Constant UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI. */
+    public static final String UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI =
+            "Unable to retrieve image with data URI {0}";
     /** The Constant UNABLE_TO_RETRIEVE_RESOURCE_WITH_GIVEN_RESOURCE_SIZE_BYTE_LIMIT. */
     public static final 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}).";
     /** The Constant UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI. */

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/resolver/resource/ResourceResolver.java

@@ -192,8 +192,13 @@ public PdfXObject retrieveImageExtended(String src) {
                 return imageXObject;
             }
         }
-        logger.error(MessageFormatUtil.format(LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI,
-                uriResolver.getBaseUri(), src));
+        if (isDataSrc(src)) {
+            logger.error(MessageFormatUtil.format(LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI,
+                    src));
+        } else {
+            logger.error(MessageFormatUtil.format(LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI,
+                    uriResolver.getBaseUri(), src));
+        }
         return null;
     }
 
@@ -283,7 +288,7 @@ public InputStream retrieveResourceAsInputStream(String src) {
      * @return true if source is under data URI scheme
      */
     public boolean isDataSrc(String src) {
-        return src.startsWith(DATA_SCHEMA_PREFIX) && src.contains(",");
+        return src != null && src.toLowerCase().startsWith(DATA_SCHEMA_PREFIX) && src.contains(",");
     }
 
     /**

styled-xml-parser/src/test/java/com/itextpdf/styledxmlparser/resolver/resource/ResourceResolverTest.java

@@ -198,15 +198,15 @@ public void retrieveImageExtendedBase64Test() {
     }
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI))
+    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI))
     public void retrieveImageExtendedIncorrectBase64Test() {
         ResourceResolver resourceResolver = new ResourceResolver(baseUri);
         PdfXObject image = resourceResolver.retrieveImageExtended(bLogoCorruptedData);
         Assert.assertNull(image);
     }
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI, logLevel = LogLevelConstants.ERROR))
+    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI, logLevel = LogLevelConstants.ERROR))
     public void retrieveImageExtendedCorruptedDataBase64Test() {
         ResourceResolver resourceResolver = new ResourceResolver(baseUri);
         PdfXObject image = resourceResolver.retrieveImageExtended(bLogoCorruptedData);

svg/src/main/java/com/itextpdf/svg/css/impl/SvgStyleResolver.java

@@ -338,7 +338,7 @@ private Map<String, String> resolveStyles(INode element, SvgCssContext context)
      */
     private void processXLink(final IAttribute attr, final Map<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();
             } catch (MalformedURLException mue) {

svg/src/test/java/com/itextpdf/svg/css/XLinkTest.java

@@ -48,6 +48,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.styledxmlparser.jsoup.nodes.Element;
 import com.itextpdf.styledxmlparser.jsoup.parser.Tag;
 import com.itextpdf.styledxmlparser.node.impl.jsoup.node.JsoupElementNode;
+import com.itextpdf.svg.SvgConstants;
 import com.itextpdf.svg.css.impl.SvgStyleResolver;
 import com.itextpdf.svg.processors.impl.SvgConverterProperties;
 import com.itextpdf.svg.processors.impl.SvgProcessorContext;
@@ -70,12 +71,40 @@ public void svgCssResolveMalformedXlinkTest() {
         Element jsoupImage = new Element(Tag.valueOf("image"), "");
         Attributes imageAttributes = jsoupImage.attributes();
 
-        String value = "htt://are";
+        String value = "http://are::";
         imageAttributes.put(new Attribute("xlink:href", value));
         JsoupElementNode node = new JsoupElementNode(jsoupImage);
 
         SvgStyleResolver sr = new SvgStyleResolver(new SvgProcessorContext(new SvgConverterProperties()));
         Map<String, String> attr = sr.resolveStyles(node, new SvgCssContext());
         Assert.assertEquals(value, attr.get("xlink:href"));
     }
+
+    @Test
+    public void svgCssResolveDataXlinkTest() {
+        Element jsoupImage = new Element(Tag.valueOf(SvgConstants.Tags.IMAGE), "");
+        Attributes imageAttributes = jsoupImage.attributes();
+        JsoupElementNode node = new JsoupElementNode(jsoupImage);
+
+        String value1 = "data:image/png;base64,iVBORw0KGgoAAAANSU";
+        imageAttributes.put(new Attribute("xlink:href", value1));
+
+        SvgStyleResolver sr = new SvgStyleResolver(new SvgProcessorContext(new SvgConverterProperties()));
+        Map<String, String> attr = sr.resolveStyles(node, new SvgCssContext());
+        Assert.assertEquals(value1, attr.get("xlink:href"));
+
+        String value2 = "data:...,.";
+        imageAttributes.put(new Attribute("xlink:href", value2));
+
+        sr = new SvgStyleResolver(new SvgProcessorContext(new SvgConverterProperties()));
+        attr = sr.resolveStyles(node, new SvgCssContext());
+        Assert.assertEquals(value2, attr.get("xlink:href"));
+
+        String value3 = "dAtA:...,.";
+        imageAttributes.put(new Attribute("xlink:href", value3));
+
+        sr = new SvgStyleResolver(new SvgProcessorContext(new SvgConverterProperties()));
+        attr = sr.resolveStyles(node, new SvgCssContext());
+        Assert.assertEquals(value3, attr.get("xlink:href"));
+    }
 }

svg/src/test/java/com/itextpdf/svg/renderers/impl/XLinkDataTest.java

@@ -0,0 +1,40 @@
+package com.itextpdf.svg.renderers.impl;
+
+import com.itextpdf.styledxmlparser.LogMessageConstant;
+import com.itextpdf.svg.renderers.SvgIntegrationTest;
+import com.itextpdf.test.ITextTest;
+import com.itextpdf.test.annotations.LogMessage;
+import com.itextpdf.test.annotations.LogMessages;
+import com.itextpdf.test.annotations.type.IntegrationTest;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
+
+import java.io.IOException;
+
+@Category(IntegrationTest.class)
+public class XLinkDataTest extends SvgIntegrationTest {
+    @Rule
+    public ExpectedException junitExpectedException = ExpectedException.none();
+
+    private static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/svg/renderers/impl/XLinkDataTest/";
+    private static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/svg/renderers/impl/XLinkDataTest/";
+
+    @BeforeClass
+    public static void beforeClass() {
+        ITextTest.createDestinationFolder(DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void correctImageWithDataTest() throws IOException, InterruptedException {
+        convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER,"correctImageWithData");
+    }
+
+    @Test
+    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_DATA_URI))
+    public void incorrectImageWithDataTest() throws IOException, InterruptedException {
+        convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "incorrectImageWithData");
+    }
+}