From ca66dc55a612edd633bf391499b07410f4430e34 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 8 Nov 2010 14:08:50 -0700
Subject: [PATCH] Bug #9311: Allow session storage for guest users

---
 framework/Core/lib/Horde/Core/Auth/Application.php | 25 ++++++++++++++++------
 framework/Core/lib/Horde/Registry.php              | 11 +++-------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/framework/Core/lib/Horde/Core/Auth/Application.php b/framework/Core/lib/Horde/Core/Auth/Application.php
index 4833f5cbd..0607ac798 100644
--- a/framework/Core/lib/Horde/Core/Auth/Application.php
+++ b/framework/Core/lib/Horde/Core/Auth/Application.php
@@ -275,8 +275,10 @@ class Horde_Core_Auth_Application extends Horde_Auth_Base
     {
         global $registry;
 
+        $is_auth = $registry->getAuth();
+
         if (!($userId = $this->getCredential('userId'))) {
-            $userId = $registry->getAuth();
+            $userId = $is_auth;
         }
         if (!($credentials = $this->getCredential('credentials'))) {
             $credentials = $registry->getAuthCredential();
@@ -289,13 +291,22 @@ class Horde_Core_Auth_Application extends Horde_Auth_Base
 
         if ($this->_base) {
             $result = $this->_base->transparent();
+        } elseif ($this->hasCapability('transparent')) {
+            /* Only clean session if we are trying to do transparent
+             * authentication to an application that has a transparent
+             * capability. This prevents session fixation issues when using
+             * transparent authentication to do initial authentication to
+             * Horde, while not destroying session information for guest
+             * users. See Bug #9311. */
+            if (!$is_auth) {
+                $registry->getCleanSession();
+            }
+            $result = $registry->callAppMethod($this->_app, $this->_apiMethods['transparent'], array('args' => array($this), 'noperms' => true));
         } else {
-            $result = $this->hasCapability('transparent')
-                ? $registry->callAppMethod($this->_app, $this->_apiMethods['transparent'], array('args' => array($this), 'noperms' => true))
-                /* If this application contains neither transparent nor
-                 * authenticate capabilities, it does not require any
-                 * authentication if already authenticated to Horde. */
-                : ($registry->getAuth() && !$this->hasCapability('authenticate'));
+            /* If this application contains neither transparent nor
+             * authenticate capabilities, it does not require any
+             * authentication if already authenticated to Horde. */
+            $result = ($registry->getAuth() && !$this->hasCapability('authenticate'));
         }
 
         return $result && $this->_setAuth();
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 228ea1cd9..e90dc7c7d 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -1680,14 +1680,9 @@ class Horde_Registry
         }
 
         /* Try transparent authentication. */
-        if (empty($options['notransparent'])) {
-            if (!$this->getAuth()) {
-                $this->getCleanSession();
-            }
-            return $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create($app)->transparent();
-        }
-
-        return false;
+        return empty($options['notransparent'])
+            ? $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create($app)->transparent()
+            : false;
     }
 
     /**
-- 
2.11.0