Skip to content

Commit

Permalink
DOMXPath::quote(string $str): string (#13456)
Browse files Browse the repository at this point in the history
Method to quote strings in XPath, similar to PDO::quote() / mysqli::real_escape_string.

Sample usage: $xp->query("//span[contains(text()," . $xp->quote($string) . ")]")

The algorithm is derived from Robert Rossney's research into XPath quoting published at https://stackoverflow.com/a/1352556/1067003
But using an improved implementation I wrote myself, originally for chrome-php/chrome#575
  • Loading branch information
divinity76 authored Feb 22, 2024
1 parent 9603199 commit 2f9320c
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 1 deletion.
2 changes: 2 additions & 0 deletions ext/dom/php_dom.stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,8 @@ public function registerNamespace(string $prefix, string $namespace): bool {}
public function registerPhpFunctions(string|array|null $restrict = null): void {}

public function registerPhpFunctionNS(string $namespaceURI, string $name, callable $callable): void {}

public static function quote(string $str): string {}
}
#endif

Expand Down
12 changes: 11 additions & 1 deletion ext/dom/php_dom_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

88 changes: 88 additions & 0 deletions ext/dom/tests/DOMXPath_quote.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
--TEST--
Test DOMXPath::quote with various inputs
--EXTENSIONS--
dom
--SKIPIF--
<?php if (!class_exists('DOMXPath')) die('skip DOMXPath not available.'); ?>
--FILE--
<?php
$dom = new DOMDocument();
$xpath = new DOMXPath($dom);


/**
* Quote a string for use in an XPath expression.
*
* Example: $xp->query("//span[contains(text()," . $xp->quote($string) . ")]")
*
* @param string $string string to quote.
* @return string quoted string.
*/
function UserlandDOMXPathQuote(string $string): string
{
if (false === \strpos($string, '\'')) {
return '\'' . $string . '\'';
}
if (false === \strpos($string, '"')) {
return '"' . $string . '"';
}
// if the string contains both single and double quotes, construct an
// expression that concatenates all non-double-quote substrings with
// the quotes, e.g.:
// 'foo'"bar => concat("'foo'", '"bar")
$sb = [];
while ($string !== '') {
$bytesUntilSingleQuote = \strcspn($string, '\'');
$bytesUntilDoubleQuote = \strcspn($string, '"');
$quoteMethod = ($bytesUntilSingleQuote > $bytesUntilDoubleQuote) ? "'" : '"';
$bytesUntilQuote = \max($bytesUntilSingleQuote, $bytesUntilDoubleQuote);
$sb[] = $quoteMethod . \substr($string, 0, $bytesUntilQuote) . $quoteMethod;
$string = \substr($string, $bytesUntilQuote);
}
$sb = \implode(',', $sb);
return 'concat(' . $sb . ')';
}



$tests = [
'' => "''", // empty string
'foo' => "'foo'", // no quotes
'"foo' => '\'"foo\'', // double quotes only
'\'foo' => '"\'foo"', // single quotes only
'\'foo"bar' => 'concat("\'foo",\'"bar\')', // both; double quotes in mid-string
'\'foo"bar"baz' => 'concat("\'foo",\'"bar"baz\')', // multiple double quotes in mid-string
'\'foo"' => 'concat("\'foo",\'"\')', // string ends with double quotes
'\'foo""' => 'concat("\'foo",\'""\')', // string ends with run of double quotes
'"\'foo' => 'concat(\'"\',"\'foo")', // string begins with double quotes
'""\'foo' => 'concat(\'""\',"\'foo")', // string begins with run of double quotes
'\'foo""bar' => 'concat("\'foo",\'""bar\')', // run of double quotes in mid-string
];

foreach ($tests as $input => $expected) {
$result = $xpath->quote($input);
if ($result === $expected) {
echo "Pass: {$input} => {$result}\n";
} else {
echo 'Fail: ';
var_dump([
'input' => $input,
'expected' => $expected,
'result' => $result,
'userland_implementation_result' => UserlandDOMXPathQuote($input),
]);
}
}
?>
--EXPECT--
Pass: => ''
Pass: foo => 'foo'
Pass: "foo => '"foo'
Pass: 'foo => "'foo"
Pass: 'foo"bar => concat("'foo",'"bar')
Pass: 'foo"bar"baz => concat("'foo",'"bar"baz')
Pass: 'foo" => concat("'foo",'"')
Pass: 'foo"" => concat("'foo",'""')
Pass: "'foo => concat('"',"'foo")
Pass: ""'foo => concat('""',"'foo")
Pass: 'foo""bar => concat("'foo",'""bar')
47 changes: 47 additions & 0 deletions ext/dom/xpath.c
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,53 @@ PHP_METHOD(DOMXPath, registerPhpFunctionNS)
);
}

/* {{{ */
PHP_METHOD(DOMXPath, quote) {
const char *input;
size_t input_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &input, &input_len) == FAILURE) {
RETURN_THROWS();
}
if (memchr(input, '\'', input_len) == NULL) {
zend_string *const output = zend_string_safe_alloc(1, input_len, 2, false);
output->val[0] = '\'';
memcpy(output->val + 1, input, input_len);
output->val[input_len + 1] = '\'';
output->val[input_len + 2] = '\0';
RETURN_STR(output);
} else if (memchr(input, '"', input_len) == NULL) {
zend_string *const output = zend_string_safe_alloc(1, input_len, 2, false);
output->val[0] = '"';
memcpy(output->val + 1, input, input_len);
output->val[input_len + 1] = '"';
output->val[input_len + 2] = '\0';
RETURN_STR(output);
} else {
smart_str output = {0};
// need to use the concat() trick published by Robert Rossney at https://stackoverflow.com/a/1352556/1067003
smart_str_appendl(&output, "concat(", 7);
const char *ptr = input;
const char *const end = input + input_len;
while (ptr < end) {
const char *const single_quote_ptr = memchr(ptr, '\'', end - ptr);
const char *const double_quote_ptr = memchr(ptr, '"', end - ptr);
const size_t distance_to_single_quote = single_quote_ptr ? single_quote_ptr - ptr : end - ptr;
const size_t distance_to_double_quote = double_quote_ptr ? double_quote_ptr - ptr : end - ptr;
const size_t bytes_until_quote = MAX(distance_to_single_quote, distance_to_double_quote);
const char quote_method = (distance_to_single_quote > distance_to_double_quote) ? '\'' : '"';
smart_str_appendc(&output, quote_method);
smart_str_appendl(&output, ptr, bytes_until_quote);
smart_str_appendc(&output, quote_method);
ptr += bytes_until_quote;
smart_str_appendc(&output, ',');
}
ZEND_ASSERT(ptr == end);
output.s->val[output.s->len - 1] = ')';
RETURN_STR(smart_str_extract(&output));
}
}
/* }}} */

#endif /* LIBXML_XPATH_ENABLED */

#endif

0 comments on commit 2f9320c

Please sign in to comment.