X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Foauth.php;h=3d4533d3e0061da5a4a8e1af01d9c2d0629ee82a;hb=e6463c8af6af247c9555bf2677a6aa75a4721d62;hp=b8430920764ac801958032cc0479c2743fef3d1e;hpb=69e41f7703bff03dc88e7181961a717ae41330c4;p=friendica.git diff --git a/include/oauth.php b/include/oauth.php index b843092076..3d4533d3e0 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -1,8 +1,8 @@ - * + * */ define('REQUEST_TOKEN_DURATION', 300); @@ -15,29 +15,31 @@ class FKOAuthDataStore extends OAuthDataStore { function gen_token(){ return md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid()))); } - + function lookup_consumer($consumer_key) { + logger(__function__.":".$consumer_key); //echo "
"; var_dump($consumer_key); killme(); - + $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'", dbesc($consumer_key) ); - if (count($r)) + if (dbm::is_result($r)) return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']); return null; } function lookup_token($consumer, $token_type, $token) { - //echo __file__.":".__line__.""; var_dump($consumer, $token_type, $token); killme(); - $r = q("SELECT id, secret,scope, expires FROM tokens WHERE client_id='%s' AND scope='%s' AND id='%s'", + logger(__function__.":".$consumer.", ". $token_type.", ".$token); + $r = q("SELECT id, secret,scope, expires, uid FROM tokens WHERE client_id='%s' AND scope='%s' AND id='%s'", dbesc($consumer->key), dbesc($token_type), dbesc($token) ); - if (count($r)){ + if (dbm::is_result($r)){ $ot=new OAuthToken($r[0]['id'],$r[0]['secret']); $ot->scope=$r[0]['scope']; $ot->expires = $r[0]['expires']; + $ot->uid = $r[0]['uid']; return $ot; } return null; @@ -50,18 +52,26 @@ class FKOAuthDataStore extends OAuthDataStore { dbesc($nonce), intval($timestamp) ); - if (count($r)) + if (dbm::is_result($r)) return new OAuthToken($r[0]['id'],$r[0]['secret']); return null; } function new_request_token($consumer, $callback = null) { + logger(__function__.":".$consumer.", ". $callback); $key = $this->gen_token(); $sec = $this->gen_token(); + + if ($consumer->key){ + $k = $consumer->key; + } else { + $k = $consumer; + } + $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d)", dbesc($key), dbesc($sec), - dbesc($consumer->key), + dbesc($k), 'request', intval(REQUEST_TOKEN_DURATION)); if (!$r) return null; @@ -69,6 +79,8 @@ class FKOAuthDataStore extends OAuthDataStore { } function new_access_token($token, $consumer, $verifier = null) { + logger(__function__.":".$token.", ". $consumer.", ". $verifier); + // return a new access token attached to this consumer // for the user associated with this token if the request token // is authorized @@ -76,34 +88,34 @@ class FKOAuthDataStore extends OAuthDataStore { $ret=Null; - // get verifier for this user - $uverifier = get_pconfig(local_user(), "oauth", "verifier"); - - - if (is_null($verifier) || ($verifier==$uverifier)){ + // get user for this verifier + $uverifier = get_config("oauth", $verifier); + logger(__function__.":".$verifier.",".$uverifier); + if (is_null($verifier) || ($uverifier!==false)){ $key = $this->gen_token(); $sec = $this->gen_token(); - $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d)", + $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d, %d)", dbesc($key), dbesc($sec), - dbesc($consumer->$key), + dbesc($consumer->key), 'access', - intval(ACCESS_TOKEN_DURATION)); + intval(ACCESS_TOKEN_DURATION), + intval($uverifier)); if ($r) $ret = new OAuthToken($key,$sec); } - //q("DELETE FROM tokens WHERE id='%s'", $token->key); + q("DELETE FROM tokens WHERE id='%s'", $token->key); - if (!is_null($ret)){ - //del_pconfig(local_user(), "oauth", "verifier"); - $apps = get_pconfig(local_user(), "oauth", "apps"); + if (!is_null($ret) && $uverifier!==false){ + del_config("oauth", $verifier); + /* $apps = get_pconfig($uverifier, "oauth", "apps"); if ($apps===false) $apps=array(); $apps[] = $consumer->key; - //set_pconfig(local_user(), "oauth", "apps", $apps); + set_pconfig($uverifier, "oauth", "apps", $apps);*/ } return $ret; @@ -117,8 +129,54 @@ class FKOAuth1 extends OAuthServer { $this->add_signature_method(new OAuthSignatureMethod_PLAINTEXT()); $this->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1()); } -} + function loginUser($uid){ + logger("FKOAuth1::loginUser $uid"); + $a = get_app(); + $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", + intval($uid) + ); + if (dbm::is_result($r)){ + $record = $r[0]; + } else { + logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); + header('HTTP/1.0 401 Unauthorized'); + die('This api requires login'); + } + $_SESSION['uid'] = $record['uid']; + $_SESSION['theme'] = $record['theme']; + $_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme'); + $_SESSION['authenticated'] = 1; + $_SESSION['page_flags'] = $record['page-flags']; + $_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $record['nickname']; + $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; + $_SESSION["allow_api"] = true; + + //notice( t("Welcome back ") . $record['username'] . EOL); + $a->user = $record; + + if(strlen($a->user['timezone'])) { + date_default_timezone_set($a->user['timezone']); + $a->timezone = $a->user['timezone']; + } + + $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", + intval($_SESSION['uid'])); + if (dbm::is_result($r)) { + $a->contact = $r[0]; + $a->cid = $r[0]['id']; + $_SESSION['cid'] = $a->cid; + } + q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d", + dbesc(datetime_convert()), + intval($_SESSION['uid']) + ); + + call_hooks('logged_in', $a->user); + } + +} +/* class FKOAuth2 extends OAuth2 { private function db_secret($client_secret){ @@ -161,7 +219,7 @@ class FKOAuth2 extends OAuth2 { $r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'", dbesc($oauth_token)); - if (count($r)) + if (dbm::is_result($r)) return $r[0]; return null; } @@ -189,7 +247,7 @@ class FKOAuth2 extends OAuth2 { $r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'", dbesc($code)); - if (count($r)) + if (dbm::is_result($r)) return $r[0]; return null; } @@ -207,3 +265,4 @@ class FKOAuth2 extends OAuth2 { } } +*/