Merge branch 'master' into horde_5_2

horde · Nov 13, 2013 · 8926145 · 8926145
2 parents ce0a3f7 + f200f28
commit 8926145
Show file tree

Hide file tree

Showing 65 changed files with 1,163 additions and 1,139 deletions.
diff --git a/framework/Autoloader_Cache/package.xml b/framework/Autoloader_Cache/package.xml
@@ -16,10 +16,9 @@
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </developer>
- <date>2013-08-20</date>
- <time>18:43:48</time>
+ <date>2013-11-12</date>
  <version>
-  <release>2.0.6</release>
+  <release>2.0.7</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -28,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [mms] Support msgpack for serializing the map lookup.
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -291,11 +290,24 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-08-20</date>
+   <date>2013-11-12</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 * [mms] Support msgpack for serializing the map lookup.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.0.7</release>
+    <api>1.0.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-11-12</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* 
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/framework/Core/lib/Horde/Core/Ajax/Application.php b/framework/Core/lib/Horde/Core/Ajax/Application.php
@@ -82,11 +82,13 @@ public function __construct($app, Horde_Variables $vars, $action = null,
 
         $ob = $this->_getHandler();
 
+        /* Non-authenticated actions MUST occur in a handler. */
+        if (!$ob && !$registry->currentProcessAuth()) {
+            throw new Horde_Exception('Accessing AJAX action without being authenticated.');
+        }
+
         /* Check authentication/token. */
         if ($ob && !$ob->external($action)) {
-            if (!$registry->currentProcessAuth()) {
-                throw new Horde_Exception('Accessing AJAX action without being authenticated.');
-            }
             $session->checkToken($token);
         }
 

diff --git a/framework/Core/lib/Horde/Core/Ajax/Response/HordeCore/NoAuth.php b/framework/Core/lib/Horde/Core/Ajax/Response/HordeCore/NoAuth.php
@@ -39,6 +39,19 @@ public function __construct($app, $error = Horde_Auth::REASON_FAILED)
         $this->_error = $error;
     }
 
+    /**
+     */
+    public function send()
+    {
+        global $registry;
+
+        if (!empty($registry->authException)) {
+            $registry->getApiInstance($this->_app, 'application')->appInitFailure($registry->authException);
+        }
+
+        parent::send();
+    }
+
     /**
      */
     protected function _jsonData()

diff --git a/framework/Core/lib/Horde/Core/Ajax/Response/HordeCore/SessionTimeout.php b/framework/Core/lib/Horde/Core/Ajax/Response/HordeCore/SessionTimeout.php
@@ -31,6 +31,19 @@ public function __construct($app)
         $this->_app = $app;
     }
 
+    /**
+     */
+    public function send()
+    {
+        global $registry;
+
+        if (!empty($registry->authException)) {
+            $registry->getApiInstance($this->_app, 'application')->appInitFailure($registry->authException);
+        }
+
+        parent::send();
+    }
+
     /**
      */
     protected function _jsonData()

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
@@ -50,6 +50,18 @@ class Horde_Registry implements Horde_Shutdown_Task
      */
     public $applications = array();
 
+    /**
+     * Original authentication exception. Set if 'fallback' auth is used, and
+     * authentication fails.
+     *
+     * @since 2.11.0
+     * @todo Fix this up for H6 (framework needs to do better job of
+     *       supporting bootstrapping before authentication).
+     *
+     * @var Exception
+     */
+    public $authException;
+
     /**
      * A flag that is set once the basic horde application has been
      * minimally configured.
@@ -283,6 +295,7 @@ static public function appInit($app, array $args = array())
         } catch (Horde_Exception_PushApp $e) {
             if ($fallback_auth) {
                 $args['authentication'] = 'none';
+                $registry->authException = $e;
                 return self::appInit($app, $args);
             }
 

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -28,9 +28,9 @@
   <email>mrubinsk@horde.org</email>
   <active>yes</active>
  </developer>
- <date>2013-11-06</date>
+ <date>2013-11-12</date>
  <version>
-  <release>2.11.0</release>
+  <release>2.11.1</release>
   <api>2.11.0</api>
  </version>
  <stability>
@@ -39,12 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [mms] Fix hiding preferences if they are contained within a prefs container.
-* [mms] Added standardized/normalized mousewheelY javascript event handling to HordeCore.
-* [mms] Add nonce generation/checking to Horde_Session.
-* [mms] Application hook methods moved from Horde:: to Horde_Core_Hooks::.
-* [mms] Add &apos;fallback&apos; option for the Horde_Registry#appInit() &apos;authentication&apos; parameter.
-* [mms] Fix deauthenticating when a system-level logout event occurs.
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3226,7 +3221,7 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-11-06</date>
+   <date>2013-11-12</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 * [mms] Fix hiding preferences if they are contained within a prefs container.
@@ -3237,5 +3232,18 @@
 * [mms] Fix deauthenticating when a system-level logout event occurs.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.11.1</release>
+    <api>2.11.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-11-12</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* 
+   </notes>
+  </release>
  </changelog>
 </package>