mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #976 from nextcloud/downstream-25702 

Hide the LDAP password in the client side
This commit is contained in:
Lukas Reschke 2016-08-28 15:06:27 +02:00 committed by GitHub
parent 25f1fdb275 5b4e752079
commit 3647fbe7cd
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/user_ldap/ajax/getConfiguration.php
View File

@ -32,4 +32,9 @@ OCP\JSON::callCheck();
$prefix = (string)$_POST['ldap_serverconfig_chooser']; $prefix = (string)$_POST['ldap_serverconfig_chooser'];
$ldapWrapper = new OCA\User_LDAP\LDAP(); $ldapWrapper = new OCA\User_LDAP\LDAP();
$connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
OCP\JSON::success(array('configuration' => $connection->getConfiguration())); $configuration = $connection->getConfiguration();
if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') {
// hide password
$configuration['ldap_agent_password'] = '**PASSWORD SET**';
}
OCP\JSON::success(array('configuration' => $configuration));

16
apps/user_ldap/ajax/testConfiguration.php
View File

@ -33,12 +33,19 @@ OCP\JSON::callCheck();
$l = \OC::$server->getL10N('user_ldap'); $l = \OC::$server->getL10N('user_ldap');
$ldapWrapper = new OCA\User_LDAP\LDAP(); $ldapWrapper = new OCA\User_LDAP\LDAP();
$connection = new \OCA\User_LDAP\Connection($ldapWrapper, '', null); $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $_POST['ldap_serverconfig_chooser']);
//needs to be true, otherwise it will also fail with an irritating message
$_POST['ldap_configuration_active'] = 1;
try { try {
if ($connection->setConfiguration($_POST)) { $configurationOk = true;
$conf = $connection->getConfiguration();
if ($conf['ldap_configuration_active'] === '0') {
//needs to be true, otherwise it will also fail with an irritating message
$conf['ldap_configuration_active'] = '1';
$configurationOk = $connection->setConfiguration($conf);
}
if ($configurationOk) {
//Configuration is okay
/* /*
* Clossing the session since it won't be used from this point on. There might be a potential * Clossing the session since it won't be used from this point on. There might be a potential
* race condition if a second request is made: either this request or the other might not * race condition if a second request is made: either this request or the other might not
@ -46,7 +53,6 @@ try {
* problem with that other than the extra connection. * problem with that other than the extra connection.
*/ */
\OC::$server->getSession()->close(); \OC::$server->getSession()->close();
//Configuration is okay
if ($connection->bind()) { if ($connection->bind()) {
/* /*
* This shiny if block is an ugly hack to find out whether anonymous * This shiny if block is an ugly hack to find out whether anonymous

2
apps/user_ldap/js/wizard/configModel.js
View File

@ -318,7 +318,7 @@ OCA = OCA || {};
*/ */
requestConfigurationTest: function() { requestConfigurationTest: function() {
var url = OC.generateUrl('apps/user_ldap/ajax/testConfiguration.php'); var url = OC.generateUrl('apps/user_ldap/ajax/testConfiguration.php');
var params = OC.buildQueryString(this.configuration); var params = OC.buildQueryString({ldap_serverconfig_chooser: this.configID});
var model = this; var model = this;
$.post(url, params, function(result) { model._processTestResult(model, result) }); $.post(url, params, function(result) { model._processTestResult(model, result) });
//TODO: make sure only one test is running at a time //TODO: make sure only one test is running at a time

2
apps/user_ldap/js/wizard/view.js
View File

@ -271,7 +271,7 @@ OCA = OCA || {};
* requests a configuration test * requests a configuration test
*/ */
onTestButtonClick: function() { onTestButtonClick: function() {
this.configModel.requestWizard('ldap_action_test_connection', this.configModel.configuration); this.configModel.requestWizard('ldap_action_test_connection', {ldap_serverconfig_chooser: this.configModel.configID});
}, },
/** /**