WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Users: Add `'illegal_user_logins'` filter to allow certain usernames to be blacklisted. 

Props danielbachhuber, chriscct7, crazycoolcam, SergeyBiryukov.
Fixes #27317.
Built from https://develop.svn.wordpress.org/trunk@35189


git-svn-id: http://core.svn.wordpress.org/trunk@35155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-10-15 05:43:26 +00:00
parent b6b2baccbd
commit 7f08716c16
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/user.php
View File

@ -142,6 +142,12 @@ function edit_user( $user_id = 0 ) {
if ( !$update && username_exists( $user->user_login ) ) if ( !$update && username_exists( $user->user_login ) )
$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' )); $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
/** This filter is documented in wp-includes/user-functions.php */
$usernames = apply_filters( 'illegal_user_logins', array() );
if ( in_array( $user->user_login, $usernames ) ) {
$errors->add( 'illegal_user_login', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
}
/* checking email address */ /* checking email address */
if ( empty( $user->user_email ) ) { if ( empty( $user->user_email ) ) {
$errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) ); $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );

10
wp-includes/ms-functions.php
View File

@ -427,8 +427,14 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ); $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
add_site_option( 'illegal_names', $illegal_names ); add_site_option( 'illegal_names', $illegal_names );
} }
if ( in_array( $user_name, $illegal_names ) ) if ( in_array( $user_name, $illegal_names ) ) {
$errors->add('user_name', __( 'That username is not allowed.' ) ); $errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) );
}
/** This filter is documented in wp-includes/user-functions.php */
if ( in_array( $user_name, apply_filters( 'illegal_user_logins', array() ) ) ) {
$errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) );
}
if ( is_email_address_unsafe( $user_email ) ) if ( is_email_address_unsafe( $user_email ) )
$errors->add('user_email', __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.')); $errors->add('user_email', __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));

11
wp-includes/user-functions.php
View File

@ -1315,6 +1315,17 @@ function wp_insert_user( $userdata ) {
return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) ); return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) );
} }
/**
* Filter the list of blacklisted usernames.
*
* @since 4.4.0
*
* @param array $usernames Array of blacklisted usernames.
*/
if ( in_array( $user_login, apply_filters( 'illegal_user_logins', array() ) ) ) {
return new WP_Error( 'illegal_user_login', __( 'Sorry, that username is not allowed.' ) );
}
/* /*
* If a nicename is provided, remove unsafe user characters before using it. * If a nicename is provided, remove unsafe user characters before using it.
* Otherwise build a nicename from the user_login. * Otherwise build a nicename from the user_login.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-35188'; $wp_version = '4.4-alpha-35189';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.