keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check for REDIRECT_REMOTE_USER as well

Browse source
This commit is contained in:
Michael 2021-06-16 19:39:51 +00:00
parent 5e22704f7e
commit 6b3476409a
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Module/OAuth/Token.php
View file

@ -46,8 +46,14 @@ class Token extends BaseApi
]); ]);
// AndStatus transmits the client data in the AUTHORIZATION header field, see https://github.com/andstatus/andstatus/issues/530 // AndStatus transmits the client data in the AUTHORIZATION header field, see https://github.com/andstatus/andstatus/issues/530
if (empty($request['client_id']) && !empty($_SERVER['HTTP_AUTHORIZATION']) && (substr($_SERVER['HTTP_AUTHORIZATION'], 0, 6) == 'Basic ')) { $authorization = $_SERVER['HTTP_AUTHORIZATION'] ?? '';
$datapair = explode(':', base64_decode(trim(substr($_SERVER['HTTP_AUTHORIZATION'], 6)))); if (empty($authorization)) {
// workaround for HTTP-auth in CGI mode
$authorization = $_SERVER['REDIRECT_REMOTE_USER'] ?? '';
}
if (empty($request['client_id']) && !empty($authorization) && (substr($authorization, 0, 6) == 'Basic ')) {
$datapair = explode(':', base64_decode(trim(substr($authorization, 6))));
if (count($datapair) == 2) { if (count($datapair) == 2) {
$request['client_id'] = $datapair[0]; $request['client_id'] = $datapair[0];
$request['client_secret'] = $datapair[1]; $request['client_secret'] = $datapair[1];

2
src/Security/BasicAuth.php
View file

@ -124,7 +124,7 @@ class BasicAuth
// workaround for HTTP-auth in CGI mode // workaround for HTTP-auth in CGI mode
if (!empty($_SERVER['REDIRECT_REMOTE_USER'])) { if (!empty($_SERVER['REDIRECT_REMOTE_USER'])) {
$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)); $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6));
if (strlen($userpass)) { if (!empty($userpass) && strpos($userpass, ':')) {
list($name, $password) = explode(':', $userpass); list($name, $password) = explode(':', $userpass);
$_SERVER['PHP_AUTH_USER'] = $name; $_SERVER['PHP_AUTH_USER'] = $name;
$_SERVER['PHP_AUTH_PW'] = $password; $_SERVER['PHP_AUTH_PW'] = $password;

5
src/Security/OAuth.php
View file

@ -83,6 +83,11 @@ class OAuth
{ {
$authorization = $_SERVER['HTTP_AUTHORIZATION'] ?? ''; $authorization = $_SERVER['HTTP_AUTHORIZATION'] ?? '';
if (empty($authorization)) {
// workaround for HTTP-auth in CGI mode
$authorization = $_SERVER['REDIRECT_REMOTE_USER'] ?? '';
}
if (substr($authorization, 0, 7) != 'Bearer ') { if (substr($authorization, 0, 7) != 'Bearer ') {
return []; return [];
} }