✨ Add File Type on URL

sugeng-sulistiyawan · Oct 25, 2024 · cc7e6cb · cc7e6cb
1 parent c0a77e7
commit cc7e6cb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/actions/FileAction.php b/src/actions/FileAction.php
@@ -34,6 +34,8 @@
  */
 class FileAction extends Action
 {
+    const FILENAME_SEPARATOR = 'fname-';
+
     /**
      * @var string filesystem config component (fs)
      */
@@ -52,7 +54,9 @@ public function run($data = null)
         $filesystem = Yii::$app->get($this->component);
 
         try {
-            $params = Json::decode($filesystem->/** @scrutinizer ignore-call */decrypt($data));
+            [$dataEncrypt, $filename] = explode(self::FILENAME_SEPARATOR, $data);
+
+            $params = Json::decode($filesystem->/** @scrutinizer ignore-call */decrypt($dataEncrypt));
 
             $now = (int) (new DateTimeImmutable())->getTimestamp();
             $expires = (int) $params['expires'];
@@ -61,9 +65,13 @@ public function run($data = null)
                 throw new NotFoundHttpException(Yii::t('yii', 'Page not found.'));
             }
 
+            $attachmentName = (string) pathinfo($params['path'], PATHINFO_BASENAME);
+            if ($filename !== $attachmentName) {
+                throw new NotFoundHttpException(Yii::t('yii', 'Page not found.'));
+            }
+
             $content = $filesystem->read($params['path']);
             $mimeType = $filesystem->mimeType($params['path']);
-            $attachmentName = (string) pathinfo($params['path'], PATHINFO_BASENAME);
         } catch (\Throwable $th) {
             throw new NotFoundHttpException(Yii::t('yii', 'Page not found.'));
         }

diff --git a/src/traits/UrlGeneratorAdapterTrait.php b/src/traits/UrlGeneratorAdapterTrait.php
@@ -4,6 +4,7 @@
 
 use DateTimeInterface;
 use diecoding\flysystem\AbstractComponent;
+use diecoding\flysystem\actions\FileAction;
 use League\Flysystem\Config;
 use League\Flysystem\PathPrefixer;
 use yii\helpers\Json;
@@ -40,7 +41,7 @@ public function publicUrl(string $path, /** @scrutinizer ignore-unused */Config
             'expires' => 0,
         ];
 
-        return Url::toRoute([$this->component->action, 'data' => $this->component->/** @scrutinizer ignore-call */encrypt(Json::encode($params))], true);
+        return $this->generateUrlAction($params);
     }
 
     public function temporaryUrl(string $path, DateTimeInterface $expiresAt, /** @scrutinizer ignore-unused */Config $config): string
@@ -55,6 +56,14 @@ public function temporaryUrl(string $path, DateTimeInterface $expiresAt, /** @sc
             'expires' => (int) $expiresAt->getTimestamp(),
         ];
 
-        return Url::toRoute([$this->component->action, 'data' => $this->component->/** @scrutinizer ignore-call */encrypt(Json::encode($params))], true);
+        return $this->generateUrlAction($params);
+    }
+
+    private function generateUrlAction(array $params): string
+    {
+        $attachmentName = (string) pathinfo($params['path'], PATHINFO_BASENAME);
+        $data = $this->component->/** @scrutinizer ignore-call */encrypt(Json::encode($params)) . FileAction::FILENAME_SEPARATOR . $attachmentName;
+
+        return Url::toRoute([$this->component->action, 'data' => $data], true);
     }
 }