Implement fix for #3276 in 2.3/develop

pyrocms · Apr 24, 2014 · af42c70 · af42c70
1 parent 36a3aa1
commit af42c70
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/installer/assets/config/config.php b/installer/assets/config/config.php
@@ -230,7 +230,7 @@
 | MUST set an encryption key.  See the user guide for info.
 |
 */
-$config['encryption_key'] = "Jiu348^&H%fa";
+$config['encryption_key'] = '{encryption-key}';
 
 /*
 |--------------------------------------------------------------------------

diff --git a/installer/libraries/Installer_lib.php b/installer/libraries/Installer_lib.php
@@ -293,13 +293,21 @@ public function write_db_file($db)
      */
     public function write_config_file()
     {
+        ci()->load->library('encrypt');
+
         $server_name = ci()->session->userdata('http_server');
         $supported_servers = ci()->config->item('supported_servers');
 
         // Able to use clean URLs?
         $index_page = ($supported_servers[$server_name]['rewrite_support'] !== false) ? '' : 'index.php';
 
-        return $this->_write_file_vars('../system/cms/config/config.php', './assets/config/config.php', array('{index}' => $index_page));
+        // Make some sort of random key to encrypt sessions, cookies, etc
+        $encryption_key = substr(ci()->encrypt->encode(str_shuffle(md5(time())), mt_rand()), 0, 42);
+
+        return $this->_write_file_vars('../system/cms/config/config.php', './assets/config/config.php', array(
+            '{index}'           => $index_page,
+            '{encryption-key}'  => $encryption_key,
+        ));
     }
 
     /**

diff --git a/system/cms/config/config.php b/system/cms/config/config.php
@@ -230,7 +230,7 @@
 | MUST set an encryption key.  See the user guide for info.
 |
 */
-$config['encryption_key'] = "Jiu348^&H%fa";
+$config['encryption_key'] = '';
 
 /*
 |--------------------------------------------------------------------------