Skip to content

Escape value in CSS ~= attribute selector matching #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
netliomax25-code wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Escape value in CSS ~= attribute selector matching #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...rc/main/java/com/itextpdf/styledxmlparser/css/selector/item/CssAttributeSelectorItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ public boolean matches(INode node) {
case '$':
return value.length() > 0 && attributeValue.endsWith(value);
case '~':
String pattern = MessageFormatUtil.format("(^{0}\\s+)|(\\s+{1}\\s+)|(\\s+{2}$)", value, value, value);
String quotedValue = Pattern.quote(value);
String pattern = MessageFormatUtil.format("(^{0}\\s+)|(\\s+{1}\\s+)|(\\s+{2}$)", quotedValue,
quotedValue, quotedValue);
return Pattern.compile(pattern).matcher(attributeValue).matches();
case '*':
return value.length() > 0 && attributeValue.contains(value);
Expand Down
42 changes: 42 additions & 0 deletions ...l-parser/src/test/java/com/itextpdf/styledxmlparser/css/selector/item/CssMatchesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,48 @@ public void matchesRootSelectorItemTestNotTaggedText() {
Assertions.assertFalse(item.matches(divNode));
}

@Test
public void matchesAttributeContainsWordTreatsValueAsLiteralTest() {
CssAttributeSelectorItem item = new CssAttributeSelectorItem("[data-info~=\"a.c\"]");
IXmlParser htmlParser = new JsoupHtmlParser();
IDocumentNode documentNode = htmlParser.parse("<div data-info=\" abc\"></div>");

INode bodyNode = documentNode
.childNodes().get(0)
.childNodes().get(1);
INode divNode = bodyNode.childNodes().get(0);

Assertions.assertFalse(item.matches(divNode));
}

@Test
public void matchesAttributeContainsWordLiteralValueTest() {
CssAttributeSelectorItem item = new CssAttributeSelectorItem("[data-info~=\"abc\"]");
IXmlParser htmlParser = new JsoupHtmlParser();
IDocumentNode documentNode = htmlParser.parse("<div data-info=\" abc\"></div>");

INode bodyNode = documentNode
.childNodes().get(0)
.childNodes().get(1);
INode divNode = bodyNode.childNodes().get(0);

Assertions.assertTrue(item.matches(divNode));
}

@Test
public void matchesAttributeContainsWordInvalidRegexValueTest() {
CssAttributeSelectorItem item = new CssAttributeSelectorItem("[data-info~=\"(\"]");
IXmlParser htmlParser = new JsoupHtmlParser();
IDocumentNode documentNode = htmlParser.parse("<div data-info=\" abc\"></div>");

INode bodyNode = documentNode
.childNodes().get(0)
.childNodes().get(1);
INode divNode = bodyNode.childNodes().get(0);

Assertions.assertFalse(item.matches(divNode));
}

@Test
public void cssPageTypeSelectorItemMatchesTest() {
CssPageTypeSelectorItem item = new CssPageTypeSelectorItem("customPageName");
Expand Down