From bcef87f4c98c75ccabfef0a1bde60e2a4201cf81 Mon Sep 17 00:00:00 2001
From: Corentin Ardeois <cardeois@iweb.com>
Date: Fri, 29 Jul 2016 15:58:15 -0400
Subject: [PATCH 1/4] Add support for expressions

Any rendered string can contain variables encapsulated with "$$" characters.

Example:
Display Name declared with `Port $$host.vars.tcp_port$$ check` will
be processed as `"Port " + host.vars.tcp_port + " check"`

API:
```bash
 ./director-curl POST director/service?name=my_service '{"display_name": "Port $$host.vars.tcp_port$$ check" }'
 ```

 Rendered config:
 ```
  apply Service "my_service" {
      import "my_template"

      display_name = "Port " + host.vars.tcp_port + " check"
  }
 ```

refs #11976
---
 .../IcingaConfig/IcingaConfigHelper.php       |  6 ++++-
 .../IcingaConfig/IcingaConfigHelperTest.php   | 26 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/library/Director/IcingaConfig/IcingaConfigHelper.php b/library/Director/IcingaConfig/IcingaConfigHelper.php
index 71e4a5bc..c163bfb0 100644
--- a/library/Director/IcingaConfig/IcingaConfigHelper.php
+++ b/library/Director/IcingaConfig/IcingaConfigHelper.php
@@ -100,7 +100,7 @@ class IcingaConfigHelper
 
         $string = preg_replace($special, $replace, $string);
 
-        return '"' . $string . '"';
+        return '"' . self::renderVariablesAsExpression($string) . '"';
     }
 
     public static function renderDictionaryKey($key)
@@ -257,4 +257,8 @@ class IcingaConfigHelper
 
         return $seconds . 's';
     }
+
+    private static function renderVariablesAsExpression($string) {
+        return preg_replace('/\$\$([\w\.]+)\$\$/', '" + ${1} + "', $string);
+    }
 }
diff --git a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
index c73b5bb8..80075370 100644
--- a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
+++ b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
@@ -69,4 +69,30 @@ class IcingaConfigHelperTest extends BaseTestCase
     {
         return file_get_contents(__DIR__ . '/rendered/' . $name . '.out');
     }
+
+    public function testRenderStringIsCorrectlyRendered()
+    {
+        $this->assertEquals(c::renderString('val1\\\val2'), '"val1\\\\\\\\val2"');
+        $this->assertEquals(c::renderString('"val1"'), '"\"val1\""');
+        $this->assertEquals(c::renderString('\$val\$'), '"\\\\$val\\\\$"');
+        $this->assertEquals(c::renderString('\t'), '"\\\\t"');
+        $this->assertEquals(c::renderString('\r'), '"\\\\r"');
+        $this->assertEquals(c::renderString('\n'), '"\\\\n"');
+        $this->assertEquals(c::renderString('\f'), '"\\\\f"');
+    }
+
+    public function testRenderStringWithVariables()
+    {
+        $this->assertEquals(
+            c::renderString('Before $$name$$ $$name$$ After'),
+            '"Before " + name + " " + name + " After"');
+        $this->assertEquals(
+            c::renderString('Before $$var1$$ $$var2$$ After'),
+            '"Before " + var1 + " " + var2 + " After"');
+        $this->assertEquals(c::renderString('$$host.vars.custom$$'), '"" + host.vars.custom + ""');
+        $this->assertEquals(c::renderString('$$var"$$'), '"$$var\"$$"');
+        $this->assertEquals(
+            c::renderString('\tI am\rrendering\nproperly\fand I $$support$$ "multiple" $$variables$$\$'),
+            '"\\\\tI am\\\\rrendering\\\\nproperly\\\\fand I " + support + " \"multiple\" " + variables + "\\\\$"');
+    }
 }

From ddcfb09f584c2f9ea613515291ed25d3b7635a7f Mon Sep 17 00:00:00 2001
From: Corentin Ardeois <cardeois@internap.com>
Date: Thu, 1 Sep 2016 17:25:38 -0400
Subject: [PATCH 2/4] Handle expressions only for apply objects

Expressions will be handled only if the object is an ApplyRule.
Only properties and custom variables are replaced.

