Add new field for tracking domains that have been checked at least on…

…ce, increase check to 30 minutes, code format
indygriffiths · Jun 28, 2018 · d99b99f · d99b99f
1 parent 702865f
commit d99b99f
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 19 deletions.
diff --git a/mysite/_config.php b/mysite/_config.php
@@ -21,5 +21,5 @@
     'BrokenRedirectorPagesReport',
     'BrokenVirtualPagesReport',
     'RecentlyEditedReport',
-    'EmptyPagesReport'
+    'EmptyPagesReport',
 ]);
diff --git a/mysite/code/Jobs/CheckSSLCertificates.php b/mysite/code/Jobs/CheckSSLCertificates.php
@@ -12,7 +12,7 @@ class CheckSSLCertificates implements CronTask
      */
     public function getSchedule()
     {
-        return '0 * * * *';
+        return '0/30 * * * *';
     }
 
     /**
@@ -26,6 +26,7 @@ public function process()
         $this->log('Number of existing domains: '.$domains->count(), SS_Log::DEBUG);
 
         foreach ($domains as $d) {
+            $hasBeenChecked = $d->HasBeenChecked;
             $d->LastChecked = time();
 
             $this->log('Checking '.$d->Domain, SS_Log::INFO);
@@ -90,6 +91,7 @@ public function process()
             $d->ErrorCode = '';
             $d->ErrorMessage = '';
             $d->AlertedCommonNameMismatch = false;
+            $d->HasBeenChecked = true;
 
             $this->log('Checking this certificate against the current one', SS_Log::DEBUG);
             if ($lastCert->exists() && $lastCert->Fingerprint === $fingerprint) {
@@ -121,7 +123,7 @@ public function process()
             $d->write();
 
             // Post to Slack about the new certificate only if this isn't the first certificate
-            if ($lastCert->exists()) {
+            if ($hasBeenChecked) {
                 $this->notifyNewCertificate($d, $cert);
             }
         }
@@ -249,7 +251,7 @@ private function getStream($domain)
         $streamOptions = stream_context_create([
             'ssl' => [
                 'capture_peer_cert' => true,
-                'verify_peer'       => false,
+                'verify_peer' => false,
             ],
         ]);
 

diff --git a/mysite/code/Jobs/GetCloudFlareDomains.php b/mysite/code/Jobs/GetCloudFlareDomains.php
@@ -26,7 +26,7 @@ public function process()
         $zones = $cf->Zones();
 
         foreach ($zones as $z) {
-            if (in_array($z->name, $domains)) {
+            if (in_array($z->name, $domains, true)) {
                 continue;
             }
 

diff --git a/mysite/code/Jobs/GetIncapsulaDomains.php b/mysite/code/Jobs/GetIncapsulaDomains.php
@@ -26,7 +26,7 @@ public function process()
         $zones = $cf->Sites();
 
         foreach ($zones as $z) {
-            if (in_array($z->domain, $domains)) {
+            if (in_array($z->domain, $domains, true)) {
                 continue;
             }
 

diff --git a/mysite/code/Model/Domain.php b/mysite/code/Model/Domain.php
@@ -13,6 +13,7 @@ class Domain extends DataObject
         'OpsGenieID' => 'Text',
         'AlertPriority' => 'Text',
         'AlertedCommonNameMismatch' => 'Boolean(0)',
+        'HasBeenChecked' => 'Boolean(0)',
     ];
 
     private static $has_many = [
@@ -144,9 +145,9 @@ public function HasValidCertificateNice()
     public function LastCheckSuccessful()
     {
         return empty($this->ErrorCode) &&
-               empty($this->ErrorMessage) &&
-               !empty($this->LastChecked) &&
-               $this->HasValidCertificate();
+            empty($this->ErrorMessage) &&
+            !empty($this->LastChecked) &&
+            $this->HasValidCertificate();
     }
 
     /**

diff --git a/mysite/code/Report/LetsEncryptReport.php b/mysite/code/Report/LetsEncryptReport.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Report for listing domains who are using Let's Encrypt
+ * Report for listing domains who are using Let's Encrypt.
  */
 class LetsEncryptReport extends SS_Report
 {
@@ -18,8 +18,8 @@ public function description()
     public function sourceRecords($params = null)
     {
         return Domain::get()
-                     ->filter(['Certificates.Issuer:PartialMatch' => 'Let\'s Encrypt'])
-                     ->sort('Domain');
+            ->filter(['Certificates.Issuer:PartialMatch' => 'Let\'s Encrypt'])
+            ->sort('Domain');
     }
 
     public function columns()

diff --git a/mysite/code/Tasks/ClearData.php b/mysite/code/Tasks/ClearData.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * Class for managing ClearData
- * @package ${PACKAGE}
+ * Class for managing ClearData.
  */
-class ClearData extends BuildTask {
-
+class ClearData extends BuildTask
+{
     /**
      * Implement this method in the task subclass to
-     * execute via the TaskRunner
+     * execute via the TaskRunner.
      *
      * @param SS_HTTPRequest $request
      */
-    public function run($request) {
+    public function run($request)
+    {
         DB::query('TRUNCATE TABLE Domain');
         DB::query('TRUNCATE TABLE Certificate');
     }
-}
+}