comanage-dev - [comanage-dev] r278 - in directory/trunk/app: Controller Controller/Component/Auth webroot/auth/login
Subject: COmanage Developers List
List archive
[comanage-dev] r278 - in directory/trunk/app: Controller Controller/Component/Auth webroot/auth/login
Chronological Thread
- From:
- To:
- Subject: [comanage-dev] r278 - in directory/trunk/app: Controller Controller/Component/Auth webroot/auth/login
- Date: Mon, 9 Apr 2012 10:44:43 -0400
Author: benno
Date: 2012-04-09 10:44:43 -0400 (Mon, 09 Apr 2012)
New Revision: 278
Modified:
directory/trunk/app/Controller/Component/Auth/RemoteUserAuthenticate.php
directory/trunk/app/Controller/UsersController.php
directory/trunk/app/webroot/auth/login/index.php
Log:
Commit residual directory auth changes
Modified:
directory/trunk/app/Controller/Component/Auth/RemoteUserAuthenticate.php
===================================================================
--- directory/trunk/app/Controller/Component/Auth/RemoteUserAuthenticate.php
2012-04-09 14:26:00 UTC (rev 277)
+++ directory/trunk/app/Controller/Component/Auth/RemoteUserAuthenticate.php
2012-04-09 14:44:43 UTC (rev 278)
@@ -36,9 +36,11 @@
*/
public function authenticate(CakeRequest $request, CakeResponse $response)
{
- $u = env('REMOTE_USER');
- $u = "plee";
+ // Grab the authenticated user from the session (as set by
webroot/auth/login/index.php).
+ // We don't seem to have access to the SessionComponent here, so just
read it natively.
+ $u = $_SESSION['Auth']['external']['user'];
+
if(empty($u)) {
return false;
}
Property changes on:
directory/trunk/app/Controller/Component/Auth/RemoteUserAuthenticate.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: directory/trunk/app/Controller/UsersController.php
===================================================================
--- directory/trunk/app/Controller/UsersController.php 2012-04-09 14:26:00
UTC (rev 277)
+++ directory/trunk/app/Controller/UsersController.php 2012-04-09 14:44:43
UTC (rev 278)
@@ -67,6 +67,7 @@
public function logout() {
$this->Session->delete('Auth.User');
+ // XXX should redirect to /auth/logout/index.php to trip external logout
$this->redirect("/");
}
}
Property changes on: directory/trunk/app/Controller/UsersController.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: directory/trunk/app/webroot/auth/login/index.php
===================================================================
--- directory/trunk/app/webroot/auth/login/index.php 2012-04-09 14:26:00
UTC (rev 277)
+++ directory/trunk/app/webroot/auth/login/index.php 2012-04-09 14:44:43
UTC (rev 278)
@@ -22,8 +22,11 @@
* @version $Id$
*/
+// So we don't have to put the entire app under .htaccess auth, we grab
REMOTE_USER
+// and stuff it into the session so the auth component knows who we
authenticated.
+
// Since this page isn't part of the framework, we need to reconfigure
-// to access the Cake session
+// to access the Cake session.
session_name("CAKEPHP");
session_start();
Property changes on: directory/trunk/app/webroot/auth/login/index.php
___________________________________________________________________
Added: svn:keywords
+ Id
- [comanage-dev] r278 - in directory/trunk/app: Controller Controller/Component/Auth webroot/auth/login, svnlog, 04/09/2012
Archive powered by MHonArc 2.6.16.