Optimize imports & cleanup some codes

Author: yhabteab

application/clicommands/CheckCommand.php

@@ -6,7 +6,6 @@
 
 use Icinga\Application\Logger;
 use Icinga\Module\X509\Command;
-use Icinga\Module\X509\Job;
 use Icinga\Module\X509\Model\X509Certificate;
 use Icinga\Module\X509\Model\X509Target;
 use ipl\Sql\Expression;
@@ -91,34 +90,28 @@ public function hostAction()
         // Sub queries for (valid_from, valid_to) columns
         $validFrom = X509Certificate::on($conn)
             ->with(['chain', 'issuer_certificate'])
-            ->columns([
-                new Expression('MAX(GREATEST(%s, %s))', ['valid_from', 'issuer_certificate.valid_from'])
-            ]);
+            ->columns([new Expression('MAX(GREATEST(%s, %s))', ['valid_from', 'issuer_certificate.valid_from'])]);
 
         $validFrom->getResolver()->setAliasPrefix('sub_');
         $validFrom
             ->getSelectBase()
-            ->where(new Expression(
-                'sub_certificate_link.certificate_chain_id = target_chain.id'
-            ));
+            ->where(new Expression('sub_certificate_link.certificate_chain_id = target_chain.id'));
 
         $validTo = clone $validFrom;
-        $validTo->columns([
-            new Expression('MIN(LEAST(%s, %s))', ['valid_to', 'issuer_certificate.valid_to'])
-        ]);
+        $validTo->columns([new Expression('MIN(LEAST(%s, %s))', ['valid_to', 'issuer_certificate.valid_to'])]);
 
-        list($validFromSelect, $validFromValues) = $validFrom->dump();
-        list($validToSelect, $validToValues) = $validTo->dump();
+        list($validFromSelect, $_) = $validFrom->dump();
+        list($validToSelect, $_) = $validTo->dump();
         $targets
             ->withColumns([
-                'valid_from' => new Expression("$validFromSelect", null, ...$validFromValues),
-                'valid_to'   => new Expression("$validToSelect", null, ...$validToValues)
+                'valid_from' => new Expression($validFromSelect),
+                'valid_to'   => new Expression($validToSelect)
             ])
             ->getSelectBase()
             ->where(new Expression('target_chain_link.order = 0'));
 
         if ($ip !== null) {
-            $targets->filter(Filter::equal('ip', Job::binary($ip)));
+            $targets->filter(Filter::equal('ip', $ip));
         }
         if ($hostname !== null) {
             $targets->filter(Filter::equal('hostname', $hostname));

application/controllers/CertificateController.php

@@ -8,7 +8,6 @@
 use Icinga\Module\X509\CertificateDetails;
 use Icinga\Module\X509\Controller;
 use Icinga\Module\X509\Model\X509Certificate;
-use ipl\Sql;
 use ipl\Stdlib\Filter;
 
 class CertificateController extends Controller

library/X509/CertificateDetails.php

@@ -5,9 +5,9 @@
 namespace Icinga\Module\X509;
 
 use DateTime;
+use Icinga\Module\X509\Model\X509Certificate;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
-use ipl\Orm\Model;
 
 /**
  * Widget to display X.509 certificate details
@@ -23,7 +23,7 @@ class CertificateDetails extends BaseHtmlElement
      */
     protected $cert;
 
-    public function setCert(Model $cert)
+    public function setCert(X509Certificate $cert)
     {
         $this->cert = $cert;
 

library/X509/Job.php

@@ -439,7 +439,7 @@ protected function processChain($target, $chain)
             $row = X509Target::on($this->db)->columns(['id']);
 
             $filter = Filter::all();
-            $filter->add(Filter::equal('ip', static::binary($target->ip)));
+            $filter->add(Filter::equal('ip', $target->ip));
             $filter->add(Filter::equal('port', $target->port));
             $filter->add(Filter::equal('hostname', $target->hostname));
 

library/X509/ProvidedHook/HostsImportSource.php

@@ -4,11 +4,9 @@
 
 namespace Icinga\Module\X509\ProvidedHook;
 
-use Icinga\Module\X509\DbTool;
 use Icinga\Module\X509\Job;
 use Icinga\Module\X509\Model\X509Target;
 use ipl\Sql;
-use ipl\Stdlib\Filter;
 
 class HostsImportSource extends X509ImportSource
 {
@@ -60,12 +58,12 @@ public function fetchData()
                 $target->host_name_or_ip = $target->host_ip;
             }
 
-            unset($target->ip); // Isn't needed any more!!
-            unset($target->chain); // We don't need any relation properties anymore
+            // Target ip is now obsolete and must not be included in the results.
+            // The relation is only used to utilize the query and must not be in the result set as well.
+            unset($target->ip);
+            unset($target->chain);
 
-            $properties = iterator_to_array($target);
-
-            $results[$target->host_name_or_ip] = (object) $properties;
+            $results[$target->host_name_or_ip] = (object) iterator_to_array($target);
         }
 
         return $results;

library/X509/ProvidedHook/ServicesImportSource.php

@@ -101,12 +101,12 @@ public function fetchData()
                 $target->host_port
             );
 
-            unset($target->ip); // Isn't needed any more!!
-            unset($target->chain); // We don't need any relation properties anymore
+            // Target ip is now obsolete and must not be included in the results.
+            // The relation is only used to utilize the query and must not be in the result set as well.
+            unset($target->ip);
+            unset($target->chain);
 
-            $properties = iterator_to_array($target);
-
-            $results[$target->host_name_ip_and_port] = (object) $properties;
+            $results[$target->host_name_ip_and_port] = (object) iterator_to_array($target);
         }
 
         return $results;