Skip to content

Fix incorrect message shuffling salt in PHP 5.6 #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 1, 2024
Merged

Fix incorrect message shuffling salt in PHP 5.6 #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
034d809
Fix duplicate warning
ernilambar Feb 20, 2024
c0710ef
Add feature test for duplicate warning when shuffling salts
ernilambar Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions features/config-shuffle-salts.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,3 +338,17 @@ Feature: Refresh the salts in the wp-config.php file
"""
define( 'NEW_KEY'
"""

@less-than-php-7.0
Scenario: Shuffling salts duplicate warnings on PHP < 7.0
Given a WP install
When I try `wp config shuffle-salts WP_CACHE_KEY_SALT NONCE_SALT`
Then STDERR should contain:
"""
Warning: Could not shuffle the unknown key 'WP_CACHE_KEY_SALT'.
"""
And STDERR should not contain:
"""
Warning: Could not shuffle the unknown key 'WP_CACHE_KEY_SALT'.
Warning: Could not shuffle the unknown key 'WP_CACHE_KEY_SALT'.
"""
3 changes: 2 additions & 1 deletion src/Config_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,11 +889,12 @@ public function shuffle_salts( $args, $assoc_args ) {

try {
foreach ( $keys as $key ) {
$unique_key = self::unique_key();
if ( ! $force && ! in_array( $key, self::DEFAULT_SALT_CONSTANTS, true ) ) {
WP_CLI::warning( "Could not shuffle the unknown key '{$key}'." );
continue;
}
$secret_keys[ $key ] = trim( self::unique_key() );
$secret_keys[ $key ] = trim( $unique_key );
}
} catch ( Exception $ex ) {
foreach ( $keys as $key ) {
Expand Down