This is to add an opportunity for injecting S3 options like ACL permi…

…ssions. One needs them in case it's expected for newly upload files be "public-read". (#365) It's also fixes the wrong default value for "use_path_style_endpoint" flag.
helios-ag · Jul 28, 2019 · f49ec06 · f49ec06
1 parent bc724ef
commit f49ec06
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Configuration/ElFinderConfigurationReader.php b/src/Configuration/ElFinderConfigurationReader.php
@@ -267,7 +267,7 @@ private function configureFlysystem($opt, $adapter, $serviceName)
                     'endpoint' => $opt['aws_s3_v3']['endpoint'],
                     'use_path_style_endpoint' => $opt['aws_s3_v3']['use_path_style_endpoint'],
                 ));
-                $filesystem = new Filesystem(new AwsS3v3($client, $opt['aws_s3_v3']['bucket_name'], $opt['aws_s3_v3']['optional_prefix']));
+                $filesystem = new Filesystem(new AwsS3v3($client, $opt['aws_s3_v3']['bucket_name'], $opt['aws_s3_v3']['optional_prefix'], $opt['aws_s3_v3']['options']));
 
                 break;
             case 'copy_com':

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -390,7 +390,13 @@ private function createFlysystemNode()
                             ->scalarNode('bucket_name')->defaultvalue('')->end()
                             ->scalarNode('optional_prefix')->defaultvalue('')->end()
                             ->scalarNode('endpoint')->defaultvalue('')->end()
-                            ->scalarNode('use_path_style_endpoint')->defaultValue('')->end()
+                            ->scalarNode('use_path_style_endpoint')->defaultValue(false)->end()
+                            ->arrayNode('options')
+                                ->canBeEnabled()
+                                    ->children()
+                                        ->scalarNode('ACL')->defaultvalue('')->end()
+                                ->end()
+                            ->end()
                     ->end()
                 ->end()
                 ->arrayNode('copy_com')