Changeset 4124 in subversion

Timestamp:

Oct 22, 2010 3:25:00 PM (3 years ago)

Author:

alec

Message:

• Add support for IMAP proxy authentication (#1486690)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (2 diffs)
• program/include/rcmail.php (modified) (1 diff)
• program/include/rcube_imap_generic.php (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -45 +45 @@
 - Add LOGINDISABLED support (RFC 2595)
 - Add support for AUTH=PLAIN in IMAP authentication
-- Re-implemented SMTP proxy authorization support
+- Re-implemented SMTP proxy authentication support
+- Add support for IMAP proxy authentication (#1486690)
 
 RELEASE 0.4.2

trunk/roundcubemail/config/main.inc.php.dist

@@ -87 +87 @@
 // IMAP connection timeout, in seconds. Default: 0 (no limit)
 $rcmail_config['imap_timeout'] = 0;
+
+// Optional IMAP authentication identifier to be used as authorization proxy
+$rcmail_config['imap_auth_cid'] = null;
+
+// Optional IMAP authentication password to be used for imap_auth_cid
+$rcmail_config['imap_auth_pw'] = null;
 
 // ----------------------------------
@@ -121 +127 @@
 $rcmail_config['smtp_auth_cid'] = null;
 
-// Optional SMTP authorization password to be used for smtp_auth_cid
+// Optional SMTP authentication password to be used for smtp_auth_cid
 $rcmail_config['smtp_auth_pw'] = null;
 

trunk/roundcubemail/program/include/rcmail.php

@@ -502 +502 @@
     $options = array(
       'auth_method' => $this->config->get('imap_auth_type', 'check'),
+      'auth_cid'    => $this->config->get('imap_auth_cid'),
+      'auth_pw'     => $this->config->get('imap_auth_pw'),
       'delimiter'   => isset($_SESSION['imap_delimiter']) ? $_SESSION['imap_delimiter'] : $this->config->get('imap_delimiter'),
       'rootdir'     => isset($_SESSION['imap_root']) ? $_SESSION['imap_root'] : $this->config->get('imap_root'),

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -421 +421 @@
         }
         else { // PLAIN
-            $reply = base64_encode($user . chr(0) . $user . chr(0) . $pass);
+            // proxy authentication
+            if (!empty($this->prefs['auth_cid'])) {
+                $authc = $this->prefs['auth_cid'];
+                $pass  = $this->prefs['auth_pw'];
+            }
+            else {
+                $authc = $user;
+            }
+
+            $reply = base64_encode($user . chr(0) . $authc . chr(0) . $pass);
 
             // RFC 4959 (SASL-IR): save one round trip