Ticket #33: mousmoulas

--- /home/zmousm/amavis/maia/maia/php/auth.php  2004-03-03 13:21:20.000000000 +0200
+++ /var/www/html/maia/auth.php 2004-06-12 02:59:52.000000000 +0300
@@ -164,12 +164,90 @@
     }
 
 
+/*
+ * exchange_ldap_get_email(): Find or make a best effort guess for a user's
+ *                            primary e-mail address using a Microsoft
+ *                            Exchange Server and a Windows Domain Active
+ *                            Directory.
+ *                            Code contributed by Zenon Mousmoulas
+ *                            <zmousm@grnet.gr> or <zenon@mousmoulas.gr>.
+ */
+function exchange_ldap_get_email($user_name)
+{
+  global $lang_error_ldap_connect;
+  global $lang_error_ldap_bind;
+  global $auth_ldap_server;
+  global $auth_ldap_bind_dn;
+  global $auth_ldap_password;
+  global $auth_ldap_base_dn;
+
+  $ldap_conn = ldap_connect($auth_ldap_server)
+    or die($lang_error_ldap_connect);
+
+  @ldap_bind($ldap_conn, $auth_ldap_bind_dn, $auth_ldap_password)
+    or die($lang_error_ldap_bind);
+
+  $filter = "(sAMAccountName=" . $user_name . ")";
+
+  $sr = ldap_search($ldap_conn, $auth_ldap_base_dn, $filter,
+                   array("dn", "proxyAddresses", "mail"));
+
+  if (ldap_count_entries($ldap_conn, $sr) == 1) { // only expect to find one entry
+    $entries = ldap_get_entries($ldap_conn, $sr);
+    $entries = $entries[0];
+
+    if (array_key_exists("proxyaddresses", $entries)) { // the proxyAddresses attribute takes precedence
+      $i = 0;
+      foreach ($entries["proxyaddresses"] as $praddr) { // store the proxyAddresses values of type SMTP:
+        if (eregi("^smtp:", $praddr))
+         $proxyaddresses[$i++] = substr($praddr, 5);
+      }
+      if ($i == 1) {
+       ldap_close($ldap_conn);
+       return $proxyaddresses[0];
+      }
+    }
+    if (array_key_exists("mail", $entries)) { // find the mail attribute
+      if ($entries["mail"]["count"] == 1) {
+       $mailattr = $entries["mail"][0];
+      } else { // too many mail attribute entries
+       ldap_close($ldap_conn);
+       return "";
+      }
+    }
+    // compare SMTP proxyAddresses values with mail value
+    if (is_array($proxyaddresses)) {
+      if (isset($mailattr)) {
+       foreach ($proxyaddresses as $praddr) {
+         if (strtolower($mailattr) == strtolower($praddr)) { // try to find the SMTP proxyAddresses value that matches that of the mail attribute
+           ldap_close($ldap_conn);
+           return $praddr;
+         }
+       }
+       // mail attribute value doesnt match any SMTP proxyAddresses value
+       ldap_close($ldap_conn);
+       return "";
+      } else { // if mail attribute not set, give up and return the first SMTP proxyAddresses value
+       ldap_close($ldap_conn);
+       return $proxyaddresses[0];
+      }
+    } else { // no SMTP proxyAddresses value was found
+      ldap_close($ldap_conn);
+      return "";
+    }
+  } else { // found too many or too few entries!
+    ldap_close($ldap_conn);
+    return "";
+  }
+}
+
+
     /*
      * auth_exchange(): Authenticate against Microsoft Exchange Server
      *                  Code based on information provided by
      *                  Matt Linzbach <MLinzbach@Merchant-Gould.com>.
      */
-    function auth_exchange($user, $pass, $domain, $alias)
+    function auth_exchange($user, $pass, $domain, $alias = "")
     {
        global $dbh;
        global $auth_exchange_params;
@@ -327,6 +405,7 @@
             if (!empty($user_name) && !empty($pwd)) {
                 $authenticated = auth_exchange($user_name, $pwd, $nt_domain);
                 // BROKEN!  No idea what e-mail address to return here.
+               $email = exchange_ldap_get_email($user_name);
             }
         } elseif ($auth_method == "sql") {
             if (!empty($user_name) && !empty($pwd)) {
@@ -342,4 +421,4 @@
 
        return array($authenticated, $email);
     }
-?>
\ No newline at end of file
+?>