Fix asset validation issues on upload

craftcms · Dec 15, 2023 · 3b4b2be · 3b4b2be
1 parent de92bbc
commit 3b4b2be
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 46 deletions.
diff --git a/src/Helper.php b/src/Helper.php
@@ -38,6 +38,28 @@ public static function setMemoryLimit(int|string $limit, int|string $offset = 0)
         return $memoryLimit;
     }
 
+    public static function removeAttributeFromRule(array $rule, string $attributeToRemove): ?array
+    {
+        $attributes = Collection::wrap($rule[0])
+            ->reject(fn($attribute) => $attribute === $attributeToRemove);
+
+        if ($attributes->isEmpty()) {
+            return null;
+        }
+
+        $rule[0] = $attributes->all();
+
+        return $rule;
+    }
+
+    public static function removeAttributeFromRules(array $rules, string $attributeToRemove): array
+    {
+        return Collection::make($rules)
+            ->map(fn($rule) => Helper::removeAttributeFromRule($rule, $attributeToRemove))
+            ->filter()
+            ->all();
+    }
+
     /**
      * A version of tableExists that doesn't rely on the cache component
      */

diff --git a/src/Module.php b/src/Module.php
@@ -4,13 +4,16 @@
 
 use Craft;
 use craft\base\Event;
+use craft\base\Model;
 use craft\cloud\fs\AssetsFs;
 use craft\cloud\fs\StorageFs;
 use craft\cloud\fs\TmpFs;
 use craft\cloud\web\assets\uploader\UploaderAsset;
 use craft\cloud\web\ResponseBehavior;
 use craft\console\Application as ConsoleApplication;
 use craft\debug\Module as DebugModule;
+use craft\elements\Asset;
+use craft\events\DefineRulesEvent;
 use craft\events\RegisterComponentTypesEvent;
 use craft\events\RegisterTemplateRootsEvent;
 use craft\fs\Temp;
@@ -55,7 +58,7 @@ public function init(): void
             ? 'craft\\cloud\\cli\\controllers'
             : 'craft\\cloud\\controllers';
 
-        $this->registerEventHandlers();
+        $this->registerGlobalEventHandlers();
         $this->validateConfig();
     }
 
@@ -96,43 +99,6 @@ public function getConfig(): Config
         return $this->_config;
     }
 
-    protected function registerEventHandlers(): void
-    {
-        Event::on(
-            ImageTransforms::class,
-            ImageTransforms::EVENT_REGISTER_IMAGE_TRANSFORMERS,
-            static function(RegisterComponentTypesEvent $event) {
-                $event->types[] = ImageTransformer::class;
-            }
-        );
-
-        Event::on(
-            FsService::class,
-            FsService::EVENT_REGISTER_FILESYSTEM_TYPES,
-            static function(RegisterComponentTypesEvent $event) {
-                $event->types[] = AssetsFs::class;
-            }
-        );
-
-        Event::on(
-            View::class,
-            View::EVENT_REGISTER_CP_TEMPLATE_ROOTS,
-            function(RegisterTemplateRootsEvent $e) {
-                $e->roots[$this->id] = sprintf('%s/templates', $this->getBasePath());
-            }
-        );
-
-        Event::on(
-            CraftVariable::class,
-            CraftVariable::EVENT_INIT,
-            function(\yii\base\Event $e) {
-                /** @var CraftVariable $craftVariable */
-                $craftVariable = $e->sender;
-                $craftVariable->set('cloud', Module::class);
-            }
-        );
-    }
-
     protected function bootstrapCloud(ConsoleApplication|WebApplication $app): void
     {
         // Set Craft memory limit to just below PHP's limit
@@ -207,6 +173,48 @@ protected function bootstrapCloud(ConsoleApplication|WebApplication $app): void
             'staticCaching' => StaticCaching::class,
         ]);
 
