Commit Graph

3206 Commits

Author SHA1 Message Date
Eric Lippmann 7dbcd27c3c Remove superfluous whitespace 2016-04-13 11:04:54 +02:00
Eric Lippmann 9082a5204e Fix tab order of refresh and close container controls 2016-04-13 11:04:23 +02:00
Eric Lippmann c803ec64c5 lib: Move getters before setters in ExternalBackend 2016-04-11 10:57:01 +02:00
Eric Lippmann 1d1a4b4be3 Optimize imports in LdapConnection 2016-04-08 12:58:30 +02:00
Eric Lippmann 1f69189b14 Merge branch 'feature/ldap-scope-11485'
resolves #11485
2016-04-08 12:57:41 +02:00
Markus Frosch 955a9482ad lib/LDAP: Add fetchByDn for a base scope retrieval on an entry
refs #11485
2016-04-07 17:16:51 +02:00
Markus Frosch 202d61dd4e lib/LDAP: Add support for LDAP search scope
Configurable on the LdapQuery, handled by LdapConnection::ldapSearch

refs #11485
2016-04-07 17:16:38 +02:00
Markus Frosch adeaf60aed lib/LDAP: Do not explicitly set the fields list when ordering
refs #11489
2016-04-07 17:13:07 +02:00
Florian Strohmaier 0a9c0925cb CSS: Add space before the autosubmit info in forms 2016-04-07 12:46:13 +02:00
Markus Frosch 0f538e7f06 lib/LDAP: LdapUtils::explodeDN replace deprecated use of eval in preg_replace
fixes #11490
2016-04-04 09:25:59 +02:00
Eric Lippmann 0edd1b5a08 doc: natcasesort files 2016-04-01 15:01:12 +02:00
Eric Lippmann a5119a7a2e Fix TreeNodeIterator::isEmpty() 2016-03-30 15:31:53 +02:00
Eric Lippmann 528be1ee79 doc: Iterate files alphabetically and directories last 2016-03-30 15:31:53 +02:00
Eric Lippmann c7aec8ae64 Respect module stylesheets again when generating the ETag
fixes #11465
2016-03-29 11:39:41 +02:00
Eric Lippmann 6e28b4690e Merge branch 'feature/user-getroles-10887'
resolves #10887
2016-03-29 11:28:56 +02:00
Eric Lippmann e0781cf8b5 Fix PHPDoc of AdmissionLoader::applyRoles()
refs #10887
2016-03-29 11:26:00 +02:00
Eric Lippmann 5b5978787b Move permission and restriction initialization in AdmissionLoader
refs #10887
2016-03-29 11:25:55 +02:00
Eric Lippmann 32c6a03000 Remove Role::addPermission()
Method is not used.

refs #10887
2016-03-29 11:25:53 +02:00
Eric Lippmann 123488cfc0 Remove Role::addRestriction()
Method is not used.

refs #10887
2016-03-29 11:25:51 +02:00
Eric Lippmann 08b70267cd Move setters after getter in Role.php
refs #10887
2016-03-29 11:25:47 +02:00
Eric Lippmann 3d6ae6ac26 Fix PHPDoc of User::setRestrictions()
refs #10887
2016-03-29 11:25:39 +02:00
Eric Lippmann 98934e9c5f lib/DbConnection: Use isset for charset check 2016-03-24 17:55:30 +01:00
Raphael Bicker ea871ea032 Fix Cannot execute queries while other unbuffered queries are active
fixes #11264

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2016-03-24 17:53:55 +01:00
Alexander A. Klimov c6eb3cd2c7 Add missing User::$roles definition
refs #10887
2016-03-24 16:34:32 +01:00
Alexander A. Klimov df0d3aaf1e AdmissionLoader: set the roles of the user
refs #10887
2016-03-24 16:24:24 +01:00
Alexander A. Klimov 57ce39834d Role: implement setPermissions() and setRestrictions()
refs #10887
2016-03-24 16:11:31 +01:00
Eric Lippmann f1f4cdc3cb lib: Use AdmissionLoader::applyRoles() in Auth
refs #10887
2016-03-24 15:30:30 +01:00
Eric Lippmann 1aa42bdaf6 lib: Add User::getRoles() and ::setRoles()
refs #10887
2016-03-24 15:30:07 +01:00
Eric Lippmann 6ec1878977 lib: Add Authentication/Role
refs #10887
2016-03-24 15:29:39 +01:00
Eric Lippmann 2699d2c9ed lib: Rename AdmissionLoader::applyPerm... to applyRoles()
refs #10887
2016-03-24 15:28:21 +01:00
Markus Frosch 88d973ac39 Restrict access to application log with 'application/log' permission
fixes #11279
2016-03-02 20:47:37 +01:00
Markus Frosch 929f45deea Fix session resume for external auths
When REMOTE_USER is not available from _SERVER (PHP internal webserver)

