diff options
Diffstat (limited to 'phpBB/includes/auth')
| -rw-r--r-- | phpBB/includes/auth/auth.php | 1080 | ||||
| -rw-r--r-- | phpBB/includes/auth/auth_apache.php | 249 | ||||
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 276 | ||||
| -rw-r--r-- | phpBB/includes/auth/auth_ldap.php | 353 | ||||
| -rw-r--r-- | phpBB/includes/auth/provider/apache.php | 275 | ||||
| -rw-r--r-- | phpBB/includes/auth/provider/db.php | 337 | ||||
| -rw-r--r-- | phpBB/includes/auth/provider/index.htm | 10 | ||||
| -rw-r--r-- | phpBB/includes/auth/provider/interface.php | 93 | ||||
| -rw-r--r-- | phpBB/includes/auth/provider/ldap.php | 386 | 
9 files changed, 2181 insertions, 878 deletions
| diff --git a/phpBB/includes/auth/auth.php b/phpBB/includes/auth/auth.php new file mode 100644 index 0000000000..279959974d --- /dev/null +++ b/phpBB/includes/auth/auth.php @@ -0,0 +1,1080 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* Permission/Auth class +* @package phpBB3 +*/ +class phpbb_auth +{ +	var $acl = array(); +	var $cache = array(); +	var $acl_options = array(); +	var $acl_forum_ids = false; + +	/** +	* Init permissions +	*/ +	function acl(&$userdata) +	{ +		global $db, $cache; + +		$this->acl = $this->cache = $this->acl_options = array(); +		$this->acl_forum_ids = false; + +		if (($this->acl_options = $cache->get('_acl_options')) === false) +		{ +			$sql = 'SELECT auth_option_id, auth_option, is_global, is_local +				FROM ' . ACL_OPTIONS_TABLE . ' +				ORDER BY auth_option_id'; +			$result = $db->sql_query($sql); + +			$global = $local = 0; +			$this->acl_options = array(); +			while ($row = $db->sql_fetchrow($result)) +			{ +				if ($row['is_global']) +				{ +					$this->acl_options['global'][$row['auth_option']] = $global++; +				} + +				if ($row['is_local']) +				{ +					$this->acl_options['local'][$row['auth_option']] = $local++; +				} + +				$this->acl_options['id'][$row['auth_option']] = (int) $row['auth_option_id']; +				$this->acl_options['option'][(int) $row['auth_option_id']] = $row['auth_option']; +			} +			$db->sql_freeresult($result); + +			$cache->put('_acl_options', $this->acl_options); +		} + +		if (!trim($userdata['user_permissions'])) +		{ +			$this->acl_cache($userdata); +		} + +		// Fill ACL array +		$this->_fill_acl($userdata['user_permissions']); + +		// Verify bitstring length with options provided... +		$renew = false; +		$global_length = sizeof($this->acl_options['global']); +		$local_length = sizeof($this->acl_options['local']); + +		// Specify comparing length (bitstring is padded to 31 bits) +		$global_length = ($global_length % 31) ? ($global_length - ($global_length % 31) + 31) : $global_length; +		$local_length = ($local_length % 31) ? ($local_length - ($local_length % 31) + 31) : $local_length; + +		// You thought we are finished now? Noooo... now compare them. +		foreach ($this->acl as $forum_id => $bitstring) +		{ +			if (($forum_id && strlen($bitstring) != $local_length) || (!$forum_id && strlen($bitstring) != $global_length)) +			{ +				$renew = true; +				break; +			} +		} + +		// If a bitstring within the list does not match the options, we have a user with incorrect permissions set and need to renew them +		if ($renew) +		{ +			$this->acl_cache($userdata); +			$this->_fill_acl($userdata['user_permissions']); +		} + +		return; +	} + +	/** +	* Retrieves data wanted by acl function from the database for the +	* specified user. +	* +	* @param int $user_id User ID +	* @return array User attributes +	*/ +	public function obtain_user_data($user_id) +	{ +		global $db; + +		$sql = 'SELECT user_id, username, user_permissions, user_type +			FROM ' . USERS_TABLE . ' +			WHERE user_id = ' . $user_id; +		$result = $db->sql_query($sql); +		$user_data = $db->sql_fetchrow($result); +		$db->sql_freeresult($result); +		return $user_data; +	} + +	/** +	* Fill ACL array with relevant bitstrings from user_permissions column +	* @access private +	*/ +	function _fill_acl($user_permissions) +	{ +		$seq_cache = array(); +		$this->acl = array(); +		$user_permissions = explode("\n", $user_permissions); + +		foreach ($user_permissions as $f => $seq) +		{ +			if ($seq) +			{ +				$i = 0; + +				if (!isset($this->acl[$f])) +				{ +					$this->acl[$f] = ''; +				} + +				while ($subseq = substr($seq, $i, 6)) +				{ +					if (isset($seq_cache[$subseq])) +					{ +						$converted = $seq_cache[$subseq]; +					} +					else +					{ +						$converted = $seq_cache[$subseq] = str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT); +					} + +					// We put the original bitstring into the acl array +					$this->acl[$f] .= $converted; +					$i += 6; +				} +			} +		} +	} + +	/** +	* Look up an option +	* if the option is prefixed with !, then the result becomes negated +	* +	* If a forum id is specified the local option will be combined with a global option if one exist. +	* If a forum id is not specified, only the global option will be checked. +	*/ +	function acl_get($opt, $f = 0) +	{ +		$negate = false; + +		if (strpos($opt, '!') === 0) +		{ +			$negate = true; +			$opt = substr($opt, 1); +		} + +		if (!isset($this->cache[$f][$opt])) +		{ +			// We combine the global/local option with an OR because some options are global and local. +			// If the user has the global permission the local one is true too and vice versa +			$this->cache[$f][$opt] = false; + +			// Is this option a global permission setting? +			if (isset($this->acl_options['global'][$opt])) +			{ +				if (isset($this->acl[0])) +				{ +					$this->cache[$f][$opt] = $this->acl[0][$this->acl_options['global'][$opt]]; +				} +			} + +			// Is this option a local permission setting? +			// But if we check for a global option only, we won't combine the options... +			if ($f != 0 && isset($this->acl_options['local'][$opt])) +			{ +				if (isset($this->acl[$f]) && isset($this->acl[$f][$this->acl_options['local'][$opt]])) +				{ +					$this->cache[$f][$opt] |= $this->acl[$f][$this->acl_options['local'][$opt]]; +				} +			} +		} + +		// Founder always has all global options set to true... +		return ($negate) ? !$this->cache[$f][$opt] : $this->cache[$f][$opt]; +	} + +	/** +	* Get forums with the specified permission setting +	* if the option is prefixed with !, then the result becomes negated +	* +	* @param bool $clean set to true if only values needs to be returned which are set/unset +	*/ +	function acl_getf($opt, $clean = false) +	{ +		$acl_f = array(); +		$negate = false; + +		if (strpos($opt, '!') === 0) +		{ +			$negate = true; +			$opt = substr($opt, 1); +		} + +		// If we retrieve a list of forums not having permissions in, we need to get every forum_id +		if ($negate) +		{ +			if ($this->acl_forum_ids === false) +			{ +				global $db; + +				$sql = 'SELECT forum_id +					FROM ' . FORUMS_TABLE; + +				if (sizeof($this->acl)) +				{ +					$sql .= ' WHERE ' . $db->sql_in_set('forum_id', array_keys($this->acl), true); +				} +				$result = $db->sql_query($sql); + +				$this->acl_forum_ids = array(); +				while ($row = $db->sql_fetchrow($result)) +				{ +					$this->acl_forum_ids[] = $row['forum_id']; +				} +				$db->sql_freeresult($result); +			} +		} + +		if (isset($this->acl_options['local'][$opt])) +		{ +			foreach ($this->acl as $f => $bitstring) +			{ +				// Skip global settings +				if (!$f) +				{ +					continue; +				} + +				$allowed = (!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt]; + +				if (!$clean) +				{ +					$acl_f[$f][$opt] = ($negate) ? !$allowed : $allowed; +				} +				else +				{ +					if (($negate && !$allowed) || (!$negate && $allowed)) +					{ +						$acl_f[$f][$opt] = 1; +					} +				} +			} +		} + +		// If we get forum_ids not having this permission, we need to fill the remaining parts +		if ($negate && sizeof($this->acl_forum_ids)) +		{ +			foreach ($this->acl_forum_ids as $f) +			{ +				$acl_f[$f][$opt] = 1; +			} +		} + +		return $acl_f; +	} + +	/** +	* Get local permission state for any forum. +	* +	* Returns true if user has the permission in one or more forums, false if in no forum. +	* If global option is checked it returns the global state (same as acl_get($opt)) +	* Local option has precedence... +	*/ +	function acl_getf_global($opt) +	{ +		if (is_array($opt)) +		{ +			// evaluates to true as soon as acl_getf_global is true for one option +			foreach ($opt as $check_option) +			{ +				if ($this->acl_getf_global($check_option)) +				{ +					return true; +				} +			} + +			return false; +		} + +		if (isset($this->acl_options['local'][$opt])) +		{ +			foreach ($this->acl as $f => $bitstring) +			{ +				// Skip global settings +				if (!$f) +				{ +					continue; +				} + +				// as soon as the user has any permission we're done so return true +				if ((!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt]) +				{ +					return true; +				} +			} +		} +		else if (isset($this->acl_options['global'][$opt])) +		{ +			return $this->acl_get($opt); +		} + +		return false; +	} + +	/** +	* Get permission settings (more than one) +	*/ +	function acl_gets() +	{ +		$args = func_get_args(); +		$f = array_pop($args); + +		if (!is_numeric($f)) +		{ +			$args[] = $f; +			$f = 0; +		} + +		// alternate syntax: acl_gets(array('m_', 'a_'), $forum_id) +		if (is_array($args[0])) +		{ +			$args = $args[0]; +		} + +		$acl = 0; +		foreach ($args as $opt) +		{ +			$acl |= $this->acl_get($opt, $f); +		} + +		return $acl; +	} + +	/** +	* Get permission listing based on user_id/options/forum_ids +	* +	* Be careful when using this function with permissions a_, m_, u_ and f_ ! +	* It may not work correctly. When a user group grants an a_* permission, +	* e.g. a_foo, but the user's a_foo permission is set to "Never", then +	* the user does not in fact have the a_ permission. +	* But the user will still be listed as having the a_ permission. +	* +	* For more information see: http://tracker.phpbb.com/browse/PHPBB3-10252 +	*/ +	function acl_get_list($user_id = false, $opts = false, $forum_id = false) +	{ +		if ($user_id !== false && !is_array($user_id) && $opts === false && $forum_id === false) +		{ +			$hold_ary = array($user_id => $this->acl_raw_data_single_user($user_id)); +		} +		else +		{ +			$hold_ary = $this->acl_raw_data($user_id, $opts, $forum_id); +		} + +		$auth_ary = array(); +		foreach ($hold_ary as $user_id => $forum_ary) +		{ +			foreach ($forum_ary as $forum_id => $auth_option_ary) +			{ +				foreach ($auth_option_ary as $auth_option => $auth_setting) +				{ +					if ($auth_setting) +					{ +						$auth_ary[$forum_id][$auth_option][] = $user_id; +					} +				} +			} +		} + +		return $auth_ary; +	} + +	/** +	* Cache data to user_permissions row +	*/ +	function acl_cache(&$userdata) +	{ +		global $db; + +		// Empty user_permissions +		$userdata['user_permissions'] = ''; + +		$hold_ary = $this->acl_raw_data_single_user($userdata['user_id']); + +		// Key 0 in $hold_ary are global options, all others are forum_ids + +		// If this user is founder we're going to force fill the admin options ... +		if ($userdata['user_type'] == USER_FOUNDER) +		{ +			foreach ($this->acl_options['global'] as $opt => $id) +			{ +				if (strpos($opt, 'a_') === 0) +				{ +					$hold_ary[0][$this->acl_options['id'][$opt]] = ACL_YES; +				} +			} +		} + +		$hold_str = $this->build_bitstring($hold_ary); + +		if ($hold_str) +		{ +			$userdata['user_permissions'] = $hold_str; + +			$sql = 'UPDATE ' . USERS_TABLE . " +				SET user_permissions = '" . $db->sql_escape($userdata['user_permissions']) . "', +					user_perm_from = 0 +				WHERE user_id = " . $userdata['user_id']; +			$db->sql_query($sql); +		} + +		return; +	} + +	/** +	* Build bitstring from permission set +	*/ +	function build_bitstring(&$hold_ary) +	{ +		$hold_str = ''; + +		if (sizeof($hold_ary)) +		{ +			ksort($hold_ary); + +			$last_f = 0; + +			foreach ($hold_ary as $f => $auth_ary) +			{ +				$ary_key = (!$f) ? 'global' : 'local'; + +				$bitstring = array(); +				foreach ($this->acl_options[$ary_key] as $opt => $id) +				{ +					if (isset($auth_ary[$this->acl_options['id'][$opt]])) +					{ +						$bitstring[$id] = $auth_ary[$this->acl_options['id'][$opt]]; + +						$option_key = substr($opt, 0, strpos($opt, '_') + 1); + +						// If one option is allowed, the global permission for this option has to be allowed too +						// example: if the user has the a_ permission this means he has one or more a_* permissions +						if ($auth_ary[$this->acl_options['id'][$opt]] == ACL_YES && (!isset($bitstring[$this->acl_options[$ary_key][$option_key]]) || $bitstring[$this->acl_options[$ary_key][$option_key]] == ACL_NEVER)) +						{ +							$bitstring[$this->acl_options[$ary_key][$option_key]] = ACL_YES; +						} +					} +					else +					{ +						$bitstring[$id] = ACL_NEVER; +					} +				} + +				// Now this bitstring defines the permission setting for the current forum $f (or global setting) +				$bitstring = implode('', $bitstring); + +				// The line number indicates the id, therefore we have to add empty lines for those ids not present +				$hold_str .= str_repeat("\n", $f - $last_f); + +				// Convert bitstring for storage - we do not use binary/bytes because PHP's string functions are not fully binary safe +				for ($i = 0, $bit_length = strlen($bitstring); $i < $bit_length; $i += 31) +				{ +					$hold_str .= str_pad(base_convert(str_pad(substr($bitstring, $i, 31), 31, 0, STR_PAD_RIGHT), 2, 36), 6, 0, STR_PAD_LEFT); +				} + +				$last_f = $f; +			} +			unset($bitstring); + +			$hold_str = rtrim($hold_str); +		} + +		return $hold_str; +	} + +	/** +	* Clear one or all users cached permission settings +	*/ +	function acl_clear_prefetch($user_id = false) +	{ +		global $db, $cache; + +		// Rebuild options cache +		$cache->destroy('_role_cache'); + +		$sql = 'SELECT * +			FROM ' . ACL_ROLES_DATA_TABLE . ' +			ORDER BY role_id ASC'; +		$result = $db->sql_query($sql); + +		$this->role_cache = array(); +		while ($row = $db->sql_fetchrow($result)) +		{ +			$this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting']; +		} +		$db->sql_freeresult($result); + +		foreach ($this->role_cache as $role_id => $role_options) +		{ +			$this->role_cache[$role_id] = serialize($role_options); +		} + +		$cache->put('_role_cache', $this->role_cache); + +		// Now empty user permissions +		$where_sql = ''; + +		if ($user_id !== false) +		{ +			$user_id = (!is_array($user_id)) ? $user_id = array((int) $user_id) : array_map('intval', $user_id); +			$where_sql = ' WHERE ' . $db->sql_in_set('user_id', $user_id); +		} + +		$sql = 'UPDATE ' . USERS_TABLE . " +			SET user_permissions = '', +				user_perm_from = 0 +			$where_sql"; +		$db->sql_query($sql); + +		return; +	} + +	/** +	* Get assigned roles +	*/ +	function acl_role_data($user_type, $role_type, $ug_id = false, $forum_id = false) +	{ +		global $db; + +		$roles = array(); + +		$sql_id = ($user_type == 'user') ? 'user_id' : 'group_id'; + +		$sql_ug = ($ug_id !== false) ? ((!is_array($ug_id)) ? "AND a.$sql_id = $ug_id" : 'AND ' . $db->sql_in_set("a.$sql_id", $ug_id)) : ''; +		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? "AND a.forum_id = $forum_id" : 'AND ' . $db->sql_in_set('a.forum_id', $forum_id)) : ''; + +		// Grab assigned roles... +		$sql = 'SELECT a.auth_role_id, a.' . $sql_id . ', a.forum_id +			FROM ' . (($user_type == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE) . ' a, ' . ACL_ROLES_TABLE . " r +			WHERE a.auth_role_id = r.role_id +				AND r.role_type = '" . $db->sql_escape($role_type) . "' +				$sql_ug +				$sql_forum +			ORDER BY r.role_order ASC"; +		$result = $db->sql_query($sql); + +		while ($row = $db->sql_fetchrow($result)) +		{ +			$roles[$row[$sql_id]][$row['forum_id']] = $row['auth_role_id']; +		} +		$db->sql_freeresult($result); + +		return $roles; +	} + +	/** +	* Get raw acl data based on user/option/forum +	*/ +	function acl_raw_data($user_id = false, $opts = false, $forum_id = false) +	{ +		global $db; + +		$sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : $db->sql_in_set('user_id', array_map('intval', $user_id))) : ''; +		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : ''; + +		$sql_opts = $sql_opts_select = $sql_opts_from = ''; +		$hold_ary = array(); + +		if ($opts !== false) +		{ +			$sql_opts_select = ', ao.auth_option'; +			$sql_opts_from = ', ' . ACL_OPTIONS_TABLE . ' ao'; +			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts); +		} + +		$sql_ary = array(); + +		// Grab non-role settings - user-specific +		$sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . ' +			FROM ' . ACL_USERS_TABLE . ' a' . $sql_opts_from . ' +			WHERE a.auth_role_id = 0 ' . +				(($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') . +				(($sql_user) ? 'AND a.' . $sql_user : '') . " +				$sql_forum +				$sql_opts"; + +		// Now the role settings - user-specific +		$sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . ' +			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . ' +			WHERE a.auth_role_id = r.role_id ' . +				(($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') . +				(($sql_user) ? 'AND a.' . $sql_user : '') . " +				$sql_forum +				$sql_opts"; + +		foreach ($sql_ary as $sql) +		{ +			$result = $db->sql_query($sql); + +			while ($row = $db->sql_fetchrow($result)) +			{ +				$option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']]; +				$hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting']; +			} +			$db->sql_freeresult($result); +		} + +		$sql_ary = array(); + +		// Now grab group settings - non-role specific... +		$sql_ary[] = 'SELECT ug.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . ' +			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug, ' . GROUPS_TABLE . ' g' . $sql_opts_from . ' +			WHERE a.auth_role_id = 0 ' . +				(($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') . ' +				AND a.group_id = ug.group_id +				AND g.group_id = ug.group_id +				AND ug.user_pending = 0 +				AND NOT (ug.group_leader = 1 AND g.group_skip_auth = 1) +				' . (($sql_user) ? 'AND ug.' . $sql_user : '') . " +				$sql_forum +				$sql_opts"; + +		// Now grab group settings - role specific... +		$sql_ary[] = 'SELECT ug.user_id, a.forum_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . ' +			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug, ' . GROUPS_TABLE . ' g, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . ' +			WHERE a.auth_role_id = r.role_id ' . +				(($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') . ' +				AND a.group_id = ug.group_id +				AND g.group_id = ug.group_id +				AND ug.user_pending = 0 +				AND NOT (ug.group_leader = 1 AND g.group_skip_auth = 1) +				' . (($sql_user) ? 'AND ug.' . $sql_user : '') . " +				$sql_forum +				$sql_opts"; + +		foreach ($sql_ary as $sql) +		{ +			$result = $db->sql_query($sql); + +			while ($row = $db->sql_fetchrow($result)) +			{ +				$option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']]; + +				if (!isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) || (isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) && $hold_ary[$row['user_id']][$row['forum_id']][$option] != ACL_NEVER)) +				{ +					$hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting']; + +					// If we detect ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again) +					if ($row['auth_setting'] == ACL_NEVER) +					{ +						$flag = substr($option, 0, strpos($option, '_') + 1); + +						if (isset($hold_ary[$row['user_id']][$row['forum_id']][$flag]) && $hold_ary[$row['user_id']][$row['forum_id']][$flag] == ACL_YES) +						{ +							unset($hold_ary[$row['user_id']][$row['forum_id']][$flag]); + +/*							if (in_array(ACL_YES, $hold_ary[$row['user_id']][$row['forum_id']])) +							{ +								$hold_ary[$row['user_id']][$row['forum_id']][$flag] = ACL_YES; +							} +*/ +						} +					} +				} +			} +			$db->sql_freeresult($result); +		} + +		return $hold_ary; +	} + +	/** +	* Get raw user based permission settings +	*/ +	function acl_user_raw_data($user_id = false, $opts = false, $forum_id = false) +	{ +		global $db; + +		$sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : $db->sql_in_set('user_id', array_map('intval', $user_id))) : ''; +		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : ''; + +		$sql_opts = ''; +		$hold_ary = $sql_ary = array(); + +		if ($opts !== false) +		{ +			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts); +		} + +		// Grab user settings - non-role specific... +		$sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option +			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao +			WHERE a.auth_role_id = 0 +				AND a.auth_option_id = ao.auth_option_id ' . +				(($sql_user) ? 'AND a.' . $sql_user : '') . " +				$sql_forum +				$sql_opts +			ORDER BY a.forum_id, ao.auth_option"; + +		// Now the role settings - user-specific +		$sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id, ao.auth_option +			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao +			WHERE a.auth_role_id = r.role_id +				AND r.auth_option_id = ao.auth_option_id ' . +				(($sql_user) ? 'AND a.' . $sql_user : '') . " +				$sql_forum +				$sql_opts +			ORDER BY a.forum_id, ao.auth_option"; + +		foreach ($sql_ary as $sql) +		{ +			$result = $db->sql_query($sql); + +			while ($row = $db->sql_fetchrow($result)) +			{ +				$hold_ary[$row['user_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting']; +			} +			$db->sql_freeresult($result); +		} + +		return $hold_ary; +	} + +	/** +	* Get raw group based permission settings +	*/ +	function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false) +	{ +		global $db; + +		$sql_group = ($group_id !== false) ? ((!is_array($group_id)) ? 'group_id = ' . (int) $group_id : $db->sql_in_set('group_id', array_map('intval', $group_id))) : ''; +		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : ''; + +		$sql_opts = ''; +		$hold_ary = $sql_ary = array(); + +		if ($opts !== false) +		{ +			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts); +		} + +		// Grab group settings - non-role specific... +		$sql_ary[] = 'SELECT a.group_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option +			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao +			WHERE a.auth_role_id = 0 +				AND a.auth_option_id = ao.auth_option_id ' . +				(($sql_group) ? 'AND a.' . $sql_group : '') . " +				$sql_forum +				$sql_opts +			ORDER BY a.forum_id, ao.auth_option"; + +		// Now grab group settings - role specific... +		$sql_ary[] = 'SELECT a.group_id, a.forum_id, r.auth_setting, r.auth_option_id, ao.auth_option +			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao +			WHERE a.auth_role_id = r.role_id +				AND r.auth_option_id = ao.auth_option_id ' . +				(($sql_group) ? 'AND a.' . $sql_group : '') . " +				$sql_forum +				$sql_opts +			ORDER BY a.forum_id, ao.auth_option"; + +		foreach ($sql_ary as $sql) +		{ +			$result = $db->sql_query($sql); + +			while ($row = $db->sql_fetchrow($result)) +			{ +				$hold_ary[$row['group_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting']; +			} +			$db->sql_freeresult($result); +		} + +		return $hold_ary; +	} + +	/** +	* Get raw acl data based on user for caching user_permissions +	* This function returns the same data as acl_raw_data(), but without the user id as the first key within the array. +	*/ +	function acl_raw_data_single_user($user_id) +	{ +		global $db, $cache; + +		// Check if the role-cache is there +		if (($this->role_cache = $cache->get('_role_cache')) === false) +		{ +			$this->role_cache = array(); + +			// We pre-fetch roles +			$sql = 'SELECT * +				FROM ' . ACL_ROLES_DATA_TABLE . ' +				ORDER BY role_id ASC'; +			$result = $db->sql_query($sql); + +			while ($row = $db->sql_fetchrow($result)) +			{ +				$this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting']; +			} +			$db->sql_freeresult($result); + +			foreach ($this->role_cache as $role_id => $role_options) +			{ +				$this->role_cache[$role_id] = serialize($role_options); +			} + +			$cache->put('_role_cache', $this->role_cache); +		} + +		$hold_ary = array(); + +		// Grab user-specific permission settings +		$sql = 'SELECT forum_id, auth_option_id, auth_role_id, auth_setting +			FROM ' . ACL_USERS_TABLE . ' +			WHERE user_id = ' . $user_id; +		$result = $db->sql_query($sql); + +		while ($row = $db->sql_fetchrow($result)) +		{ +			// If a role is assigned, assign all options included within this role. Else, only set this one option. +			if ($row['auth_role_id']) +			{ +				$hold_ary[$row['forum_id']] = (empty($hold_ary[$row['forum_id']])) ? unserialize($this->role_cache[$row['auth_role_id']]) : $hold_ary[$row['forum_id']] + unserialize($this->role_cache[$row['auth_role_id']]); +			} +			else +			{ +				$hold_ary[$row['forum_id']][$row['auth_option_id']] = $row['auth_setting']; +			} +		} +		$db->sql_freeresult($result); + +		// Now grab group-specific permission settings +		$sql = 'SELECT a.forum_id, a.auth_option_id, a.auth_role_id, a.auth_setting +			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug, ' . GROUPS_TABLE . ' g +			WHERE a.group_id = ug.group_id +				AND g.group_id = ug.group_id +				AND ug.user_pending = 0 +				AND NOT (ug.group_leader = 1 AND g.group_skip_auth = 1) +				AND ug.user_id = ' . $user_id; +		$result = $db->sql_query($sql); + +		while ($row = $db->sql_fetchrow($result)) +		{ +			if (!$row['auth_role_id']) +			{ +				$this->_set_group_hold_ary($hold_ary[$row['forum_id']], $row['auth_option_id'], $row['auth_setting']); +			} +			else if (!empty($this->role_cache[$row['auth_role_id']])) +			{ +				foreach (unserialize($this->role_cache[$row['auth_role_id']]) as $option_id => $setting) +				{ +					$this->_set_group_hold_ary($hold_ary[$row['forum_id']], $option_id, $setting); +				} +			} +		} +		$db->sql_freeresult($result); + +		return $hold_ary; +	} + +	/** +	* Private function snippet for setting a specific piece of the hold_ary +	*/ +	function _set_group_hold_ary(&$hold_ary, $option_id, $setting) +	{ +		if (!isset($hold_ary[$option_id]) || (isset($hold_ary[$option_id]) && $hold_ary[$option_id] != ACL_NEVER)) +		{ +			$hold_ary[$option_id] = $setting; + +			// If we detect ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again) +			if ($setting == ACL_NEVER) +			{ +				$flag = substr($this->acl_options['option'][$option_id], 0, strpos($this->acl_options['option'][$option_id], '_') + 1); +				$flag = (int) $this->acl_options['id'][$flag]; + +				if (isset($hold_ary[$flag]) && $hold_ary[$flag] == ACL_YES) +				{ +					unset($hold_ary[$flag]); + +/*					This is uncommented, because i suspect this being slightly wrong due to mixed permission classes being possible +					if (in_array(ACL_YES, $hold_ary)) +					{ +						$hold_ary[$flag] = ACL_YES; +					}*/ +				} +			} +		} +	} + +	/** +	* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him. +	*/ +	function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0) +	{ +		global $config, $db, $user, $phpbb_root_path, $phpEx, $phpbb_container; + +		$method = trim(basename($config['auth_method'])); + +		$provider = $phpbb_container->get('auth.provider.' . $method); +		if ($provider) +		{ +			$login = $provider->login($username, $password); + +			// If the auth module wants us to create an empty profile do so and then treat the status as LOGIN_SUCCESS +			if ($login['status'] == LOGIN_SUCCESS_CREATE_PROFILE) +			{ +				// we are going to use the user_add function so include functions_user.php if it wasn't defined yet +				if (!function_exists('user_add')) +				{ +					include($phpbb_root_path . 'includes/functions_user.' . $phpEx); +				} + +				user_add($login['user_row'], (isset($login['cp_data'])) ? $login['cp_data'] : false); + +				$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type +					FROM ' . USERS_TABLE . " +					WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; +				$result = $db->sql_query($sql); +				$row = $db->sql_fetchrow($result); +				$db->sql_freeresult($result); + +				if (!$row) +				{ +					return array( +						'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, +						'error_msg'		=> 'AUTH_NO_PROFILE_CREATED', +						'user_row'		=> array('user_id' => ANONYMOUS), +					); +				} + +				$login = array( +					'status'	=> LOGIN_SUCCESS, +					'error_msg'	=> false, +					'user_row'	=> $row, +				); +			} + +			// If login succeeded, we will log the user in... else we pass the login array through... +			if ($login['status'] == LOGIN_SUCCESS) +			{ +				$old_session_id = $user->session_id; + +				if ($admin) +				{ +					global $SID, $_SID; + +					$cookie_expire = time() - 31536000; +					$user->set_cookie('u', '', $cookie_expire); +					$user->set_cookie('sid', '', $cookie_expire); +					unset($cookie_expire); + +					$SID = '?sid='; +					$user->session_id = $_SID = ''; +				} + +				$result = $user->session_create($login['user_row']['user_id'], $admin, $autologin, $viewonline); + +				// Successful session creation +				if ($result === true) +				{ +					// If admin re-authentication we remove the old session entry because a new one has been created... +					if ($admin) +					{ +						// the login array is used because the user ids do not differ for re-authentication +						$sql = 'DELETE FROM ' . SESSIONS_TABLE . " +							WHERE session_id = '" . $db->sql_escape($old_session_id) . "' +							AND session_user_id = {$login['user_row']['user_id']}"; +						$db->sql_query($sql); +					} + +					return array( +						'status'		=> LOGIN_SUCCESS, +						'error_msg'		=> false, +						'user_row'		=> $login['user_row'], +					); +				} + +				return array( +					'status'		=> LOGIN_BREAK, +					'error_msg'		=> $result, +					'user_row'		=> $login['user_row'], +				); +			} + +			return $login; +		} + +		trigger_error('Authentication method not found', E_USER_ERROR); +	} + +	/** +	* Fill auth_option statement for later querying based on the supplied options +	*/ +	function build_auth_option_statement($key, $auth_options, &$sql_opts) +	{ +		global $db; + +		if (!is_array($auth_options)) +		{ +			if (strpos($auth_options, '%') !== false) +			{ +				$sql_opts = "AND $key " . $db->sql_like_expression(str_replace('%', $db->any_char, $auth_options)); +			} +			else +			{ +				$sql_opts = "AND $key = '" . $db->sql_escape($auth_options) . "'"; +			} +		} +		else +		{ +			$is_like_expression = false; + +			foreach ($auth_options as $option) +			{ +				if (strpos($option, '%') !== false) +				{ +					$is_like_expression = true; +				} +			} + +			if (!$is_like_expression) +			{ +				$sql_opts = 'AND ' . $db->sql_in_set($key, $auth_options); +			} +			else +			{ +				$sql = array(); + +				foreach ($auth_options as $option) +				{ +					if (strpos($option, '%') !== false) +					{ +						$sql[] = $key . ' ' . $db->sql_like_expression(str_replace('%', $db->any_char, $option)); +					} +					else +					{ +						$sql[] = $key . " = '" . $db->sql_escape($option) . "'"; +					} +				} + +				$sql_opts = 'AND (' . implode(' OR ', $sql) . ')'; +			} +		} +	} +} diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php deleted file mode 100644 index 391e7abb0e..0000000000 --- a/phpBB/includes/auth/auth_apache.php +++ /dev/null @@ -1,249 +0,0 @@ -<?php -/** -* Apache auth plug-in for phpBB3 -* -* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him. -* -* @package login -* @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/** -* Checks whether the user is identified to apache -* Only allow changing authentication to apache if the user is identified -* Called in acp_board while setting authentication plugins -* -* @return boolean|string false if the user is identified and else an error message -*/ -function init_apache() -{ -	global $user; - -	if (!isset($_SERVER['PHP_AUTH_USER']) || $user->data['username'] !== $_SERVER['PHP_AUTH_USER']) -	{ -		return $user->lang['APACHE_SETUP_BEFORE_USE']; -	} -	return false; -} - -/** -* Login function -*/ -function login_apache(&$username, &$password) -{ -	global $db; - -	// do not allow empty password -	if (!$password) -	{ -		return array( -			'status'	=> LOGIN_ERROR_PASSWORD, -			'error_msg'	=> 'NO_PASSWORD_SUPPLIED', -			'user_row'	=> array('user_id' => ANONYMOUS), -		); -	} - -	if (!$username) -	{ -		return array( -			'status'	=> LOGIN_ERROR_USERNAME, -			'error_msg'	=> 'LOGIN_ERROR_USERNAME', -			'user_row'	=> array('user_id' => ANONYMOUS), -		); -	} - -	if (!isset($_SERVER['PHP_AUTH_USER'])) -	{ -		return array( -			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, -			'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE', -			'user_row'		=> array('user_id' => ANONYMOUS), -		); -	} - -	$php_auth_user = $_SERVER['PHP_AUTH_USER']; -	$php_auth_pw = $_SERVER['PHP_AUTH_PW']; - -	if (!empty($php_auth_user) && !empty($php_auth_pw)) -	{ -		if ($php_auth_user !== $username) -		{ -			return array( -				'status'	=> LOGIN_ERROR_USERNAME, -				'error_msg'	=> 'LOGIN_ERROR_USERNAME', -				'user_row'	=> array('user_id' => ANONYMOUS), -			); -		} - -		$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type -			FROM ' . USERS_TABLE . " -			WHERE username = '" . $db->sql_escape($php_auth_user) . "'"; -		$result = $db->sql_query($sql); -		$row = $db->sql_fetchrow($result); -		$db->sql_freeresult($result); - -		if ($row) -		{ -			// User inactive... -			if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) -			{ -				return array( -					'status'		=> LOGIN_ERROR_ACTIVE, -					'error_msg'		=> 'ACTIVE_ERROR', -					'user_row'		=> $row, -				); -			} - -			// Successful login... -			return array( -				'status'		=> LOGIN_SUCCESS, -				'error_msg'		=> false, -				'user_row'		=> $row, -			); -		} - -		// this is the user's first login so create an empty profile -		return array( -			'status'		=> LOGIN_SUCCESS_CREATE_PROFILE, -			'error_msg'		=> false, -			'user_row'		=> user_row_apache($php_auth_user, $php_auth_pw), -		); -	} - -	// Not logged into apache -	return array( -		'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, -		'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE', -		'user_row'		=> array('user_id' => ANONYMOUS), -	); -} - -/** -* Autologin function -* -* @return array containing the user row or empty if no auto login should take place -*/ -function autologin_apache() -{ -	global $db; - -	if (!isset($_SERVER['PHP_AUTH_USER'])) -	{ -		return array(); -	} - -	$php_auth_user = $_SERVER['PHP_AUTH_USER']; -	$php_auth_pw = $_SERVER['PHP_AUTH_PW']; - -	if (!empty($php_auth_user) && !empty($php_auth_pw)) -	{ -		set_var($php_auth_user, $php_auth_user, 'string', true); -		set_var($php_auth_pw, $php_auth_pw, 'string', true); - -		$sql = 'SELECT * -			FROM ' . USERS_TABLE . " -			WHERE username = '" . $db->sql_escape($php_auth_user) . "'"; -		$result = $db->sql_query($sql); -		$row = $db->sql_fetchrow($result); -		$db->sql_freeresult($result); - -		if ($row) -		{ -			return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row; -		} - -		if (!function_exists('user_add')) -		{ -			global $phpbb_root_path, $phpEx; - -			include($phpbb_root_path . 'includes/functions_user.' . $phpEx); -		} - -		// create the user if he does not exist yet -		user_add(user_row_apache($php_auth_user, $php_auth_pw)); - -		$sql = 'SELECT * -			FROM ' . USERS_TABLE . " -			WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($php_auth_user)) . "'"; -		$result = $db->sql_query($sql); -		$row = $db->sql_fetchrow($result); -		$db->sql_freeresult($result); - -		if ($row) -		{ -			return $row; -		} -	} - -	return array(); -} - -/** -* This function generates an array which can be passed to the user_add function in order to create a user -*/ -function user_row_apache($username, $password) -{ -	global $db, $config, $user; -	// first retrieve default group id -	$sql = 'SELECT group_id -		FROM ' . GROUPS_TABLE . " -		WHERE group_name = '" . $db->sql_escape('REGISTERED') . "' -			AND group_type = " . GROUP_SPECIAL; -	$result = $db->sql_query($sql); -	$row = $db->sql_fetchrow($result); -	$db->sql_freeresult($result); - -	if (!$row) -	{ -		trigger_error('NO_GROUP'); -	} - -	// generate user account data -	return array( -		'username'		=> $username, -		'user_password'	=> phpbb_hash($password), -		'user_email'	=> '', -		'group_id'		=> (int) $row['group_id'], -		'user_type'		=> USER_NORMAL, -		'user_ip'		=> $user->ip, -		'user_new'		=> ($config['new_member_post_limit']) ? 1 : 0, -	); -} - -/** -* The session validation function checks whether the user is still logged in -* -* @return boolean true if the given user is authenticated or false if the session should be closed -*/ -function validate_session_apache(&$user) -{ -	// Check if PHP_AUTH_USER is set and handle this case -	if (isset($_SERVER['PHP_AUTH_USER'])) -	{ -		$php_auth_user = ''; -		set_var($php_auth_user, $_SERVER['PHP_AUTH_USER'], 'string', true); - -		return ($php_auth_user === $user['username']) ? true : false; -	} - -	// PHP_AUTH_USER is not set. A valid session is now determined by the user type (anonymous/bot or not) -	if ($user['user_type'] == USER_IGNORE) -	{ -		return true; -	} - -	return false; -} - -?>
\ No newline at end of file diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php deleted file mode 100644 index 1c6cdf7832..0000000000 --- a/phpBB/includes/auth/auth_db.php +++ /dev/null @@ -1,276 +0,0 @@ -<?php -/** -* Database auth plug-in for phpBB3 -* -* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him. -* -* This is for authentication via the integrated user table -* -* @package login -* @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/** -* Login function -* -* @param string $username -* @param string $password -* @param string $ip			IP address the login is taking place from. Used to -*							limit the number of login attempts per IP address. -* @param string $browser	The user agent used to login -* @param string $forwarded_for X_FORWARDED_FOR header sent with login request -* @return array				A associative array of the format -*							array( -*								'status' => status constant -*								'error_msg' => string -*								'user_row' => array -*							) -*/ -function login_db($username, $password, $ip = '', $browser = '', $forwarded_for = '') -{ -	global $db, $config; - -	// do not allow empty password -	if (!$password) -	{ -		return array( -			'status'	=> LOGIN_ERROR_PASSWORD, -			'error_msg'	=> 'NO_PASSWORD_SUPPLIED', -			'user_row'	=> array('user_id' => ANONYMOUS), -		); -	} - -	if (!$username) -	{ -		return array( -			'status'	=> LOGIN_ERROR_USERNAME, -			'error_msg'	=> 'LOGIN_ERROR_USERNAME', -			'user_row'	=> array('user_id' => ANONYMOUS), -		); -	} - -	$username_clean = utf8_clean_string($username); - -	$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts -		FROM ' . USERS_TABLE . " -		WHERE username_clean = '" . $db->sql_escape($username_clean) . "'"; -	$result = $db->sql_query($sql); -	$row = $db->sql_fetchrow($result); -	$db->sql_freeresult($result); - -	if (($ip && !$config['ip_login_limit_use_forwarded']) || -		($forwarded_for && $config['ip_login_limit_use_forwarded'])) -	{ -		$sql = 'SELECT COUNT(*) AS attempts -			FROM ' . LOGIN_ATTEMPT_TABLE . ' -			WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']); -		if ($config['ip_login_limit_use_forwarded']) -		{ -			$sql .= " AND attempt_forwarded_for = '" . $db->sql_escape($forwarded_for) . "'"; -		} -		else -		{ -			$sql .= " AND attempt_ip = '" . $db->sql_escape($ip) . "' "; -		} - -		$result = $db->sql_query($sql); -		$attempts = (int) $db->sql_fetchfield('attempts'); -		$db->sql_freeresult($result); - -		$attempt_data = array( -			'attempt_ip'			=> $ip, -			'attempt_browser'		=> trim(substr($browser, 0, 149)), -			'attempt_forwarded_for'	=> $forwarded_for, -			'attempt_time'			=> time(), -			'user_id'				=> ($row) ? (int) $row['user_id'] : 0, -			'username'				=> $username, -			'username_clean'		=> $username_clean, -		); -		$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $db->sql_build_array('INSERT', $attempt_data); -		$result = $db->sql_query($sql); -	} -	else -	{ -		$attempts = 0; -	} - -	if (!$row) -	{ -		if ($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max']) -		{ -			return array( -				'status'		=> LOGIN_ERROR_ATTEMPTS, -				'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS', -				'user_row'		=> array('user_id' => ANONYMOUS), -			); -		} - -		return array( -			'status'	=> LOGIN_ERROR_USERNAME, -			'error_msg'	=> 'LOGIN_ERROR_USERNAME', -			'user_row'	=> array('user_id' => ANONYMOUS), -		); -	} - -	$show_captcha = ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts']) || -		($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max']); - -	// If there are too much login attempts, we need to check for an confirm image -	// Every auth module is able to define what to do by itself... -	if ($show_captcha) -	{ -		// Visual Confirmation handling -		if (!class_exists('phpbb_captcha_factory')) -		{ -			global $phpbb_root_path, $phpEx; -			include ($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx); -		} - -		$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']); -		$captcha->init(CONFIRM_LOGIN); -		$vc_response = $captcha->validate($row); -		if ($vc_response) -		{ -			return array( -				'status'		=> LOGIN_ERROR_ATTEMPTS, -				'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS', -				'user_row'		=> $row, -			); -		} -		else -		{ -			$captcha->reset(); -		} - -	} - -	// If the password convert flag is set we need to convert it -	if ($row['user_pass_convert']) -	{ -		// in phpBB2 passwords were used exactly as they were sent, with addslashes applied -		$password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : ''; -		$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format; -		$password_new_format = ''; - -		set_var($password_new_format, stripslashes($password_old_format), 'string', true); - -		if ($password == $password_new_format) -		{ -			if (!function_exists('utf8_to_cp1252')) -			{ -				global $phpbb_root_path, $phpEx; -				include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx); -			} - -			// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding -			// plain md5 support left in for conversions from other systems. -			if ((strlen($row['user_password']) == 34 && (phpbb_check_hash(md5($password_old_format), $row['user_password']) || phpbb_check_hash(md5(utf8_to_cp1252($password_old_format)), $row['user_password']))) -				|| (strlen($row['user_password']) == 32  && (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password']))) -			{ -				$hash = phpbb_hash($password_new_format); - -				// Update the password in the users table to the new format and remove user_pass_convert flag -				$sql = 'UPDATE ' . USERS_TABLE . ' -					SET user_password = \'' . $db->sql_escape($hash) . '\', -						user_pass_convert = 0 -					WHERE user_id = ' . $row['user_id']; -				$db->sql_query($sql); - -				$row['user_pass_convert'] = 0; -				$row['user_password'] = $hash; -			} -			else -			{ -				// Although we weren't able to convert this password we have to -				// increase login attempt count to make sure this cannot be exploited -				$sql = 'UPDATE ' . USERS_TABLE . ' -					SET user_login_attempts = user_login_attempts + 1 -					WHERE user_id = ' . (int) $row['user_id'] . ' -						AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX; -				$db->sql_query($sql); - -				return array( -					'status'		=> LOGIN_ERROR_PASSWORD_CONVERT, -					'error_msg'		=> 'LOGIN_ERROR_PASSWORD_CONVERT', -					'user_row'		=> $row, -				); -			} -		} -	} - -	// Check password ... -	if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password'])) -	{ -		// Check for old password hash... -		if (strlen($row['user_password']) == 32) -		{ -			$hash = phpbb_hash($password); - -			// Update the password in the users table to the new format -			$sql = 'UPDATE ' . USERS_TABLE . " -				SET user_password = '" . $db->sql_escape($hash) . "', -					user_pass_convert = 0 -				WHERE user_id = {$row['user_id']}"; -			$db->sql_query($sql); - -			$row['user_password'] = $hash; -		} - -		$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . ' -			WHERE user_id = ' . $row['user_id']; -		$db->sql_query($sql); - -		if ($row['user_login_attempts'] != 0) -		{ -			// Successful, reset login attempts (the user passed all stages) -			$sql = 'UPDATE ' . USERS_TABLE . ' -				SET user_login_attempts = 0 -				WHERE user_id = ' . $row['user_id']; -			$db->sql_query($sql); -		} - -		// User inactive... -		if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) -		{ -			return array( -				'status'		=> LOGIN_ERROR_ACTIVE, -				'error_msg'		=> 'ACTIVE_ERROR', -				'user_row'		=> $row, -			); -		} - -		// Successful login... set user_login_attempts to zero... -		return array( -			'status'		=> LOGIN_SUCCESS, -			'error_msg'		=> false, -			'user_row'		=> $row, -		); -	} - -	// Password incorrect - increase login attempts -	$sql = 'UPDATE ' . USERS_TABLE . ' -		SET user_login_attempts = user_login_attempts + 1 -		WHERE user_id = ' . (int) $row['user_id'] . ' -			AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX; -	$db->sql_query($sql); - -	// Give status about wrong password... -	return array( -		'status'		=> ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD, -		'error_msg'		=> ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD', -		'user_row'		=> $row, -	); -} - -?> diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php deleted file mode 100644 index eebf147d48..0000000000 --- a/phpBB/includes/auth/auth_ldap.php +++ /dev/null @@ -1,353 +0,0 @@ -<?php -/** -* -* LDAP auth plug-in for phpBB3 -* -* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him. -* -* @package login -* @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/** -* Connect to ldap server -* Only allow changing authentication to ldap if we can connect to the ldap server -* Called in acp_board while setting authentication plugins -*/ -function init_ldap() -{ -	global $config, $user; - -	if (!@extension_loaded('ldap')) -	{ -		return $user->lang['LDAP_NO_LDAP_EXTENSION']; -	} - -	$config['ldap_port'] = (int) $config['ldap_port']; -	if ($config['ldap_port']) -	{ -		$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']); -	} -	else -	{ -		$ldap = @ldap_connect($config['ldap_server']); -	} - -	if (!$ldap) -	{ -		return $user->lang['LDAP_NO_SERVER_CONNECTION']; -	} - -	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); -	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); - -	if ($config['ldap_user'] || $config['ldap_password']) -	{ -		if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password']))) -		{ -			return $user->lang['LDAP_INCORRECT_USER_PASSWORD']; -		} -	} - -	// ldap_connect only checks whether the specified server is valid, so the connection might still fail -	$search = @ldap_search( -		$ldap, -		htmlspecialchars_decode($config['ldap_base_dn']), -		ldap_user_filter($user->data['username']), -		(empty($config['ldap_email'])) ? -			array(htmlspecialchars_decode($config['ldap_uid'])) : -			array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])), -		0, -		1 -	); - -	if ($search === false) -	{ -		return $user->lang['LDAP_SEARCH_FAILED']; -	} - -	$result = @ldap_get_entries($ldap, $search); - -	@ldap_close($ldap); - - -	if (!is_array($result) || sizeof($result) < 2) -	{ -		return sprintf($user->lang['LDAP_NO_IDENTITY'], $user->data['username']); -	} - -	if (!empty($config['ldap_email']) && !isset($result[0][htmlspecialchars_decode($config['ldap_email'])])) -	{ -		return $user->lang['LDAP_NO_EMAIL']; -	} - -	return false; -} - -/** -* Login function -*/ -function login_ldap(&$username, &$password) -{ -	global $db, $config, $user; - -	// do not allow empty password -	if (!$password) -	{ -		return array( -			'status'	=> LOGIN_ERROR_PASSWORD, -			'error_msg'	=> 'NO_PASSWORD_SUPPLIED', -			'user_row'	=> array('user_id' => ANONYMOUS), -		); -	} - -	if (!$username) -	{ -		return array( -			'status'	=> LOGIN_ERROR_USERNAME, -			'error_msg'	=> 'LOGIN_ERROR_USERNAME', -			'user_row'	=> array('user_id' => ANONYMOUS), -		); -	} - -	if (!@extension_loaded('ldap')) -	{ -		return array( -			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, -			'error_msg'		=> 'LDAP_NO_LDAP_EXTENSION', -			'user_row'		=> array('user_id' => ANONYMOUS), -		); -	} - -	$config['ldap_port'] = (int) $config['ldap_port']; -	if ($config['ldap_port']) -	{ -		$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']); -	} -	else -	{ -		$ldap = @ldap_connect($config['ldap_server']); -	} - -	if (!$ldap) -	{ -		return array( -			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, -			'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION', -			'user_row'		=> array('user_id' => ANONYMOUS), -		); -	} - -	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); -	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); - -	if ($config['ldap_user'] || $config['ldap_password']) -	{ -		if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password']))) -		{ -			return array( -				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, -				'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION', -				'user_row'		=> array('user_id' => ANONYMOUS), -			); -		} -	} - -	$search = @ldap_search( -		$ldap, -		htmlspecialchars_decode($config['ldap_base_dn']), -		ldap_user_filter($username), -		(empty($config['ldap_email'])) ? -			array(htmlspecialchars_decode($config['ldap_uid'])) : -			array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])), -		0, -		1 -	); - -	$ldap_result = @ldap_get_entries($ldap, $search); - -	if (is_array($ldap_result) && sizeof($ldap_result) > 1) -	{ -		if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password))) -		{ -			@ldap_close($ldap); - -			$sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type -				FROM ' . USERS_TABLE . " -				WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; -			$result = $db->sql_query($sql); -			$row = $db->sql_fetchrow($result); -			$db->sql_freeresult($result); - -			if ($row) -			{ -				unset($ldap_result); - -				// User inactive... -				if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) -				{ -					return array( -						'status'		=> LOGIN_ERROR_ACTIVE, -						'error_msg'		=> 'ACTIVE_ERROR', -						'user_row'		=> $row, -					); -				} - -				// Successful login... set user_login_attempts to zero... -				return array( -					'status'		=> LOGIN_SUCCESS, -					'error_msg'		=> false, -					'user_row'		=> $row, -				); -			} -			else -			{ -				// retrieve default group id -				$sql = 'SELECT group_id -					FROM ' . GROUPS_TABLE . " -					WHERE group_name = '" . $db->sql_escape('REGISTERED') . "' -						AND group_type = " . GROUP_SPECIAL; -				$result = $db->sql_query($sql); -				$row = $db->sql_fetchrow($result); -				$db->sql_freeresult($result); - -				if (!$row) -				{ -					trigger_error('NO_GROUP'); -				} - -				// generate user account data -				$ldap_user_row = array( -					'username'		=> $username, -					'user_password'	=> phpbb_hash($password), -					'user_email'	=> (!empty($config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($config['ldap_email'])][0]) : '', -					'group_id'		=> (int) $row['group_id'], -					'user_type'		=> USER_NORMAL, -					'user_ip'		=> $user->ip, -					'user_new'		=> ($config['new_member_post_limit']) ? 1 : 0, -				); - -				unset($ldap_result); - -				// this is the user's first login so create an empty profile -				return array( -					'status'		=> LOGIN_SUCCESS_CREATE_PROFILE, -					'error_msg'		=> false, -					'user_row'		=> $ldap_user_row, -				); -			} -		} -		else -		{ -			unset($ldap_result); -			@ldap_close($ldap); - -			// Give status about wrong password... -			return array( -				'status'		=> LOGIN_ERROR_PASSWORD, -				'error_msg'		=> 'LOGIN_ERROR_PASSWORD', -				'user_row'		=> array('user_id' => ANONYMOUS), -			); -		} -	} - -	@ldap_close($ldap); - -	return array( -		'status'	=> LOGIN_ERROR_USERNAME, -		'error_msg'	=> 'LOGIN_ERROR_USERNAME', -		'user_row'	=> array('user_id' => ANONYMOUS), -	); -} - -/** -* Generates a filter string for ldap_search to find a user -* -* @param	$username	string	Username identifying the searched user -* -* @return				string	A filter string for ldap_search -*/ -function ldap_user_filter($username) -{ -	global $config; - -	$filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')'; -	if ($config['ldap_user_filter']) -	{ -		$_filter = ($config['ldap_user_filter'][0] == '(' && substr($config['ldap_user_filter'], -1) == ')') ? $config['ldap_user_filter'] : "({$config['ldap_user_filter']})"; -		$filter = "(&{$filter}{$_filter})"; -	} -	return $filter; -} - -/** -* Escapes an LDAP AttributeValue -*/ -function ldap_escape($string) -{ -	return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string); -} - -/** -* This function is used to output any required fields in the authentication -* admin panel. It also defines any required configuration table fields. -*/ -function acp_ldap(&$new) -{ -	global $user; - -	$tpl = ' - -	<dl> -		<dt><label for="ldap_server">' . $user->lang['LDAP_SERVER'] . ':</label><br /><span>' . $user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt> -		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd> -	</dl> -	<dl> -		<dt><label for="ldap_port">' . $user->lang['LDAP_PORT'] . ':</label><br /><span>' . $user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt> -		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd> -	</dl> -	<dl> -		<dt><label for="ldap_dn">' . $user->lang['LDAP_DN'] . ':</label><br /><span>' . $user->lang['LDAP_DN_EXPLAIN'] . '</span></dt> -		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd> -	</dl> -	<dl> -		<dt><label for="ldap_uid">' . $user->lang['LDAP_UID'] . ':</label><br /><span>' . $user->lang['LDAP_UID_EXPLAIN'] . '</span></dt> -		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd> -	</dl> -	<dl> -		<dt><label for="ldap_user_filter">' . $user->lang['LDAP_USER_FILTER'] . ':</label><br /><span>' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt> -		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd> -	</dl> -	<dl> -		<dt><label for="ldap_email">' . $user->lang['LDAP_EMAIL'] . ':</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt> -		<dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd> -	</dl> -	<dl> -		<dt><label for="ldap_user">' . $user->lang['LDAP_USER'] . ':</label><br /><span>' . $user->lang['LDAP_USER_EXPLAIN'] . '</span></dt> -		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd> -	</dl> -	<dl> -		<dt><label for="ldap_password">' . $user->lang['LDAP_PASSWORD'] . ':</label><br /><span>' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt> -		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd> -	</dl> -	'; - -	// These are fields required in the config table -	return array( -		'tpl'		=> $tpl, -		'config'	=> array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password') -	); -} - -?>
\ No newline at end of file diff --git a/phpBB/includes/auth/provider/apache.php b/phpBB/includes/auth/provider/apache.php new file mode 100644 index 0000000000..5f6f2862b6 --- /dev/null +++ b/phpBB/includes/auth/provider/apache.php @@ -0,0 +1,275 @@ +<?php +/** +* +* @package auth +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** + * Apache authentication provider for phpBB3 + * + * @package auth + */ +class phpbb_auth_provider_apache implements phpbb_auth_provider_interface +{ +	/** +	 * Apache Authentication Constructor +	 * +	 * @param 	phpbb_db_driver 	$db +	 * @param 	phpbb_config 		$config +	 * @param 	phpbb_request 		$request +	 * @param 	phpbb_user 			$user +	 * @param 	string 				$phpbb_root_path +	 * @param 	string 				$php_ext +	 */ +	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext) +	{ +		$this->db = $db; +		$this->config = $config; +		$this->request = $request; +		$this->user = $user; +		$this->phpbb_root_path = $phpbb_root_path; +		$this->php_ext = $php_ext; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function init() +	{ +		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'))) +		{ +			return $this->user->lang['APACHE_SETUP_BEFORE_USE']; +		} +		return false; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function login($username, $password) +	{ +		// do not allow empty password +		if (!$password) +		{ +			return array( +				'status'	=> LOGIN_ERROR_PASSWORD, +				'error_msg'	=> 'NO_PASSWORD_SUPPLIED', +				'user_row'	=> array('user_id' => ANONYMOUS), +			); +		} + +		if (!$username) +		{ +			return array( +				'status'	=> LOGIN_ERROR_USERNAME, +				'error_msg'	=> 'LOGIN_ERROR_USERNAME', +				'user_row'	=> array('user_id' => ANONYMOUS), +			); +		} + +		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER)) +		{ +			return array( +				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, +				'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE', +				'user_row'		=> array('user_id' => ANONYMOUS), +			); +		} + +		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER')); +		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW')); + +		if (!empty($php_auth_user) && !empty($php_auth_pw)) +		{ +			if ($php_auth_user !== $username) +			{ +				return array( +					'status'	=> LOGIN_ERROR_USERNAME, +					'error_msg'	=> 'LOGIN_ERROR_USERNAME', +					'user_row'	=> array('user_id' => ANONYMOUS), +				); +			} + +			$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type +				FROM ' . USERS_TABLE . " +				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'"; +			$result = $this->db->sql_query($sql); +			$row = $this->db->sql_fetchrow($result); +			$this->db->sql_freeresult($result); + +			if ($row) +			{ +				// User inactive... +				if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) +				{ +					return array( +						'status'		=> LOGIN_ERROR_ACTIVE, +						'error_msg'		=> 'ACTIVE_ERROR', +						'user_row'		=> $row, +					); +				} + +				// Successful login... +				return array( +					'status'		=> LOGIN_SUCCESS, +					'error_msg'		=> false, +					'user_row'		=> $row, +				); +			} + +			// this is the user's first login so create an empty profile +			return array( +				'status'		=> LOGIN_SUCCESS_CREATE_PROFILE, +				'error_msg'		=> false, +				'user_row'		=> user_row_apache($php_auth_user, $php_auth_pw), +			); +		} + +		// Not logged into apache +		return array( +			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, +			'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE', +			'user_row'		=> array('user_id' => ANONYMOUS), +		); +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function autologin() +	{ +		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER)) +		{ +			return array(); +		} + +		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER')); +		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW')); + +		if (!empty($php_auth_user) && !empty($php_auth_pw)) +		{ +			set_var($php_auth_user, $php_auth_user, 'string', true); +			set_var($php_auth_pw, $php_auth_pw, 'string', true); + +			$sql = 'SELECT * +				FROM ' . USERS_TABLE . " +				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'"; +			$result = $this->db->sql_query($sql); +			$row = $this->db->sql_fetchrow($result); +			$this->db->sql_freeresult($result); + +			if ($row) +			{ +				return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row; +			} + +			if (!function_exists('user_add')) +			{ +				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); +			} + +			// create the user if he does not exist yet +			user_add(user_row_apache($php_auth_user, $php_auth_pw)); + +			$sql = 'SELECT * +				FROM ' . USERS_TABLE . " +				WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($php_auth_user)) . "'"; +			$result = $this->db->sql_query($sql); +			$row = $this->db->sql_fetchrow($result); +			$this->db->sql_freeresult($result); + +			if ($row) +			{ +				return $row; +			} +		} + +		return array(); +	} + +	/** +	 * This function generates an array which can be passed to the user_add +	 * function in order to create a user +	 * +	 * @param 	string	$username 	The username of the new user. +	 * @param 	string	$password 	The password of the new user. +	 * @return 	array 				Contains data that can be passed directly to +	 *								the user_add function. +	 */ +	private function user_row($username, $password) +	{ +		// first retrieve default group id +		$sql = 'SELECT group_id +			FROM ' . GROUPS_TABLE . " +			WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "' +				AND group_type = " . GROUP_SPECIAL; +		$result = $this->db->sql_query($sql); +		$row = $this->db->sql_fetchrow($result); +		$this->db->sql_freeresult($result); + +		if (!$row) +		{ +			trigger_error('NO_GROUP'); +		} + +		// generate user account data +		return array( +			'username'		=> $username, +			'user_password'	=> phpbb_hash($password), +			'user_email'	=> '', +			'group_id'		=> (int) $row['group_id'], +			'user_type'		=> USER_NORMAL, +			'user_ip'		=> $this->user->ip, +			'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0, +		); +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function validate_session($user) +	{ +		// Check if PHP_AUTH_USER is set and handle this case +		if ($this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER)) +		{ +			$php_auth_user = $this->request->server('PHP_AUTH_USER'); + +			return ($php_auth_user === $user['username']) ? true : false; +		} + +		// PHP_AUTH_USER is not set. A valid session is now determined by the user type (anonymous/bot or not) +		if ($user['user_type'] == USER_IGNORE) +		{ +			return true; +		} + +		return false; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function acp($new) +	{ +		return; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function logout($data, $new_session) +	{ +		return; +	} +} diff --git a/phpBB/includes/auth/provider/db.php b/phpBB/includes/auth/provider/db.php new file mode 100644 index 0000000000..894041c9cf --- /dev/null +++ b/phpBB/includes/auth/provider/db.php @@ -0,0 +1,337 @@ +<?php +/** +* +* @package auth +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** + * Database authentication provider for phpBB3 + * + * This is for authentication via the integrated user table + * + * @package auth + */ +class phpbb_auth_provider_db implements phpbb_auth_provider_interface +{ + +	/** +	 * Database Authentication Constructor +	 * +	 * @param	phpbb_db_driver	$db +	 * @param	phpbb_config 	$config +	 * @param	phpbb_request	$request +	 * @param	phpbb_user		$user +	 * @param	string			$phpbb_root_path +	 * @param	string			$php_ext +	 */ +	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext) +	{ +		$this->db = $db; +		$this->config = $config; +		$this->request = $request; +		$this->user = $user; +		$this->phpbb_root_path = $phpbb_root_path; +		$this->php_ext = $php_ext; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function init() +	{ +		return; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function login($username, $password) +	{ +		// Auth plugins get the password untrimmed. +		// For compatibility we trim() here. +		$password = trim($password); + +		// do not allow empty password +		if (!$password) +		{ +			return array( +				'status'	=> LOGIN_ERROR_PASSWORD, +				'error_msg'	=> 'NO_PASSWORD_SUPPLIED', +				'user_row'	=> array('user_id' => ANONYMOUS), +			); +		} + +		if (!$username) +		{ +			return array( +				'status'	=> LOGIN_ERROR_USERNAME, +				'error_msg'	=> 'LOGIN_ERROR_USERNAME', +				'user_row'	=> array('user_id' => ANONYMOUS), +			); +		} + +		$username_clean = utf8_clean_string($username); + +		$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts +			FROM ' . USERS_TABLE . " +			WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'"; +		$result = $this->db->sql_query($sql); +		$row = $this->db->sql_fetchrow($result); +		$this->db->sql_freeresult($result); + +		if (($this->user->ip && !$this->config['ip_login_limit_use_forwarded']) || +			($this->user->forwarded_for && $this->config['ip_login_limit_use_forwarded'])) +		{ +			$sql = 'SELECT COUNT(*) AS attempts +				FROM ' . LOGIN_ATTEMPT_TABLE . ' +				WHERE attempt_time > ' . (time() - (int) $this->config['ip_login_limit_time']); +			if ($this->config['ip_login_limit_use_forwarded']) +			{ +				$sql .= " AND attempt_forwarded_for = '" . $this->db->sql_escape($this->user->forwarded_for) . "'"; +			} +			else +			{ +				$sql .= " AND attempt_ip = '" . $this->db->sql_escape($this->user->ip) . "' "; +			} + +			$result = $this->db->sql_query($sql); +			$attempts = (int) $this->db->sql_fetchfield('attempts'); +			$this->db->sql_freeresult($result); + +			$attempt_data = array( +				'attempt_ip'			=> $this->user->ip, +				'attempt_browser'		=> trim(substr($this->user->browser, 0, 149)), +				'attempt_forwarded_for'	=> $this->user->forwarded_for, +				'attempt_time'			=> time(), +				'user_id'				=> ($row) ? (int) $row['user_id'] : 0, +				'username'				=> $username, +				'username_clean'		=> $username_clean, +			); +			$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $this->db->sql_build_array('INSERT', $attempt_data); +			$result = $this->db->sql_query($sql); +		} +		else +		{ +			$attempts = 0; +		} + +		if (!$row) +		{ +			if ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']) +			{ +				return array( +					'status'		=> LOGIN_ERROR_ATTEMPTS, +					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS', +					'user_row'		=> array('user_id' => ANONYMOUS), +				); +			} + +			return array( +				'status'	=> LOGIN_ERROR_USERNAME, +				'error_msg'	=> 'LOGIN_ERROR_USERNAME', +				'user_row'	=> array('user_id' => ANONYMOUS), +			); +		} + +		$show_captcha = ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) || +			($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']); + +		// If there are too many login attempts, we need to check for a confirm image +		// Every auth module is able to define what to do by itself... +		if ($show_captcha) +		{ +			// Visual Confirmation handling +			if (!class_exists('phpbb_captcha_factory', false)) +			{ +				include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->php_ext); +			} + +			$captcha = phpbb_captcha_factory::get_instance($this->config['captcha_plugin']); +			$captcha->init(CONFIRM_LOGIN); +			$vc_response = $captcha->validate($row); +			if ($vc_response) +			{ +				return array( +					'status'		=> LOGIN_ERROR_ATTEMPTS, +					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS', +					'user_row'		=> $row, +				); +			} +			else +			{ +				$captcha->reset(); +			} + +		} + +		// If the password convert flag is set we need to convert it +		if ($row['user_pass_convert']) +		{ +			// enable super globals to get literal value +			// this is needed to prevent unicode normalization +			$super_globals_disabled = $this->request->super_globals_disabled(); +			if ($super_globals_disabled) +			{ +				$this->request->enable_super_globals(); +			} + +			// in phpBB2 passwords were used exactly as they were sent, with addslashes applied +			$password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : ''; +			$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format; +			$password_new_format = $this->request->variable('password', '', true); + +			if ($super_globals_disabled) +			{ +				$this->request->disable_super_globals(); +			} + +			if ($password == $password_new_format) +			{ +				if (!function_exists('utf8_to_cp1252')) +				{ +					include($this->phpbb_root_path . 'includes/utf/data/recode_basic.' . $this->php_ext); +				} + +				// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding +				// plain md5 support left in for conversions from other systems. +				if ((strlen($row['user_password']) == 34 && (phpbb_check_hash(md5($password_old_format), $row['user_password']) || phpbb_check_hash(md5(utf8_to_cp1252($password_old_format)), $row['user_password']))) +					|| (strlen($row['user_password']) == 32  && (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password']))) +				{ +					$hash = phpbb_hash($password_new_format); + +					// Update the password in the users table to the new format and remove user_pass_convert flag +					$sql = 'UPDATE ' . USERS_TABLE . ' +						SET user_password = \'' . $this->db->sql_escape($hash) . '\', +							user_pass_convert = 0 +						WHERE user_id = ' . $row['user_id']; +					$this->db->sql_query($sql); + +					$row['user_pass_convert'] = 0; +					$row['user_password'] = $hash; +				} +				else +				{ +					// Although we weren't able to convert this password we have to +					// increase login attempt count to make sure this cannot be exploited +					$sql = 'UPDATE ' . USERS_TABLE . ' +						SET user_login_attempts = user_login_attempts + 1 +						WHERE user_id = ' . (int) $row['user_id'] . ' +							AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX; +					$this->db->sql_query($sql); + +					return array( +						'status'		=> LOGIN_ERROR_PASSWORD_CONVERT, +						'error_msg'		=> 'LOGIN_ERROR_PASSWORD_CONVERT', +						'user_row'		=> $row, +					); +				} +			} +		} + +		// Check password ... +		if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password'])) +		{ +			// Check for old password hash... +			if (strlen($row['user_password']) == 32) +			{ +				$hash = phpbb_hash($password); + +				// Update the password in the users table to the new format +				$sql = 'UPDATE ' . USERS_TABLE . " +					SET user_password = '" . $this->db->sql_escape($hash) . "', +						user_pass_convert = 0 +					WHERE user_id = {$row['user_id']}"; +				$this->db->sql_query($sql); + +				$row['user_password'] = $hash; +			} + +			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . ' +				WHERE user_id = ' . $row['user_id']; +			$this->db->sql_query($sql); + +			if ($row['user_login_attempts'] != 0) +			{ +				// Successful, reset login attempts (the user passed all stages) +				$sql = 'UPDATE ' . USERS_TABLE . ' +					SET user_login_attempts = 0 +					WHERE user_id = ' . $row['user_id']; +				$this->db->sql_query($sql); +			} + +			// User inactive... +			if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) +			{ +				return array( +					'status'		=> LOGIN_ERROR_ACTIVE, +					'error_msg'		=> 'ACTIVE_ERROR', +					'user_row'		=> $row, +				); +			} + +			// Successful login... set user_login_attempts to zero... +			return array( +				'status'		=> LOGIN_SUCCESS, +				'error_msg'		=> false, +				'user_row'		=> $row, +			); +		} + +		// Password incorrect - increase login attempts +		$sql = 'UPDATE ' . USERS_TABLE . ' +			SET user_login_attempts = user_login_attempts + 1 +			WHERE user_id = ' . (int) $row['user_id'] . ' +				AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX; +		$this->db->sql_query($sql); + +		// Give status about wrong password... +		return array( +			'status'		=> ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD, +			'error_msg'		=> ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD', +			'user_row'		=> $row, +		); +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function autologin() +	{ +		return; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function acp($new) +	{ +		return; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function logout($data, $new_session) +	{ +		return; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function validate_session($user) +	{ +		return; +	} +} diff --git a/phpBB/includes/auth/provider/index.htm b/phpBB/includes/auth/provider/index.htm new file mode 100644 index 0000000000..ee1f723a7d --- /dev/null +++ b/phpBB/includes/auth/provider/index.htm @@ -0,0 +1,10 @@ +<html> +<head> +<title></title> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +</head> + +<body bgcolor="#FFFFFF" text="#000000"> + +</body> +</html> diff --git a/phpBB/includes/auth/provider/interface.php b/phpBB/includes/auth/provider/interface.php new file mode 100644 index 0000000000..2d1935f8f0 --- /dev/null +++ b/phpBB/includes/auth/provider/interface.php @@ -0,0 +1,93 @@ +<?php +/** +* +* @package auth +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** + * The interface authentication provider classes have to implement. + * + * @package auth + */ +interface phpbb_auth_provider_interface +{ +	/** +	 * Checks whether the user is currently identified to the authentication +	 * provider. +	 * Called in acp_board while setting authentication plugins. +	 * Changing to an authentication provider will not be permitted in acp_board +	 * if there is an error. +	 * +	 * @return 	boolean|string 	False if the user is identified, otherwise an +	 *							error message, or null if not implemented. +	 */ +	public function init(); + +	/** +	 * Performs login. +	 * +	 * @param	string	$username 	The name of the user being authenticated. +	 * @param	string	$password	The password of the user. +	 * @return	array	An associative array of the format: +	 *						array( +	 *							'status' => status constant +	 *							'error_msg' => string +	 *							'user_row' => array +	 *						) +	 */ +	public function login($username, $password); + +	/** +	 * Autologin function +	 * +	 * @return 	array|null	containing the user row, empty if no auto login +	 * 						should take place, or null if not impletmented. +	 */ +	public function autologin(); + +	/** +	 * This function is used to output any required fields in the authentication +	 * admin panel. It also defines any required configuration table fields. +	 * +	 * @param 	array 	$new 	Contains the new configuration values that have +	 * 							been set in acp_board. +	 * @return	array|null	Returns null if not implemented or an array of the +	 *						form: +	 *							array( +	 *								'tpl'		=> string +	 *								'config' 	=> array +	 *							) +	 */ +	public function acp($new); + +	/** +	 * Performs additional actions during logout. +	 * +	 * @param 	array	$data			An array corresponding to +	 *									phpbb_session::data +	 * @param 	boolean	$new_session	True for a new session, false for no new +	 *									session. +	 */ +	public function logout($data, $new_session); + +	/** +	 * The session validation function checks whether the user is still logged +	 * into phpBB. +	 * +	 * @param 	array 	$user +	 * @return 	boolean	true if the given user is authenticated, false if the  +	 * 					session should be closed, or null if not implemented. +	 */ +	public function validate_session($user); +} diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php new file mode 100644 index 0000000000..f67c1e9247 --- /dev/null +++ b/phpBB/includes/auth/provider/ldap.php @@ -0,0 +1,386 @@ +<?php +/** +* +* @package auth +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** + * Database authentication provider for phpBB3 + * + * This is for authentication via the integrated user table + * + * @package auth + */ +class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface +{ +	/** +	 * LDAP Authentication Constructor +	 * +	 * @param 	phpbb_db_driver	$db +	 * @param 	phpbb_config	$config +	 * @param 	phpbb_user		$user +	 */ +	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user) +	{ +		$this->db = $db; +		$this->config = $config; +		$this->user = $user; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function init() +	{ +		if (!@extension_loaded('ldap')) +		{ +			return $this->user->lang['LDAP_NO_LDAP_EXTENSION']; +		} + +		$this->config['ldap_port'] = (int) $this->config['ldap_port']; +		if ($this->config['ldap_port']) +		{ +			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']); +		} +		else +		{ +			$ldap = @ldap_connect($this->config['ldap_server']); +		} + +		if (!$ldap) +		{ +			return $this->user->lang['LDAP_NO_SERVER_CONNECTION']; +		} + +		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); +		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); + +		if ($this->config['ldap_user'] || $this->config['ldap_password']) +		{ +			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password']))) +			{ +				return $this->user->lang['LDAP_INCORRECT_USER_PASSWORD']; +			} +		} + +		// ldap_connect only checks whether the specified server is valid, so the connection might still fail +		$search = @ldap_search( +			$ldap, +			htmlspecialchars_decode($this->config['ldap_base_dn']), +			$this->ldap_user_filter($this->user->data['username']), +			(empty($this->config['ldap_email'])) ? +				array(htmlspecialchars_decode($this->config['ldap_uid'])) : +				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])), +			0, +			1 +		); + +		if ($search === false) +		{ +			return $this->user->lang['LDAP_SEARCH_FAILED']; +		} + +		$result = @ldap_get_entries($ldap, $search); + +		@ldap_close($ldap); + + +		if (!is_array($result) || sizeof($result) < 2) +		{ +			return sprintf($this->user->lang['LDAP_NO_IDENTITY'], $this->user->data['username']); +		} + +		if (!empty($this->config['ldap_email']) && !isset($result[0][htmlspecialchars_decode($this->config['ldap_email'])])) +		{ +			return $this->user->lang['LDAP_NO_EMAIL']; +		} + +		return false; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function login($username, $password) +	{ +		// do not allow empty password +		if (!$password) +		{ +			return array( +				'status'	=> LOGIN_ERROR_PASSWORD, +				'error_msg'	=> 'NO_PASSWORD_SUPPLIED', +				'user_row'	=> array('user_id' => ANONYMOUS), +			); +		} + +		if (!$username) +		{ +			return array( +				'status'	=> LOGIN_ERROR_USERNAME, +				'error_msg'	=> 'LOGIN_ERROR_USERNAME', +				'user_row'	=> array('user_id' => ANONYMOUS), +			); +		} + +		if (!@extension_loaded('ldap')) +		{ +			return array( +				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, +				'error_msg'		=> 'LDAP_NO_LDAP_EXTENSION', +				'user_row'		=> array('user_id' => ANONYMOUS), +			); +		} + +		$this->config['ldap_port'] = (int) $this->config['ldap_port']; +		if ($this->config['ldap_port']) +		{ +			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']); +		} +		else +		{ +			$ldap = @ldap_connect($this->config['ldap_server']); +		} + +		if (!$ldap) +		{ +			return array( +				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, +				'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION', +				'user_row'		=> array('user_id' => ANONYMOUS), +			); +		} + +		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); +		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); + +		if ($this->config['ldap_user'] || $this->config['ldap_password']) +		{ +			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password']))) +			{ +				return array( +					'status'		=> LOGIN_ERROR_EXTERNAL_AUTH, +					'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION', +					'user_row'		=> array('user_id' => ANONYMOUS), +				); +			} +		} + +		$search = @ldap_search( +			$ldap, +			htmlspecialchars_decode($this->config['ldap_base_dn']), +			$this->ldap_user_filter($username), +			(empty($this->config['ldap_email'])) ? +				array(htmlspecialchars_decode($this->config['ldap_uid'])) : +				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])), +			0, +			1 +		); + +		$ldap_result = @ldap_get_entries($ldap, $search); + +		if (is_array($ldap_result) && sizeof($ldap_result) > 1) +		{ +			if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password))) +			{ +				@ldap_close($ldap); + +				$sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type +					FROM ' . USERS_TABLE . " +					WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($username)) . "'"; +				$result = $this->db->sql_query($sql); +				$row = $this->db->sql_fetchrow($result); +				$this->db->sql_freeresult($result); + +				if ($row) +				{ +					unset($ldap_result); + +					// User inactive... +					if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) +					{ +						return array( +							'status'		=> LOGIN_ERROR_ACTIVE, +							'error_msg'		=> 'ACTIVE_ERROR', +							'user_row'		=> $row, +						); +					} + +					// Successful login... set user_login_attempts to zero... +					return array( +						'status'		=> LOGIN_SUCCESS, +						'error_msg'		=> false, +						'user_row'		=> $row, +					); +				} +				else +				{ +					// retrieve default group id +					$sql = 'SELECT group_id +						FROM ' . GROUPS_TABLE . " +						WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "' +							AND group_type = " . GROUP_SPECIAL; +					$result = $this->db->sql_query($sql); +					$row = $this->db->sql_fetchrow($result); +					$this->db->sql_freeresult($result); + +					if (!$row) +					{ +						trigger_error('NO_GROUP'); +					} + +					// generate user account data +					$ldap_user_row = array( +						'username'		=> $username, +						'user_password'	=> phpbb_hash($password), +						'user_email'	=> (!empty($this->config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($this->config['ldap_email'])][0]) : '', +						'group_id'		=> (int) $row['group_id'], +						'user_type'		=> USER_NORMAL, +						'user_ip'		=> $this->user->ip, +						'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0, +					); + +					unset($ldap_result); + +					// this is the user's first login so create an empty profile +					return array( +						'status'		=> LOGIN_SUCCESS_CREATE_PROFILE, +						'error_msg'		=> false, +						'user_row'		=> $ldap_user_row, +					); +				} +			} +			else +			{ +				unset($ldap_result); +				@ldap_close($ldap); + +				// Give status about wrong password... +				return array( +					'status'		=> LOGIN_ERROR_PASSWORD, +					'error_msg'		=> 'LOGIN_ERROR_PASSWORD', +					'user_row'		=> array('user_id' => ANONYMOUS), +				); +			} +		} + +		@ldap_close($ldap); + +		return array( +			'status'	=> LOGIN_ERROR_USERNAME, +			'error_msg'	=> 'LOGIN_ERROR_USERNAME', +			'user_row'	=> array('user_id' => ANONYMOUS), +		); +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function autologin() +	{ +		return; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function acp($new) +	{ +		$tpl = ' + +		<dl> +			<dt><label for="ldap_server">' . $this->user->lang['LDAP_SERVER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt> +			<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd> +		</dl> +		<dl> +			<dt><label for="ldap_port">' . $this->user->lang['LDAP_PORT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt> +			<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd> +		</dl> +		<dl> +			<dt><label for="ldap_dn">' . $this->user->lang['LDAP_DN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_DN_EXPLAIN'] . '</span></dt> +			<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd> +		</dl> +		<dl> +			<dt><label for="ldap_uid">' . $this->user->lang['LDAP_UID'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_UID_EXPLAIN'] . '</span></dt> +			<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd> +		</dl> +		<dl> +			<dt><label for="ldap_user_filter">' . $this->user->lang['LDAP_USER_FILTER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt> +			<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd> +		</dl> +		<dl> +			<dt><label for="ldap_email">' . $this->user->lang['LDAP_EMAIL'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt> +			<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd> +		</dl> +		<dl> +			<dt><label for="ldap_user">' . $this->user->lang['LDAP_USER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_EXPLAIN'] . '</span></dt> +			<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd> +		</dl> +		<dl> +			<dt><label for="ldap_password">' . $this->user->lang['LDAP_PASSWORD'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt> +			<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd> +		</dl> +		'; + +		// These are fields required in the config table +		return array( +			'tpl'		=> $tpl, +			'config'	=> array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password') +		); +	} + +	/** +	 * Generates a filter string for ldap_search to find a user +	 * +	 * @param	$username	string	Username identifying the searched user +	 * +	 * @return				string	A filter string for ldap_search +	 */ +	private function ldap_user_filter($username) +	{ +		$filter = '(' . $this->config['ldap_uid'] . '=' . $this->ldap_escape(htmlspecialchars_decode($username)) . ')'; +		if ($this->config['ldap_user_filter']) +		{ +			$_filter = ($this->config['ldap_user_filter'][0] == '(' && substr($this->config['ldap_user_filter'], -1) == ')') ? $this->config['ldap_user_filter'] : "({$this->config['ldap_user_filter']})"; +			$filter = "(&{$filter}{$_filter})"; +		} +		return $filter; +	} + +	/** +	 * Escapes an LDAP AttributeValue +	 * +	 * @param	string	$string	The string to be escaped +	 * @return	string	The escaped string +	 */ +	private function ldap_escape($string) +	{ +		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string); +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function logout($data, $new_session) +	{ +		return; +	} + +	/** +	 * {@inheritdoc} +	 */ +	public function validate_session($user) +	{ +		return; +	} +} | 