refs #11976
---
 .../CustomVariable/CustomVariable.php         |  6 +-
 .../CustomVariable/CustomVariableString.php   |  4 +-
 .../CustomVariable/CustomVariables.php        |  8 +--
 library/Director/Db/Cache/PrefetchCache.php   |  6 +-
 .../IcingaConfig/IcingaConfigHelper.php       | 20 +++++--
 library/Director/Objects/IcingaObject.php     | 11 ++--
 .../CustomVariable/CustomVariablesTest.php    | 15 +++++
 .../IcingaConfig/IcingaConfigHelperTest.php   | 13 +++--
 .../Director/Objects/IcingaServiceTest.php    | 56 ++++++++++++++++++-
 .../Director/Objects/rendered/service3.out    | 16 ++++++
 .../Director/Objects/rendered/service4.out    | 12 ++++
 11 files changed, 136 insertions(+), 31 deletions(-)
 create mode 100644 test/php/library/Director/Objects/rendered/service3.out
 create mode 100644 test/php/library/Director/Objects/rendered/service4.out

diff --git a/library/Director/CustomVariable/CustomVariable.php b/library/Director/CustomVariable/CustomVariable.php
index 4d8d70fb..e028475f 100644
--- a/library/Director/CustomVariable/CustomVariable.php
+++ b/library/Director/CustomVariable/CustomVariable.php
@@ -88,12 +88,12 @@ abstract class CustomVariable implements IcingaConfigRenderer
         return $this->modified;
     }
 
-    public function toConfigStringPrefetchable()
+    public function toConfigStringPrefetchable($renderExpressions = false)
     {
         if (PrefetchCache::shouldBeUsed()) {
-            return PrefetchCache::instance()->renderVar($this);
+            return PrefetchCache::instance()->renderVar($this, $renderExpressions);
         } else {
-            return $this->toConfigString();
+            return $this->toConfigString($renderExpressions);
         }
     }
 
diff --git a/library/Director/CustomVariable/CustomVariableString.php b/library/Director/CustomVariable/CustomVariableString.php
index b67b3322..6f0677b0 100644
--- a/library/Director/CustomVariable/CustomVariableString.php
+++ b/library/Director/CustomVariable/CustomVariableString.php
@@ -36,8 +36,8 @@ class CustomVariableString extends CustomVariable
         return $this;
     }
 
-    public function toConfigString()
+    public function toConfigString($renderExpressions = false)
     {
-        return c::renderString($this->getValue());
+        return c::renderString($this->getValue(), $renderExpressions);
     }
 }
diff --git a/library/Director/CustomVariable/CustomVariables.php b/library/Director/CustomVariable/CustomVariables.php
index 3ce0bb00..3bec8924 100644
--- a/library/Director/CustomVariable/CustomVariables.php
+++ b/library/Director/CustomVariable/CustomVariables.php
@@ -268,24 +268,24 @@ class CustomVariables implements Iterator, Countable, IcingaConfigRenderer
         return $this->storedVars;
     }
 
-    public function toConfigString()
+    public function toConfigString($renderExpressions = false)
     {
         $out = '';
 
         ksort($this->vars);
         foreach ($this->vars as $key => $var) {
             // TODO: ctype_alnum + underscore?
-            $out .= $this->renderSingleVar($key, $var);
+            $out .= $this->renderSingleVar($key, $var, $renderExpressions);
         }
 
         return $out;
     }
 
-    protected function renderSingleVar($key, $var)
+    protected function renderSingleVar($key, $var, $renderExpressions = false)
     {
         return c::renderKeyValue(
             $this->renderKeyName($key),
-            $var->toConfigStringPrefetchable()
+            $var->toConfigStringPrefetchable($renderExpressions)
         );
     }
 
diff --git a/library/Director/Db/Cache/PrefetchCache.php b/library/Director/Db/Cache/PrefetchCache.php
index ec5a910d..86fd922b 100644
--- a/library/Director/Db/Cache/PrefetchCache.php
+++ b/library/Director/Db/Cache/PrefetchCache.php
@@ -84,14 +84,14 @@ class PrefetchCache
     }
     */
 
