Fixed EZP-20757 - %secret% key should be generated at install/update

ezsystems · Apr 30, 2013 · 33a70a8 · 33a70a8
1 parent 29da705
commit 33a70a8
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,8 @@
         "symfony-cmf/routing": "1.0.*",
         "qafoo/rmf": "1.0.*",
         "kriswallsmith/buzz": ">=0.9",
-        "tedivm/stash-bundle": "@dev"
+        "tedivm/stash-bundle": "@dev",
+        "sensio/distribution-bundle": "2.2.*"
     },
     "require-dev": {
         "ezsystems/ezpublish-legacy": "@dev",

diff --git a/composer.lock b/composer.lock
diff --git a/eZ/Bundle/EzPublishLegacyBundle/Resources/config/services.yml b/eZ/Bundle/EzPublishLegacyBundle/Resources/config/services.yml
@@ -165,7 +165,12 @@ services:
 
     ezpublish_legacy.setup_wizard.configuration_dumper:
         class: %ezpublish_legacy.setup_wizard.configuration_dumper.class%
-        arguments: [@filesystem, %ezpublish_legacy.setup_wizard.configuration_dumper.environments%, %kernel.root_dir%, %kernel.cache_dir%]
+        arguments:
+            - @filesystem
+            - %ezpublish_legacy.setup_wizard.configuration_dumper.environments%
+            - %kernel.root_dir%
+            - %kernel.cache_dir%
+            - @?sensio.distribution.webconfigurator
 
     # Image alias generator using legacy
     ezpublish_legacy.fieldType.ezimage.variation_service:

diff --git a/eZ/Bundle/EzPublishLegacyBundle/SetupWizard/ConfigurationDumper.php b/eZ/Bundle/EzPublishLegacyBundle/SetupWizard/ConfigurationDumper.php
@@ -9,6 +9,7 @@
 
 namespace eZ\Bundle\EzPublishLegacyBundle\SetupWizard;
 
+use Sensio\Bundle\DistributionBundle\Configurator\Configurator;
 use eZ\Publish\Core\MVC\Symfony\ConfigDumperInterface;
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Filesystem\Filesystem;
@@ -20,6 +21,11 @@ class ConfigurationDumper implements ConfigDumperInterface
      */
     protected $fs;
 
+    /**
+     * @var \Sensio\Bundle\DistributionBundle\Configurator\Configurator
+     */
+    protected $sensioConfigurator;
+
     /**
      * Path to root dir (kernel.root_dir)
      *
@@ -42,12 +48,13 @@ class ConfigurationDumper implements ConfigDumperInterface
      */
     protected $envs;
 
-    public function __construct( Filesystem $fs, array $envs, $rootDir, $cacheDir )
+    public function __construct( Filesystem $fs, array $envs, $rootDir, $cacheDir, Configurator $sensioConfigurator = null )
     {
         $this->fs = $fs;
         $this->rootDir = $rootDir;
         $this->cacheDir = $cacheDir;
         $this->envs = array_fill_keys( $envs, true );
+        $this->sensioConfigurator = $sensioConfigurator;
     }
 
     /**
@@ -97,6 +104,18 @@ public function dump( array $configArray, $options = ConfigDumperInterface::OPT_
             file_put_contents( $configFile, Yaml::dump( $envConfigArray, 7 ) );
         }
 
+        // Handling %secret%
+        if ( $this->sensioConfigurator !== null )
+        {
+            $this->sensioConfigurator->mergeParameters(
+                array(
+                    // Step #1 is SecretStep
+                    'secret' => $this->sensioConfigurator->getStep( 1 )->secret
+                )
+            );
+            $this->sensioConfigurator->write();
+        }
+
         $this->clearCache();
     }