Imported Upstream version 0.7

[roundcube.git] / plugins / http_authentication / http_authentication.php

diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
index a8003cf463f9a5be6a3d770327efa2fe2fa76a93..be49b52be0c70fe3a6b0b4fbd29d7c1fb0b7829e 100644 (file)
--- a/plugins/http_authentication/http_authentication.php
+++ b/plugins/http_authentication/http_authentication.php
@@ -5,17 +5,24 @@
  *
  * Make use of an existing HTTP authentication and perform login with the existing user credentials
  *
- * @version 1.1
+ * Configuration:
+ * // redirect the client to this URL after logout. This page is then responsible to clear HTTP auth
+ * $rcmail_config['logout_url'] = 'http://server.tld/logout.html';
+ *
+ * See logout.html (in this directory) for an example how HTTP auth can be cleared.
+ *
+ * @version 1.4
  * @author Thomas Bruederli
  */
 class http_authentication extends rcube_plugin
 {
-  public $task = 'login';
+  public $task = 'login|logout';
 
   function init()
   {
     $this->add_hook('startup', array($this, 'startup'));
     $this->add_hook('authenticate', array($this, 'authenticate'));
+    $this->add_hook('logout_after', array($this, 'logout'));
   }
 
   function startup($args)
@@ -30,15 +37,30 @@ class http_authentication extends rcube_plugin
 
   function authenticate($args)
   {
+    // Allow entering other user data in login form,
+    // e.g. after log out (#1487953)
+    if (!empty($args['user'])) {
+        return $args;
+    }
+
     if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
       $args['user'] = $_SERVER['PHP_AUTH_USER'];
       $args['pass'] = $_SERVER['PHP_AUTH_PW'];
     }
-    
+
     $args['cookiecheck'] = false;
-  
+    $args['valid'] = true;
+
     return $args;
   }
+  
+  function logout($args)
+  {
+    // redirect to configured URL in order to clear HTTP auth credentials
+    if (!empty($_SERVER['PHP_AUTH_USER']) && $args['user'] == $_SERVER['PHP_AUTH_USER'] && ($url = rcmail::get_instance()->config->get('logout_url'))) {
+      header("Location: $url", true, 307);
+    }
+  }
 
 }