Skip to content

Fix for Basic Auth not being passed through with PHP in CGI mode #32

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

Open
graham73may wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix for Basic Auth not being passed through with PHP in CGI mode #32

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35d974f
Fixed PHP Fast CGI issue where PHP_AUTH_USER and PHP_AUTH_PW headers …
graham73may Mar 21, 2016
4ddbb3a
Formatting changed to match original repo
graham73may Mar 21, 2016
c693218
Wrapped list() in !empty
graham73may Mar 21, 2016
c1a5e95
Update README.md
graham73may Jun 30, 2018
137db37
Applying code changes from Tug
graham73may Nov 27, 2024
a1e3b74
Merge remote-tracking branch 'upstream/master'
graham73may Nov 27, 2024
e9074d0
Applying code changes from Tug
graham73may Nov 27, 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
Prev Previous commit
Next Next commit
Formatting changed to match original repo
  • Loading branch information
@graham73may
graham73may committed Mar 21, 2016
commit 4ddbb3a1484767102726d87181299da339a18f48
83 changes: 38 additions & 45 deletions basic-auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@
* Plugin URI: https://github.com/WP-API/Basic-Auth
*/

function json_basic_auth_handler($user)
{
function json_basic_auth_handler( $user ) {
global $wp_json_basic_auth_error;

global $wp_json_basic_auth_error;
$wp_json_basic_auth_error = null;

$wp_json_basic_auth_error = null;

// Don't authenticate twice
if (!empty($user)) {
return $user;
}
// Don't authenticate twice
if ( ! empty( $user ) ) {
return $user;
}

if (!isset($_SERVER['PHP_AUTH_USER']) && (isset($_SERVER['HTTP_AUTHORIZATION']) || isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']))) {
if (isset($_SERVER['HTTP_AUTHORIZATION'])) {
Expand All @@ -29,51 +27,46 @@ function json_basic_auth_handler($user)

list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($header, 6)));
}

// Check that we're trying to authenticate
if ( !isset( $_SERVER['PHP_AUTH_USER'] ) ) {
return $user;
}

// Check that we're trying to authenticate
if (!isset($_SERVER['PHP_AUTH_USER'])) {
return $user;
}

$username = $_SERVER['PHP_AUTH_USER'];
$password = $_SERVER['PHP_AUTH_PW'];

/**
* In multi-site, wp_authenticate_spam_check filter is run on authentication. This filter calls
* get_currentuserinfo which in turn calls the determine_current_user filter. This leads to infinite
* recursion and a stack overflow unless the current function is removed from the determine_current_user
* filter during authentication.
*/
remove_filter('determine_current_user', 'json_basic_auth_handler', 20);
$username = $_SERVER['PHP_AUTH_USER'];
$password = $_SERVER['PHP_AUTH_PW'];

$user = wp_authenticate($username, $password);
/**
* In multi-site, wp_authenticate_spam_check filter is run on authentication. This filter calls
* get_currentuserinfo which in turn calls the determine_current_user filter. This leads to infinite
* recursion and a stack overflow unless the current function is removed from the determine_current_user
* filter during authentication.
*/
remove_filter( 'determine_current_user', 'json_basic_auth_handler', 20 );

add_filter('determine_current_user', 'json_basic_auth_handler', 20);
$user = wp_authenticate( $username, $password );

if (is_wp_error($user)) {
$wp_json_basic_auth_error = $user;
add_filter( 'determine_current_user', 'json_basic_auth_handler', 20 );

return null;
}
if ( is_wp_error( $user ) ) {
$wp_json_basic_auth_error = $user;
return null;
}

$wp_json_basic_auth_error = true;
$wp_json_basic_auth_error = true;

return $user->ID;
return $user->ID;
}
add_filter( 'determine_current_user', 'json_basic_auth_handler', 20 );

add_filter('determine_current_user', 'json_basic_auth_handler', 20);

function json_basic_auth_error($error)
{
function json_basic_auth_error( $error ) {
// Passthrough other errors
if ( ! empty( $error ) ) {
return $error;
}

// Passthrough other errors
if (!empty($error)) {
return $error;
}
global $wp_json_basic_auth_error;

global $wp_json_basic_auth_error;

return $wp_json_basic_auth_error;
return $wp_json_basic_auth_error;
}

add_filter('json_authentication_errors', 'json_basic_auth_error');
add_filter( 'json_authentication_errors', 'json_basic_auth_error' );