Commit fa01e4e3 authored by Bas Couwenberg's avatar Bas Couwenberg

Merge tag 'upstream/2.6.1'

Upstream version 2.6.1
parents c22ae798 0ca50acf
......@@ -4,6 +4,13 @@ Please make sure to always read our [Upgrading](doc/80-Upgrading.md) documentati
## What's New
### What's New in Version 2.6.1
You can find issues and features related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/51?closed=1).
The command audit now logs a command's payload as JSON which fixes a
[bug](https://github.com/Icinga/icingaweb2/issues/3535) that has been introduced in version 2.6.0.
### What's New in Version 2.6.0
You can find issues and features related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/48?closed=1).
......@@ -814,4 +821,3 @@ The location of a user's preferences has been changed from config-dir/preference
* Bug 9378: Rpm calls usermod w/ invalid option on openSUSE
* Bug 9384: Timeline+Role problem
* Bug 9392: Command links seem to be broken
cfe6c7b06587189b3ef688183cacd32594db071a 2018-07-19 09:34:58 +0200
b3e0b5d587c3587a09d82b3634dbe3a5dd315353 2018-08-02 12:46:39 +0200
......@@ -70,7 +70,16 @@ class Hook
public static function has($name)
{
$name = self::normalizeHookName($name);
return array_key_exists($name, self::$hooks);
if (! array_key_exists($name, self::$hooks)) {
return false;
}
$hook = self::$hooks[$name];
// $hook is in the format key => value
$hook = reset($hook);
return self::hasPermission($hook);
}
protected static function normalizeHookName($name)
......
......@@ -8,7 +8,7 @@ namespace Icinga\Application;
*/
class Version
{
const VERSION = '2.6.0';
const VERSION = '2.6.1';
/**
* Get the version of this instance of Icinga Web 2
......
Module: doc
Version: 2.6.0
Version: 2.6.1
Description: Documentation module
Extracts, shows and exports documentation for Icinga Web 2 and its modules.
Module: migrate
Version: 2.6.0
Version: 2.6.1
Description: Migrate module
This module was introduced with the domain-aware authentication feature in version 2.5.0.
It helps you migrating users and user configurations according to a given domain.
......@@ -12,6 +12,7 @@ use Icinga\Module\Monitoring\Command\Renderer\IcingaApiCommandRenderer;
use Icinga\Module\Monitoring\Exception\CommandTransportException;
use Icinga\Module\Monitoring\Exception\CurlException;
use Icinga\Module\Monitoring\Web\Rest\RestRequest;
use Icinga\Util\Json;
/**
* Command transport over Icinga 2's REST API
......@@ -198,11 +199,7 @@ class ApiCommandTransport implements CommandTransportInterface
);
$data = $command->getData();
$payload = [];
foreach ($data as $key => $value) {
$payload[] = "$key=$value";
}
$payload = implode(', ', $payload);
$payload = Json::encode($data);
AuditHook::logActivity(
'monitoring/command',
"Issued command {$command->getEndpoint()} with the following payload: $payload",
......
Module: monitoring
Version: 2.6.0
Version: 2.6.1
Description: Icinga monitoring module
This is the core module for most Icingaweb users. It provides an
abstraction layer for various Icinga data backends.
Module: setup
Version: 2.6.0
Version: 2.6.1
Description: Setup module
Web based wizard for setting up Icinga Web 2 and its modules.
This includes the data backends (e.g. relational database, LDAP),
......
Module: test
Version: 2.6.0
Version: 2.6.1
Description: Translation module
This module allows developers to run (unit) tests against Icinga Web 2 and
any of its modules. Usually you do not need to enable this.
Module: translation
Version: 2.6.0
Version: 2.6.1
Description: Translation module
This module allows developers and translators to translate Icinga Web 2 and
its modules for multiple languages. You do not need this module to run an
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment