Changeset a392125 in github

Timestamp:

Oct 11, 2010 3:19:50 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

bb26996

Parents:

14015da

Message:

• Add SASL proxy authentication for SMTP (#1486693)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube_smtp.php (modified) (5 diffs)

CHANGELOG

@@ -27 +27 @@
 - Prevent from inserting empty link when composing HTML message (#1486944)
 - Add caching support in id2uid and uid2id functions (#1487019)
+- Add SASL proxy authentication for SMTP (#1486693)
 
 RELEASE 0.4.2

config/main.inc.php.dist

@@ -117 +117 @@
 // best server supported one)
 $rcmail_config['smtp_auth_type'] = '';
+
+// Optional SMTP authorization identifier to be used as authorization proxy
+$rcmail_config['smtp_authzid'] = null;
 
 // SMTP HELO host 

program/include/rcube_smtp.php

@@ -45 +45 @@
    * @param string User name
    * @param string Password
+   * @param string Optional authorization ID to be used as authorization proxy
    *
    * @return bool  Returns true on success, or false on error
    */
-  public function connect($host=null, $port=null, $user=null, $pass=null)
+  public function connect($host=null, $port=null, $user=null, $pass=null, $authz=null)
   {
     $RCMAIL = rcmail::get_instance();
@@ -60 +61 @@
     // let plugins alter smtp connection config
     $CONFIG = $RCMAIL->plugins->exec_hook('smtp_connect', array(
-      'smtp_server' => $host ? $host : $RCMAIL->config->get('smtp_server'),
-      'smtp_port'   => $port ? $port : $RCMAIL->config->get('smtp_port', 25),
-      'smtp_user'   => $user ? $user : $RCMAIL->config->get('smtp_user'),
-      'smtp_pass'   => $pass ? $pass : $RCMAIL->config->get('smtp_pass'),
+      'smtp_server'    => $host ? $host : $RCMAIL->config->get('smtp_server'),
+      'smtp_port'      => $port ? $port : $RCMAIL->config->get('smtp_port', 25),
+      'smtp_user'      => $user ? $user : $RCMAIL->config->get('smtp_user'),
+      'smtp_pass'      => $pass ? $pass : $RCMAIL->config->get('smtp_pass'),
+      'smtp_authzid'   => $authz ? $authz : $RCMAIL->config->get('smtp_authzid'),
       'smtp_auth_type' => $RCMAIL->config->get('smtp_auth_type'),
       'smtp_helo_host' => $RCMAIL->config->get('smtp_helo_host'),
@@ -106 +108 @@
     if($RCMAIL->config->get('smtp_debug'))
       $this->conn->setDebug(true, array($this, 'debug_handler'));
-    
+
     // try to connect to server and exit on failure
     $result = $this->conn->connect($smtp_timeout);
@@ -121 +123 @@
     $smtp_auth_type = empty($CONFIG['smtp_auth_type']) ? NULL : $CONFIG['smtp_auth_type'];
 
+    if (!empty($CONFIG['smtp_authzid'])) {
+      $smtp_authz = $smtp_user;
+      $smtp_user  = $CONFIG['smtp_authzid'];
+    }
+
     // attempt to authenticate to the SMTP server
     if ($smtp_user && $smtp_pass)
@@ -128 +135 @@
         $smtp_user = idn_to_ascii($smtp_user);
 
-      $result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls);
+      $result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls, $smtp_authz);
 
       if (PEAR::isError($result))