fixes #11277
2016-03-02 17:39:05 +01:00
Marius Hein 845a8b78cf Bump version 2016-02-29 22:41:58 +01:00
Thomas Gelf 1fba491160 DbConnection: fix utf8-encoded MySQL connections 2016-02-29 20:58:34 +01:00
Eric Lippmann 9c5dfc5207 Merge branch 'bugfix/benchmark-not-always-rendered-10856'
fixes #10856
2016-02-27 22:49:44 +01:00
Eric Lippmann 03d7f3a1f4 Ensure trailing slash if cookie path is detected automatically
Seems like IE (8, 9, ?) has problems w/o the trailing slash and additional directories on the server that start w/ the path.

refs #11187
2016-02-27 22:42:32 +01:00
Eric Lippmann 5f43ac8f26 Fix path, secure flag and domain of session cookies
refs #11187
2016-02-27 22:24:01 +01:00
Eric Lippmann 5f642879c7 Respect cookie domain config in Cookie.php
refs #11187
2016-02-27 22:19:37 +01:00
Alexander A. Klimov 923e902957 Web::bootstrap(): set up the request before setting up the session
refs #11187
2016-02-27 22:17:01 +01:00
Eric Lippmann 7cef06f981 Disable benchmark only if the layout is disabled
Benchmark should be disabled if the response is not HTML. This is most likely the case when the layout is disabled.
If Web 2 or Zend sends JSON for example, the layout is disabled.

The follwing code inside an action disables the layout (and view):
$this->_helper->layout()->disableLayout();

The following code inside an action disables the action's view script:
$this->_helper->viewRenderer->setNoRender(true);

Note that an action's view script is also disabled via setNoRender() when rendering another view script via
render() or renderScript().

Another appraoch is to check the content-type. If explicitly set to not HTML, disable benchmark:

$renderBenchmark = true;
$response = $this->getResponse();
$headers = $response->getHeaders();
foreach ($headers as $header) {
    if (strtolower($header['name']) === 'content-type'
        && stristr($header['value'], 'text/html') === false
    ) {
        $renderBenchmark = false;
        break;
    }
}
if ($renderBenchmark) {
    $layout->benchmark = $this->renderBenchmark();
}

Maybe we should also provide a action method for disabling benchmark, regardless of the user's setting.

refs #10856
2016-02-27 20:14:02 +01:00
Eric Lippmann bf7d082576 Fix PHPDoc of Url::addFilter() 2016-02-27 16:25:04 +01:00
Alexander A. Klimov 5b0730574d Simplify Url::addFilter()
This changes the rendered resulting Url from x&(y&z) to x&y&z.

refs #10778
2016-02-27 16:23:09 +01:00
Eric Lippmann 8433bf1fc1 Don't hide the filter editor from the view if the view is compact
refs #10778
2016-02-27 15:57:00 +01:00
Eric Lippmann d8b14cb772 Control whether a filter editor should be rendered via setVisible()
We (may) have situations where a controller or view has to access the filter editor being created via Controller::setupFilterControl().
This is impossible if the view is compact because the filterEditor will be unset. This change introduces FilterEditor::setVisible() for
giving the responsibility of rendering to the filter editor. Controller::setupFilterControl() will be adapted accordingly.

refs #10778
2016-02-27 15:51:13 +01:00
Eric Lippmann 88f4f68f29 Merge branch 'bugfix/move-auth-backend-configuration-to-app-config-10309'
fixes #10309
2016-02-27 15:25:11 +01:00
Eric Lippmann e4a0678df0 Load resources from config automatically instead of throwing an exception
fixes #10918
2016-02-26 12:29:30 +01:00
Eric Lippmann 9d5e21e71e Remove IniUserGroupBackend.php
Does not conform to its interface anymore and is not in use.
2016-02-26 10:32:13 +01:00
Thomas Gelf 9231746d09 functions.php: failsafe method initialization
This avoids collisions for modules not using the fake bootstrap in our
current tests. Can be removed once we fixed that.
2016-02-25 18:07:29 +01:00
Alexander A. Klimov 1bbb7a3118 Manager::detectEnabledModules(): shorten error message 2016-02-25 17:34:03 +01:00
Alexander A. Klimov 1aada1abbb Present the fact that Icinga Web 2's config directory isn't readable in a nicer way
fixes #11119
2016-02-25 17:31:09 +01:00