Add support of attr() with type for url and string

Add support of attr() with fallback for url and string
Add support of attr() in target-counter
Add tests

DEVSIX-2994

Autoported commit.
Original commit hash: [a54cb196]

Author: Egor Martsynkovsky

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/resolve/CssContentPropertyResolverIntegrationTest.cs

@@ -0,0 +1,69 @@
+/*
+This file is part of the iText (R) project.
+Copyright (c) 1998-2021 iText Group NV
+Authors: iText Software.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License version 3
+as published by the Free Software Foundation with the addition of the
+following permission added to Section 15 as permitted in Section 7(a):
+FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
+ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
+OF THIRD PARTY RIGHTS
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, see http://www.gnu.org/licenses or write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA, 02110-1301 USA, or download the license from the following URL:
+http://itextpdf.com/terms-of-use/
+
+The interactive user interfaces in modified source and object code versions
+of this program must display Appropriate Legal Notices, as required under
+Section 5 of the GNU Affero General Public License.
+
+In accordance with Section 7(b) of the GNU Affero General Public License,
+a covered work must retain the producer line in every PDF that is created
+or manipulated using iText.
+
+You can be released from the requirements of the license by purchasing
+a commercial license. Buying such a license is mandatory as soon as you
+develop commercial activities involving the iText software without
+disclosing the source code of your own applications.
+These activities include: offering paid services to customers as an ASP,
+serving PDFs on the fly in a web application, shipping iText with a closed
+source product.
+
+For more information, please contact iText Software Corp. at this
+address: [email protected]
+*/
+using System;
+using iText.Html2pdf;
+
+namespace iText.Html2pdf.Css.Resolve {
+    public class CssContentPropertyResolverIntegrationTest : ExtendedHtmlConversionITextTest {
+        public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css" + "/CssContentPropertyResolverIntegrationTest/";
+
+        public static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
+             + "/test/itext/html2pdf/css" + "/CssContentPropertyResolverIntegrationTest/";
+
+        [NUnit.Framework.OneTimeSetUp]
+        public static void BeforeClass() {
+            CreateOrClearDestinationFolder(DESTINATION_FOLDER);
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void CheckSimpleAttrFunctionTest() {
+            ConvertToPdfAndCompare("checkSimpleAttrFunctionTest", SOURCE_FOLDER, DESTINATION_FOLDER);
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void CheckAttrFunctionWithTypeTest() {
+            ConvertToPdfAndCompare("checkAttrFunctionWithTypeTest", SOURCE_FOLDER, DESTINATION_FOLDER);
+        }
+    }
+}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/resolve/CssContentPropertyResolverTest.cs

@@ -24,6 +24,7 @@ You should have received a copy of the GNU Affero General Public License
 using System.Collections.Generic;
 using iText.Html2pdf.Css;
 using iText.Html2pdf.Css.Resolve.Func.Counter;
+using iText.StyledXmlParser.Css.Pseudo;
 using iText.StyledXmlParser.Node;
 using iText.Test;
 using iText.Test.Attributes;
@@ -100,5 +101,27 @@ public virtual void ResolveContentCounterNotPageTest() {
             NUnit.Framework.Assert.AreEqual(1, result.Count);
             NUnit.Framework.Assert.IsTrue(result[0] is ITextNode);
         }
+
+        [NUnit.Framework.Test]
+        [LogMessage(iText.Html2pdf.LogMessageConstant.CONTENT_PROPERTY_INVALID, Count = 1)]
+        public virtual void ResolveContentWrongTargetCounterTest() {
+            IDictionary<String, String> styles = new Dictionary<String, String>();
+            styles.Put(CssConstants.CONTENT, "target-counter(attr(), pages)");
+            CssContext context = new CssContext();
+            IElementNode iNode = new CssPseudoElementNode(null, "test");
+            IList<INode> result = CssContentPropertyResolver.ResolveContent(styles, iNode, context);
+            NUnit.Framework.Assert.IsNull(result);
+        }
+
+        [NUnit.Framework.Test]
+        [LogMessage(iText.Html2pdf.LogMessageConstant.CONTENT_PROPERTY_INVALID, Count = 1)]
+        public virtual void ResolveContentWrongTargetCountersTest() {
+            IDictionary<String, String> styles = new Dictionary<String, String>();
+            styles.Put(CssConstants.CONTENT, "target-counters(attr(), pages)");
+            CssContext context = new CssContext();
+            IElementNode iNode = new CssPseudoElementNode(null, "test");
+            IList<INode> result = CssContentPropertyResolver.ResolveContent(styles, iNode, context);
+            NUnit.Framework.Assert.IsNull(result);
+        }
     }
 }

itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/CssContentPropertyResolverIntegrationTest/checkAttrFunctionWithTypeTest.html

