Skip to content

OAuth 1: Fix special characters in query strings #559

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

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

OAuth 1: Fix special characters in query strings #559

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa8137c
OAuth 1: Fix special characters in query strings
Alanaktion Jan 22, 2020
5d5fd7e
Woops, don't use PHP 7-only functions in a 5.3 lib :P
Alanaktion Jan 22, 2020
3804efe
Correctly handle null parameters
Alanaktion Jan 22, 2020
959fa1b
Fix empty param handling
Alanaktion Feb 6, 2020
5743e32
Better empty param handling
Alanaktion Feb 6, 2020
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
27 changes: 24 additions & 3 deletions src/OAuth/OAuth1/Signature/Signature.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ public function setTokenSecret($token)
*/
public function getSignature(UriInterface $uri, array $params, $method = 'POST')
{
parse_str($uri->getQuery(), $queryStringData);
$queryStringData = $this->parseQueryString($uri->getQuery());

foreach (array_merge($queryStringData, $params) as $key => $value) {
$signatureData[rawurlencode($key)] = rawurlencode($value);
$signatureData[rawurlencode($key)] = rawurlencode(strtr($value, ' ', '+'));
}

ksort($signatureData);
uksort($signatureData, 'strnatcmp');

// determine base uri
$baseUri = $uri->getScheme() . '://' . $uri->getRawAuthority();
Expand All @@ -80,6 +80,27 @@ public function getSignature(UriInterface $uri, array $params, $method = 'POST')
return base64_encode($this->hash($baseString));
}

/**
* A userland implementation of parse_str that treats arrays as string keys
*
* @param string $query
*
* @return array
*/
protected function parseQueryString($query)
{
$result = [];
$params = explode('&', $query);
foreach ($params as $param) {
if ($param === '') {
continue;
}
$parts = explode('=', $param, 2);
$result[rawurldecode($parts[0])] = isset($parts[1]) ? urldecode($parts[1]) : '';
}
return $result;
}

/**
* @param array $signatureData
*
Expand Down