CMS6 compatibility fixes

Author: lianna-blanca

src/ClamAV.php

@@ -285,6 +285,6 @@ protected function getIP(): string
             return '';
         }
 
-        return $request->getIP();
+        return $request->getIP() ?? '';
     }
 }

src/Extension/ClamAVExtension.php

@@ -4,6 +4,7 @@
 
 use SilverStripe\Assets\File;
 use SilverStripe\Assets\Folder;
+use SilverStripe\Control\Controller;
 use SilverStripe\Core\Extension;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Validation\ValidationResult;
@@ -151,9 +152,17 @@ public function getFullPath(bool $stripQueryParams = false): ?string
             return null;
         }
 
+        // getSourceURL() calls FlysystemAssetStore::grant() for protected files,
+        // which requires an active controller/request. During dev/build with no
+        // database no controller exists, so fall back to the stored filename
+        // which is sufficient for the scan log record.
+        if (!Controller::curr()) {
+            return $owner->getFilename() ?: null;
+        }
+
         $sourceUrl = $this->owner->File->getSourceURL() ?? '';
         if ($stripQueryParams) {
-            return strtok($sourceUrl, '?');
+            return strtok($sourceUrl, '?') ?: null;
         }
 
         return $sourceUrl;

src/Model/ClamAVScan.php

@@ -223,8 +223,9 @@ public function onBeforeWrite(): void
                     $member = Security::getCurrentUser();
                     if ($member) {
                         $this->MemberID = $member->ID;
+                    } else {
+                        $this->MemberID = 0;
                     }
-                    $this->MemberID = 0;
                 }
             }
 
@@ -447,7 +448,7 @@ public function getStateMessage(): DBHTMLText
         $colour = '#C00';
         $text = '';
 
-        $action = $this->State;
+        $action = $this->getState();
         $state_messages = $this->config()->state_messages;
         if (!isset($state_messages[$action])) {
             $action = self::STATE_INVALID;
@@ -492,16 +493,17 @@ public function getUserIdentifier(): ?string
     {
         if ($this->MemberID) {
             $member = $this->Member();
-
-            return $member->Email . ' #' . $member->ID . ' (' . $this->IPAddress . ')';
+            if ($member && $member->exists()) {
+                return $member->Email . ' #' . $member->ID . ' (' . $this->IPAddress . ')';
+            }
         }
 
         return $this->IPAddress;
     }
 
     public function getRawDataSummary(): ?string
     {
-        $rawData = $this->RawData;
+        $rawData = $this->getRawData();
 
         return ($rawData && isset($rawData['status'])) ? $rawData['status'] : '';
     }

src/Tasks/Traits/ScanTrait.php

@@ -71,22 +71,27 @@ protected function scanList(SS_List $list): bool
             }
             $logRecord = $file->scanForVirus();
 
-            // scans by a job/task will have an IPAddress of 127.0.0.1
-            $originalScan = $file->ClamAVScans()->sort('Created DESC')->first();
-            if (isset($originalScan, $originalScan->IPAddress)) {
-                // replace 127.0.0.1 with original IPAddress
-                $logRecord->IPAddress = $originalScan->IPAddress;
+            // Null guard must precede any property access on $logRecord.
+            if (!$logRecord) {
+                $this->log('Skipping ' . $file->ClassName . ' #' . $file->ID . '. File doesn\'t exist.');
+
+                continue;
             }
 
-            if ($logRecord === ClamAV::OFFLINE) {
+            // scanFileForVirus() catches socket exceptions and returns an unscanned
+            // ClamAVScan record (IsScanned = false) when the daemon is unreachable,
+            // rather than throwing. An unscanned record here means the daemon is down.
+            if (!$logRecord->IsScanned) {
                 $this->log('ClamAV daemon is offline.', 'error');
 
                 return false;
             }
-            if (!$logRecord) {
-                $this->log('Skipping ' . $file->ClassName . ' #' . $file->ID . '. File doesn\'t exist.');
 
-                continue;
+            // scans by a job/task will have an IPAddress of 127.0.0.1
+            $originalScan = $file->ClamAVScans()->sort('Created DESC')->first();
+            if (isset($originalScan, $originalScan->IPAddress)) {
+                // replace 127.0.0.1 with original IPAddress
+                $logRecord->IPAddress = $originalScan->IPAddress;
             }
             if ($logRecord->IsInfected) {
                 $this->log($file->ClassName . ' #' . $file->ID . ' has a virus.', 'error');