tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,834 Commits 117 Branches 71 Tags 80 MiB
Commit Graph

5834 Commits

Author SHA1 Message Date
Eric Lippmann 8563d5ed3f PHPDoc: Use @var instead of @type 
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
 2015-03-12 16:08:47 +01:00
Eric Lippmann 6dc48fe9d3 CSS: Remove .skip-links-inline ... 
... because we don't use it.
 2015-03-12 16:08:47 +01:00
Eric Lippmann 90971f2caf Revert "Merge branch 'feature/organize-headings-7976'" 
This reverts commit ea2a17a76c, reversing
changes made to e72de8dfe1.

refs #7976
fixes #8647
 2015-03-12 16:08:34 +01:00
Marius Hein ddc8dd5d4c Add command send custom notification to monitoring module 
refs #8644
 2015-03-12 16:08:22 +01:00
Eric Lippmann 093dfd627e Security: Hide config menu items if the user lacks the required permission 
refs #8720
 2015-03-12 15:45:33 +01:00
Eric Lippmann da16bfcef3 Security: Use PermittedMenuItemFilter in the MenuRenderer 
refs #8720
 2015-03-12 15:45:30 +01:00
Eric Lippmann e6a60e214c lib: Add PermittedMenuItemFilter ... 
... for iterating over menu items the user is allowed to display

refs #8720
 2015-03-12 15:45:27 +01:00
Eric Lippmann 7f010102f6 Add wildcard support to the permission passed to User::can() 
refs #8720
 2015-03-12 15:45:25 +01:00
Eric Lippmann 33112f6a18 Use {@inheritdoc} in the RoleForm 
refs #8720
 2015-03-12 15:45:22 +01:00
Eric Lippmann 517437eb1b Security: Add wildcard permissions to the config/ tree 
refs #8720
 2015-03-12 15:45:17 +01:00
Eric Lippmann 195fe6f04b Security: Rename system/config/modules to config/modules 
Module config permission and application config permission have to be separeted.
Application config related permissions were added beneath config/application and module
related config permissions will be config/modules for now.

refs #8720
 2015-03-12 15:45:14 +01:00
Eric Lippmann f6e9551235 Security: Rename system/config/roles to config/application/roles 
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
 2015-03-12 15:45:10 +01:00
Eric Lippmann 08abbda152 Security: Rename system/config/resources to config/application/resources 
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
 2015-03-12 15:45:07 +01:00
Eric Lippmann a4e81c320a Security: Rename system/config/authentication to config/application/authentication 
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
 2015-03-12 15:45:04 +01:00
Eric Lippmann 956bc3c07a Security: Rename system/config/application to config/application/general 
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
 2015-03-12 15:44:58 +01:00
Eric Lippmann 0c30356d52 Add Menu::getPermission() and Menu::setPermission() 
Those two functions are required for filtering menu items based on a user's grants.

refs #8720
 2015-03-12 15:44:43 +01:00
