Merge pull request #243 from civicrm/5.35

5.35
civicrm · Feb 21, 2021 · b9ca377 · b9ca377
2 parents c40aa71 + 185002d
commit b9ca377
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/wp-cli/civicrm.php b/wp-cli/civicrm.php
@@ -367,7 +367,7 @@ private function install() {
       $upload_dir = wp_upload_dir();
       $settings_dir = $upload_dir['basedir'] . DIRECTORY_SEPARATOR . 'civicrm' . DIRECTORY_SEPARATOR;
       civicrm_setup($upload_dir['basedir'] . DIRECTORY_SEPARATOR);
-      WP_CLI::launch("chmod 0755 $settings_dir -R");
+      WP_CLI::launch("chmod -R 0755 " . escapeshellarg($settings_dir));
 
       # now we've got some files in place, require PEAR DB and check db setup
       $dsn = "mysql://{$dbuser}:{$dbpass}@{$dbhost}/{$dbname}?new_link=true";
@@ -454,8 +454,9 @@ private function install() {
         'CMSdbPass'          => DB_PASSWORD,
         'CMSdbHost'          => DB_HOST,
         'CMSdbName'          => DB_NAME,
-        'siteKey'            => preg_replace(';[^a-zA-Z0-9];', '', base64_encode(random_bytes(32))),
-        'credKeys'           => 'aes-cbc:hkdf-sha256:' . preg_replace(';[^a-zA-Z0-9];', '', base64_encode(random_bytes(32))),
+        'siteKey'            => preg_replace(';[^a-zA-Z0-9];', '', base64_encode(random_bytes(37))),
+        'credKeys'           => 'aes-cbc:hkdf-sha256:' . preg_replace(';[^a-zA-Z0-9];', '', base64_encode(random_bytes(37))),
+        'signKeys'           => 'jwt-hs256:hkdf-sha256:' . preg_replace(';[^a-zA-Z0-9];', '', base64_encode(random_bytes(37))),
       ];
 
       $str = file_get_contents($tplPath . 'civicrm.settings.php.template');