@@ -0,0 +1,23 @@
+<html>
+
+<head>
+  <style>
+    .toc-row a::after {
+      content: " " target-counter(attr(href url), page);
+    }
+  </style>
+</head>
+<body>
+
+<div class="toc-container">
+  <div class="toc-row"><a href="#one">Link To Page One</a></div>
+  <div class="toc-row"><a href="#two">Link To Page Two</a></div>
+</div>
+
+<div class="content-container">
+  <div class="page" id="one">Page One Content Here</div>
+  <div class="page" id="two" style="page-break-before: always">Page Two Content Here</div>
+</div>
+
+</body>
+</html>

itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/CssContentPropertyResolverIntegrationTest/checkSimpleAttrFunctionTest.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<style>
+[data-foo]::before {
+  content: attr(data-foo) " ";
+}
+</style>
+<body>
+<p data-foo="hello">world</p>
+</body>
+</html>

itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/CssContentPropertyResolverIntegrationTest/cmp_checkAttrFunctionWithTypeTest.pdf

@@ -48,6 +48,7 @@ source product.
 using iText.Html2pdf.Css.Resolve.Func.Counter;
 using iText.Html2pdf.Html;
 using iText.IO.Util;
+using iText.StyledXmlParser.Css;
 using iText.StyledXmlParser.Css.Page;
 using iText.StyledXmlParser.Css.Parse;
 using iText.StyledXmlParser.Css.Pseudo;
@@ -158,7 +159,11 @@ internal static IList<INode> ResolveContent(IDictionary<String, String> styles,
                             if (@params.Count < TARGET_COUNTER_MIN_PARAMS_SIZE) {
                                 return ErrorFallback(contentStr);
                             }
-                            String target = CssUtils.ExtractUrl(@params[0]);
+                            String target = @params[0].StartsWith(CommonCssConstants.ATTRIBUTE + "(") ? CssUtils.ExtractAttributeValue
+                                (@params[0], (IElementNode)contentContainer.ParentNode()) : CssUtils.ExtractUrl(@params[0]);
+                            if (target == null) {
+                                return ErrorFallback(contentStr);
+                            }
                             String counterName = @params[1].Trim();
                             CounterDigitsGlyphStyle listStyleType = HtmlUtils.ConvertStringCounterGlyphStyleToEnum(@params.Count > TARGET_COUNTER_MIN_PARAMS_SIZE
                                  ? @params[TARGET_COUNTER_MIN_PARAMS_SIZE].Trim() : null);
@@ -186,7 +191,11 @@ internal static IList<INode> ResolveContent(IDictionary<String, String> styles,
                                 if (@params.Count < TARGET_COUNTERS_MIN_PARAMS_SIZE) {
                                     return ErrorFallback(contentStr);
                                 }
-                                String target = CssUtils.ExtractUrl(@params[0]);
+                                String target = @params[0].StartsWith(CommonCssConstants.ATTRIBUTE + "(") ? CssUtils.ExtractAttributeValue
+                                    (@params[0], (IElementNode)contentContainer.ParentNode()) : CssUtils.ExtractUrl(@params[0]);
+                                if (target == null) {
+                                    return ErrorFallback(contentStr);
+                                }
                                 String counterName = @params[1].Trim();
                                 String counterSeparator = @params[2].Trim();
                                 counterSeparator = counterSeparator.JSubstring(1, counterSeparator.Length - 1);
@@ -224,17 +233,14 @@ internal static IList<INode> ResolveContent(IDictionary<String, String> styles,
                                         result.Add(new CssContentElementNode(contentContainer, TagConstants.DIV, attributes));
                                     }
                                     else {
-                                        if (token.GetValue().StartsWith("attr(") && contentContainer is CssPseudoElementNode) {
-                                            int endBracket = token.GetValue().IndexOf(')');
-                                            if (endBracket > 5) {
-                                                String attrName = token.GetValue().JSubstring(5, endBracket);
-                                                if (attrName.Contains("(") || attrName.Contains(" ") || attrName.Contains("'") || attrName.Contains("\"")) {
-                                                    return ErrorFallback(contentStr);
-                                                }
-                                                IElementNode element = (IElementNode)contentContainer.ParentNode();
-                                                String value = element.GetAttribute(attrName);
-                                                result.Add(new CssContentPropertyResolver.ContentTextNode(contentContainer, value == null ? "" : value));
+                                        if (token.GetValue().StartsWith(CommonCssConstants.ATTRIBUTE + "(") && contentContainer is CssPseudoElementNode
+                                            ) {
+                                            String value = CssUtils.ExtractAttributeValue(token.GetValue(), (IElementNode)contentContainer.ParentNode(
+                                                ));
+                                            if (value == null) {
+                                                return ErrorFallback(contentStr);
                                             }
+                                            result.Add(new CssContentPropertyResolver.ContentTextNode(contentContainer, value));
                                         }
                                         else {
                                             if (token.GetValue().EndsWith("quote") && contentContainer is IStylesContainer) {

itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/CssContentPropertyResolverIntegrationTest/cmp_checkSimpleAttrFunctionTest.pdf

@@ -1 +1 @@
-a9bca9c275e780d5ecf4b1eb219b7e374c8c9988
+a54cb196505d4bfe08cf2c6fb6ea7836385b28c7