Support for composite file extension validation

framework/CHANGELOG.md

@@ -25,6 +25,7 @@ Yii Framework 2 Change Log
 - Enh #15202: Add optional param `--silent-exit-on-exception` in `yii\console\Controller` (egorrishe)
 - Bug #18110: Add quotes to return value of viewName in MSSQL schema. It is `[someView]` now (darkdef)
 - Bug #18134: Instance of `ExpressionInterface` will not be quoted in `Connection:quoteColumnName` (darkdef)
+- Bug #18094: Support for composite file extension validation (darkdef)
 
 
 2.0.35 May 02, 2020

framework/assets/yii.validation.js

@@ -408,10 +408,18 @@ yii.validation = (function ($) {
 
     function validateFile(file, messages, options) {
         if (options.extensions && options.extensions.length > 0) {
-            var index = file.name.lastIndexOf('.');
-            var ext = !~index ? '' : file.name.substr(index + 1, file.name.length).toLowerCase();
+            var found = false;
+            var filename = file.name.toLowerCase();
 
-            if (!~options.extensions.indexOf(ext)) {
+            for (var index=0; index < options.extensions.length; index++) {
+                var ext = options.extensions[index].toLowerCase();
+                if (filename.substr(filename.length - options.extensions[index].length) === ext) {
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found) {
                 messages.push(options.wrongExtension.replace(/\{file\}/g, file.name));
             }
         }

framework/validators/FileValidator.php

@@ -11,6 +11,7 @@
 use yii\helpers\FileHelper;
 use yii\helpers\Html;
 use yii\helpers\Json;
+use yii\helpers\StringHelper;
 use yii\web\JsExpression;
 use yii\web\UploadedFile;
 
@@ -412,7 +413,11 @@ protected function validateExtension($file)
             }
         }
 
-        if (!in_array($extension, $this->extensions, true)) {
+        if (is_array($this->extensions) and count($this->extensions)) {
+            foreach ($this->extensions as $ext) {
+                if (StringHelper::endsWith($file->name, $ext, false))
+                    return true;
+            }
             return false;
         }