Bugfix for pull request #2147 (Fix for issue #2122)

[friendica.git] / include / oauth.php

diff --git a/include/oauth.php b/include/oauth.php
index 63d5fcd92aa7fca13319c2c220c4cd5ad907c8f5..6a1d72d178f413fb68a94b8f7a64c7c35cb4d045 100644 (file)
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -1,11 +1,12 @@
 <?php
-/** 
+/**
  * OAuth server
  * Based on oauth2-php <http://code.google.com/p/oauth2-php/>
- * 
+ *
  */
 
-define('TOKEN_DURATION', 300);
+define('REQUEST_TOKEN_DURATION', 300);
+define('ACCESS_TOKEN_DURATION', 31536000);
 
 require_once("library/OAuth1.php");
 require_once("library/oauth2-php/lib/OAuth2.inc");
@@ -14,10 +15,11 @@ 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 "<pre>"; var_dump($consumer_key); killme();
-         
+
                $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'",
                        dbesc($consumer_key)
                );
@@ -27,8 +29,8 @@ class FKOAuthDataStore extends OAuthDataStore {
   }
 
   function lookup_token($consumer, $token_type, $token) {
-               //echo __file__.":".__line__."<pre>"; 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)
@@ -37,6 +39,7 @@ class FKOAuthDataStore extends OAuthDataStore {
                        $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;
@@ -55,19 +58,29 @@ class FKOAuthDataStore extends OAuthDataStore {
   }
 
   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(TOKEN_DURATION));
+                               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
@@ -75,22 +88,35 @@ class FKOAuthDataStore extends OAuthDataStore {
     
     $ret=Null;
     
-    if (!is_null($token) && $token->expires > time()){
+    // 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(TOKEN_DURATION));
+                               intval(ACCESS_TOKEN_DURATION),
+                               intval($uverifier));
                if ($r)
                        $ret = new OAuthToken($key,$sec);               
        }
                
                
        q("DELETE FROM tokens WHERE id='%s'", $token->key);
+       
+       
+       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($uverifier, "oauth", "apps", $apps);*/
+       }
                
     return $ret;
     
@@ -101,9 +127,56 @@ 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(count($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'] = $a->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(count($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){
@@ -192,3 +265,4 @@ class FKOAuth2 extends OAuth2 {
        }       
        
 }
+*/