Skip to content

ProperEscaping: Fix message for action attribute #575

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
rebeccahum merged 1 commit into from
Aug 31, 2020
Merged

ProperEscaping: Fix message for action attribute #575

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
22 changes: 11 additions & 11 deletions WordPressVIPMinimum/Sniffs/Security/ProperEscapingFunctionSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ public function process_token( $stackPtr ) {

$data = [ $function_name ];

if ( $function_name !== 'esc_url' && $this->is_href_or_src( $this->tokens[ $html ]['content'] ) ) {
$message = 'Wrong escaping function. href and src attributes should be escaped by `esc_url()`, not by `%s()`.';
if ( $function_name !== 'esc_url' && $this->attr_expects_url( $this->tokens[ $html ]['content'] ) ) {
$message = 'Wrong escaping function. href, src, and action attributes should be escaped by `esc_url()`, not by `%s()`.';
$this->phpcsFile->addError( $message, $stackPtr, 'hrefSrcEscUrl', $data );
return;
}
Expand All @@ -95,32 +95,32 @@ public function process_token( $stackPtr ) {
}

/**
* Tests whether provided string ends with open src or href attribute.
* Tests whether provided string ends with open attribute which expects a URL value.
*
* @param string $content Haystack in which we look for an open src or href attribute.
* @param string $content Haystack in which we look for an open attribute which exects a URL value.
*
* @return bool True if string ends with open src or href attribute.
* @return bool True if string ends with open attribute which exects a URL value.
*/
public function is_href_or_src( $content ) {
$is_href_or_src = false;
foreach ( [ 'href', 'src', 'url' ] as $attr ) {
public function attr_expects_url( $content ) {
$attr_expects_url = false;
foreach ( [ 'href', 'src', 'url', 'action' ] as $attr ) {
foreach ( [
'="',
"='",
'=\'"', // The tokenizer does some fun stuff when it comes to mixing double and single quotes.
'="\'', // The tokenizer does some fun stuff when it comes to mixing double and single quotes.
] as $ending ) {
if ( $this->endswith( $content, $attr . $ending ) === true ) {
$is_href_or_src = true;
$attr_expects_url = true;
break;
}
}
}
return $is_href_or_src;
return $attr_expects_url;
}

/**
* Tests, whether provided string ends with open HMTL attribute.
* Tests whether provided string ends with open HMTL attribute.
*
* @param string $content Haystack in which we look for open HTML attribute.
*
Expand Down
6 changes: 5 additions & 1 deletion WordPressVIPMinimum/Tests/Security/ProperEscapingFunctionUnitTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,8 @@ echo '<media:content url="' . esc_attr( $post_image ) . '" medium="image">'; //

echo 'data-param-url="' . esc_url( $share_url ) . '"'; // OK.

echo 'data-param-url="' . esc_html( $share_url ) . '"'; // NOK.
echo 'data-param-url="' . esc_html( $share_url ) . '"'; // NOK.

?>

<form method="post" action="<?php echo esc_html(admin_url('admin.php?page='.$base_name.'&amp;mode=logs&amp;id='.$poll_id)); ?>">
1 change: 1 addition & 0 deletions WordPressVIPMinimum/Tests/Security/ProperEscapingFunctionUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public function getErrorList() {
23 => 1,
33 => 1,
37 => 1,
41 => 1,
];
}

Expand Down