Skip to content

Commit 03a0835

Browse files
committed
Security: Backport the WordPress 7.1.4 security fixes to the 4.8 branch.
- Users: Escape user login - Upgrade/Install: Improve the handling of the upgrade working directory. Merges [64873], [64877] to the 4.8 branch. Props xknown, jeremyfelt, jorbin, rfaile313, umut3806, marcs0h. git-svn-id: https://develop.svn.wordpress.org/branches/4.8@64933 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 7533ec5 commit 03a0835

10 files changed

Lines changed: 64 additions & 31 deletions

‎src/wp-admin/includes/ajax-actions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ function wp_ajax_add_user( $action ) {
14041404
'show-link' => sprintf(
14051405
/* translators: %s: the new user */
14061406
__( 'User %s added' ),
1407-
'<a href="#user-' . $user_id . '">' . $user_object->user_login . '</a>'
1407+
'<a href="#user-' . $user_id . '">' . esc_html( $user_object->user_login ) . '</a>'
14081408
),
14091409
'role' => $role,
14101410
)

‎src/wp-admin/includes/class-wp-ms-users-list-table.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public function column_cb( $user ) {
209209
return;
210210
}
211211
?>
212-
<label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>"><?php echo sprintf( __( 'Select %s' ), $user->user_login ); ?></label>
212+
<label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>"><?php echo sprintf( __( 'Select %s' ), esc_html( $user->user_login ) ); ?></label>
213213
<input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ) ?>" />
214214
<?php
215215
}
@@ -241,7 +241,7 @@ public function column_username( $user ) {
241241

242242
echo $avatar;
243243

244-
?><strong><a href="<?php echo $edit_link; ?>" class="edit"><?php echo $user->user_login; ?></a><?php
244+
?><strong><a href="<?php echo $edit_link; ?>" class="edit"><?php echo esc_html( $user->user_login ); ?></a><?php
245245
if ( in_array( $user->user_login, $super_admins ) ) {
246246
echo ' - ' . __( 'Super Admin' );
247247
}

‎src/wp-admin/includes/class-wp-upgrader.php‎

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,21 @@ public function download_package( $package ) {
282282
return $download_file;
283283
}
284284

285+
/**
286+
* Builds an unpredictable name for the directory a package is unpacked into.
287+
*
288+
* @since 7.1.4
289+
*
290+
* @param string $package The full local path or URI of the package.
291+
* @return string The directory name, without a path.
292+
*/
293+
private function get_working_dir_name( $package ) {
294+
// Strip off any .tmp or .zip suffixes.
295+
$name = basename( basename( $package, '.tmp' ), '.zip' );
296+
297+
return $name . '-' . wp_generate_password( 16, false );
298+
}
299+
285300
/**
286301
* Unpack a compressed package file.
287302
*
@@ -302,15 +317,32 @@ public function unpack_package( $package, $delete_package = true ) {
302317

303318
$upgrade_folder = $wp_filesystem->wp_content_dir() . 'upgrade/';
304319

305-
//Clean up contents of upgrade directory beforehand.
306-
$upgrade_files = $wp_filesystem->dirlist($upgrade_folder);
307-
if ( !empty($upgrade_files) ) {
308-
foreach ( $upgrade_files as $file )
309-
$wp_filesystem->delete($upgrade_folder . $file['name'], true);
320+
// Clean up contents of upgrade directory beforehand, keeping its index.php.
321+
$upgrade_files = $wp_filesystem->dirlist( $upgrade_folder );
322+
if ( ! empty( $upgrade_files ) ) {
323+
foreach ( $upgrade_files as $file ) {
324+
if ( 'index.php' === $file['name'] ) {
325+
continue;
326+
}
327+
328+
$wp_filesystem->delete( $upgrade_folder . $file['name'], true );
329+
}
330+
}
331+
332+
/*
333+
* The upgrade directory is web-served. Keep it from being listed, as core does
334+
* for wp-content and its plugins and themes directories, so the name of the
335+
* working directory created below cannot be discovered from a directory index.
336+
*/
337+
if ( ! $wp_filesystem->is_dir( $upgrade_folder ) ) {
338+
$wp_filesystem->mkdir( $upgrade_folder, FS_CHMOD_DIR );
339+
}
340+
if ( ! $wp_filesystem->exists( $upgrade_folder . 'index.php' ) ) {
341+
$wp_filesystem->put_contents( $upgrade_folder . 'index.php', "<?php\n// Silence is golden.\n", FS_CHMOD_FILE );
310342
}
311343

312-
// We need a working directory - Strip off any .tmp or .zip suffixes
313-
$working_dir = $upgrade_folder . basename( basename( $package, '.tmp' ), '.zip' );
344+
// We need a working directory.
345+
$working_dir = $upgrade_folder . $this->get_working_dir_name( $package );
314346

315347
// Clean up working directory
316348
if ( $wp_filesystem->is_dir($working_dir) )

‎src/wp-admin/includes/class-wp-users-list-table.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,10 +403,10 @@ public function single_row( $user_object, $style = '', $role = '', $numposts = 0
403403
$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_object->ID ) ) );
404404

