Handle infinite recursion correctly

Author: rmccue

client.php

@@ -8,8 +8,6 @@
  * @return WP_Post|WP_Error
  */
 function rest_get_client( $type, $key ) {
-	// $this->should_attempt = false;
-
 	$query = new WP_Query();
 	$consumers = $query->query( array(
 		'post_type' => 'json_consumer',
@@ -26,8 +24,6 @@ function rest_get_client( $type, $key ) {
 		),
 	) );
 
-	// $this->should_attempt = true;
-
 	if ( empty( $consumers ) || empty( $consumers[0] ) ) {
 		return new WP_Error( 'json_consumer_notfound', __( 'Consumer Key is invalid' ), array( 'status' => 401 ) );
 	}

lib/class-wp-rest-oauth1.php

@@ -311,7 +311,10 @@ public function add_consumer( $params ) {
 	 * @return array Array of consumer object, user object
 	 */
 	public function check_token( $token, $consumer_key ) {
+		$this->should_attempt = false;
 		$consumer = rest_get_client( $this->type, $consumer_key );
+		$this->should_attempt = true;
+
 		if ( is_wp_error( $consumer ) ) {
 			return $consumer;
 		}
@@ -479,7 +482,10 @@ public function generate_access_token( $oauth_consumer_key, $oauth_token, $oauth
 			return new WP_Error( 'json_oauth1_invalid_verifier', __( 'OAuth verifier does not match' ), array( 'status' => 400 ) );
 		}
 
+		$this->should_attempt = false;
 		$consumer = rest_get_client( $this->type, $oauth_consumer_key );
+		$this->should_attempt = true;
+
 		if ( is_wp_error( $consumer ) ) {
 			return $consumer;
 		}