From: Adam Magness Date: Mon, 4 Dec 2017 20:59:21 +0000 (-0500) Subject: Move to Network X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2bbfc0640f411f99e37d82763ce57af5c0c18bd9;p=friendica.git Move to Network Move to network namespace. Get rid of q() and try to get used to [ ] instead of array() --- diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php new file mode 100644 index 0000000000..a323f5cd56 --- /dev/null +++ b/src/Network/FKOAuth1.php @@ -0,0 +1,77 @@ +add_signature_method(new OAuthSignatureMethod_PLAINTEXT()); + $this->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1()); + } + + /** + * @param string $uid user id + * @return void + */ + public static function loginUser($uid) + { + logger("FKOAuth1::loginUser $uid"); + $a = get_app(); + $r = dba::select('user', array(), array('uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1), array('limit' => 1)); + + if (DBM::is_result($r)) { + $record = $r; + } 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; + + $a->user = $record; + + if (strlen($a->user['timezone'])) { + date_default_timezone_set($a->user['timezone']); + $a->timezone = $a->user['timezone']; + } + + $r = dba::select('contact', array(), array('uid' => $_SESSION['uid'], 'self' => 1), array('limit' => 1)); + + if (DBM::is_result($r)) { + $a->contact = $r; + $a->cid = $r['id']; + $_SESSION['cid'] = $a->cid; + } + + dba::update('user', ['login_date' => datetime_convert()], ['uid' => $_SESSION['uid']]); + + call_hooks('logged_in', $a->user); + } +} diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php new file mode 100644 index 0000000000..007908b99b --- /dev/null +++ b/src/Network/FKOAuthDataStore.php @@ -0,0 +1,180 @@ + + * + */ +namespace Friendica\Network; + +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 +{ + /** + * @return string + */ + private static function genToken() + { + return md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid()))); + } + + /** + * @param string $consumer_key key + * @return mixed + */ + public static function lookup_consumer($consumer_key) + { + logger(__function__.":".$consumer_key); + + $s = dba::select('clients', array('client_id', 'pw', 'redirect_uri'), array('client_id' => $consumer_key)); + $r = dba::inArray($r); + + if (DBM::is_result($r)) { + return new OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']); + } + + return null; + } + + /** + * @param string $consumer consumer + * @param string $token_type type + * @param string $token token + * @return mixed + */ + public static function lookup_token($consumer, $token_type, $token) + { + logger(__function__.":".$consumer.", ". $token_type.", ".$token); + + $s = dba::select('tokens', array('id', 'secret', 'scope', 'expires', 'uid'), array('client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token)); + $r = dba::inArray($s); + + 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; + } + + /** + * @param string $consumer consumer + * @param string $token token + * @param string $nonce nonce + * @param string $timestamp timestamp + * @return mixed + */ + public static function lookup_nonce($consumer, $token, $nonce, $timestamp) + { + $s = dba::select('tokens', array('id', 'secret'), array('client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp)); + $r = dba::inArray($s); + + if (DBM::is_result($r)) { + return new OAuthToken($r[0]['id'], $r[0]['secret']); + } + + return null; + } + + /** + * @param string $consumer consumer + * @param string $callback optional, default null + * @return mixed + */ + public static function new_request_token($consumer, $callback = null) + { + logger(__function__.":".$consumer.", ". $callback); + $key = self::genToken(); + $sec = self::genToken(); + + if ($consumer->key) { + $k = $consumer->key; + } else { + $k = $consumer; + } + + $r = dba::insert( + 'tokens', + array( + 'id' => $key, + 'secret' => $sec, + 'client_id' => $k, + 'scope' => 'request', + 'expires' => UNIX_TIMESTAMP() + REQUEST_TOKEN_DURATION) + ); + + if (!$r) { + return null; + } + + return new OAuthToken($key, $sec); + } + + /** + * @param string $token token + * @param string $consumer consumer + * @param string $verifier optional, defult null + * @return object + */ + public static 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 = self::genToken(); + $sec = self::genToken(); + $r = dba::insert( + 'tokens', + array( + 'id' => $key, + 'secret' => $sec, + 'client_id' => $consumer->key, + 'scope' => 'access', + 'expires' => UNIX_TIMESTAMP() + ACCESS_TOKEN_DURATION, + 'uid' => $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; + } +} diff --git a/src/Protocol/FKOAuth1.php b/src/Protocol/FKOAuth1.php deleted file mode 100644 index 710097ae00..0000000000 --- a/src/Protocol/FKOAuth1.php +++ /dev/null @@ -1,80 +0,0 @@ -add_signature_method(new OAuthSignatureMethod_PLAINTEXT()); - $this->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1()); - } - - /** - * @param string $uid user id - * @return void - */ - public static function loginUser($uid) - { - logger("FKOAuth1::loginUser $uid"); - $a = get_app(); - $r = dba::select('user', array(), array('uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1), array('limit' => 1)); - - if (DBM::is_result($r)) { - $record = $r; - } 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; - - $a->user = $record; - - if (strlen($a->user['timezone'])) { - date_default_timezone_set($a->user['timezone']); - $a->timezone = $a->user['timezone']; - } - - $r = dba::select('contact', array(), array('uid' => $_SESSION['uid'], 'self' => 1), array('limit' => 1)); - - if (DBM::is_result($r)) { - $a->contact = $r; - $a->cid = $r['id']; - $_SESSION['cid'] = $a->cid; - } - - dba::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 deleted file mode 100644 index dc4b774b9b..0000000000 --- a/src/Protocol/FKOAuthDataStore.php +++ /dev/null @@ -1,180 +0,0 @@ - - * - */ -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 -{ - /** - * @return string - */ - private static function genToken() - { - return md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid()))); - } - - /** - * @param string $consumer_key key - * @return mixed - */ - public static function lookup_consumer($consumer_key) - { - logger(__function__.":".$consumer_key); - - $s = dba::select('clients', array('client_id', 'pw', 'redirect_uri'), array('client_id' => $consumer_key)); - $r = dba::inArray($r); - - if (DBM::is_result($r)) { - return new OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']); - } - - return null; - } - - /** - * @param string $consumer consumer - * @param string $token_type type - * @param string $token token - * @return mixed - */ - public static function lookup_token($consumer, $token_type, $token) - { - logger(__function__.":".$consumer.", ". $token_type.", ".$token); - - $s = dba::select('tokens', array('id', 'secret', 'scope', 'expires', 'uid'), array('client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token)); - $r = dba::inArray($s); - - 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; - } - - /** - * @param string $consumer consumer - * @param string $token token - * @param string $nonce nonce - * @param string $timestamp timestamp - * @return mixed - */ - public static function lookup_nonce($consumer, $token, $nonce, $timestamp) - { - $s = dba::select('tokens', array('id', 'secret'), array('client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp)); - $r = dba::inArray($s); - - if (DBM::is_result($r)) { - return new OAuthToken($r[0]['id'], $r[0]['secret']); - } - - return null; - } - - /** - * @param string $consumer consumer - * @param string $callback optional, default null - * @return mixed - */ - public static function new_request_token($consumer, $callback = null) - { - logger(__function__.":".$consumer.", ". $callback); - $key = self::genToken(); - $sec = self::genToken(); - - if ($consumer->key) { - $k = $consumer->key; - } else { - $k = $consumer; - } - - $r = dba::insert( - 'tokens', - array( - 'id' => $key, - 'secret' => $sec, - 'client_id' => $k, - 'scope' => 'request', - 'expires' => UNIX_TIMESTAMP() + REQUEST_TOKEN_DURATION) - ); - - if (!$r) { - return null; - } - - return new OAuthToken($key, $sec); - } - - /** - * @param string $token token - * @param string $consumer consumer - * @param string $verifier optional, defult null - * @return object - */ - public static 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 = self::genToken(); - $sec = self::genToken(); - $r = dba::insert( - 'tokens', - array( - 'id' => $key, - 'secret' => $sec, - 'client_id' => $consumer->key, - 'scope' => 'access', - 'expires' => UNIX_TIMESTAMP() + ACCESS_TOKEN_DURATION, - 'uid' => $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; - } -}