Skip to content

[1.14] Security fix for missing encoding in CssSelector #691

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

Merged
merged 8 commits into from
May 28, 2025
Merged

[1.14] Security fix for missing encoding in CssSelector #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
51fef3b
fix missing encoding in CssSelector.php
divinity76 May 23, 2025
2c7a59c
update testcase..
divinity76 May 23, 2025
8d53911
update testcase
divinity76 May 23, 2025
cdc0df7
StyleCI
divinity76 May 23, 2025
ddbec79
StyleCI
divinity76 May 23, 2025
aa654a5
testacse
divinity76 May 23, 2025
58c967a
testcase
divinity76 May 23, 2025
a9cee6e
nit
divinity76 May 26, 2025
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
20 changes: 16 additions & 4 deletions src/Dom/Selector/CssSelector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,32 @@
final class CssSelector implements Selector
{
/** @var string */
private $expression;
private $expressionEncoded;

public function __construct(string $expression)
{
$this->expression = $expression;
$this->expressionEncoded = \json_encode(
$expression,
\JSON_UNESCAPED_SLASHES
| \JSON_UNESCAPED_UNICODE
| \JSON_THROW_ON_ERROR
);
}

public function expressionCount(): string
{
return \sprintf('document.querySelectorAll("%s").length', $this->expression);
return \sprintf(
'document.querySelectorAll(%s).length',
$this->expressionEncoded
);
}

public function expressionFindOne(int $position): string
{
return \sprintf('document.querySelectorAll("%s")[%d]', $this->expression, $position - 1);
return \sprintf(
'document.querySelectorAll(%s)[%d]',
$this->expressionEncoded,
$position - 1
);
}
}
6 changes: 4 additions & 2 deletions tests/PageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
class PageTest extends BaseTestCase
{
private const WAIT_FOR_ELEMENT_HTML = '<div data-name="el">content</div>';
private const WAIT_FOR_ELEMENT_HTML = '<div data-name="el">content1</div><div data-name="&quot;el&quot;">content2</div>';
private const WAIT_FOR_ELEMENT_RESOURCE_FILE = 'elementLoad.html';

public function testSetViewport(): void
Expand Down Expand Up @@ -441,7 +441,9 @@ public function testWaitUntilContainsElement(): void

self::assertStringNotContainsString(self::WAIT_FOR_ELEMENT_HTML, $page->getHtml());

$page->waitUntilContainsElement('div[data-name=\"el\"]');
$page->waitUntilContainsElement('div[data-name="el"]'); // search for <div data-name="el">
$page->waitUntilContainsElement('div[data-name=el]'); // search for <div data-name="el">
$page->waitUntilContainsElement('div[data-name=\"el\"]'); // search for <div data-name="&quot;el&quot;'>

self::assertStringContainsString(self::WAIT_FOR_ELEMENT_HTML, $page->getHtml());
}
Expand Down
8 changes: 7 additions & 1 deletion tests/resources/static-web/elementLoad.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ <h1>page a</h1>
let el = document.createElement('div');

el.dataset.name = 'el';
el.innerHTML = 'content';
el.innerHTML = 'content1';

document.body.appendChild(el)

let el2 = document.createElement('div');

el2.dataset.name = '"el"';
el2.innerHTML = 'content2';
document.body.appendChild(el2)
}, 500)
</script>
</html>