Merge pull request #1687 from WordPress-Coding-Standards/feature/572-nonceverification-allow-for-wp_unslash

Sniff::has_nonce_check(): allow for unslashing a variable before nonce check

Author: GaryJones

WordPress/Sniff.php

@@ -1455,6 +1455,7 @@ protected function has_nonce_check( $stackPtr ) {
 			|| $this->is_in_type_test( $stackPtr )
 			|| $this->is_comparison( $stackPtr )
 			|| $this->is_in_array_comparison( $stackPtr )
+			|| $this->is_in_function_call( $stackPtr, $this->unslashingFunctions ) !== false
 		) {
 			$allow_nonce_after = true;
 		}

WordPress/Tests/Security/NonceVerificationUnitTest.inc

@@ -246,3 +246,21 @@ function allow_for_array_comparison_in_condition() {
 		foo();
 	}
 }
+
+# Issue #572.
+function allow_for_unslash_before_noncecheck_but_demand_noncecheck() {
+	$var = wp_unslash( $_POST['foo'] ); // Bad.
+	echo $var;
+}
+
+function allow_for_unslash_before_noncecheck() {
+	$var = stripslashes_from_strings_only( $_POST['foo'] ); // OK.
+	wp_verify_nonce( $var );
+	echo $var;
+}
+
+function allow_for_unslash_in_sanitization() {
+	$var = sanitize_text_field( wp_unslash( $_POST['foo'] ) ); // OK.
+	wp_verify_nonce( $var );
+	echo $var;
+}

WordPress/Tests/Security/NonceVerificationUnitTest.php

@@ -51,6 +51,7 @@ public function getErrorList() {
 			190 => 1,
 			198 => 1,
 			202 => 1,
+			252 => 1,
 		);
 	}