Cache password methods

[gosa.git] / gosa-core / include / class_config.inc

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 9ade720a7bcc97c1dc754e2a436ab35af2826f07..4d8b18c8c325eb34c66232ecfd0012cff7400b34 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -106,7 +106,7 @@ class config  {
       $msg = sprintf(_("XML error in gosa.conf: %s at line %d"),
             xml_error_string(xml_get_error_code($this->parser)),
             xml_get_current_line_number($this->parser));
-      msg_dialog::display(_("Config file parsing"), $msg, FATAL_ERROR_DIALOG);
+      msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG);
       exit;
     }
   }
@@ -216,11 +216,11 @@ class config  {
 
   function get_ldap_link($sizelimit= FALSE)
   {
-    if(!is_resource($this->ldap->cid)){
+    if($this->ldap === NULL || !is_resource($this->ldap->cid)){
 
       /* Build new connection */
       $this->ldap= ldap_init ($this->current['SERVER'], $this->current['BASE'],
-          $this->current['ADMIN'], $this->current['PASSWORD']);
+          $this->get_admin_dn(), $this->get_admin_password());
 
       /* Check for connection */
       if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
@@ -247,7 +247,8 @@ class config  {
         $this->ldap->referrals= $this->current['REFERRAL'];
       }
     }
-    return ($this->ldap);
+
+    return new ldapMultiplexer($this->ldap);
   }
 
   function set_current($name)
@@ -320,6 +321,13 @@ class config  {
     /* Convert BASE to have escaped special characters */
     $this->current['BASE']= @LDAP::convert($this->current['BASE']);
 
+    /* Load server informations */
+    $this->load_servers();
+  }
+
+
+  function update_credentials_from_config()
+  {
     /* Parse LDAP referral informations */
     if (!isset($this->current['ADMIN']) || !isset($this->current['PASSWORD'])){
       $url= $this->current['SERVER'];
@@ -328,10 +336,49 @@ class config  {
       $this->current['PASSWORD']= $referral['PASSWORD'];
     }
 
-    /* Load server informations */
-    $this->load_servers();
+    /* Bail out if problematic */
+    if (!isset($this->current['ADMIN']) || !isset($this->current['PASSWORD'])){
+      msg_dialog::display(_("Configuration error"), _("Cannot find any administrative LDAP credentials!"), FATAL_ERROR_DIALOG);
+      exit;
+    }
+  }
+
+
+  function encode_server_url($url, $base, $val)
+  {
+    return (preg_replace("/_+/", "_", "HTTP_".strtr(strtoupper($url."_".md5($base)."_$val"), ".-:/", "____")));
+  }
+
+
+  function get_admin_dn()
+  {
+    $enc= $this->encode_server_url($this->current['SERVER'], $this->current['BASE'], "ADMIN");
+    /* Answer from http request */
+    if (isset($_SERVER[$enc])){
+      return $_SERVER[$enc];
+    }
+
+    /* Answer in old style for compatibility */
+    $this->update_credentials_from_config();
+    return $this->current['ADMIN'];
   }
 
+
+  function get_admin_password()
+  {
+    $enc= $this->encode_server_url($this->current['SERVER'], $this->current['BASE'], "PASSWORD");
+
+    /* Answer from http request */
+    if (isset($_SERVER[$enc])){
+      return $_SERVER[$enc];
+    }
+
+    /* Answer in old style for compatibility */
+    $this->update_credentials_from_config();
+    return $this->current['PASSWORD'];
+  }
+
+
   function load_servers ()
   {
     /* Only perform actions if current is set */
@@ -377,9 +424,7 @@ class config  {
     if ($ldap->count()){
       $attrs= $ldap->fetch();
       $this->data['SERVERS']['KERBEROS']= array( 'SERVER' => $attrs['cn'][0],
-          'REALM' => $attrs['goKrbRealm'][0],
-          'ADMIN' => $attrs['goKrbAdmin'][0],
-          'PASSWORD' => $attrs['goKrbPassword'][0]);
+          'REALM' => $attrs['goKrbRealm'][0]);
     }
 
     /* Get cups server. FIXME: only one is supported currently */
@@ -724,7 +769,7 @@ class config  {
    */
   function getShareList($listboxEntry = false)
   {
-    $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","",get_ou("serverou"),
+    $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","server",get_ou("serverou"),
         $this->current['BASE'],array("goExportEntry","cn"), GL_NONE);
     $return =array();
     foreach($tmp as $entry){