summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/ajax
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2015-05-07 21:09:10 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-05-18 18:14:05 +0200
commitb9e53097577499b519f9fcdd053421cb1507bab3 (patch)
tree993d979ffb581936309934c2a2d068f61c1ebdb2 /apps/user_ldap/ajax
parentb085f5855362bb8c305083c1d60ebfd459323a96 (diff)
downloadnextcloud-server-b9e53097577499b519f9fcdd053421cb1507bab3.tar.gz
nextcloud-server-b9e53097577499b519f9fcdd053421cb1507bab3.zip
catch unallowed anonymous auth attempt and show specific error
Diffstat (limited to 'apps/user_ldap/ajax')
-rw-r--r--apps/user_ldap/ajax/testConfiguration.php21
1 files changed, 13 insertions, 8 deletions
diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php
index 31f72a38e0b..289957764a1 100644
--- a/apps/user_ldap/ajax/testConfiguration.php
+++ b/apps/user_ldap/ajax/testConfiguration.php
@@ -34,16 +34,21 @@ $ldapWrapper = new OCA\user_ldap\lib\LDAP();
$connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null);
//needs to be true, otherwise it will also fail with an irritating message
$_POST['ldap_configuration_active'] = 1;
-if($connection->setConfiguration($_POST)) {
- //Configuration is okay
- if($connection->bind()) {
- OCP\JSON::success(array('message'
+
+try {
+ if ($connection->setConfiguration($_POST)) {
+ //Configuration is okay
+ if ($connection->bind()) {
+ OCP\JSON::success(array('message'
=> $l->t('The configuration is valid and the connection could be established!')));
+ } else {
+ OCP\JSON::error(array('message'
+ => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
+ }
} else {
OCP\JSON::error(array('message'
- => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
- }
-} else {
- OCP\JSON::error(array('message'
=> $l->t('The configuration is invalid. Please have a look at the logs for further details.')));
+ }
+} catch (\Exception $e) {
+ OCP\JSON::error(array('message' => $e->getMessage()));
}