diff --git a/tests/oauth/exchangetokens.php b/tests/oauth/exchangetokens.php index 2394826c7e..049c0cad07 100755 --- a/tests/oauth/exchangetokens.php +++ b/tests/oauth/exchangetokens.php @@ -24,82 +24,121 @@ require_once INSTALLDIR . '/extlib/OAuth.php'; $ini = parse_ini_file("oauth.ini"); -$test_consumer = new OAuthConsumer($ini['consumer_key'], $ini['consumer_secret']); +// Check to make sure we have everything we need from the ini file +foreach(array('consumer_key', 'consumer_secret', 'apiroot', 'access_token_url') as $inikey) { + if (empty($ini[$inikey])) { + print "You forgot to specify a $inikey in your oauth.ini file.\n"; + exit(1); + } +} -$at_endpoint = $ini['apiroot'] . $ini['access_token_url']; +$consumer = new OAuthConsumer($ini['consumer_key'], $ini['consumer_secret']); -$shortoptions = 't:s:'; -$longoptions = array('oauth_token=', 'token_secret='); +$endpoint = $ini['apiroot'] . $ini['access_token_url']; + +$shortoptions = 't:s:v:'; +$longoptions = array('oauth_token=', 'oauth_token_secret=', 'oauth_verifier='); $helptext = <<sign_request($hmac_method, $test_consumer, $rt); +try { -$r = httpRequest($req_req->to_url()); + $oauthReq = OAuthRequest::from_consumer_and_token( + $consumer, + $rtok, + "POST", + $endpoint, + $params + ); -common_debug("Exchange request token = " . var_export($rt, true)); -common_debug("Exchange tokens URL: " . $req_req->to_url()); + $oauthReq->sign_request($hmac_method, $consumer, $rtok); -$body = $r->getBody(); + $httpReq = httpRequest($endpoint, $oauthReq->to_postdata()); + $body = $httpReq->getBody(); -$token_stuff = array(); -parse_str($body, $token_stuff); +} catch (Exception $e) { + // oh noez + print $e->getMessage(); + print "\nOAuth Request:\n"; + var_dump($oauthReq); + exit(1); +} -print 'Access token : ' . $token_stuff['oauth_token'] . "\n"; -print 'Access token secret : ' . $token_stuff['oauth_token_secret'] . "\n"; +$tokenStuff = array(); +parse_str($body, $tokenStuff); -function httpRequest($url) +if (empty($tokenStuff['oauth_token']) || empty($tokenStuff['oauth_token_secret'])) { + print "Error! HTTP response body: $body\n"; + exit(1); +} + +print "Access Token\n"; +print ' - oauth_token = ' . $tokenStuff['oauth_token'] . "\n"; +print ' - oauth_token_secret = ' . $tokenStuff['oauth_token_secret'] . "\n"; + +function httpRequest($endpoint, $poststr) { $request = HTTPClient::start(); - $request->setConfig(array( - 'follow_redirects' => true, - 'connect_timeout' => 120, - 'timeout' => 120, - 'ssl_verify_peer' => false, - 'ssl_verify_host' => false - )); + $request->setConfig( + array( + 'follow_redirects' => true, + 'connect_timeout' => 120, + 'timeout' => 120, + 'ssl_verify_peer' => false, + 'ssl_verify_host' => false + ) + ); - return $request->get($url); + parse_str($poststr, $postdata); + return $request->post($endpoint, null, $postdata); } diff --git a/tests/oauth/fetch_temp_creds.php b/tests/oauth/fetch_temp_creds.php index 63ca351cd8..bea512a914 100755 --- a/tests/oauth/fetch_temp_creds.php +++ b/tests/oauth/fetch_temp_creds.php @@ -33,10 +33,10 @@ foreach(array('consumer_key', 'consumer_secret', 'apiroot', 'request_token_url') } } -$testConsumer = new OAuthConsumer($ini['consumer_key'], $ini['consumer_secret']); -$requestTokenUrl = $ini['apiroot'] . $ini['request_token_url']; -$parsed = parse_url($requestTokenUrl); -$params = array(); +$consumer = new OAuthConsumer($ini['consumer_key'], $ini['consumer_secret']); +$endpoint = $ini['apiroot'] . $ini['request_token_url']; +$parsed = parse_url($endpoint); +$params = array(); parse_str($parsed['query'], $params); $params['oauth_callback'] = 'oob'; // out-of-band @@ -45,14 +45,14 @@ $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); try { $req = OAuthRequest::from_consumer_and_token( - $testConsumer, + $consumer, null, "POST", - $requestTokenUrl, + $endpoint, $params ); - $req->sign_request($hmac_method, $testConsumer, NULL); - $r = httpRequest($req->to_url()); + $req->sign_request($hmac_method, $consumer, NULL); + $r = httpRequest($endpoint, $req->to_postdata()); } catch (Exception $e) { // oh noez print $e->getMessage(); @@ -69,18 +69,24 @@ parse_str($body, $tokenStuff); $tok = $tokenStuff['oauth_token']; $confirmed = $tokenStuff['oauth_callback_confirmed']; -if (empty($tokenStuff['oauth_token']) || empty($confirmed) || $confirmed != 'true') { - print "Error: $body\n"; +if (empty($tokenStuff['oauth_token']) + || empty($tokenStuff['oauth_token_secret']) + || empty($confirmed) + || $confirmed != 'true') +{ + print "Error! HTTP response body: $body\n"; exit(1); } $authurl = $ini['apiroot'] . $ini['authorize_url'] . '?oauth_token=' . $tok; -print "\nSuccess! "; -print "Authorize URL:\n\n$authurl\n\n"; +print "Request Token\n"; +print ' - oauth_token = ' . $tokenStuff['oauth_token'] . "\n"; +print ' - oauth_token_secret = ' . $tokenStuff['oauth_token_secret'] . "\n"; +print "Authorize URL\n $authurl\n\n"; print "Now paste the Authorize URL into your browser and authorize your temporary credentials.\n"; -function httpRequest($url) +function httpRequest($endpoint, $poststr) { $request = HTTPClient::start(); @@ -94,5 +100,7 @@ function httpRequest($url) ) ); - return $request->post($url); + // Turn signed request query string back into an array + parse_str($poststr, $postdata); + return $request->post($endpoint, null, $postdata); }