From 9c29eea515b336b23187a86f5b55443571fcba01 Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Tue, 3 Jan 2012 02:56:20 +0100
Subject: Setup auth system from plugins

---
 inc/auth.php | 56 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 22 deletions(-)

(limited to 'inc/auth.php')

diff --git a/inc/auth.php b/inc/auth.php
index e0f58e5f2..b11a14d50 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -36,29 +36,41 @@ function auth_setup(){
     global $AUTH_ACL;
     global $lang;
     global $config_cascade;
+    global $plugin_controller;
     $AUTH_ACL = array();
 
     if(!$conf['useacl']) return false;
 
-    // load the the backend auth functions and instantiate the auth object XXX
-    if (@file_exists(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php')) {
-        require_once(DOKU_INC.'inc/auth/basic.class.php');
-        require_once(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php');
-
-        $auth_class = "auth_".$conf['authtype'];
-        if (class_exists($auth_class)) {
-            $auth = new $auth_class();
-            if ($auth->success == false) {
-                // degrade to unauthenticated user
-                unset($auth);
-                auth_logoff();
-                msg($lang['authtempfail'], -1);
-            }
-        } else {
-            nice_die($lang['authmodfailed']);
-        }
-    } else {
-        nice_die($lang['authmodfailed']);
+    // try to load auth backend from plugins
+    $plugins = $plugin_controller->getList('auth');
+    foreach ($plugin_controller->getList('auth') as $plugin) {
+    	if ($conf['authtype'] === $plugin) {
+    		$auth = $plugin_controller->load('auth', $plugin)->getAuth();
+    		break;
+    	}
+    }
+
+    if (!$auth) {
+	    // load the the backend auth functions and instantiate the auth object XXX
+	    if (@file_exists(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php')) {
+	        require_once(DOKU_INC.'inc/auth/basic.class.php');
+	        require_once(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php');
+
+	        $auth_class = "auth_".$conf['authtype'];
+	        if (class_exists($auth_class)) {
+	            $auth = new $auth_class();
+	            if ($auth->success == false) {
+	                // degrade to unauthenticated user
+	                unset($auth);
+	                auth_logoff();
+	                msg($lang['authtempfail'], -1);
+	            }
+	        } else {
+	            nice_die($lang['authmodfailed']);
+	        }
+	    } else {
+	        nice_die($lang['authmodfailed']);
+	    }
     }
 
     if(!$auth) return;
@@ -675,7 +687,7 @@ function auth_sendPassword($user,$password){
 
     if(empty($conf['mailprefix'])) {
         $subject = $lang['regpwmail'];
-    } else {  
+    } else {
         $subject = '['.$conf['mailprefix'].'] '.$lang['regpwmail'];
     }
 
@@ -920,10 +932,10 @@ function act_resendpwd(){
 
         if(empty($conf['mailprefix'])) {
             $subject = $lang['regpwmail'];
-        } else {  
+        } else {
             $subject = '['.$conf['mailprefix'].'] '.$lang['regpwmail'];
         }
-        
+
         if(mail_send($userinfo['name'].' <'.$userinfo['mail'].'>',
                      $subject,
                      $text,
-- 
cgit v1.2.3


From f4476bd9b5badd36cd0617d76538e47d9649986b Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Mon, 20 Feb 2012 19:51:26 +0100
Subject: Refactored auth system: All auth methods are now introduced as
 plugins.

---
 inc/auth.php | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

(limited to 'inc/auth.php')

diff --git a/inc/auth.php b/inc/auth.php
index b11a14d50..aac7a2fca 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -45,35 +45,19 @@ function auth_setup(){
     $plugins = $plugin_controller->getList('auth');
     foreach ($plugin_controller->getList('auth') as $plugin) {
     	if ($conf['authtype'] === $plugin) {
-    		$auth = $plugin_controller->load('auth', $plugin)->getAuth();
+    		$auth = $plugin_controller->load('auth', $plugin);
     		break;
     	}
     }
 
-    if (!$auth) {
-	    // load the the backend auth functions and instantiate the auth object XXX
-	    if (@file_exists(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php')) {
-	        require_once(DOKU_INC.'inc/auth/basic.class.php');
-	        require_once(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php');
-
-	        $auth_class = "auth_".$conf['authtype'];
-	        if (class_exists($auth_class)) {
-	            $auth = new $auth_class();
-	            if ($auth->success == false) {
-	                // degrade to unauthenticated user
-	                unset($auth);
-	                auth_logoff();
-	                msg($lang['authtempfail'], -1);
-	            }
-	        } else {
-	            nice_die($lang['authmodfailed']);
-	        }
-	    } else {
-	        nice_die($lang['authmodfailed']);
-	    }
-    }
+	if(!$auth) return;
 
-    if(!$auth) return;
+	if ($auth && $auth->success == false) {
+		// degrade to unauthenticated user
+	    unset($auth);
+	    auth_logoff();
+	    msg($lang['authtempfail'], -1);
+	}
 
     // do the login either by cookie or provided credentials XXX
     if (!isset($_REQUEST['u'])) $_REQUEST['u'] = '';
@@ -102,7 +86,10 @@ function auth_setup(){
     }
 
     // apply cleaning
-    $_REQUEST['u'] = $auth->cleanUser($_REQUEST['u']);
+    if (true === $auth->success)
+    {
+    	$_REQUEST['u'] = $auth->cleanUser($_REQUEST['u']);
+    }
 
     if(isset($_REQUEST['authtok'])){
         // when an authentication token is given, trust the session
-- 
cgit v1.2.3