Can log on the admin interface using x.org account.

[dotclear.git] / class.xorg.auth.php

diff --git a/class.xorg.auth.php b/class.xorg.auth.php
index 6fea694..a1db5ec 100644 (file)
--- a/class.xorg.auth.php
+++ b/class.xorg.auth.php
@@ -3,6 +3,8 @@
 require_once dirname(__FILE__) . '/../../inc/core/class.dc.auth.php';
 
 class xorgAuth extends dcAuth {
+  private $forceSU = false;
+
   public $xorg_infos = array('forlife' => null,
                              'prenom' => null,
                              'nom' => null);
@@ -21,19 +23,21 @@ class xorgAuth extends dcAuth {
       foreach ($this->xorg_infos as $key => $val) {
         $this->xorg_infos[$key] = $_SESSION['auth-xorg-' . $key];
       }
+      $this->user_id = $_SESSION['auth-xorg'];
     }
   }
 
   public function checkUser($user_id, $pwd = null, $user_key = null) {
-    return $this->callXorg();
+    return $this->callXorg() && $user_id == $this->user_id;
 //    echo "checking auth for " . $user_id;
-    return parent::checkUser($user_id, $pwd, $user_key);
+//    return parent::checkUser($user_id, $pwd, $user_key);
   }
 
   public function check($permissions, $blog_id) {
-     $this->buildFromSession();
+    $this->buildFromSession();
+    return true;
 //    echo "Checking right to view $permissions on $blog_id";
-    return parent::check($permissions, $blog_id);
+//    return parent::check($permissions, $blog_id);
   }
 
   public function callXorg($path = null) {
@@ -55,6 +59,30 @@ class xorgAuth extends dcAuth {
     exit;
   }
 
+  private function acquireAdminRights() {
+    $this->forceSU = true;
+  }
+
+  private function releaseAdminRights() {
+    $this->forceSU = false;
+  }
+
+  private function createUser() {
+    global $core;
+    $this->acquireAdminRights();
+    if (!$core->userExists($_SESSION['auth-xorg'])) {
+      $cur = new cursor($this->con, 'dc_user');
+      $cur->user_id = $_SESSION['auth-xorg'];
+      $cur->user_pwd = md5(rand());
+      $cur->user_lang = 'fr';
+      $cur->user_name = $_SESSION['auth-xorg-nom'];
+      $cur->user_firstname = $_SESSION['auth-xorg-prenom'];
+      $cur->user_email = $_SESSION['auth-xorg'] . '@polytechnique.org';
+      $core->addUser($cur);
+    }
+    $this->releaseAdminRights();
+  }
+
   public function returnXorg() {
     if (!isset($_GET['auth'])) {
       return false;
@@ -71,11 +99,15 @@ class xorgAuth extends dcAuth {
     }
     if (md5('1' . $_SESSION['auth-x-challenge'] . XORG_AUTH_KEY . $params . '1') == $_GET['auth']) {
       unset($_GET['auth']);
-      $_SESSION['auth-xorg'] = $_GET['forlife'];
+      $_SESSION['sess_user_id'] = $_SESSION['auth-xorg'] = $_GET['forlife'];
+                 $_SESSION['sess_browser_uid'] = http::browserUID(DC_MASTER_KEY);
+      $_SESSION['sess_blog_id'] = 'default';
+      $this->createUser();
       header("Location: http://murphy.m4x.org" . $_GET['path']);
       exit;
     }
-    $_SESSION['auth-xorg'] = null;
+    unset($_SESSION['auth-xorg']);
+    unset($_SESSION['sess_user_id']);
     unset($_GET['auth']);
     echo "Failed !!!";
     return false;
@@ -88,6 +120,42 @@ class xorgAuth extends dcAuth {
     header('Location: http://murphy.m4x.org/~x2003bruneau/dotclear/');
     exit;
   }
+
+  public function allowPassChange() {
+    return false;
+  }
+
+  public function userID() {
+    $this->buildFromSession();
+    return $this->user_id;
+  }
+
+  public function getPermissions() {
+    return array('default' => array('name' => 'My first blog',
+                                    'url'  => 'http://murphy.m4x.org/~x2003bruneau/dotclear/',
+                                    'permissions' => array('usage' => true,
+                                                           'contentadmin' => true,
+                                                           'admin' => true)));
+  }
+
+  public function getInfo($n) {
+    switch ($n) {
+      case 'user_lang':
+        return "fr";
+      case 'user_default_blog':
+        return 'default';
+      case 'user_post_status':
+        return 1;
+      case 'user_tz':
+        return 'UTC';
+    }
+    echo "$n ";
+    return null;
+  }
+
+  public function isSuperAdmin() {
+    return $this->forceSU;
+  }
 }
 
 ?>