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

223 Commits

Author SHA1 Message Date
Johannes Meyer 3fffd90135 Rename permission config/application/groups* to config/authentication/... 
refs #8826
 2015-06-02 09:04:34 +02:00
Johannes Meyer a558f2873a Rename permission config/application/users* to config/authentication/... 
refs #8826
 2015-06-02 09:02:57 +02:00
Johannes Meyer 17e7f1e754 Link the roles configuration with the user and group management 
refs #8826
 2015-06-01 16:43:11 +02:00
Johannes Meyer 8713f59e66 AuthBackendController: Only show tabs the user is permitted to view 
refs #8826
 2015-05-27 10:38:35 +02:00
Johannes Meyer 20f0b46574 Introduce class AuthBackendController 
refs #8826
 2015-05-26 10:11:40 +02:00
Eric Lippmann 71a2324cb9 lib: Let Controller::assertHttpMethod() throw a HttpMethodNotAllowedException 
refs #6281
 2015-05-22 09:12:42 +02:00
Johannes Meyer 675d070b86 Set the view property `compact' exactly once 
refs #7876
 2015-04-15 15:33:00 +02:00
Johannes Meyer d882ea11b4 Avoid to set an empty redirect url parameter when accessing icinga web 2 2015-04-15 11:00:47 +02:00
Eric Lippmann dfd8c91827 Add PHPDoc to ActionController::$params 2015-04-07 12:25:46 +02:00
Eric Lippmann 29d5fd351b Merge branch 'bugfix/logout-external-8626' 
fixes #8626
 2015-03-12 16:47:49 +01:00
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 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 2f752ed1ac Respond with HTTP status code 403 when an XHR requires authentication 
refs #8626
 2015-03-11 22:32:04 +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
Louis Sautier 083c1a9e6b Fix some spelling errors in comments and messages 
fixes #8633

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
 2015-03-08 15:32:22 +01:00
Alexander Fuhr 2112676594 Implement hidden accessible control for auto refresh on the page 
refs #7945
 2015-02-13 14:34:29 +01:00
Alexander Fuhr b9c9f564ec Add editable auto_refresh parameter to the user preferences 
refs #7945
 2015-02-12 15:12:10 +01:00
Eric Lippmann 97261cd8bd lib: Do not setLayout('pdf') twice 2015-02-11 15:15:18 +01:00
Eric Lippmann 6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Eric Lippmann 5b4fab0750 Add license header 
This time without syntax errors hopefully :)
 2015-02-03 16:27:59 +01:00
Eric Lippmann 5fa2e3cfdc Revert "Add license header" 
This reverts commit 338d067aba.
 2015-02-03 16:16:26 +01:00
Eric Lippmann 338d067aba Add license header 
fixes #7788
 2015-02-03 15:51:04 +01:00
Eric Lippmann 2faf5f0ca1 Throw SecurityException in ActionController::assertPermission() 2015-01-30 09:34:19 +01:00
Eric Lippmann 6da3cb8403 lib: Reorder auth related functions in the ActionController 2015-01-23 09:36:05 +01:00
Eric Lippmann ef0a7c0e77 Revert "Security: Temporary grant all permissions" 
This reverts commit 9b7e75a616.

Patching function hasPermission is not enough. A fix will follow.
 2015-01-22 17:11:53 +01:00
Eric Lippmann 0f13c0428c Controller: Introduce method assertHttpMethod() 
We have actions where only certain HTTP methods, e.g. POST are allowed but they are not restricted yet.
Controller::assertHttpMethod() takes a number of allowed HTTP methods and responds with HTTP 405 in case
the current request's method is not one of the given methods.
 2015-01-22 15:47:16 +01:00
Eric Lippmann 9b7e75a616 Security: Temporary grant all permissions 
We'll introduce permissions and restrictions in the next hours. Because our web setup
does not configure permissions yet, all permissions are granted for all users from now on.
 2015-01-22 15:20:38 +01:00
Matthias Jentsch a1950aabba Fix some obsolete or wrong docstrings 2014-12-29 16:27:28 +01:00
Eric Lippmann 9647293f1b Add our own dispatcher prototype for namespaced controllers 
refs #5786
 2014-12-18 17:11:30 +01:00
Thomas Gelf cddb68bffb ActionController: shift global parameters globally 2014-12-03 10:40:48 +01:00
Gunnar Beutner 9a79cd58e9 Re-enable auto-refresh 2014-11-18 10:48:33 +01:00
Bernd Erk ac8cc0613c Merge branch 'master' into feature/redesign-7144 
Conflicts:
	application/views/scripts/authentication/login.phtml
	public/css/icinga/login.less
 2014-11-12 17:21:54 +01:00
Bernd Erk f9e8cc84b9 Design: headline and main menu 2014-11-06 00:09:14 +01:00
Johannes Meyer 38ee467603 Fix that the session is written too early when post-dispatching 2014-10-15 13:15:30 +02:00
Johannes Meyer cbadaa78d6 Merge branch 'master' into feature/setup-wizard-7163 2014-09-29 15:35:52 +02:00
Alexander Fuhr c8a24f72b8 Introduce getValue() in Preferences and fix the loading of values 2014-09-26 14:15:50 +02:00
Johannes Meyer c00dbf9f46 Write session on response 
There should not be any necessity to write the session once changes are
being made to it. We now track whether changes were made and write
the session when responding to the user's request if so.
 2014-09-24 10:46:35 +02:00
Eric Lippmann 264d818133 Do not save config references in the `ActionController' 
This is redundant because our `Config' class already caches loaded configs.
 2014-09-19 14:44:21 +02:00
Eric Lippmann c51b05296e Merge branch 'master' into bugfix/commands-6593 2014-09-19 13:18:47 +02:00
Eric Lippmann d091e2150c Fix `ActionController::prepareInit()' php doc 2014-09-16 18:43:14 +02:00
Alexander Fuhr b38ef9c0bd Implement plural and context based translation functionality 
refs #6982
 2014-09-16 15:19:23 +02:00
