tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error message when no authentication method available 

The error handling for configuration files has slightly changed (non
existent files are treated as empty) so the authentication chain handling
needed to be adjusted as well.

fixes #6268
This commit is contained in:
Johannes Meyer 2014-07-09 12:53:25 +02:00
parent 0d92efc1b0
commit e21b4243ca
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/controllers/AuthenticationController.php
View File

@ -77,14 +77,14 @@ class AuthenticationController extends ActionController
new Exception('Cannot load authentication configuration. An exception was thrown:', 0, $e)
);
throw new ConfigurationError(
'No authentication methods available. It seems that none authentication method has been set'
. ' up. Please check the system log or Icinga Web 2 log for more information'
t(
'No authentication methods available. Authentication configuration could not be loaded.'
. ' Please check the system log or Icinga Web 2 log for more information'
)
);
}
$chain = new AuthChain($config);
if ($this->getRequest()->isGet()) {
$user = new User('');
foreach ($chain as $backend) {
@ -119,7 +119,15 @@ class AuthenticationController extends ActionController
$this->rerenderLayout()->redirectNow($redirectUrl);
}
}
if ($backendsWithError === $backendsTried) {
if ($backendsTried === 0) {
throw new ConfigurationError(
t(
'No authentication methods available. It seems that no authentication method has been set'
. ' up. Please check the system log or Icinga Web 2 log for more information'
)
);
}
if ($backendsTried === $backendsWithError) {
throw new ConfigurationError(
$this->translate(
'No authentication methods available. It seems that all set up authentication methods have'