Dev WIP Auth plugins

LimeSurvey · Feb 5, 2015 · 714afd3 · 714afd3
1 parent 9147018
commit 714afd3
Show file tree

Hide file tree

Showing 15 changed files with 188 additions and 1,026 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -14,6 +14,8 @@
 @date_default_timezone_set(@date_default_timezone_get());
 $internalConfig = array(
 	'basePath' => __DIR__ . '/../',
+
+    'theme' => 'default',
 	'runtimePath' => dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'runtime',
 	'name' => 'LimeSurvey',
 	'defaultController' => 'surveys',

diff --git a/application/controllers/DevController.php b/application/controllers/DevController.php
@@ -0,0 +1,17 @@
+<?php
+
+class DevController extends CController {
+
+    public function actionIndex() {
+        $result = "";
+        $dir = __DIR__ . '/../../plugins';
+
+        $result .= print_r(App()->pluginManager->scanPlugins(), true);
+
+//        $plugins = \ls\pluginmanager\PluginConfig::findAll(true);
+
+//        App()->pluginManager->subscribe("test", function($event) { var_dump($event); });
+
+        $this->renderText('<pre>' . $result . '</pre>');
+    }
+}
diff --git a/application/controllers/PluginsController.php b/application/controllers/PluginsController.php
@@ -9,17 +9,17 @@ class PluginsController extends LSYii_Controller
      * Stored dynamic properties set and unset via __get and __set.
      * @var array of mixed.
      */
-    protected $properties = array();
-
-    public function __get($property)
-    {
-        return $this->properties[$property];
-    }
-
-    public function __set($property, $value)
-    {
-        $this->properties[$property] = $value;
-    }
+//    protected $properties = array();
+//
+//    public function __get($property)
+//    {
+//        return $this->properties[$property];
+//    }
+//
+//    public function __set($property, $value)
+//    {
+//        $this->properties[$property] = $value;
+//    }
 
     public function _init()
     {

diff --git a/application/controllers/UsersController.php b/application/controllers/UsersController.php
@@ -0,0 +1,29 @@
+<?php
+use ls\pluginmanager\PluginEvent;
+class UsersController extends LSYii_Controller
+{
+
+    public $layout = 'minimal';
+
+
+    public function accessRules()
+    {
+        // Note the order; rules are numerically indexed and we want to
+        // parents rules to be executed only if ours dont apply.
+        return array_merge([
+            ['allow' ,'actions' => 'login'],
+            ['allow' , 'actions' => 'logout', 'users' => '@'],
+        ], parent::accessRules());
+    }
+
+    public function actionLogin() {
+        // Get all active auth plugins.
+        $event = new PluginEvent('newLoginForm');
+        $event->dispatch();
+        $loginForms = $event->get('forms');
+        return $this->render('login', ['loginForms' => $loginForms]);
+    }
+
+}
+
+?>
diff --git a/application/core/LSWebUser.php b/application/core/LSWebUser.php
@@ -1,5 +1,5 @@
 <?php
-    Yii::import('application.helpers.Hash', true);
+    use Cake\Utility\Hash;
 
     class LSWebUser extends CWebUser
     {

diff --git a/application/core/plugins/Authdb/AuthDb.php b/application/core/plugins/Authdb/AuthDb.php
@@ -48,6 +48,13 @@ protected function getOnePass()
 
     public function eventNewLoginForm(PluginEvent $event)
     {
+        $event->set('forms.' . $this->name, [
+        'serverkey' => array(
+            'type' => 'string',
+            'label' => 'Key to use for username e.g. PHP_AUTH_USER, LOGON_USER, REMOTE_USER. See phpinfo in global settings.',
+            'default' => 'REMOTE_USER',
+        ) ]);
+        return;
         $sUserName='';
         $sPassword='';
         if (Yii::app()->getConfig("demoMode") === true && Yii::app()->getConfig("demoModePrefill") === true)
@@ -63,6 +70,8 @@ public function eventNewLoginForm(PluginEvent $event)
 
     public function eventNewUserSession(PluginEvent $event)
     {
+
+
         // Do nothing if this user is not Authdb type
         $identity = $event->get('identity');
         if ($identity->plugin != __CLASS__) {

diff --git a/application/core/plugins/Authwebserver/AuthWebServer.php b/application/core/plugins/Authwebserver/AuthWebServer.php
@@ -29,6 +29,16 @@ public function init()
     {
     }
 
+     public function eventNewLoginForm(PluginEvent $event)
+    {
+        $event->set('forms.' . $this->name, [
+        'serverkey' => array(
+            'type' => 'string',
+            'label' => 'Key to use for username e.g. PHP_AUTH_USER, LOGON_USER, REMOTE_USER. See phpinfo in global settings.',
+            'default' => 'REMOTE_USER',
+        ) ]);
+        return;
+    }
     public function eventBeforeLogin(PluginEvent $event)
     {       
         // normal login through webserver authentication    
@@ -66,10 +76,10 @@ public function eventBeforeLogin(PluginEvent $event)
         }
     }
 
-    public function eventNewUserSession()
+    public function eventNewUserSession(PluginEvent $event)
     {
         // Do nothing if this user is not Authwebserver type
-        $identity = $this->getEvent()->get('identity');
+        $identity = $event->get('identity');
         if ($identity->plugin != 'Authwebserver')
         {
             return;

diff --git a/application/core/plugins/Authwebserver/limesurvey.json b/application/core/plugins/Authwebserver/limesurvey.json
@@ -11,7 +11,8 @@
     },
     "events" : [
         "beforeLogin",
-        "newUserSession"
+        "newUserSession",
+        "newLoginForm"
     ],
     "apiVersion" : "1.0"
 }