Skip to content
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

fix auth error on 4.2.3 #68

Merged
merged 4 commits into from
Nov 29, 2016
Merged

fix auth error on 4.2.3 #68

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68099b2
updated and simplified wp-security-stop-users-enumeration.php for bug…
davidegiunchidiennea May 20, 2016
a932eb0
Merge remote-tracking branch 'upstream/master'
davidegiunchidiennea Nov 28, 2016
4c913ac
fix error on block_ip_if_locked, doesn 't exit with an wp_user. Other…
davidegiunchidiennea Nov 28, 2016
29977b6
fix error on block_ip_if_locked, doesn 't exit with an wp_user. Other…
davidegiunchidiennea Nov 28, 2016
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
12 changes: 8 additions & 4 deletions all-in-one-wp-security/classes/wp-security-user-login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function __construct()
{
$this->key_login_msg = 'aiowps_login_msg_id';
// As a first authentication step, check if user's IP is locked.
add_filter('authenticate', array($this, 'block_ip_if_locked'), 1, 0);
add_filter('authenticate', array($this, 'block_ip_if_locked'), 1, 1);
// Check whether user needs to be manually approved after default WordPress authenticate hooks (with priority 20).
add_filter('authenticate', array($this, 'check_manual_registration_approval'), 30, 1);
// Check login captcha
Expand All @@ -26,8 +26,10 @@ function __construct()
* user's IP is currently locked.
*
* @global AIO_WP_Security $aio_wp_security
* @param WP_Error|WP_User $user
* @return WP_User
*/
function block_ip_if_locked()
function block_ip_if_locked($user)
{
global $aio_wp_security;
$user_locked = $this->check_locked_user();
Expand All @@ -41,7 +43,9 @@ function block_ip_if_locked()
$error_msg .= $this->get_unlock_request_form();
}
wp_die($error_msg, __('Service Temporarily Unavailable', 'all-in-one-wp-security-and-firewall'), 503);
}
} else {
return $user;
}
}
/**
* Check login captcha (if enabled).
Expand Down Expand Up @@ -560,4 +564,4 @@ function get_unlock_request_form()
$unlock_request_form .= '<button type="submit" name="aiowps_unlock_request" id="aiowps_unlock_request" class="button">'.__('Request Unlock', 'all-in-one-wp-security-and-firewall').'</button></div></form>';
return $unlock_request_form;
}
}
}