X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOpenID%2Fopenidserver.php;h=b2cf1f8ac35fc3bed4351b7ec508a90ba99f6d31;hb=b1c5cb9db99993fcea7c060bffa6d5d50f22a41f;hp=198a1a32805603afd9a7839a8cad295ba4b4dcbb;hpb=54696f7c46684234bbeb48747b37f934ffd0d393;p=quix0rs-gnu-social.git

diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php
index 198a1a3280..b2cf1f8ac3 100644
--- a/plugins/OpenID/openidserver.php
+++ b/plugins/OpenID/openidserver.php
@@ -23,6 +23,7 @@
  * @package   StatusNet
  * @author   Craig Andrews <candrews@integralblue.com>
  * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -33,6 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/action.php';
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
+require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
 
 /**
  * Settings for OpenID
@@ -42,55 +44,121 @@ require_once INSTALLDIR.'/plugins/OpenID/openid.php';
  * @category Settings
  * @package  StatusNet
  * @author   Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class OpenidserverAction extends Action
 {
+    var $oserver;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->oserver = oid_server();
+        return true;
+    }
 
     function handle($args)
     {
         parent::handle($args);
-        $oserver = oid_server();
-        $request = $oserver->decodeRequest();
+        $request = $this->oserver->decodeRequest();
         if (in_array($request->mode, array('checkid_immediate',
             'checkid_setup'))) {
-            $cur = common_current_user();
-            error_log("Request identity: " . $request->identity);
-            if(!$cur){
-                /* Go log in, and then come back. */
-                common_set_returnto($_SERVER['REQUEST_URI']);
-                common_redirect(common_local_url('login'));
-                return;
-            }else if(common_profile_url($cur->nickname) == $request->identity || $request->idSelect()){
-                $response = &$request->answer(true, null, common_profile_url($cur->nickname));
+            $user = common_current_user();
+            if(!$user){
+                if($request->immediate){
+                    //cannot prompt the user to login in immediate mode, so answer false
+                    $response = $this->generateDenyResponse($request);
+                }else{
+                    // Go log in, and then come back.
+                    //
+                    // Note: 303 redirect rather than 307 to avoid
+                    // prompting user for form resubmission if we
+                    // were POSTed here.
+                    common_set_returnto($_SERVER['REQUEST_URI']);
+                    common_redirect(common_local_url('login'), 303);
+                    return;
+                }
+            }else if(common_profile_url($user->nickname) == $request->identity || $request->idSelect()){
+                $user_openid_trustroot = User_openid_trustroot::pkeyGet(
+                                                array('user_id'=>$user->id, 'trustroot'=>$request->trust_root));
+                if(empty($user_openid_trustroot)){
+                    if($request->immediate){
+                        //cannot prompt the user to trust this trust root in immediate mode, so answer false
+                        $response = $this->generateDenyResponse($request);
+                    }else{
+                        common_ensure_session();
+                        $_SESSION['openid_trust_root'] = $request->trust_root;
+                        $allowResponse = $this->generateAllowResponse($request, $user);
+                        $this->oserver->encodeResponse($allowResponse); //sign the response
+                        $denyResponse = $this->generateDenyResponse($request);
+                        $this->oserver->encodeResponse($denyResponse); //sign the response
+                        $_SESSION['openid_allow_url'] = $allowResponse->encodeToUrl();
+                        $_SESSION['openid_deny_url'] = $denyResponse->encodeToUrl();
+
+                        // Ask the user to trust this trust root...
+                        //
+                        // Note: 303 redirect rather than 307 to avoid
+                        // prompting user for form resubmission if we
+                        // were POSTed here.
+                        common_redirect(common_local_url('openidtrust'), 303);
+                        return;
+                    }
+                }else{
+                    //user has previously authorized this trust root
+                    $response = $this->generateAllowResponse($request, $user);
+                    //$response = $request->answer(true, null, common_profile_url($user->nickname));
+                }
             } else if ($request->immediate) {
-                $response = &$request->answer(false);
+                $response = $this->generateDenyResponse($request);
             } else {
                 //invalid
-                $this->clientError(sprintf(_('You are not authorized to use the identity %s'),$request->identity),$code=403);
+                // TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+                $this->clientError(sprintf(_m('You are not authorized to use the identity %s.'),$request->identity),$code=403);
             }
         } else {
-            $response = &$oserver->handleRequest($request);
+            $response = $this->oserver->handleRequest($request);
         }
 
         if($response){
-            $webresponse = $oserver->encodeResponse($response);
-
-            if ($webresponse->code != AUTH_OPENID_HTTP_OK) {
-                header(sprintf("HTTP/1.1 %d ", $webresponse->code),
-                       true, $webresponse->code);
+            $response = $this->oserver->encodeResponse($response);
+            if ($response->code != AUTH_OPENID_HTTP_OK) {
+                header(sprintf("HTTP/1.1 %d ", $response->code),
+                       true, $response->code);
             }
 
-            if($webresponse->headers){
-                foreach ($webresponse->headers as $k => $v) {
+            if($response->headers){
+                foreach ($response->headers as $k => $v) {
                     header("$k: $v");
                 }
             }
-            $this->raw($webresponse->body);
+            $this->raw($response->body);
         }else{
-            $this->clientError(_('Just an OpenID provider. Nothing to see here, move along...'),$code=500);
+            // TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+            $this->clientError(_m('Just an OpenID provider. Nothing to see here, move along...'),$code=500);
         }
     }
+
+    function generateAllowResponse($request, $user){
+        $response = $request->answer(true, null, common_profile_url($user->nickname));
+        
+        $profile = $user->getProfile();
+        $sreg_data = array(
+            'fullname' => $profile->fullname,
+            'nickname' => $user->nickname,
+            'email' => $user->email,
+            'language' => $user->language,
+            'timezone' => $user->timezone);
+        $sreg_request = Auth_OpenID_SRegRequest::fromOpenIDRequest($request);
+        $sreg_response = Auth_OpenID_SRegResponse::extractResponse(
+                              $sreg_request, $sreg_data);
+        $sreg_response->toMessage($response->fields);
+        return $response;
+    }
+
+    function generateDenyResponse($request){
+        $response = $request->answer(false);
+        return $response;
+    }
 }