Changeset 4133 in subversion

Timestamp:

Oct 25, 2010 9:08:54 AM (3 years ago)

Author:

alec

Message:

• Added support for SASL proxy authentication (#1486691)

Location:

trunk/plugins/managesieve

Files:

• Changelog (modified) (1 diff)
• config.inc.php.dist (modified) (1 diff)
• lib/rcube_sieve.php (modified) (2 diffs)
• managesieve.php (modified) (1 diff)

trunk/plugins/managesieve/Changelog

@@ +1 @@
+- Added support for SASL proxy authentication (#1486691)
+
 * version 2.10 [2010-10-10]
 -----------------------------------------------------------

trunk/plugins/managesieve/config.inc.php.dist

@@ -15 +15 @@
 // or none. Optional, defaults to best method supported by server.
 $rcmail_config['managesieve_auth_type'] = null;
+
+// Optional managesieve authentication identifier to be used as authorization proxy.
+// Authenticate as a different user but act on behalf of the logged in user.
+// Works with PLAIN and DIGEST-MD5 auth.
+$rcmail_config['managesieve_auth_cid'] = null;
+
+// Optional managesieve authentication password to be used for imap_auth_cid
+$rcmail_config['managesieve_auth_pw'] = null;
 
 // use or not TLS for managesieve server connection

trunk/plugins/managesieve/lib/rcube_sieve.php

@@ -45 +45 @@
      * @param array   Disabled extensions
      * @param boolean Enable/disable debugging
+     * @param string  Proxy authentication identifier
+     * @param string  Proxy authentication password
      */
     public function __construct($username, $password='', $host='localhost', $port=2000,
-        $auth_type=null, $usetls=true, $disabled=array(), $debug=false)
+        $auth_type=null, $usetls=true, $disabled=array(), $debug=false,
+        $auth_cid=null, $auth_pw=null)
     {
         $this->sieve = new Net_Sieve();
@@ -54 +57 @@
             $this->sieve->setDebug(true, array($this, 'debug_handler'));
         }
+
         if (PEAR::isError($this->sieve->connect($host, $port, NULL, $usetls))) {
             return $this->_set_error(SIEVE_ERROR_CONNECTION);
         }
+
+        if (!empty($auth_cid)) {
+            $authz    = $username;
+            $username = $auth_cid;
+            $password = $auth_pw;
+        }
+
         if (PEAR::isError($this->sieve->login($username, $password,
-            $auth_type ? strtoupper($auth_type) : null))
+            $auth_type ? strtoupper($auth_type) : null, $authz))
         ) {
             return $this->_set_error(SIEVE_ERROR_LOGIN);
         }
+
         $this->disabled = $disabled;
     }

trunk/plugins/managesieve/managesieve.php

@@ -75 +75 @@
             $this->rc->config->get('managesieve_usetls', false),
             $this->rc->config->get('managesieve_disabled_extensions'),
-            $this->rc->config->get('managesieve_debug', false)
+            $this->rc->config->get('managesieve_debug', false),
+            $this->rc->config->get('managesieve_auth_cid'), 
+            $this->rc->config->get('managesieve_auth_pw')
         );