alt_auth - make the new features work with AD - thanks to Father Barry for testing (and making them work)

e107_plugins/alt_auth/alt_auth_adminmenu.php

@@ -27,8 +27,6 @@ function alt_auth_get_authlist()
 
 // All user fields which might, just possibly, be transferred. The option name must be the corresponding field in the E107 user database, prefixed with 'xf_'
 $alt_auth_user_fields = array(
-//  'user_loginname' 	=> array('prompt' => LAN_ALT_10, 'optname' => 'xf_user_loginname', 'default' => 'user_loginname', 'optional' => FALSE, 'otherdb' =>  TRUE, 'e107db' => TRUE, 'importdb' =>  TRUE, 'ldap' => TRUE, 'ldap_field' => 'cn'),
-//  'user_password' 	=> array('prompt' => LAN_ALT_11, 'optname' => 'xf_user_password', 'default' => 'user_password', 'optional' => FALSE, 'otherdb' =>  TRUE, 'e107db' => TRUE, 'importdb' =>  TRUE, 'ldap' => TRUE, 'ldap_field' => ''),
   'user_email' 		=> array('prompt' => LAN_ALT_12, 'optname' => 'xf_user_email', 'default' => 'user_email', 'optional' =>  TRUE, 'otherdb' =>  TRUE, 'e107db' => TRUE, 'importdb' => FALSE, 'ldap' => TRUE, 'ldap_field' => 'mail'),
   'user_hideemail' 	=> array('prompt' => LAN_ALT_13, 'optname' => 'xf_user_hideemail', 'default' => 'user_hideemail', 'optional' =>  TRUE, 'otherdb' => FALSE, 'e107db' => TRUE, 'importdb' => FALSE, 'ldap' => TRUE, 'ldap_field' => ''),
   'user_name' 		=> array('prompt' => LAN_ALT_14, 'optname' => 'xf_user_name', 'default' => 'user_name', 'optional' => TRUE, 'otherdb' =>  TRUE, 'e107db' => TRUE, 'importdb' => FALSE, 'ldap' => TRUE, 'ldap_field' => ''),

e107_plugins/alt_auth/alt_auth_login_class.php

@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/alt_auth/alt_auth_login_class.php,v $
-|     $Revision: 1.3 $
+|     $Revision: 1.4 $
-|     $Date: 2008-07-25 19:33:02 $
+|     $Date: 2008-12-01 21:47:17 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -34,7 +34,6 @@ class alt_login
 		return AUTH_NOCONNECT;
 	  }
 
-
 	  $login_result = $_login -> login($username, $userpass, $newvals, FALSE);
 
 	  if($login_result === AUTH_SUCCESS )
@@ -68,6 +67,10 @@ class alt_login
 			if (!isset($db_vals['user_name'])) $db_vals['user_name'] = $username;
 			if (!isset($db_vals['user_loginname'])) $db_vals['user_loginname'] = $username;
 			if (!isset($db_vals['user_join'])) $db_vals['user_join'] = time();
+			$db_vals['user_class'] = varset($pref['initial_user_classes'],'');
+			if (!isset($db_vals['user_signature'])) $db_vals['user_signature'] = '';
+			if (!isset($db_vals['user_prefs'])) $db_vals['user_prefs'] = '';
+			if (!isset($db_vals['user_perms'])) $db_vals['user_perms'] = '';
 			$aa_sql->db_Insert('user',$db_vals);
 		}
 		return LOGIN_CONTINUE;

e107_plugins/alt_auth/languages/English/lan_ldap_conf.php

@@ -1,6 +1,6 @@
 <?php
 define("LDAPLAN_1", "Server address");
-define("LDAPLAN_2", "Base DN or Domain<br />If LDAP - Enter BaseDN<br />If AD - Enter domain");
+define("LDAPLAN_2", "Base DN or Domain<br />LDAP - Enter BaseDN<br />AD - enter the fqdn eg ad.mydomain.co.uk");
 define("LDAPLAN_3", "LDAP Browsing user<br />Full context of the user who is able to search the directory.");
 define("LDAPLAN_4", "LDAP Browsing password<br />Password for the LDAP Browsing user.");
 define("LDAPLAN_5", "LDAP Version");