Eric Lippmann 5c647719e4 lib/ModuleActionController: Fix stupid code 2014-09-16 09:29:03 +02:00
Eric Lippmann f8edb4f220 lib: Add method `ActionController::prepareInit()' 
As it should not be required for controllers to call the parent's init() method, base controllers should use
prepareInit() in order to prepare the controller initialization.
 2014-09-16 09:28:10 +02:00
Alexander Fuhr e2b5e05f21 Implement plural translation (testing) 2014-09-15 14:11:42 +02:00
Alexander Fuhr 583fd46f15 Experimental Plural Translation Implementation 
Personal BACKUP
 2014-09-11 18:04:10 +02:00
Johannes Meyer ae9e5a40cc Merge branch 'master' into bugfix/rebuild-form-builder-5525 
Conflicts:
	application/forms/Preference/GeneralForm.php
 2014-09-08 08:46:53 +02:00
Johannes Meyer fc72ddfbc8 Adjust Preferences/GeneralForm to use handleRequest() &. Co. 
refs #5525
 2014-09-05 10:21:24 +02:00
Thomas Gelf 6faedf5733 ActionController: no benchmark for no renderer 
Benchmarks should not be shown when the renderer is no longer available.
 2014-09-02 16:49:28 +02:00
Johannes Meyer 1ba3df310c Remove BaseConfigController, User\Message and Widget\AlertMesageBox 
refs #6758
 2014-09-02 16:25:03 +02:00
Johannes Meyer fb5685bac3 Merge branch 'master' into bugfix/rebuild-form-builder-5525 
Conflicts:
	application/forms/Config/Authentication/BaseBackendForm.php
	application/forms/Config/Authentication/DbBackendForm.php
	application/forms/Config/Authentication/LdapBackendForm.php
	application/forms/Config/Authentication/ReorderForm.php
	application/forms/Config/LoggingForm.php
	application/forms/Config/ResourceForm.php
	application/forms/Preference/GeneralForm.php
	library/Icinga/Application/Config.php
	library/Icinga/Web/Form.php
	modules/monitoring/application/controllers/ConfigController.php
	modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
	modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
	modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
	modules/monitoring/application/forms/Config/SecurityForm.php
 2014-08-29 16:05:56 +02:00
Alexander Klimov 45638b218c Throw IcingaException rather than Exception 
fixes #7014
 2014-08-27 16:03:15 +02:00
Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525 
Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ConfigController.php
	application/forms/Authentication/LoginForm.php
	application/forms/Preference/GeneralForm.php
	modules/monitoring/application/controllers/ChartController.php
 2014-08-20 13:13:50 +02:00
Thomas Gelf db3ef8fbd0 ActionController: remove redirectToLogin default 
The redirectOnLogin function now doesn't have any predefined default.
This also leads to the behaviour that "Logout" will not redirect you
anywhere on a new login while "forcibly being logged out" (e.g. by
logging out in another browser tab) will bring you back to where you
came from.
 2014-08-19 12:28:24 +02:00
Thomas Gelf 9d4a4f49c9 ActionController: JS should redirect to __SELF__... 
...once you lost your session. That's the only way to do this in a
smooth way. When the server get's an unauthenticated request for a
single container, redirecting to auth/login?redir=<that-container>
was not what you expect.

Together with JS handling __SELF__ in redirection URLs this will
play fine.

refs #6935
 2014-08-19 09:57:24 +02:00
Thomas Gelf 8f729bfb65 ActionController: set a default window title 
In case a controller action didn't set a view title this fix restores
the default title on XHR requests.

fixes #6797
 2014-07-31 17:04:26 +02:00
Johannes Meyer c3731fa79e Adjust removeresource-action to suit the new resource form interface 
refs #5525
 2014-07-24 16:17:30 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files 
refs #6309
 2014-07-15 13:43:52 +02:00
Johannes Meyer bb2c85f90b Remove forgotten ActionController::requiresConfig() call 
Should have been reverted by last commit but was not.
 2014-07-07 16:12:26 +02:00
Johannes Meyer 82d2f5ac9b Revert "Merge branch 'feature/install-wizard-6136'" 
This reverts commit 88d4262e7c, reversing
changes made to 6fae333048.

Conflicts:

	application/controllers/InstallController.php
	library/Icinga/Web/Controller/ActionController.php
 2014-07-07 15:09:03 +02:00
Thomas Gelf 0d4166b1bd ModuleActionController: fix reference, var removed 2014-07-04 12:39:23 +02:00
Thomas Gelf 3772b9c16f ActionController: set layout module name early 
Didn't work correctly before
 2014-07-04 12:33:49 +02:00
Johannes Meyer f2e5d8afa5 Remove @codeCoverageIgnoreStart/-Stop annotations 
refs #6091
 2014-06-30 13:58:37 +02:00
Thomas Gelf 59dd80ed32 ActionController: benchmark should measure rendering 
We have been cheating a little bit, now the measurement should be more
precise.
 2014-06-25 20:37:17 +02:00
Thomas Gelf 2746b5ff9f ConfigController: switch over to new config tabs 
Module configuration now takes place in module detail view and does no
longer pollute our config tabs. Modules are now able to provide a bunch
of own config tabs, we don't really care what they use them for.
 2014-06-24 21:31:59 +02:00
Thomas Gelf 3f9f4bb9e1 ModuleActionController: module object shortcut 
This helps modules with the need to know more about themselves. No
more App -> Module Manager -> Module voodoo.
 2014-06-24 20:54:39 +02:00
Thomas Gelf ea44de8698 ActionController/translate: detect domain only once 2014-06-22 20:09:23 +02:00
Thomas Gelf 23ed744747 params/_render: replace it everywhere 
Cleaning up controllers and JS, using headers only and respecting
history.
 2014-06-22 20:07:44 +02:00
Thomas Gelf 61600ae2d4 ModuleActionController: fix typo 2014-06-22 19:39:54 +02:00
Thomas Gelf 216f0f3f55 isIframe: clean up, load less html and js 
We use isIframe only when we have no JS, therefore it makes no sense
to load JS files in an iFrame. Also removed sidebar.
 2014-06-22 16:30:06 +02:00
Thomas Gelf bb23d0636c ModuleActionController: use isXhr() 2014-06-22 16:04:55 +02:00
Thomas Gelf 3774eb6889 ActionController: add isXhr() method 
Makes things easier as we use this a lot
 2014-06-22 15:36:41 +02:00
Thomas Gelf 331d756a2a ActionController: isolate ignoreXhrBody 
This function is only a workaround for broken forms not redirecting
after submission. Will hopefully be removed soon.
 2014-06-22 15:33:38 +02:00
Thomas Gelf b4f8ef74fa ActionController: remove obsolete code 2014-06-22 15:20:55 +02:00
Thomas Gelf 631603aba3 ActionController: create postDispatchXhr 
Moved XHR-specific stuff to a dedicated post-dispatch function
 2014-06-22 15:17:28 +02:00
Thomas Gelf cf995b366b ActionController: cleanup postDispatch 
Make XHR handling more readable, move module-related stuff to the
module controller
 2014-06-22 15:11:08 +02:00
Thomas Gelf de19745eb2 ActionController: move moduleInit to Module controller 2014-06-22 13:54:02 +02:00
Thomas Gelf 2cd25b7376 ActionController: if/else should be easy to read 2014-06-22 13:52:40 +02:00
Thomas Gelf b7fc0b67a8 Web/controllers: use own Request/Response objects 
* introduces Icinga\Web\Response
* uses ModuleActionController where necessary
* no module translationDomain voodoo in base ActionController
 2014-06-22 13:49:21 +02:00
Thomas Gelf ef5e1b54fd Web\Window: fix it's usage, add helper function 
Improved window handling, fixed controllers using it.
 2014-06-22 13:21:21 +02:00
Thomas Gelf b350e3640d Web\Window: move window handle to dedicated class 
One more step in cleaning up our ActionController
 2014-06-22 13:01:48 +02:00
Thomas Gelf d69a6d1640 ActionController: remove getRequestUrl 
Thie removes complexity and makes redirection to login less error-
prone.
 2014-06-22 12:23:34 +02:00
Thomas Gelf 9608d8254d ActionController: remove addModuleContainer 
This method was obsolete
 2014-06-22 12:09:07 +02:00
Thomas Gelf 4980b700da ActionController: __construct() as first function 2014-06-22 12:07:50 +02:00
Thomas Gelf a4955df1a9 controller->Auth(): one more lazy-loading helper 
Not sure about the capital A, but doesn't look so bad - and similar
to Config().
 2014-06-22 12:06:09 +02:00
Thomas Gelf 373e1c5ecb Web\Controller: re-introduce ModuleActionController 
This will help getting rid of a couple of if/else constructs
 2014-06-22 12:03:37 +02:00
Thomas Gelf 216c2ca770 Autorefresh: should work also on initial page load 
fixes #6296
 2014-06-21 01:54:32 +02:00
Thomas Gelf 07134cf931 JS/XHR: handle multiple notifications 
As there seems to be problems with sending the same header multiple
times we put multiple notifications in one header.
 2014-06-20 13:20:20 +02:00
Thomas Gelf dbf03ee647 ActionController: refine url handling on redirect 2014-06-20 13:18:03 +02:00
Thomas Gelf 7cad4de3be ActionController: allow to disable autorefresh 2014-06-20 13:17:11 +02:00
Thomas Gelf 992a8a276b Web/ActionController: provide $this->params 
We always need params, this are our new URL params made accessible
this way. This is just for our query string, not for POST body params.
 2014-06-17 12:58:04 +00:00
Thomas Gelf 468b290277 Monitoring\Controller: provide $this->backend 
Every monitoring controller needs $backend, so why declaring it over
and over again. Created "moduleInit" dummy function in our base action
controller to allow such implementations without polluting init().
 2014-06-17 12:55:43 +00:00
Johannes Meyer 159d765f14 Fix that calling ActionController::translate() throws an exception 
Translating strings must not throw an exception
even if the given domain is not valid.

fixes #6432
 2014-06-11 13:39:22 +02:00
Thomas Gelf e01629fe0b ActionController: fix initial redirect 
refs #6419
 2014-06-06 08:32:21 +00:00
Thomas Gelf 99aae5a0d9 JS/XHR: get ready to get XHR redirect-aware 
These are just the first steps, there is more to come
 2014-06-05 03:37:36 +00:00
Eric Lippmann a379502b15 Preferences: Rename `showBenchmark' to `show_benchmark' 
We use underscore_case notation for all configuration keys.

refs #4952
 2014-06-02 13:33:55 +02:00
Thomas Gelf 88460189cd Encoding: no ASCII chars > 127 in HTTP headers 
Had quite some trouble with this, decided to URL-encode titles and
notifications.
 2014-05-28 21:34:36 +00:00
Thomas Gelf 360ac87550 Translation: add a module-aware translation helper 
With this fix $this->translate works in our view scripts

refs #6338
 2014-05-27 21:41:46 +00:00
Thomas Gelf 70ba36aad6 notifications: improve client- and serverside 
This is just a first step, trying to catch a few gotchas:

* it doesn't send notifications to the browser when issueing a redirect
  as redirects can currently not be catched in jQuery response handlers
* it tries to find a better notification handling place in the response
  handler (JS) - still imperfect
* it explicitely stores sessions once modified by notifications. Still
  need to crosscheck whether this is really needed and how we can get
  rid of this.

refs #6280
 2014-05-26 14:41:47 +00:00
Johannes Meyer 88e451402f Redirect to /install when the setup.token exists but no config.ini 
refs #6136
 2014-05-14 12:53:44 +02:00