Merge pull request #68 from tinect/feat/preventDirectoryDeletion

feat: prevent delete operation from deleting all contents

Author: sifex

src/BunnyCDNAdapter.php

@@ -450,6 +450,11 @@ private function copyFile(string $source, string $destination, Config $config):
      */
     public function delete($path): void
     {
+        // if path is empty or ends with /, it's a directory.
+        if (empty($path) || str_ends_with($path, '/')) {
+            throw UnableToDeleteFile::atLocation($path, 'Deletion of directories prevented.');
+        }
+
         try {
             $this->client->delete($path);
             // @codeCoverageIgnoreStart

tests/ClientTest.php

@@ -10,6 +10,10 @@
 use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\DirectoryNotEmptyException;
 use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\NotFoundException;
 
+if (\is_file(__DIR__.'/ClientDI.php')) {
+    require_once __DIR__.'/ClientDI.php';
+}
+
 class ClientTest extends TestCase
 {
     public BunnyCDNClient $client;

tests/FlysystemAdapterTest.php

@@ -9,6 +9,7 @@
 use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\UnableToCopyFile;
+use League\Flysystem\UnableToDeleteFile;
 use League\Flysystem\UnableToMoveFile;
 use League\Flysystem\UnableToProvideChecksum;
 use League\Flysystem\UnableToRetrieveMetadata;
@@ -19,6 +20,10 @@
 use PlatformCommunity\Flysystem\BunnyCDN\Util;
 use Throwable;
 
+if (\is_file(__DIR__.'/ClientDI.php')) {
+    require_once __DIR__.'/ClientDI.php';
+}
+
 class FlysystemAdapterTest extends FilesystemAdapterTestCase
 {
     public const DEMOURL = 'https://example.org.local';
@@ -70,6 +75,44 @@ public function generating_a_temporary_url(): void
         $this->markTestSkipped('No temporary URL support is provided for BunnyCDN');
     }
 
+    /**
+     * @test
+     */
+    public function delete_on_directory_throws_exception(): void
+    {
+        $this->runScenario(function () {
+            $adapter = $this->adapter();
+
+            $adapter->write(
+                'test/text.txt',
+                'contents',
+                new Config([Config::OPTION_VISIBILITY => Visibility::PUBLIC])
+            );
+
+            $this->expectException(UnableToDeleteFile::class);
+            $adapter->delete('test/');
+        });
+    }
+
+    /**
+     * @test
+     */
+    public function delete_with_empty_path_throws_exception(): void
+    {
+        $this->runScenario(function () {
+            $adapter = $this->adapter();
+
+            $adapter->write(
+                'test/text.txt',
+                'contents',
+                new Config([Config::OPTION_VISIBILITY => Visibility::PUBLIC])
+            );
+
+            $this->expectException(UnableToDeleteFile::class);
+            $adapter->delete('');
+        });
+    }
+
     /**
      * @test
      */

tests/PrefixTest.php

@@ -13,6 +13,10 @@
 use PlatformCommunity\Flysystem\BunnyCDN\BunnyCDNAdapter;
 use PlatformCommunity\Flysystem\BunnyCDN\BunnyCDNClient;
 
+if (\is_file(__DIR__.'/ClientDI.php')) {
+    require_once __DIR__.'/ClientDI.php';
+}
+
 class PrefixTest extends FilesystemAdapterTestCase
 {
     /**