diff --git a/include/oauth.php b/include/oauth.php deleted file mode 100644 index 8834b93555..0000000000 --- a/include/oauth.php +++ /dev/null @@ -1,184 +0,0 @@ - - * - */ - -use Friendica\App; -use Friendica\Core\Config; -use Friendica\Core\PConfig; -use Friendica\Core\System; -use Friendica\Database\DBM; - -define('REQUEST_TOKEN_DURATION', 300); -define('ACCESS_TOKEN_DURATION', 31536000); - -require_once("library/OAuth1.php"); -require_once("library/oauth2-php/lib/OAuth2.inc"); - -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 (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) { - 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 (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; - } - - function lookup_nonce($consumer, $token, $nonce, $timestamp) { - //echo __file__.":".__line__.""; var_dump($consumer,$key); killme(); - $r = q("SELECT id, secret FROM tokens WHERE client_id='%s' AND id='%s' AND expires=%d", - dbesc($consumer->key), - dbesc($nonce), - intval($timestamp) - ); - 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($k), - 'request', - intval(REQUEST_TOKEN_DURATION)); - if (!$r) return null; - return new OAuthToken($key,$sec); - } - - 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 - // should also invalidate the request token - - $ret=Null; - - // get user for this verifier - $uverifier = Config::get("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, uid) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d, %d)", - dbesc($key), - dbesc($sec), - dbesc($consumer->key), - 'access', - intval(ACCESS_TOKEN_DURATION), - intval($uverifier)); - if ($r) - $ret = new OAuthToken($key,$sec); - } - - - dba::delete('tokens', array('id' => $token->key)); - - - if (!is_null($ret) && $uverifier!==false){ - Config::delete("oauth", $verifier); - /* $apps = PConfig::get($uverifier, "oauth", "apps"); - if ($apps===false) $apps=array(); - $apps[] = $consumer->key; - PConfig::set($uverifier, "oauth", "apps", $apps);*/ - } - - return $ret; - - } -} - -class FKOAuth1 extends OAuthServer { - function __construct() { - parent::__construct(new FKOAuthDataStore()); - $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'] = PConfig::get($record['uid'], 'system', 'mobile_theme'); - $_SESSION['authenticated'] = 1; - $_SESSION['page_flags'] = $record['page-flags']; - $_SESSION['my_url'] = System::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); - } - -} diff --git a/src/Protocol/FKOAuth1.php b/src/Protocol/FKOAuth1.php new file mode 100644 index 0000000000..5d0e9e52bf --- /dev/null +++ b/src/Protocol/FKOAuth1.php @@ -0,0 +1,77 @@ +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'] = PConfig::get($record['uid'], 'system', 'mobile_theme'); + $_SESSION['authenticated'] = 1; + $_SESSION['page_flags'] = $record['page-flags']; + $_SESSION['my_url'] = System::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); + } +} diff --git a/src/Protocol/FKOAuthDataStore.php b/src/Protocol/FKOAuthDataStore.php new file mode 100644 index 0000000000..08c32df213 --- /dev/null +++ b/src/Protocol/FKOAuthDataStore.php @@ -0,0 +1,150 @@ + + * + */ +namespace Friendica\Protocol; + +use Friendica\App; +use Friendica\Core\Config; +use Friendica\Core\System; +use Friendica\Database\DBM; +use dba; + +define('REQUEST_TOKEN_DURATION', 300); +define('ACCESS_TOKEN_DURATION', 31536000); + +require_once "library/OAuth1.php"; +require_once "library/oauth2-php/lib/OAuth2.inc"; + +/** + * @brief OAuthDataStore class + */ +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); + + $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'", + dbesc($consumer_key) + ); + + 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) + { + 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 (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; + } + + function lookup_nonce($consumer, $token, $nonce, $timestamp) + { + //echo __file__.":".__line__.""; var_dump($consumer,$key); killme(); + $r = q("SELECT id, secret FROM tokens WHERE client_id='%s' AND id='%s' AND expires=%d", + dbesc($consumer->key), + dbesc($nonce), + intval($timestamp) + ); + + 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($k), + 'request', + intval(REQUEST_TOKEN_DURATION) + ); + + if (!$r) { + return null; + } + + return new OAuthToken($key, $sec); + } + + 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 + // should also invalidate the request token + + $ret = null; + + // get user for this verifier + $uverifier = Config::get("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, uid) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d, %d)", + dbesc($key), + dbesc($sec), + dbesc($consumer->key), + 'access', + intval(ACCESS_TOKEN_DURATION), + intval($uverifier) + ); + + if ($r) { + $ret = new OAuthToken($key, $sec); + } + } + + + dba::delete('tokens', array('id' => $token->key)); + + + if (!is_null($ret) && $uverifier !== false) { + Config::delete("oauth", $verifier); + } + + return $ret; + } +}