@@ -10,8 +10,9 @@ define("LDAPLAN_8", "This will be used to ensure the username is in the correct
 define("LDAPLAN_9", "Current search filter will be:");
 define("LDAPLAN_10", "Settings Updated");
 define("LDAPLAN_11", "WARNING:  It appears as if the ldap module is not currently available; setting your auth method to LDAP will probably not work!");
-define("LDAPLAN_12", "Server Type");
+define("LDAPLAN_12", 'Server Type');
-define("LDAPLAN_13", "Update settings");
+define("LDAPLAN_13", 'Update settings');
+define('LDAPLAN_14', 'OU for AD (e.g. ou=itdept)');
 
 
 define('LAN_AUTHENTICATE_HELP','This method can be used to authenticate against most LDAP servers, including Novell\'s eDirectory and Microsoft\'s Active Directory. Refer to the wiki for further information.');

e107_plugins/alt_auth/ldap_auth.php

@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/alt_auth/ldap_auth.php,v $
-|     $Revision: 1.3 $
+|     $Revision: 1.4 $
-|     $Date: 2008-09-02 19:39:12 $
+|     $Date: 2008-12-01 21:47:17 $
 |     $Author: e107steved $
 
 To do:
@@ -22,9 +22,9 @@ To do:
 
 class auth_login
 {
-
 	var $server;
 	var $dn;
+	var $ou;
 	var $usr;
 	var $pwd;
 	var $serverType;
@@ -46,15 +46,17 @@ class auth_login
 		while ($row = $sql->db_Fetch())
 		{
 			$ldap[$row['auth_parmname']] = base64_decode(base64_decode($row['auth_parmval']));
-		  if ((strpos($row['auth_parmname'],'ldap_xf_') === 0) && $ldap[$row['auth_parmname']])
+			if ((strpos($row['auth_parmname'], 'ldap_xf_') === 0) && $ldap[$row['auth_parmname']]) // Attribute to copy on successful login
-		  {	// Attribute to copy on successful login
+			{
-			$this->copyAttribs[$ldap[$row['auth_parmname']]] = substr($row['auth_parmname'],strlen('ldap_xf_'));	// Key = LDAP attribute. Value = e107 field name
+//				$this->copyAttribs[$ldap[$row['auth_parmname']]] = substr($row['auth_parmname'], strlen('ldap_xf_')); // Key = LDAP attribute. Value = e107 field name
+				$this->copyAttribs[substr($row['auth_parmname'], strlen('ldap_xf_'))] = $ldap[$row['auth_parmname']]; // Key = LDAP attribute. Value = e107 field name
 				unset($row['auth_parmname']);
 			}
 		}
 		$this->server = explode(",", $ldap['ldap_server']);
 		$this->serverType = $ldap['ldap_servertype'];
 		$this->dn = $ldap['ldap_basedn'];
+		$this->ou = $ldap['ldap_ou']; // added by Father Barry Keal
 		$this->usr = $ldap['ldap_user'];
 		$this->pwd = $ldap['ldap_passwd'];
 		$this->ldapVersion = $ldap['ldap_version'];
@@ -62,7 +64,7 @@ class auth_login
 
 		if (!function_exists('ldap_connect'))
 		{
-			$this->Available = FALSE;
+			$this->Available = false;
 			return false;
 		}
 
@@ -72,7 +74,6 @@ class auth_login
 		}
 	}
 
-
 	function makeErrorText($extra = '')
 	{
 		$this->ldapErrorCode = ldap_errno($this->connection);
@@ -80,13 +81,13 @@ class auth_login
 		$this->ErrorText = $extra . ' ' . $this->ldapErrorCode . ': ' . $this->ldapErrorText;
 	}
 
-
 	function connect()
 	{
 		foreach ($this->server as $key => $host)
 		{
 			$this->connection = ldap_connect($host);
-			if ( $this->connection) {
+			if ($this->connection)
+			{
 				if ($this->ldapVersion == 3 || $this->serverType == "ActiveDirectory")
 				{
 					@ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, 3);
@@ -101,8 +102,6 @@ class auth_login
 		return false;
 	}
 
-
-
 	function close()
 	{
 		if (!@ldap_close($this->connection))
@@ -116,9 +115,7 @@ class auth_login
 		}
 	}
 
-
+	function login($uname, $pass, &$newvals, $connect_only = false)
-
-	function login($uname, $pass, &$newvals, $connect_only = FALSE)
 	{
 		/* Construct the full DN, eg:-
 		** "uid=username, ou=People, dc=orgname,dc=com"
@@ -128,6 +125,10 @@ class auth_login
 		if ($this->serverType == "ActiveDirectory")
 		{
 			$checkDn = $uname . '@' . $this->dn;
+			// added by Father Barry Keal
+			// $current_filter = "(sAMAccountName={$uname})"; for pre windows 2000
+			$current_filter = "(userprincipalname={$uname}@{$this->dn})"; // for 2000 +
+			// end add by Father Barry Keal
 		}
 		else
 		{
@@ -139,16 +140,14 @@ class auth_login
 			{
 				$this->result = ldap_bind($this->connection);
 			}
-		  if ($this->result === FALSE)
+			if ($this->result === false)
 			{
 				// echo "LDAP bind failed<br />";
 				$this->makeErrorText(); // Read the error code and explanatory string
 				return AUTH_NOCONNECT;
 			}
-			
 			// In ldap_auth.php, should look like this instead for eDirectory
 			// $query = ldap_search($this -> connection, $this -> dn, "cn=".$uname);
-
 			if ($this->serverType == "eDirectory")
 			{
 				$current_filter = "(&(cn={$uname})" . $this->filter . ")";
@@ -173,7 +172,8 @@ class auth_login
 
 				if ($query_result["count"] != 1)
 				{
-			  if ($connect_only) return AUTH_SUCCESS; else return AUTH_NOUSER;
+					if ($connect_only) return AUTH_SUCCESS;
+					else return AUTH_NOUSER;
 				}
 				else
 				{
@@ -183,7 +183,6 @@ class auth_login
 				}
 			}
 		}
-
 		// Try and connect...
 		$this->result = ldap_bind($this->connection, $checkDn, $pass);
 		if ($this->result)
@@ -193,23 +192,35 @@ class auth_login
 			if ($connect_only) return AUTH_SUCCESS;
 			if (trim($pass) == '') return AUTH_BADPASSWORD; // Pick up a blank password
 			if (count($this->copyAttribs) == 0) return AUTH_SUCCESS; // No attributes required - we're done
-		  $ldap_attributes = array_keys($this->copyAttribs);
+			$ldap_attributes = array_values(array_unique($this->copyAttribs));
-//		  echo "Validation search: {$checkDn}, {$current_filter},"; print_a($ldap_attributes); echo "<br />";
+			if ($this->serverType == "ActiveDirectory")
+			{	// If we are using AD then build up the full string from the fqdn
+				$altauth_tmp = explode('.', $this->dn);
+				$checkDn='';
+				foreach($altauth_tmp as $$altauth_dc)
+				{
+					$checkDn .= ",DC={$altauth_dc}";
+				}
+				// prefix with the OU
+				$checkDn = $this->ou . $checkDn;
+			}
 			$this->result = ldap_search($this->connection, $checkDn, $current_filter, $ldap_attributes);
-
 			if ($this->result)
 			{
 				$entries = ldap_get_entries($this->connection, $this->result);
-//			print_a($entries);
+				if (count($entries) == 2) // All OK
-			if (count($entries) == 2)
+				{
-			{ // All OK
+				echo "Count: {$entries[0]['count']}<br />";
 					for ($j = 0; $j < $entries[0]['count']; $j++)
 					{
-				$k = $entries[0][$j];
+						$k = $entries[0][$j];			// LDAP attribute name
-				$tlv = $entries[0][$k];
+						$tlv = $entries[0][$k];			// Array of LDAP data
-				if (is_array($tlv) && isset($this->copyAttribs[$k]))
+						if (is_array($tlv) && count($tempKeys = array_keys($this->copyAttribs,$k))) // This bit executed if we've successfully got some data. Key is the attribute name, then array of data
-				{ // This bit executed if we've successfully got some data. Key is the attribute name, then array of data
+						{
-				  $newvals[$this->copyAttribs[$k]] = $tlv[0];				// Just grab the first value
+							foreach ($tempKeys as $tk)		// Single LDAP attribute may be mapped to several fields
+							{
+								$newvals[$tk] = $this->translate($tlv[0]); // Just grab the first value
+							}
 							// echo $j.":Key: {$k} (Values: {$tlv['count']})";
 							// for ($i = 0; $i < $tlv['count']; $i++) { echo '  '.$tlv[$i]; }
 							// echo "<br />";
@@ -229,8 +240,8 @@ class auth_login
 					return AUTH_NOUSER; // Bit debateable what to return if this happens
 				}
 			}
-		  else
+			else // Probably a bit strange if we don't get any info back - but possible
-		  {	// Probably a bit strange if we don't get any info back - but possible
+				{
 					// echo "No results!<br />";
 				}
 
@@ -259,5 +270,18 @@ class auth_login
 			return AUTH_NOCONNECT;
 		}
 	}
+
+	// Function to decode some special values
+	function translate($word)
+	{
+		global $tp;
+		switch ($tp->uStrToUpper($word))
+		{
+			case 'TRUE' : return TRUE;
+			case 'FALSE' : return FALSE;
 		}
+		return $word;
+	}
+}
+
 ?>

e107_plugins/alt_auth/ldap_conf.php

@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/alt_auth/ldap_conf.php,v $
-|     $Revision: 1.3 $
+|     $Revision: 1.4 $
-|     $Date: 2008-09-02 19:39:12 $
+|     $Date: 2008-12-01 21:47:17 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -77,10 +77,12 @@ $text .= "</td></tr>";
 $text .= "<tr><td class='forumheader3'>".LDAPLAN_1."</td><td class='forumheader3'>";
 $text .= $frm -> form_text("ldap_server", 35, $ldap['ldap_server'], 120);
 $text .= "</td></tr>";
-
 $text .= "<tr><td class='forumheader3'>".LDAPLAN_2."</td><td class='forumheader3'>";
 $text .= $frm -> form_text("ldap_basedn", 35, $ldap['ldap_basedn'], 120);
 $text .= "</td></tr>";
+$text .= "<tr><td class='forumheader3'>".LDAPLAN_14."</td><td class='forumheader3'>";
+$text .= $frm -> form_text("ldap_ou", 35, $ldap['ldap_ou'], 60);
+$text .= "</td></tr>";
 
 $text .= "<tr><td class='forumheader3'>".LDAPLAN_3."</td><td class='forumheader3'>";
 $text .= $frm -> form_text("ldap_user", 35, $ldap['ldap_user'], 120);