oauth: authorize

5 files changed, 133 insertions, 33 deletions

diff --git a/include/oauth.php b/include/oauth.php
index b84309207..2724dcf7c 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -17,6 +17,7 @@ class FKOAuthDataStore extends OAuthDataStore {
   }
 	
   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'",
@@ -28,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)
@@ -38,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;
@@ -56,12 +58,20 @@ 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(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,52 @@ 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 `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['authenticated'] = 1;
+		$_SESSION['page_flags'] = $record['page-flags'];
+		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
+		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
+
+		//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 LIMIT 1",
+			dbesc(datetime_convert()),
+			intval($_SESSION['uid'])
+		);
+
+		call_hooks('logged_in', $a->user);		
+	}
+	
+}
+/*
 class FKOAuth2 extends OAuth2 {
 
 	private function db_secret($client_secret){
@@ -207,3 +263,4 @@ class FKOAuth2 extends OAuth2 {
 	}	
 	
 }
+*/
diff --git a/library/OAuth1.php b/library/OAuth1.php
index 604945265..3b211b146 100644
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -27,6 +27,10 @@ class OAuthToken {
   public $key;
   public $secret;
 
+  public $expires;
+  public $scope;
+  public $uid;
+
   /**
    * key = the token
    * secret = the token secret
@@ -552,6 +556,7 @@ class OAuthServer {
   public function verify_request(&$request) {
     $this->get_version($request);
     $consumer = $this->get_consumer($request);
+    //echo __file__.__line__.__function__."<pre>"; var_dump($consumer); die();
     $token = $this->get_token($request, $consumer, "access");
     $this->check_signature($request, $consumer, $token);
     return array($consumer, $token);
diff --git a/mod/api.php b/mod/api.php
index 5903caee6..ad75e6620 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -2,13 +2,8 @@
 
 require_once('include/api.php');
 
-function oauth_get_client(){
-	// get consumer/client from request token
-	try {
-		$request = OAuthRequest::from_request();
-	} catch(Exception $e) {
-		echo "<pre>"; var_dump($e); killme();
-	}
+function oauth_get_client($request){
+
 	
 	$params = $request->get_parameters();
 	$token = $params['oauth_token'];
@@ -45,16 +40,36 @@ function api_content(&$a) {
 		 * api/oauth/authorize interact with the user. return a standard page
 		 */
 		
+		$a->page['template'] = "minimal";
 		
-		if (x($_POST,'oauth_yes')){
 		
+		// get consumer/client from request token
+		try {
+			$request = OAuthRequest::from_request();
+		} catch(Exception $e) {
+			echo "<pre>"; var_dump($e); killme();
+		}
+		
+		
+		if (x($_POST,'oauth_yes')){
 		
-			$app = oauth_get_client();
+			$app = oauth_get_client($request);
 			if (is_null($app)) return "Invalid request. Unknown token.";
-			$consumer = new OAuthConsumer($app['key'], $app['secret']);
+			$consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
 
 			$verifier = md5($app['secret'].local_user());
-			set_pconfig(local_user(), "oauth", "verifier", $verifier);
+			set_config("oauth", $verifier, local_user());
+			
+			
+			if ($consumer->callback_url!=null) {
+				$params = $request->get_parameters();
+				$glue="?";
+				if (strstr($consumer->callback_url,$glue)) $glue="?";
+				goaway($consumer->callback_url.$glue."oauth_token=".OAuthUtil::urlencode_rfc3986($params['oauth_token'])."&oauth_verifier=".OAuthUtil::urlencode_rfc3986($verifier));
+				killme();
+			}
+			
+			
 			
 			$tpl = get_markup_template("oauth_authorize_done.tpl");
 			$o = replace_macros($tpl, array(
@@ -67,19 +82,21 @@ function api_content(&$a) {
 		
 		
 		}
-	
 		
 		
 		if(! local_user()) {
 			//TODO: we need login form to redirect to this page
 			notice( t('Please login to continue.') . EOL );
-			return login(false);
+			return login(false,$request->get_parameters());
 		}
+		//FKOAuth1::loginUser(4);
 		
-		$app = oauth_get_client();
+		$app = oauth_get_client($request);
 		if (is_null($app)) return "Invalid request. Unknown token.";
 		
 		
+
+		
 		$tpl = get_markup_template('oauth_authorize.tpl');
 		$o = replace_macros($tpl, array(
 			'$title' => t('Authorize application connection'),
diff --git a/view/oauth_authorize.tpl b/view/oauth_authorize.tpl
index 6bcf9802a..31f02ac50 100644
--- a/view/oauth_authorize.tpl
+++ b/view/oauth_authorize.tpl
@@ -3,9 +3,8 @@
 <div class='oauthapp'>
 	<img src='$app.icon'>
 	<h4>$app.name</h4>
-	<p>$app.client_id</p>
 </div>
 <h3>$authorize</h3>
 <form method="POST">
-<div class="submit"><input type="submit" name="oauth_yes" value="$yes" /></div>
+<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="$yes" /></div>
 </form>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 6f452cebc..7e7adbadc 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2750,6 +2750,28 @@ a.mail-list-link {
 .panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
 .panel_text .progress span {float: right; display: block; width: 25%; background-color: #eeeeee; text-align: right;}
 
+/**
+ * OAuth
+ */
+.oauthapp {
+	height: auto; overflow: auto;
+	border-bottom: 2px solid #cccccc;
+	padding-bottom: 1em;
+	margin-bottom: 1em;	
+}
+.oauthapp img {
+	float: left;
+	width: 48px; height: 48px;
+	margin: 10px;
+}
+.oauthapp img.noicon {
+	background-image: url("../../../images/icons/48/plugin.png");
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+.oauthapp a {
+	float: left;
+}
 
 /**
  * ICONS