Skip to content
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

Fix Signature and Callback (Issues WP-API/OAuth1#59, WP-API/OAuth1#64, WP-API/OAuth1#91) #92

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix Signature and Callback (Issues WP-API/OAuth1#59, WP-API/OAuth1#64, WP-API/OAuth1#91) #92

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cb6065
Ensure OAuth1 signature is created as per the spec
AlexC May 21, 2015
c41eb30
Remove normalize_parameters function.
coderkevin Nov 6, 2015
dd283fa
Fix issue WP-API/OAuth1#59, OAuth callback isn't called
sblaz Jun 4, 2015
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
32 changes: 8 additions & 24 deletions lib/class-wp-json-authentication-oauth1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function parse_header( $header ) {
$params = array();
if ( preg_match_all( '/(oauth_[a-z_-]*)=(:?"([^"]*)"|([^,]*))/', $header, $matches ) ) {
foreach ($matches[1] as $i => $h) {
$params[$h] = urldecode( empty($matches[3][$i]) ? $matches[4][$i] : $matches[3][$i] );
$params[$h] = rawurldecode( empty($matches[3][$i]) ? $matches[4][$i] : $matches[3][$i] );
}
if (isset($params['realm'])) {
unset($params['realm']);
Expand Down Expand Up @@ -365,13 +365,14 @@ public function generate_request_token( $params ) {

// Generate token
$key = apply_filters( 'json_oauth1_request_token_key', wp_generate_password( self::TOKEN_KEY_LENGTH, false ) );
$callback = $params['oauth_callback'];
$data = array(
'key' => $key,
'secret' => wp_generate_password( self::TOKEN_SECRET_LENGTH, false ),
'consumer' => $consumer->ID,
'authorized' => false,
'expiration' => time() + 24 * HOUR_IN_SECONDS,
'callback' => null,
'callback' => $callback,
'verifier' => null,
'user' => null,
);
Expand Down Expand Up @@ -551,23 +552,20 @@ protected function check_oauth_signature( $consumer, $oauth_params, $token = nul

$params = array_merge( $params, $oauth_params );

$base_request_uri = rawurlencode( get_home_url( null, parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ) ) );
$base_request_uri = get_home_url( null, parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ) );

// get the signature provided by the consumer and remove it from the parameters prior to checking the signature
$consumer_signature = rawurldecode( $params['oauth_signature'] );
unset( $params['oauth_signature'] );

// normalize parameter key/values
array_walk_recursive( $params, array( $this, 'normalize_parameters' ) );

// sort parameters
if ( ! uksort( $params, 'strcmp' ) )
return new WP_Error( 'json_oauth1_failed_parameter_sort', __( 'Invalid Signature - failed to sort parameters' ), array( 'status' => 401 ) );

$query_string = $this->create_signature_string( $params );

$token = (array) $token;
$string_to_sign = $http_method . '&' . $base_request_uri . '&' . $query_string;
$string_to_sign = $http_method . '&' . rawurlencode( $base_request_uri ) . '&' . rawurlencode( $query_string );
$key_parts = array(
$consumer->secret,
( $token ? $token['secret'] : '' )
Expand Down Expand Up @@ -604,7 +602,7 @@ protected function check_oauth_signature( $consumer, $oauth_params, $token = nul
* @return string Signature string
*/
public function create_signature_string( $params ) {
return implode( '%26', $this->join_with_equals_sign( $params ) ); // join with ampersand
return implode( '&', $this->join_with_equals_sign( $params ) ); // join with ampersand
}

/**
Expand All @@ -624,27 +622,13 @@ public function join_with_equals_sign( $params, $query_params = array(), $key =
if ( $key ) {
$param_key = $key . '[' . $param_key . ']'; // Handle multi-dimensional array
}
$string = $param_key . '=' . $param_value; // join with equals sign
$query_params[] = urlencode( $string );
$string = rawurlencode( $param_key ) . '=' . rawurlencode( $param_value ); // join with equals sign
$query_params[] = $string;
}
}
return $query_params;
}

/**
* Normalize each parameter by assuming each parameter may have already been encoded, so attempt to decode, and then
* re-encode according to RFC 3986
*
* @since 2.1
* @see rawurlencode()
* @param string $key
* @param string $value
*/
protected function normalize_parameters( &$key, &$value ) {
$key = rawurlencode( rawurldecode( $key ) );
$value = rawurlencode( rawurldecode( $value ) );
}

/**
* Verify that the timestamp and nonce provided with the request are valid
*
Expand Down