Fix macros with subproperties on service-apply-rule (#2083)

[semmasu]

Fixes #2083

In Service-Apply-Rules macros like $config.property$ should be evaluated, currently the only macro that gets evaluated is $config$

[Yoda-BZH]

I also tried to come up with a solution for this problem.

My solution was:

diff --git a/library/Director/IcingaConfig/IcingaConfigHelper.php b/library/Director/IcingaConfig/IcingaConfigHelper.php
index ed9f6af7..c8517e64 100644
--- a/library/Director/IcingaConfig/IcingaConfigHelper.php
+++ b/library/Director/IcingaConfig/IcingaConfigHelper.php
@@ -366,6 +366,14 @@ class IcingaConfigHelper
             && ! preg_match('/\.$/', $name);
     }
 
+
+    public static function isMacroDictionnary($macroName, $whiteList = null)
+    {
+        $tokens = explode('.', $macroName);
+
+        return $whiteList === null || in_array($tokens[0], $whiteList);
+    }
+
     public static function renderStringWithVariables($string, array $whiteList = null)
     {
         $len = strlen($string);
@@ -385,7 +393,7 @@ class IcingaConfigHelper
                         // We got a macro
                         $macroName = substr($string, $start + 1, $i - $start - 1);
                         if (static::isValidMacroName($macroName)) {
-                            if ($whiteList === null || in_array($macroName, $whiteList)) {
+                            if ($whiteList === null || in_array($macroName, $whiteList) || static::isMacroDictionnary($macroName, $whiteList)) {
                                 if ($start > $offset) {
                                     $parts[] = static::renderString(
                                         substr($string, $offset, $start - $offset)