opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fallback to auth_login check when trustExternal returns null 

This is a work based on #2701, Before this patch, it is either fully external, or fully internal (and DokuWiki's auth cookie mechanism is used in auth_login()). I believe we should provide plugin developers with a third state as out-put. Semantically $auth->trustExternal() === null to delegate auth flow back to DokuWiki makes sense to me - like no external auth result is returned, so we need to run internal auth flow.

Co-Authored-By: paweljasinski <paweljasinski@users.noreply.github.com>
This commit is contained in:
Phy 2020-03-09 20:10:54 -04:00
parent 7a0b5f30c2
commit 81e99965a7
No known key found for this signature in database
GPG Key ID: D475AA55A8144239
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inc/Extension/AuthPlugin.php
View File

@ -165,9 +165,11 @@ abstract class AuthPlugin extends Plugin
*
* If this function is implemented it will be used to
* authenticate a user - all other DokuWiki internals
* will not be used for authenticating, thus
* implementing the checkPass() function is not needed
* anymore.
* will not be used for authenticating (except this
* function returns null, in which case, DokuWiki will
* still run auth_login as a fallback, which may call
* checkPass()). If this function is not returning null,
* implementing checkPass() is not needed here anymore.
*
* The function can be used to authenticate against third
* party cookies or Apache auth mechanisms and replaces
@ -189,7 +191,8 @@ abstract class AuthPlugin extends Plugin
* @param string $user Username
* @param string $pass Cleartext Password
* @param bool $sticky Cookie should not expire
* @return bool true on successful auth
* @return bool true on successful auth,
* null on unknown result (fallback to checkPass)
*/
public function trustExternal($user, $pass, $sticky = false)
{

4
inc/Remote/ApiCore.php
View File

@ -972,9 +972,11 @@ class ApiCore
if (!$auth) return 0;
@session_start(); // reopen session for login
$ok = null;
if ($auth->canDo('external')) {
$ok = $auth->trustExternal($user, $pass, false);
} else {
}
if ($ok === null){
$evdata = array(
'user' => $user,
'password' => $pass,

12
inc/auth.php
View File

@ -100,10 +100,14 @@ function auth_setup() {
$INPUT->set('p', stripctl($INPUT->str('p')));
}
if(!is_null($auth) && $auth->canDo('external')) {
// external trust mechanism in place
$auth->trustExternal($INPUT->str('u'), $INPUT->str('p'), $INPUT->bool('r'));
} else {
$ok = null;
if (!is_null($auth) && $auth->canDo('external')) {
$ok = $auth->trustExternal($INPUT->str('u'), $INPUT->str('p'), $INPUT->bool('r'));
}
if ($ok === null) {
// external trust mechanism not in place, or returns no result,
// then attempt auth_login
$evdata = array(
'user' => $INPUT->str('u'),
'password' => $INPUT->str('p'),