+        $this->registerCloudEventHandlers();
+    }
+
+    protected function registerGlobalEventHandlers(): void
+    {
+        Event::on(
+            ImageTransforms::class,
+            ImageTransforms::EVENT_REGISTER_IMAGE_TRANSFORMERS,
+            static function(RegisterComponentTypesEvent $event) {
+                $event->types[] = ImageTransformer::class;
+            }
+        );
+
+        Event::on(
+            FsService::class,
+            FsService::EVENT_REGISTER_FILESYSTEM_TYPES,
+            static function(RegisterComponentTypesEvent $event) {
+                $event->types[] = AssetsFs::class;
+            }
+        );
+
+        Event::on(
+            View::class,
+            View::EVENT_REGISTER_CP_TEMPLATE_ROOTS,
+            function(RegisterTemplateRootsEvent $e) {
+                $e->roots[$this->id] = sprintf('%s/templates', $this->getBasePath());
+            }
+        );
+
+        Event::on(
+            CraftVariable::class,
+            CraftVariable::EVENT_INIT,
+            function(\yii\base\Event $e) {
+                /** @var CraftVariable $craftVariable */
+                $craftVariable = $e->sender;
+                $craftVariable->set('cloud', Module::class);
+            }
+        );
+    }
+
+    protected function registerCloudEventHandlers(): void
+    {
         Event::on(
             View::class,
             View::EVENT_BEFORE_RENDER_PAGE_TEMPLATE,
@@ -230,6 +238,14 @@ protected function bootstrapCloud(ConsoleApplication|WebApplication $app): void
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
             [$this->get('staticCaching'), 'handleRegisterCacheOptions'],
         );
+
+        Event::on(
+            Asset::class,
+            Model::EVENT_DEFINE_RULES,
+            function(DefineRulesEvent $e) {
+                $e->rules = Helper::removeAttributeFromRules($e->rules, 'tempFilePath');
+            }
+        );
     }
 
     protected function validateConfig(): void

diff --git a/src/controllers/AssetsController.php b/src/controllers/AssetsController.php
@@ -158,9 +158,13 @@ public function actionCreateAsset(): Response
         $asset->width = $width;
         $asset->height = $height;
 
-        // Setting newFolderId and not folderId, so that validation on newLocation occurs
+        // Setting newFolderId, so that extension validation on newLocation occurs
         $asset->newFolderId = $folder->id;
 
+        // Setting these so that Asset::_relocateFile doesn't try to download
+        $asset->folderId = $folder->id;
+        $asset->folderPath = $folder->path;
+
         if (!$selectionCondition) {
             $asset->newFilename = $targetFilename;
         }
@@ -169,7 +173,7 @@ public function actionCreateAsset(): Response
             $asset->title = Assets::filename2Title(pathinfo($originalFilename, PATHINFO_FILENAME));
         }
 
-        // Saving without Asset::SCENARIO_CREATE, as it requires a tempFilePath
+        $asset->setScenario(Asset::SCENARIO_CREATE);
         $saved = $elementsService->saveElement($asset);
 
         // In case of error, let user know about it.
@@ -330,7 +334,7 @@ public function replaceAssetFile(Asset $asset, string $filename, string $targetF
         $asset->avoidFilenameConflicts = true;
         $asset->setFilename($filename);
         $asset->newFilename = $targetFilename;
-
+        $asset->setScenario(Asset::SCENARIO_REPLACE);
         $saved = Craft::$app->getElements()->saveElement($asset);
 
         if ($assets->hasEventHandlers($assets::EVENT_AFTER_REPLACE_ASSET)) {

diff --git a/src/web/assets/uploader/src/Uploader.js b/src/web/assets/uploader/src/Uploader.js
@@ -65,7 +65,7 @@ Craft.CloudUploader = Craft.BaseUploader.extend(
           const matches = file.name.match(/\.([a-z0-4_]+)$/i);
           const fileExtension = matches[1];
 
-          if (this._extensionList.includes(fileExtension.toLowerCase())) {
+          if (!this._extensionList.includes(fileExtension.toLowerCase())) {
             this._rejectedFiles.type.push('“' + file.name + '”');
             valid = false;
           }
@@ -99,13 +99,16 @@ Craft.CloudUploader = Craft.BaseUploader.extend(
 
       this.processErrorMessages();
 
-      this.element.dispatchEvent(new Event('fileuploadstart'));
+      if (this._validFileCounter > 0) {
+        this.element.dispatchEvent(new Event('fileuploadstart'));
 
-      for (const file of validFiles) {
-        await this.uploadFile(file);
-        this._inProgressCounter--;
+        for (const file of validFiles) {
+          await this.uploadFile(file);
+          this._inProgressCounter--;
+        }
       }
 
+      this._validFileCounter = 0;
       this._totalBytes = 0;
       this._uploadedBytes = 0;
       this._lastUploadedBytes = 0;