From a791b09a6ac2946196a22b509b9276df07787914 Mon Sep 17 00:00:00 2001 From: "Nathan J. Brauer" Date: Sat, 22 Jul 2023 20:49:11 -0700 Subject: [PATCH] AssetAdapter - If visibility's already correct, don't try to re-set it. Attempting to set the visibility of a file/folder when the filesystem is already set correctly causes "Operation not permitted" errors on some Linux servers. This commit fixes that issue. --- src/Flysystem/AssetAdapter.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Flysystem/AssetAdapter.php b/src/Flysystem/AssetAdapter.php index d6c1d3fd..e17896d3 100644 --- a/src/Flysystem/AssetAdapter.php +++ b/src/Flysystem/AssetAdapter.php @@ -146,10 +146,20 @@ protected function configureServer($forceOverwrite = false) // Apply each configuration $config = new FlysystemConfig(); - $config->set('visibility', $visibility); foreach ($configurations as $file => $template) { // Ensure file contents if ($forceOverwrite || !$this->has($file)) { + if ($this->has($file)) { + $perms = $this->getVisibility($file); + if ($perms['visibility'] === $visibility) { + // If the visibility is already correct, do not try to re-set it. + // Attempting to set the visibility of a file/folder when the filesystem is already + // set correctly causes "Operation not permitted" errors on some Linux servers. + $config->set('visibility', null); + } else { + $config->set('visibility', $visibility); + } + } // Evaluate file $content = $this->renderTemplate($template); $success = $this->write($file, $content, $config); @@ -157,6 +167,7 @@ protected function configureServer($forceOverwrite = false) throw new Exception("Error writing server configuration file \"{$file}\""); } } + $perms = $this->getVisibility($file); if ($perms['visibility'] !== $visibility) { // Ensure correct permissions