Michel2/oauthsimple
1
0
Fork 0
mirror of https://github.com/jrconlin/oauthsimple.git synced 2026-07-28 04:06:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

have normalizer gen signature

Browse Source 
* fixes #27
* Added simple unit test for PHP lib.
This commit is contained in:
jrconlin
2015-03-13 22:38:59 -07:00
parent 90ec8b5cce
commit 79952158a0
2 changed files with 83 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/OAuthSimple.php
+12 -5
View File
@@ -284,7 +284,6 @@ class OAuthSimple {
}
$this->setParameters($args['parameters']);
$normParams = $this->_normalizedParameters();
$this->_parameters['oauth_signature'] = $this->_generateSignature($normParams);
return Array (
'parameters' => $this->_parameters,
@@ -433,8 +432,13 @@ class OAuthSimple {
$normalized_keys = array();
$return_array = array();
foreach ( $this->_parameters as $paramName=>$paramValue) {
if (!preg_match('/\w+_secret/',$paramName) OR (strpos($paramValue, '@') !== 0 && !file_exists(substr($paramValue, 1))) )
foreach ( $this->_parameters as $paramName=>$paramValue) {
if (preg_match('/w+_secret/', $paramName) OR
$paramName == "oauth_signature") {
continue;
}
// Read parameters from a file. Hope you're practicing safe PHP.
if (strpos($paramValue, '@') !== 0 && !file_exists(substr($paramValue, 1)))
{
if (is_array($paramValue))
{
@@ -468,8 +472,11 @@ class OAuthSimple {
array_push($return_array, $key .'='. $val);
}
}
}
$presig = join("&", $return_array);
$sig = $this->_generateSignature($presig);
$this->_parameters['oauth_signature']=$sig;
array_push($return_array, "oauth_signature=$sig");
return join("&", $return_array);
}
php/testOAuthSimple.php
+71
View File
@@ -0,0 +1,71 @@
<?php
// Craptastic UNIT test for PHP OAuthSimple
require 'OAuthSimple.php';
$path = 'http://example.com/test';
$static_nonce = 'abcd123';
$static_time = 1234567890;
$signatures = array('consumer_key' => 'test_key',
'shared_secret' => 'test_secret',
'oauth_token' => 'access_key',
'oauth_secret' => 'access_secret');
$parameters = array(
'fruit'=>'bananas are <Awe+some!>',
'number'=>42,
// defining these here overrides the auto-generator.
'oauth_nonce'=>$static_nonce,
'oauth_timestamp'=>$static_time);
$oauth = new OAuthSimple();
$results = $oauth->sign(array('path'=>$path,
'parameters'=>$parameters,
'signatures'=>$signatures));
// ====
$expected = array(
'fruit'=>'bananas are <Awe+some!>',
'number'=>42,
'oauth_nonce'=>$static_nonce,
'oauth_timestamp'=>$static_time,
'oauth_consumer_key'=>$signatures['consumer_key'],
'oauth_token'=>$signatures['oauth_token'],
'oauth_signature_method'=>'HMAC-SHA1',
'oauth_version'=>1.0,
'oauth_signature'=>'IkTXsl3d/FV7uOY0p9CFFCxpdyQ=');
if ($results['parameters'] != $expected) {
print_r($results['parameters']);
throw new OAuthSimpleException("Failure: incorrect parameters returned");
}
// ====
$expected="IkTXsl3d%2FFV7uOY0p9CFFCxpdyQ%3D";
if ($results['signature'] != $expected) {
print $results['signature']."\n$expected\n";
throw new OAuthSimpleException("Failure: incorrect signature returned");
}
// ====
$expected="http://example.com/test?fruit=bananas%20are%20%3CAwe%2Bsome%21%3E&number=42&oauth_consumer_key=test_key&oauth_nonce=abcd123&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1234567890&oauth_token=access_key&oauth_version=1.0&oauth_signature=IkTXsl3d/FV7uOY0p9CFFCxpdyQ=";
if ($results['signed_url'] != $expected){
print $results['signed_url']."\n$expected\n";
throw new OAuthSimpleException("Failure: Invalid signed URL returned");
}
// ====
$expected='OAuth oauth_nonce="abcd123", oauth_timestamp="1234567890", oauth_consumer_key="test_key", oauth_token="access_key", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="IkTXsl3d%2FFV7uOY0p9CFFCxpdyQ%3D"';
if ($results['header'] != $expected) {
print $results['header']."\n$expected\n";
throw new OAuthSimpleException("Failure: Invalid Header returned");
}
// ====
$expected='GET&http%3A%2F%2Fexample.com%2Ftest&fruit%3Dbananas%2520are%2520%253CAwe%252Bsome%2521%253E%26number%3D42%26oauth_consumer_key%3Dtest_key%26oauth_nonce%3Dabcd123%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1234567890%26oauth_token%3Daccess_key%26oauth_version%3D1.0';
if ($results['sbs'] != $expected) {
print $results['sbs']."\n$expected\n";
throw new OAuthSimpleException("Failure: Invalid Base String returned");
}
print("ok\n");