public function accessTokenHandler(\OAuthProvider $provider)
{
- $token = $this->tokens->load('access', $provider->token);
+ if ($provider->token == '') {
+ //conboy sends empty token when not authed yet
+ return OAUTH_PARAMETER_ABSENT;
+ }
+
+ try {
+ $token = $this->tokens->load('access', $provider->token);
+ } catch (OAuthException $e) {
+ if ($e->getCode() == OAUTH_TOKEN_REJECTED) {
+ return OAUTH_TOKEN_REJECTED;
+ }
+ throw $e;
+ }
+
+ if (time() - $token->lastuse > 60) {
+ //time to update lastuse after at least a minute
+ $this->tokens->updateLastUse($token->tokenKey);
+ }
+
$provider->token_secret = $token->secret;
return OAUTH_OK;
}
/**
* Get a new oauth provider instance.
* Used to work around the fastcgi bug in oauthprovider.
- *
+ *
* @return \OAuthProvider
*/
public static function getProvider()
{
- return new \OAuthProvider();
+ $params = array();
+ //$_SERVER['REDIRECT_HTTP_AUTHORIZATION'] = $_SERVER['HTTP_AUTHORIZATION'];
+
+ if (isset($_SERVER['HTTP_AUTHORIZATION'])
+ && $_SERVER['HTTP_AUTHORIZATION'] == ''
+ ) {
+ //work around bug https://bugs.php.net/bug.php?id=68168
+ //#68168: HTTP Basic auth and empty auth header reported
+ // as "signature_method_rejected"
+ $params['oauth_signature_method'] = OAUTH_SIG_METHOD_PLAINTEXT;
+ }
+
+ if (!isset($_SERVER['HTTP_AUTHORIZATION'])
+ && isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])
+ ) {
+ //FastCgi puts the headers in REDIRECT_HTTP_AUTHORIZATION,
+ // but the oauth extension does not read that.
+ // we have to parse the parameters manually
+ $regex = "/(oauth_[a-z_-]*)=(?:\"([^\"]*)\"|([^,]*))/";
+ preg_match_all(
+ $regex, $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches
+ );
+
+ foreach ($matches[1] as $key => $paramName) {
+ $params[$paramName] = urldecode($matches[2][$key]);
+ }
+ }
+
+ return new \OAuthProvider($params);
}
}
?>