Add and use behavior ExpressionInjector

library/X509/Model/Behavior/ExpressionInjector.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Icinga\Module\X509\Model\Behavior;
+
+use ipl\Orm\Contract\QueryAwareBehavior;
+use ipl\Orm\Contract\RewriteFilterBehavior;
+use ipl\Orm\Query;
+use ipl\Stdlib\Filter;
+
+class ExpressionInjector implements RewriteFilterBehavior, QueryAwareBehavior
+{
+    /** @var array */
+    protected $columns;
+
+    /** @var Query */
+    protected $query;
+
+    public function __construct(...$columns)
+    {
+        $this->columns = $columns;
+    }
+
+    public function setQuery(Query $query)
+    {
+        $this->query = $query;
+
+        return $this;
+    }
+
+    public function rewriteCondition(Filter\Condition $condition, $relation = null)
+    {
+        $columnName = $condition->metaData()->get('columnName');
+        if (in_array($columnName, $this->columns, true)) {
+            $relationPath = $condition->metaData()->get('relationPath');
+            if ($relationPath && $relationPath !== $this->query->getModel()->getTableAlias()) {
+                $subject = $this->query->getResolver()->resolveRelation($relationPath)->getTarget();
+            } else {
+                $subject = $this->query->getModel();
+            }
+
+            $expression = clone $subject->getColumns()[$columnName];
+            $expression->setColumns($this->query->getResolver()->qualifyColumns(
+                $this->query->getResolver()->requireAndResolveColumns(
+                    $expression->getColumns(),
+                    $subject
+                ),
+                $subject
+            ));
+
+            $condition->setColumn($this->query->getDb()->getQueryBuilder()->buildExpression($expression));
+        }
+    }
+}

library/X509/Model/X509Certificate.php

@@ -4,6 +4,7 @@
 
 use Icinga\Module\X509\Model\Behavior\BoolCast;
 use Icinga\Module\X509\Model\Behavior\DistinguishedEncodingRules;
+use Icinga\Module\X509\Model\Behavior\ExpressionInjector;
 use ipl\Orm\Behavior\Binary;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
@@ -103,6 +104,8 @@ public function createBehaviors(Behaviors $behaviors)
             'trusted',
             'self_signed'
         ]));
+
+        $behaviors->add(new ExpressionInjector('duration', 'expires'));
     }
 
     public function createRelations(Relations $relations)