Changeset 12682

Timestamp:

Aug 18, 2009, 2:01:21 AM (13 years ago)

Author:

ebihara

Message:

#4243:added support for being OpenID 2.0 Provider

Location:

OpenPNE3/trunk

Files:

• apps/pc_frontend/config/filters.yml (modified) (1 diff)
• apps/pc_frontend/modules/OpenID/actions/actions.class.php (modified) (5 diffs)
• apps/pc_frontend/modules/OpenID/templates/memberSuccess.php (modified) (1 diff)
• lib/filter/opAppendXRDSHeaderFilter.class.php (added)

OpenPNE3/trunk/apps/pc_frontend/config/filters.yml

@@ -6 +6 @@
 enable_app:
   class: opCheckEnabledApplicationFilter
+
+xrds_header:
+  class: opAppendXRDSHeaderFilter
 
 security:  ~

OpenPNE3/trunk/apps/pc_frontend/modules/OpenID/actions/actions.class.php

@@ -7 +7 @@
  * For the full copyright and license information, please view the LICENSE
  * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * Copyright (C) 2005-2009 OpenPNE Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
@@ -48 +32 @@
     $server = new Auth_OpenID_Server(new Auth_OpenID_FileStore(sfConfig::get('sf_cache_dir')), $url);
 
-//    header('X-XRDS-Location: '.$this->getController()->genUrl('OpenID/idpXrds'));
+    $this->getResponse()->setHttpHeader('X-XRDS-Location', $this->getController()->genUrl('OpenID/signonXrds', true));
 
     $openIDRequest = $server->decodeRequest();
     if (!$openIDRequest)
     {
-      $_SESSION['request'] = serialize($openIDRequest);
+      $_SESSION['request'] = null;
       return sfView::SUCCESS;
     }
@@ -68 +52 @@
         else
         {
+          $this->getRequest()->setMethod(sfWebRequest::GET);
+          $_SERVER['QUERY_STRING'] = str_replace('http://example.com/?', '', $openIDRequest->encodeToURL('http://example.com/'));
+          $this->forwardUnless($this->getUser()->isAuthenticated() && $this->getUser()->getMember(), 'member', 'login');
+
           $this->info = $openIDRequest;
           return 'Trust';
@@ -117 +105 @@
 
     $reqUrl = $this->getController()->genUrl('OpenID/member?id='.$this->getUser()->getMemberId(), true);
-    $this->forward404Unless($reqUrl === $info->identity, 'request:'.$reqUrl.'/identity:'.$info->identity);
-
-    if ($trusted)
+    if (!$info->idSelect())
     {
-      unset($_SESSION['request']);
-      $server = new Auth_OpenID_Server(new Auth_OpenID_FileStore(sfConfig::get('sf_cache_dir')), $info->identity);
-      $response = $info->answer(true, null, $reqUrl);
-
-      $sregRequest = Auth_OpenID_SRegRequest::fromOpenIDRequest($info);
-      if ($sregRequest)
-      {
-        $userData = array(
-          'nickname' => $this->getUser()->getMember()->name,
-        );
-        $sregResp = Auth_OpenID_SRegResponse::extractResponse($sregRequest, $userData);
-        $response->addExtension($sregResp);
-      }
-
-      $response = $server->encodeResponse($response);
-      $this->writeResponse($response);
+      $this->forward404Unless($reqUrl === $info->identity, 'request:'.$reqUrl.'/identity:'.$info->identity);
     }
 
-    $this->forward404();
+    unset($_SESSION['request']);
+    $server = new Auth_OpenID_Server(new Auth_OpenID_FileStore(sfConfig::get('sf_cache_dir')), $info->identity);
+    $response = $info->answer(true, null, $reqUrl);
+
+    $sregRequest = Auth_OpenID_SRegRequest::fromOpenIDRequest($info);
+    if ($sregRequest)
+    {
+      $userData = array(
+        'nickname' => $this->getUser()->getMember()->name,
+      );
+      $sregResp = Auth_OpenID_SRegResponse::extractResponse($sregRequest, $userData);
+      $response->addExtension($sregResp);
+    }
+
+    $response = $server->encodeResponse($response);
+
+    $this->writeResponse($response);
   }
 
@@ -150 +137 @@
     header('Content-type: application/xrds+xml');
     $type = Auth_OpenID_TYPE_2_0_IDP;
-    $uri = $this->getController()->genUrl('OpenID/index');
+    $uri = $this->getController()->genUrl('OpenID/index', true);
     echo <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <xrds:XRDS
     xmlns:xrds="xri://\$xrds"
+    xmlns="xri://\$xrd*(\$v*2.0)">
+  <XRD>
+    <Service priority="0">
+      <Type>$type</Type>
+      <URI>$uri</URI>
+    </Service>
+  </XRD>
+</xrds:XRDS>
+EOF;
+    return sfView::NONE;
+  }
+
+  public function executeSignonXrds(sfWebRequest $request)
+  {
+    header('Content-type: application/xrds+xml');
+    $type = Auth_OpenID_TYPE_2_0;
+    $uri = $this->getController()->genUrl('OpenID/index', true);
+    echo <<<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<xrds:XRDS
+    xmlns:xrds="xri://\$xrds"
+    xmlns:openid="http://openid.net/xmlns/1.0"
     xmlns="xri://\$xrd*(\$v*2.0)">
   <XRD>

OpenPNE3/trunk/apps/pc_frontend/modules/OpenID/templates/memberSuccess.php

@@ -3 +3 @@
     <title>OpenID Server Endpoint</title>
     <link rel="openid.server" href="<?php echo url_for('OpenID/index', true) ?>" />
+    <link rel="openid2.provider" href="<?php echo url_for('OpenID/index', true) ?>" />
   </head>
   <body>