405405
if ( current_user_can( 'edit_user', $user_object->ID ) ) {
406-
$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
406+
$edit = '<strong><a href="' . $edit_link . '">' . esc_html( $user_object->user_login ) . '</a></strong><br />';
407407
$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
408408
} else {
409-
$edit = "<strong>$user_object->user_login</strong><br />";
409+
$edit = '<strong>' . esc_html( $user_object->user_login ) . '</strong><br />';
410410
}
411411

412412
if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
@@ -430,11 +430,11 @@ public function single_row( $user_object, $style = '', $role = '', $numposts = 0
430430
$role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
431431

432432
// Set up the checkbox ( because the user is editable, otherwise it's empty )
433-
$checkbox = '<label class="screen-reader-text" for="user_' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
433+
$checkbox = '<label class="screen-reader-text" for="user_' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), esc_html( $user_object->user_login ) ) . '</label>'
434434
. "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='{$role_classes}' value='{$user_object->ID}' />";
435435

436436
} else {
437-
$edit = '<strong>' . $user_object->user_login . '</strong>';
437+
$edit = '<strong>' . esc_html( $user_object->user_login ) . '</strong>';
438438
}
439439
$avatar = get_avatar( $user_object->ID, 32 );
440440

‎src/wp-admin/includes/ms.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -960,22 +960,22 @@ function confirm_delete_users( $users ) {
960960
<?php
961961
wp_nonce_field( 'ms-users-delete' );
962962
$site_admins = get_super_admins();
963-
$admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>'; ?>
963+
$admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . esc_html( $current_user->user_login ) . '</option>'; ?>
964964
<table class="form-table">
965965
<?php foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
966966
if ( $user_id != '' && $user_id != '0' ) {
967967
$delete_user = get_userdata( $user_id );
968968

969969
if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
970-
wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
970+
wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), esc_html( $delete_user->user_login ) ) );
971971
}
972972