Johannes Meyer 8295d6d9b0 Do not require the `connection' directive when creating a LDAP resource 2015-03-12 15:36:52 +01:00
Johannes Meyer 7a4403f5a5 Merge branch 'feature/ldap-ssl-and-tls-support-7771' 
resolves #7771
 2015-03-12 15:19:34 +01:00
Johannes Meyer 359a5f54c3 Merge branch 'master' into feature/ldap-ssl-and-tls-support-7771 2015-03-12 15:18:53 +01:00
Johannes Meyer 5de5a65df0 Do not suppress errors when a LDAP capability query fails 2015-03-12 15:18:00 +01:00
Johannes Meyer 1b440a4f1b Make SSL/TLS configurable for LDAP resources 
refs #7771
 2015-03-12 15:17:19 +01:00
Johannes Meyer 4a982a382e Show exception message when LDAP connection validation fails, if any 2015-03-12 14:45:16 +01:00
Thomas Gelf 5270acd645 events.js: correctly detect form target container 
This is for forms with no submit button.

fixes #8710
 2015-03-12 11:30:21 +01:00
Thomas Gelf 3af36015ff dashboard: do not fix and hide any controls 
It would be better if view scripts would care about this, but as we
failed so many times this might be the better option.

fixes #8697
 2015-03-12 10:04:19 +01:00
Thomas Gelf 16ca8d0654 StatusQuery: fix join on wrong alias 
Looks like a copy & paste error, resulted in hosts been shown multiple
times.

fixes #8699
 2015-03-12 09:46:38 +01:00
Thomas Gelf 792a67c439 Revert "Remove Debian packaging from GIT" 
This reverts commit e72e340faa.
 2015-03-12 09:34:59 +01:00
Eric Lippmann 16c78c5cab Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-12 01:25:28 +01:00
Eric Lippmann b50129ad2e Add renderLayout to the re-login URL for externally authenticated users 
refs #8626
 2015-03-12 01:14:47 +01:00
Eric Lippmann 54df9e4b3e Merge branch 'master' into bugfix/logout-external-8626 2015-03-12 00:57:52 +01:00
Eric Lippmann 749957c3b4 Fix too greedy __SELF__ login redirect on XHR 
I introduced this bug some commits earlier. We only must redirect to __SELF__ on XHR
if a redirect URL was set.

refs #8626
 2015-03-12 00:57:03 +01:00
Eric Lippmann 83443a5dc4 Use -1 for last update of the menu 
We must not rely on the server time minus an offset for the last update of the menu
to trigger an immediate update of the menu because the server time may be behind the current time.

fixes #8694
 2015-03-12 00:52:19 +01:00
Eric Lippmann 2f752ed1ac Respond with HTTP status code 403 when an XHR requires authentication 
refs #8626
 2015-03-11 22:32:04 +01:00
Eric Lippmann 0806ab3ec9 Remove strict equality for $auth->isAuthenticated() 2015-03-11 22:26:03 +01:00
Eric Lippmann 7288f2e92b Use space after the boolean negotiation operator 2015-03-11 22:25:52 +01:00
Eric Lippmann 4570151b4b Fix indentation for strings spanning multiple lines in our auth controller 2015-03-11 22:11:10 +01:00
Eric Lippmann 64ad54ebd6 Optimize imports in Web.php 2015-03-11 22:08:28 +01:00
Eric Lippmann a835cad31f Remove a nonsense TODO from Web.php 
TODOs for replacing Zend classes are unnecessary.
 2015-03-11 22:06:23 +01:00
Eric Lippmann c54648244e Remove newlines from Web.php 2015-03-11 22:05:23 +01:00
Eric Lippmann c47164601a Don't alias Zend_Controller_Action_HelperBroker in Web.php 2015-03-11 22:03:49 +01:00
Eric Lippmann dfa7e20b74 Don't use Icinga\Authentication\Manager twice 2015-03-11 22:01:41 +01:00
Eric Lippmann 9e81370551 Removed unused use ... in Web.php 2015-03-11 22:00:09 +01:00
Eric Lippmann 32ca28bc46 Use @return $this for documenting fluent interfaces 2015-03-11 21:58:41 +01:00
Eric Lippmann ac2522af20 Merge branch 'master' into bugfix/logout-external-8626 2015-03-11 21:55:52 +01:00
Eric Lippmann 7fe4b3d7ab Fix PHPDoc of Web::detectLocale() 2015-03-11 21:55:04 +01:00
Eric Lippmann 29d4ad69b9 Remove // @codeCoverageIgnoreEnd 
This is obsolete.
 2015-03-11 21:50:41 +01:00
Eric Lippmann bc1336b6f9 Fix stupid code in ActionController::redirectToLogin() 
refs #8626
 2015-03-11 21:49:20 +01:00
Eric Lippmann 4ebfbf83ab Leave note about __SELF__ in our action controller 
refs #8626
 2015-03-11 21:40:14 +01:00
Eric Lippmann 7f94858b8d Add JSDoc to Icinga.Loader.prototype.processRedirectHeader() 
refs #8626
 2015-03-11 21:26:44 +01:00
Eric Lippmann 031f9ddc84 Don't always redirect to the current window's URL if the redirect URL is __SELF__ 
Please see code comments for an explanation.

refs #8626
 2015-03-11 21:24:56 +01:00
Eric Lippmann d102a61e22 Fix Undefined index: HTTP_ACCEPT_LANGUAGE 
fixes #8370
 2015-03-11 20:50:05 +01:00