makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/sec-184] Do not output LDAP password to HTML

Browse source 
SECURITY-184
This commit is contained in:
Joas Schilling 2015-06-04 14:29:03 +02:00
parent 9c84b3b5fb
commit 78b0c938a2
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/acp/acp_board.php
View file

@ -567,6 +567,7 @@ class acp_board
$old_auth_config = array(); $old_auth_config = array();
foreach ($auth_providers as $provider) foreach ($auth_providers as $provider)
{ {
/** @var \phpbb\auth\provider\provider_interface $provider */
if ($fields = $provider->acp()) if ($fields = $provider->acp())
{ {
// Check if we need to create config fields for this plugin and save config when submit was pressed // Check if we need to create config fields for this plugin and save config when submit was pressed
@ -582,6 +583,14 @@ class acp_board
continue; continue;
} }
if (substr($field, -9) === '_password' && $cfg_array[$field] === '********')
{
// Do not update password fields if the content is ********,
// because that is the password replacement we use to not
// send the password to the output
continue;
}
$old_auth_config[$field] = $this->new_config[$field]; $old_auth_config[$field] = $this->new_config[$field];
$config_value = $cfg_array[$field]; $config_value = $cfg_array[$field];
$this->new_config[$field] = $config_value; $this->new_config[$field] = $config_value;

3
phpBB/phpbb/auth/provider/ldap.php
View file

@ -289,7 +289,6 @@ class ldap extends \phpbb\auth\provider\base
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function acp() public function acp()
{ {
// These are fields required in the config table // These are fields required in the config table
@ -308,7 +307,7 @@ class ldap extends \phpbb\auth\provider\base
'TEMPLATE_VARS' => array( 'TEMPLATE_VARS' => array(
'AUTH_LDAP_BASE_DN' => $new_config['ldap_base_dn'], 'AUTH_LDAP_BASE_DN' => $new_config['ldap_base_dn'],
'AUTH_LDAP_EMAIL' => $new_config['ldap_email'], 'AUTH_LDAP_EMAIL' => $new_config['ldap_email'],
'AUTH_LDAP_PASSORD' => $new_config['ldap_password'], 'AUTH_LDAP_PASSORD' => $new_config['ldap_password'] !== '' ? '********' : '',
'AUTH_LDAP_PORT' => $new_config['ldap_port'], 'AUTH_LDAP_PORT' => $new_config['ldap_port'],
'AUTH_LDAP_SERVER' => $new_config['ldap_server'], 'AUTH_LDAP_SERVER' => $new_config['ldap_server'],
'AUTH_LDAP_UID' => $new_config['ldap_uid'], 'AUTH_LDAP_UID' => $new_config['ldap_uid'],