973973
if ( in_array( $delete_user->user_login, $site_admins ) ) {
974-
wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . $delete_user->user_login . '</em>' ) );
974+
wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . esc_html( $delete_user->user_login ) . '</em>' ) );
975975
}
976976
?>
977977
<tr>
978-
<th scope="row"><?php echo $delete_user->user_login; ?>
978+
<th scope="row"><?php echo esc_html( $delete_user->user_login ); ?>
979979
<?php echo '<input type="hidden" name="user[]" value="' . esc_attr( $user_id ) . '" />' . "\n"; ?>
980980
</th>
981981
<?php $blogs = get_blogs_of_user( $user_id, true );
@@ -985,7 +985,7 @@ function confirm_delete_users( $users ) {
985985
<td><fieldset><p><legend><?php printf(
986986
/* translators: user login */
987987
__( 'What should be done with content owned by %s?' ),
988-
'<em>' . $delete_user->user_login . '</em>'
988+
'<em>' . esc_html( $delete_user->user_login ) . '</em>'
989989
); ?></legend></p>
990990
<?php
991991
foreach ( (array) $blogs as $key => $details ) {
@@ -997,7 +997,7 @@ function confirm_delete_users( $users ) {
997997
$user_list = '';
998998
foreach ( $blog_users as $user ) {
999999
if ( ! in_array( $user->ID, $allusers ) ) {
1000-
$user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
1000+
$user_list .= "<option value='{$user->ID}'>" . esc_html( $user->user_login ) . '</option>';
10011001
}
10021002
}
10031003
if ( '' == $user_list ) {

‎src/wp-admin/includes/update-core.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,8 @@ function update_core($from, $to) {
886886

887887
// Don't copy wp-content, we'll deal with that below
888888
// We also copy version.php last so failed updates report their old version
889-
$skip = array( 'wp-content', 'wp-includes/version.php' );
889+
// Never copy a wp-config.php, which could have been written to the working directory.
890+
$skip = array( 'wp-content', 'wp-includes/version.php', 'wp-config.php' );
890891
$check_is_writable = array();
891892

892893
// Check to see which files don't really need updating - only available for 3.7 and higher

‎src/wp-admin/user-edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@
425425

426426
foreach ( $public_display as $id => $item ) {
427427
?>
428-
<option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
428+
<option <?php selected( $profileuser->display_name, $item ); ?>><?php echo esc_html( $item ); ?></option>
429429
<?php
430430
}
431431
?>
@@ -615,7 +615,7 @@
615615
<p class="description">
616616
<?php
617617
/* translators: 1: User's display name. */
618-
printf( __( 'Log %s out of all locations.' ), $profileuser->display_name );
618+
printf( __( 'Log %s out of all locations.' ), esc_html( $profileuser->display_name ) );
619619
?>
620620
</p>
621621
</td>

‎src/wp-admin/users.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,10 @@
249249
$user = get_userdata( $id );
250250
if ( $id == $current_user->ID ) {
251251
/* translators: 1: user id, 2: user login */
252-
echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
252+
echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, esc_html( $user->user_login )) . "</li>\n";
253253
} else {
254254
/* translators: 1: user id, 2: user login */
255-
echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
255+
echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, esc_html( $user->user_login )) . "</li>\n";
256256
$go_delete++;
257257
}
258258
}
@@ -375,10 +375,10 @@
375375
$user = get_userdata( $id );
376376
if ( ! current_user_can( 'remove_user', $id ) ) {
377377
/* translators: 1: user id, 2: user login */
378-
echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
378+
echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>'), $id, esc_html( $user->user_login )) . "</li>\n";
379379
} else {
380380
/* translators: 1: user id, 2: user login */
381-
echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
381+
echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1$s: %2$s'), $id, esc_html( $user->user_login )) . "</li>\n";
382382
$go_remove = true;
383383
}
384384
}

‎src/wp-includes/admin-bar.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) {
214214

215215
$avatar = get_avatar( $user_id, 26 );
216216
/* translators: %s: current user's display name */
217-
$howdy = sprintf( __( 'Howdy, %s' ), '<span class="display-name">' . $current_user->display_name . '</span>' );
217+
$howdy = sprintf( __( 'Howdy, %s' ), '<span class="display-name">' . esc_html( $current_user->display_name ) . '</span>' );
218218
$class = empty( $avatar ) ? '' : 'with-avatar';
219219

220220
$wp_admin_bar->add_menu( array(
@@ -256,10 +256,10 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
256256
) );
257257

258258
$user_info = get_avatar( $user_id, 64 );
259-
$user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
259+
$user_info .= "<span class='display-name'>" . esc_html( $current_user->display_name ) . '</span>';
260260

261261
if ( $current_user->display_name !== $current_user->user_login )
262-
$user_info .= "<span class='username'>{$current_user->user_login}</span>";
262+
$user_info .= "<span class='username'>" . esc_html( $current_user->user_login ) . '</span>';
263263

264264
$wp_admin_bar->add_menu( array(
265265
'parent' => 'user-actions',

‎src/wp-signup.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $
475475
esc_url( $home_url ),
476476
untrailingslashit( $domain . $path ),
477477
esc_url( $login_url ),
478-
$user_name
478+
esc_html( $user_name )
479479
); ?>
480480
</p>
481481
<?php

0 commit comments

Comments
 (0)