-    public function renderVar(CustomVariable $var)
+    public function renderVar(CustomVariable $var, $renderExpressions = false)
     {
         $checksum = $var->getChecksum();
         if (null === $checksum) {
-            return $var->toConfigString();
+            return $var->toConfigString($renderExpressions);
         } else {
             if (! array_key_exists($checksum, $this->renderedVars)) {
-                $this->renderedVars[$checksum] = $var->toConfigString();
+                $this->renderedVars[$checksum] = $var->toConfigString($renderExpressions);
             }
 
             return $this->renderedVars[$checksum];
diff --git a/library/Director/IcingaConfig/IcingaConfigHelper.php b/library/Director/IcingaConfig/IcingaConfigHelper.php
index c163bfb0..14b8c5d6 100644
--- a/library/Director/IcingaConfig/IcingaConfigHelper.php
+++ b/library/Director/IcingaConfig/IcingaConfigHelper.php
@@ -74,7 +74,7 @@ class IcingaConfigHelper
 
     // TODO: Find out how to allow multiline {{{...}}} strings.
     //       Parameter? Dedicated method? Always if \n is found?
-    public static function renderString($string)
+    public static function renderString($string, $renderExpressions = false)
     {
         $special = array(
             '/\\\/',
@@ -100,7 +100,11 @@ class IcingaConfigHelper
 
         $string = preg_replace($special, $replace, $string);
 
-        return '"' . self::renderVariablesAsExpression($string) . '"';
+        if ($renderExpressions) {
+            return self::renderStringWithVariables($string);
+        } else {
+            return '"' . $string . '"';
+        }
     }
 
     public static function renderDictionaryKey($key)
@@ -258,7 +262,15 @@ class IcingaConfigHelper
         return $seconds . 's';
     }
 
-    private static function renderVariablesAsExpression($string) {
-        return preg_replace('/\$\$([\w\.]+)\$\$/', '" + ${1} + "', $string);
+    private static function renderStringWithVariables($string) {
+        $string = preg_replace('/\$\$([\w\.]+)\$\$/', '" + ${1} + "', $string);
+        $string = '"' . $string . '"';
+        if (substr($string, 0, 5) === '"" + ') {
+            $string = substr($string, 5);
+        }
+        if (substr($string, -5) === ' + ""') {
+            $string = substr($string, 0, -5);
+        }
+        return $string;
     }
 }
diff --git a/library/Director/Objects/IcingaObject.php b/library/Director/Objects/IcingaObject.php
index 616a1f91..c4d92c94 100644
--- a/library/Director/Objects/IcingaObject.php
+++ b/library/Director/Objects/IcingaObject.php
@@ -1631,11 +1631,8 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
     protected function renderLegacyProperties()
     {
         $out = '';
-        $blacklist = array_merge(array(
-            'id',
-            'object_name',
-            'object_type',
-        ), array() /* $this->prioritizedProperties */);
+        $blacklist = array_merge($this->propertiesNotForRendering,
+            array() /* $this->prioritizedProperties */);
 
         foreach ($this->properties as $key => $value) {
             if (in_array($key, $blacklist)) {
@@ -1706,7 +1703,7 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
             return $this->renderRelationProperty($relKey, $value);
         }
 
-        return c::renderKeyValue($key, c::renderString($value));
+        return c::renderKeyValue($key, c::renderString($value, $this->isApplyRule()));
     }
 
     protected function renderLegacyObjectProperty($key, $value)
@@ -1783,7 +1780,7 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
     protected function renderCustomVars()
     {
         if ($this->supportsCustomVars()) {
-            return $this->vars()->toConfigString();
+            return $this->vars()->toConfigString($this->isApplyRule());
         } else {
             return '';
         }
diff --git a/test/php/library/Director/CustomVariable/CustomVariablesTest.php b/test/php/library/Director/CustomVariable/CustomVariablesTest.php
index f6d91873..8963c515 100644
--- a/test/php/library/Director/CustomVariable/CustomVariablesTest.php
+++ b/test/php/library/Director/CustomVariable/CustomVariablesTest.php
@@ -44,6 +44,21 @@ class CustomVariablesTest extends BaseTestCase
         );
     }
 
+    public function testVariablesToExpression()
+    {
+        $vars = $this->newVars();
+        $vars->bla = 'da';
+        $vars->abc = '$$val$$';
+        $expected = $this->indentVarsList(array(
+            'vars.abc = val',
+            'vars.bla = "da"'
+        ));
+        $this->assertEquals(
+            $vars->toConfigString(true),
+            $expected
+        );
+    }
+
     protected function indentVarsList($vars)
     {
         return $this->indent . implode(
diff --git a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
index 80075370..f2e709bc 100644
--- a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
+++ b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
@@ -83,16 +83,19 @@ class IcingaConfigHelperTest extends BaseTestCase
 
     public function testRenderStringWithVariables()
     {
+        $this->assertEquals(c::renderString('Before $$var$$', true), '"Before " + var');
+        $this->assertEquals(c::renderString('$$var$$ After', true), 'var + " After"');
+        $this->assertEquals(c::renderString('$$var$$', true), 'var');
         $this->assertEquals(
-            c::renderString('Before $$name$$ $$name$$ After'),
+            c::renderString('Before $$name$$ $$name$$ After', true),
             '"Before " + name + " " + name + " After"');
         $this->assertEquals(
-            c::renderString('Before $$var1$$ $$var2$$ After'),
+            c::renderString('Before $$var1$$ $$var2$$ After', true),
             '"Before " + var1 + " " + var2 + " After"');
-        $this->assertEquals(c::renderString('$$host.vars.custom$$'), '"" + host.vars.custom + ""');
-        $this->assertEquals(c::renderString('$$var"$$'), '"$$var\"$$"');
+        $this->assertEquals(c::renderString('$$host.vars.custom$$', true), 'host.vars.custom');
+        $this->assertEquals(c::renderString('$$var"$$', true), '"$$var\"$$"');
         $this->assertEquals(
-            c::renderString('\tI am\rrendering\nproperly\fand I $$support$$ "multiple" $$variables$$\$'),
+            c::renderString('\tI am\rrendering\nproperly\fand I $$support$$ "multiple" $$variables$$\$', true),
             '"\\\\tI am\\\\rrendering\\\\nproperly\\\\fand I " + support + " \"multiple\" " + variables + "\\\\$"');
     }
 }
diff --git a/test/php/library/Director/Objects/IcingaServiceTest.php b/test/php/library/Director/Objects/IcingaServiceTest.php
index 590ad76d..a6821400 100644
--- a/test/php/library/Director/Objects/IcingaServiceTest.php
+++ b/test/php/library/Director/Objects/IcingaServiceTest.php
@@ -12,6 +12,7 @@ class IcingaServiceTest extends BaseTestCase
     protected $testHostName = '___TEST___host';
 
     protected $testServiceName = '___TEST___service';
+    protected $createdServices = [];
 
     public function testUnstoredHostCanBeLazySet()
     {
@@ -233,6 +234,51 @@ class IcingaServiceTest extends BaseTestCase
         );
     }
 
+    public function testVariablesInPropertiesAndCustomVariables()
+    {
+        if ($this->skipForMissingDb()) {
+            return;
+        }
+
+        $db = $this->getDb();
+
+        $service = $this->service('___TEST___service_$$not_replaced$$');
+        $service->object_type = 'apply';
+        $service->display_name = 'Service: $$replaced$$';
+        $service->assignments = array(
+            'host.address="127.*"',
+        );
+        $service->{'vars.custom_var'} = '$$replaced$$';
+        $service->store($db);
+
+        $service = IcingaService::loadWithAutoIncId($service->id, $db);
+        $this->assertEquals(
+            $this->loadRendered('service3'),
+            (string) $service
+        );
+    }
+
+    public function testVariablesAreNotReplacedForNonApplyObjects()
+    {
+        if ($this->skipForMissingDb()) {
+            return;
+        }
+
+        $db = $this->getDb();
+
+        $service = $this->service('___TEST___service_$$not_replaced$$');
+        $service->object_type = 'object';
+        $service->display_name = 'Service: $$not_replaced$$';
+        $service->{'vars.custom_var'} = '$$not_replaced$$';
+        $service->store($db);
+
+        $service = IcingaService::loadWithAutoIncId($service->id, $db);
+        $this->assertEquals(
+            $this->loadRendered('service4'),
+            (string) $service
+        );
+    }
+
     protected function host()
     {
         return IcingaHost::create(array(
@@ -242,10 +288,14 @@ class IcingaServiceTest extends BaseTestCase
         ));
     }
 
-    protected function service()
+    protected function service($objectName = null)
     {
+        if ($objectName === null) {
+            $objectName = $this->testServiceName;
+        }
+        $this->createdServices[] = $objectName;
         return IcingaService::create(array(
-            'object_name'  => $this->testServiceName,
+            'object_name'  => $objectName,
             'object_type'  => 'object',
             'display_name' => 'Whatever service',
             'vars'         => array(
@@ -279,7 +329,7 @@ class IcingaServiceTest extends BaseTestCase
                 }
             }
 
-            $kill = array($this->testServiceName);
+            $kill = $this->createdServices;
             foreach ($kill as $name) {
                 if (IcingaService::exists(array($name), $db)) {
                     IcingaService::load($name, $db)->delete();
diff --git a/test/php/library/Director/Objects/rendered/service3.out b/test/php/library/Director/Objects/rendered/service3.out
new file mode 100644
index 00000000..2023ef8a
--- /dev/null
+++ b/test/php/library/Director/Objects/rendered/service3.out
@@ -0,0 +1,16 @@
+apply Service "___TEST___service_$$not_replaced$$" {
+    display_name = "Service: " + replaced
+    vars.custom_var = replaced
+    vars.test1 = "string"
+    vars.test2 = 17
+    vars.test3 = false
+    vars.test4 = {
+        a = [ "dict", "ionary" ]
+        @this = "is"
+    }
+
+    assign where match("127.*", host.address)
+
+    import "host var overrides (Director)"
+}
+
diff --git a/test/php/library/Director/Objects/rendered/service4.out b/test/php/library/Director/Objects/rendered/service4.out
new file mode 100644
index 00000000..1b607a58
--- /dev/null
+++ b/test/php/library/Director/Objects/rendered/service4.out
@@ -0,0 +1,12 @@
+object Service "___TEST___service_$$not_replaced$$" {
+    display_name = "Service: $$not_replaced$$"
+    vars.custom_var = "$$not_replaced$$"
+    vars.test1 = "string"
+    vars.test2 = 17
+    vars.test3 = false
+    vars.test4 = {
+        a = [ "dict", "ionary" ]
+        @this = "is"
+    }
+}
+

From 37c91050c7bf2b8436d9e0094bbda61257a64fa7 Mon Sep 17 00:00:00 2001
From: Corentin Ardeois <cardeois@internap.com>
Date: Thu, 8 Sep 2016 11:29:46 -0400
Subject: [PATCH 3/4] Expressions syntax is now $var$

Instead of $$var$$.
We make sure $$var$$ is left untouched.

refs #11976
---
 .../IcingaConfig/IcingaConfigHelper.php        |  2 +-
 .../CustomVariable/CustomVariablesTest.php     |  2 +-
 .../IcingaConfig/IcingaConfigHelperTest.php    | 18 ++++++++++--------
 .../Director/Objects/IcingaServiceTest.php     | 12 ++++++------
 .../Director/Objects/rendered/service3.out     |  8 ++++----
 .../Director/Objects/rendered/service4.out     |  6 +++---
 6 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/library/Director/IcingaConfig/IcingaConfigHelper.php b/library/Director/IcingaConfig/IcingaConfigHelper.php
index 14b8c5d6..edc113b0 100644
--- a/library/Director/IcingaConfig/IcingaConfigHelper.php
+++ b/library/Director/IcingaConfig/IcingaConfigHelper.php
@@ -263,7 +263,7 @@ class IcingaConfigHelper
     }
 
     private static function renderStringWithVariables($string) {
-        $string = preg_replace('/\$\$([\w\.]+)\$\$/', '" + ${1} + "', $string);
+        $string = preg_replace('/(?<!\$)\$([\w\.]+)\$(?!\$)/', '" + ${1} + "', $string);
         $string = '"' . $string . '"';
         if (substr($string, 0, 5) === '"" + ') {
             $string = substr($string, 5);
diff --git a/test/php/library/Director/CustomVariable/CustomVariablesTest.php b/test/php/library/Director/CustomVariable/CustomVariablesTest.php
index 8963c515..ba1e25a6 100644
--- a/test/php/library/Director/CustomVariable/CustomVariablesTest.php
+++ b/test/php/library/Director/CustomVariable/CustomVariablesTest.php
@@ -48,7 +48,7 @@ class CustomVariablesTest extends BaseTestCase
     {
         $vars = $this->newVars();
         $vars->bla = 'da';
-        $vars->abc = '$$val$$';
+        $vars->abc = '$val$';
         $expected = $this->indentVarsList(array(
             'vars.abc = val',
             'vars.bla = "da"'
diff --git a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
index f2e709bc..ff2b8617 100644
--- a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
+++ b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
@@ -83,19 +83,21 @@ class IcingaConfigHelperTest extends BaseTestCase
 
     public function testRenderStringWithVariables()
     {
-        $this->assertEquals(c::renderString('Before $$var$$', true), '"Before " + var');
-        $this->assertEquals(c::renderString('$$var$$ After', true), 'var + " After"');
-        $this->assertEquals(c::renderString('$$var$$', true), 'var');
+        $this->assertEquals(c::renderString('Before $var$', true), '"Before " + var');
+        $this->assertEquals(c::renderString('$var$ After', true), 'var + " After"');
+        $this->assertEquals(c::renderString('$var$', true), 'var');
+        $this->assertEquals(c::renderString('$$var$$', true), '"$$var$$"');
+        $this->assertEquals(c::renderString('Before $$var$$ After', true), '"Before $$var$$ After"');
         $this->assertEquals(
-            c::renderString('Before $$name$$ $$name$$ After', true),
+            c::renderString('Before $name$ $name$ After', true),
             '"Before " + name + " " + name + " After"');
         $this->assertEquals(
-            c::renderString('Before $$var1$$ $$var2$$ After', true),
+            c::renderString('Before $var1$ $var2$ After', true),
             '"Before " + var1 + " " + var2 + " After"');
-        $this->assertEquals(c::renderString('$$host.vars.custom$$', true), 'host.vars.custom');
-        $this->assertEquals(c::renderString('$$var"$$', true), '"$$var\"$$"');
+        $this->assertEquals(c::renderString('$host.vars.custom$', true), 'host.vars.custom');
+        $this->assertEquals(c::renderString('$var"$', true), '"$var\"$"');
         $this->assertEquals(
-            c::renderString('\tI am\rrendering\nproperly\fand I $$support$$ "multiple" $$variables$$\$', true),
+            c::renderString('\tI am\rrendering\nproperly\fand I $support$ "multiple" $variables$\$', true),
             '"\\\\tI am\\\\rrendering\\\\nproperly\\\\fand I " + support + " \"multiple\" " + variables + "\\\\$"');
     }
 }
diff --git a/test/php/library/Director/Objects/IcingaServiceTest.php b/test/php/library/Director/Objects/IcingaServiceTest.php
index a6821400..efbc18cf 100644
--- a/test/php/library/Director/Objects/IcingaServiceTest.php
+++ b/test/php/library/Director/Objects/IcingaServiceTest.php
@@ -242,13 +242,13 @@ class IcingaServiceTest extends BaseTestCase
 
         $db = $this->getDb();
 
-        $service = $this->service('___TEST___service_$$not_replaced$$');
+        $service = $this->service('___TEST___service_$not_replaced$');
         $service->object_type = 'apply';
-        $service->display_name = 'Service: $$replaced$$';
+        $service->display_name = 'Service: $host.vars.replaced$';
         $service->assignments = array(
             'host.address="127.*"',
         );
-        $service->{'vars.custom_var'} = '$$replaced$$';
+        $service->{'vars.custom_var'} = '$host.vars.replaced$';
         $service->store($db);
 
         $service = IcingaService::loadWithAutoIncId($service->id, $db);
@@ -266,10 +266,10 @@ class IcingaServiceTest extends BaseTestCase
 
         $db = $this->getDb();
 
-        $service = $this->service('___TEST___service_$$not_replaced$$');
+        $service = $this->service('___TEST___service_$not_replaced$');
         $service->object_type = 'object';
-        $service->display_name = 'Service: $$not_replaced$$';
-        $service->{'vars.custom_var'} = '$$not_replaced$$';
+        $service->display_name = 'Service: $host.vars.not_replaced$';
+        $service->{'vars.custom_var'} = '$host.vars.not_replaced$';
         $service->store($db);
 
         $service = IcingaService::loadWithAutoIncId($service->id, $db);
diff --git a/test/php/library/Director/Objects/rendered/service3.out b/test/php/library/Director/Objects/rendered/service3.out
index 2023ef8a..ad39128a 100644
--- a/test/php/library/Director/Objects/rendered/service3.out
+++ b/test/php/library/Director/Objects/rendered/service3.out
@@ -1,6 +1,6 @@
-apply Service "___TEST___service_$$not_replaced$$" {
-    display_name = "Service: " + replaced
-    vars.custom_var = replaced
+apply Service "___TEST___service_$not_replaced$" {
+    display_name = "Service: " + host.vars.replaced
+    vars.custom_var = host.vars.replaced
     vars.test1 = "string"
     vars.test2 = 17
     vars.test3 = false
@@ -11,6 +11,6 @@ apply Service "___TEST___service_$$not_replaced$$" {
 
     assign where match("127.*", host.address)
 
-    import "host var overrides (Director)"
+    import DirectorOverrideTemplate
 }
 
diff --git a/test/php/library/Director/Objects/rendered/service4.out b/test/php/library/Director/Objects/rendered/service4.out
index 1b607a58..ef87fc83 100644
--- a/test/php/library/Director/Objects/rendered/service4.out
+++ b/test/php/library/Director/Objects/rendered/service4.out
@@ -1,6 +1,6 @@
-object Service "___TEST___service_$$not_replaced$$" {
-    display_name = "Service: $$not_replaced$$"
-    vars.custom_var = "$$not_replaced$$"
+object Service "___TEST___service_$not_replaced$" {
+    display_name = "Service: $host.vars.not_replaced$"
+    vars.custom_var = "$host.vars.not_replaced$"
     vars.test1 = "string"
     vars.test2 = 17
     vars.test3 = false

From b7eaab715b74405f789d88c0b6462be32a732b95 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Sat, 22 Oct 2016 05:48:09 +0000
Subject: [PATCH 4/4] Make explicit calls to renderStringWithVariables

---
 .../CustomVariable/CustomVariableString.php   |  6 +++-
 .../IcingaConfig/IcingaConfigHelper.php       | 20 +++++++------
 library/Director/Objects/IcingaObject.php     |  7 ++++-
 .../IcingaConfig/IcingaConfigHelperTest.php   | 29 ++++++++++---------
 .../Director/Objects/IcingaServiceTest.php    |  3 +-
 5 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/library/Director/CustomVariable/CustomVariableString.php b/library/Director/CustomVariable/CustomVariableString.php
index 6f0677b0..11942769 100644
--- a/library/Director/CustomVariable/CustomVariableString.php
+++ b/library/Director/CustomVariable/CustomVariableString.php
@@ -38,6 +38,10 @@ class CustomVariableString extends CustomVariable
 
     public function toConfigString($renderExpressions = false)
     {
-        return c::renderString($this->getValue(), $renderExpressions);
+        if ($renderExpressions) {
+            return c::renderStringWithVariables($this->getValue());
+        } else {
+            return c::renderString($this->getValue());
+        }
     }
 }
diff --git a/library/Director/IcingaConfig/IcingaConfigHelper.php b/library/Director/IcingaConfig/IcingaConfigHelper.php
index edc113b0..f76ad167 100644
--- a/library/Director/IcingaConfig/IcingaConfigHelper.php
+++ b/library/Director/IcingaConfig/IcingaConfigHelper.php
@@ -74,7 +74,7 @@ class IcingaConfigHelper
 
     // TODO: Find out how to allow multiline {{{...}}} strings.
     //       Parameter? Dedicated method? Always if \n is found?
-    public static function renderString($string, $renderExpressions = false)
+    public static function renderString($string)
     {
         $special = array(
             '/\\\/',
@@ -100,11 +100,7 @@ class IcingaConfigHelper
 
         $string = preg_replace($special, $replace, $string);
 
-        if ($renderExpressions) {
-            return self::renderStringWithVariables($string);
-        } else {
-            return '"' . $string . '"';
-        }
+        return '"' . $string . '"';
     }
 
     public static function renderDictionaryKey($key)
@@ -262,15 +258,21 @@ class IcingaConfigHelper
         return $seconds . 's';
     }
 
-    private static function renderStringWithVariables($string) {
-        $string = preg_replace('/(?<!\$)\$([\w\.]+)\$(?!\$)/', '" + ${1} + "', $string);
-        $string = '"' . $string . '"';
+    public static function renderStringWithVariables($string)
+    {
+        $string = preg_replace(
+            '/(?<!\$)\$([\w\.]+)\$(?!\$)/',
+            '" + ${1} + "',
+            static::renderString($string)
+        );
+
         if (substr($string, 0, 5) === '"" + ') {
             $string = substr($string, 5);
         }
         if (substr($string, -5) === ' + ""') {
             $string = substr($string, 0, -5);
         }
+
         return $string;
     }
 }
diff --git a/library/Director/Objects/IcingaObject.php b/library/Director/Objects/IcingaObject.php
index c4d92c94..6d1a7cb4 100644
--- a/library/Director/Objects/IcingaObject.php
+++ b/library/Director/Objects/IcingaObject.php
@@ -1703,7 +1703,12 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
             return $this->renderRelationProperty($relKey, $value);
         }
 
-        return c::renderKeyValue($key, c::renderString($value, $this->isApplyRule()));
+        return c::renderKeyValue(
+            $key,
+            $this->isApplyRule() ?
+                c::renderStringWithVariables($value) :
+                c::renderString($value)
+        );
     }
 
     protected function renderLegacyObjectProperty($key, $value)
diff --git a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
index ff2b8617..bb5955a0 100644
--- a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
+++ b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
@@ -83,21 +83,24 @@ class IcingaConfigHelperTest extends BaseTestCase
 
     public function testRenderStringWithVariables()
     {
-        $this->assertEquals(c::renderString('Before $var$', true), '"Before " + var');
-        $this->assertEquals(c::renderString('$var$ After', true), 'var + " After"');
-        $this->assertEquals(c::renderString('$var$', true), 'var');
-        $this->assertEquals(c::renderString('$$var$$', true), '"$$var$$"');
-        $this->assertEquals(c::renderString('Before $$var$$ After', true), '"Before $$var$$ After"');
+        $this->assertEquals(c::renderStringWithVariables('Before $var$'), '"Before " + var');
+        $this->assertEquals(c::renderStringWithVariables('$var$ After'), 'var + " After"');
+        $this->assertEquals(c::renderStringWithVariables('$var$'), 'var');
+        $this->assertEquals(c::renderStringWithVariables('$$var$$'), '"$$var$$"');
+        $this->assertEquals(c::renderStringWithVariables('Before $$var$$ After'), '"Before $$var$$ After"');
         $this->assertEquals(
-            c::renderString('Before $name$ $name$ After', true),
-            '"Before " + name + " " + name + " After"');
+            c::renderStringWithVariables('Before $name$ $name$ After'),
+            '"Before " + name + " " + name + " After"'
+        );
         $this->assertEquals(
-            c::renderString('Before $var1$ $var2$ After', true),
-            '"Before " + var1 + " " + var2 + " After"');
-        $this->assertEquals(c::renderString('$host.vars.custom$', true), 'host.vars.custom');
-        $this->assertEquals(c::renderString('$var"$', true), '"$var\"$"');
+            c::renderStringWithVariables('Before $var1$ $var2$ After'),
+            '"Before " + var1 + " " + var2 + " After"'
+        );
+        $this->assertEquals(c::renderStringWithVariables('$host.vars.custom$'), 'host.vars.custom');
+        $this->assertEquals(c::renderStringWithVariables('$var"$'), '"$var\"$"');
         $this->assertEquals(
-            c::renderString('\tI am\rrendering\nproperly\fand I $support$ "multiple" $variables$\$', true),
-            '"\\\\tI am\\\\rrendering\\\\nproperly\\\\fand I " + support + " \"multiple\" " + variables + "\\\\$"');
+            c::renderStringWithVariables('\tI am\rrendering\nproperly\fand I $support$ "multiple" $variables$\$'),
+            '"\\\\tI am\\\\rrendering\\\\nproperly\\\\fand I " + support + " \"multiple\" " + variables + "\\\\$"'
+        );
     }
 }
diff --git a/test/php/library/Director/Objects/IcingaServiceTest.php b/test/php/library/Director/Objects/IcingaServiceTest.php
index efbc18cf..07fea36c 100644
--- a/test/php/library/Director/Objects/IcingaServiceTest.php
+++ b/test/php/library/Director/Objects/IcingaServiceTest.php
@@ -12,7 +12,8 @@ class IcingaServiceTest extends BaseTestCase
     protected $testHostName = '___TEST___host';
 
     protected $testServiceName = '___TEST___service';
-    protected $createdServices = [];
+
+    protected $createdServices = array();
 
     public function testUnstoredHostCanBeLazySet()
     {