X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Findex.php;h=b26380eeb389ec89152515483ba3f3c503e03b29;hb=3c635e52dd5a36f4ef1ef1ee5eee6ae86cf42746;hp=67d3c08267dc230d6dda57a2c48c82c9bef30bc5;hpb=dc068f92a2a30deec9e67196b1b212f1ee66bbf2;p=gosa.git diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php index 67d3c0826..b26380eeb 100644 --- a/gosa-core/html/index.php +++ b/gosa-core/html/index.php @@ -1,21 +1,23 @@ assign ('date', gmdate("D, d M Y H:i:s")); $smarty->assign ('username', $username); - $smarty->assign ('personal_img', get_template_path('images/personal.png')); + $smarty->assign ('personal_img', get_template_path('images/login-head.png')); $smarty->assign ('password_img', get_template_path('images/password.png')); $smarty->assign ('directory_img', get_template_path('images/ldapserver.png')); @@ -74,15 +81,15 @@ function displayLogin() /* show login screen */ $smarty->assign ("PHPSESSID", session_id()); - if (isset($_SESSION['errors'])){ - $smarty->assign("errors", $_SESSION['errors']); + if (session::is_set('errors')){ + $smarty->assign("errors", session::get('errors')); } if ($error_collector != ""){ $smarty->assign("php_errors", $error_collector.""); } else { $smarty->assign("php_errors", ""); } - + $smarty->assign("msg_dialogs", msg_dialog::get_dialogs()); $smarty->display (get_template_path('headers.tpl')); $smarty->display(get_template_path('login.tpl')); exit(); @@ -90,23 +97,28 @@ function displayLogin() +/***************************************************************************** + * M A I N * + *****************************************************************************/ + /* Set error handler to own one, initialize time calculation and start session. */ -session_start (); +session::start(); +session::set('errorsAlreadyPosted',array()); /* Destroy old session if exists. Else you will get your old session back, if you not logged out correctly. */ -if(is_array($_SESSION) && count($_SESSION)){ - session_destroy(); - session_start(); +if(is_array(session::get_all()) && count(session::get_all())){ + session::destroy(); + session::start(); } $username= ""; /* Reset errors */ -$_SESSION['errors'] = ""; -$_SESSION['errorsAlreadyPosted']= array(); -$_SESSION['LastError'] = ""; +session::set('errors',""); +session::set('errorsAlreadyPosted',""); +session::set('LastError',""); /* Check if we need to run setup */ if (!file_exists(CONFIG_DIR."/".CONFIG_FILE)){ @@ -115,24 +127,24 @@ if (!file_exists(CONFIG_DIR."/".CONFIG_FILE)){ } /* Reset errors */ -$_SESSION['errors']= ""; +session::set('errors',""); /* Check for java script */ if(isset($_POST['javascript']) && $_POST['javascript'] == "true") { - $_SESSION['js']= TRUE; + session::set('js',TRUE); }elseif(isset($_POST['javascript'])) { - $_SESSION['js']= FALSE; + session::set('js',FALSE); } /* Check if gosa.conf (.CONFIG_FILE) is accessible */ if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){ - msg_dialog::display(_("Configuration accessibility"),sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE),FATAL_ERROR_DIALOG); + msg_dialog::display(_("Configuration error"),sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE),FATAL_ERROR_DIALOG); exit(); } /* Parse configuration file */ $config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR); -$_SESSION['DEBUGLEVEL']= $config->data['MAIN']['DEBUGLEVEL']; +session::set('DEBUGLEVEL',$config->data['MAIN']['DEBUGLEVEL']); if ($_SERVER["REQUEST_METHOD"] != "POST"){ @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config"); } @@ -148,11 +160,10 @@ if (isset ($config->data['MAIN']['COMPILE'])){ } else { $smarty->compile_dir= '/var/spool/gosa'; } -$smarty->assign ('nextfield', 'username'); /* Check for compile directory */ if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){ - msg_dialog::display(_("Smarty"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"), + msg_dialog::display(_("Smarty error"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"), $smarty->compile_dir),FATAL_ERROR_DIALOG); exit(); } @@ -170,9 +181,9 @@ $GLOBALS['t_gettext_message_dir'] = $BASE_DIR.'/locale/'; /* Set the text domain as 'messages' */ $domain = 'messages'; -bindtextdomain($domain, "$BASE_DIR/locale"); +bindtextdomain($domain, LOCALE_DIR); textdomain($domain); - +$smarty->assign ('nextfield', 'username'); if ($_SERVER["REQUEST_METHOD"] != "POST"){ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, "Setting language to"); @@ -199,24 +210,49 @@ if ($config->data['MAIN']['FORCESSL'] == 'true' && $ssl != ''){ exit; } +/* Do we have htaccess authentification enabled? */ +$htaccess_authenticated= FALSE; +if (isset($config->data['MAIN']['HTACCESS_AUTH']) && preg_match('/^(yes|true)$/i', $config->data['MAIN']['HTACCESS_AUTH'])){ + if (!isset($_SERVER['REMOTE_USER'])){ + msg_dialog::display(_("Configuration error"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG); + exit; + } + + $tmp= process_htaccess($_SERVER['REMOTE_USER'], isset($_SERVER['KRB5CCNAME'])); + $username= $tmp['username']; + $server= $tmp['server']; + if ($username == ""){ + msg_dialog::display(_("Error"), _("Cannot find a valid user for the current authentication setup!"), FATAL_ERROR_DIALOG); + exit; + } + if ($server == ""){ + msg_dialog::display(_("Error"), _("User information is not unique accross the configured LDAP trees!"), FATAL_ERROR_DIALOG); + exit; + } + + $htaccess_authenticated= TRUE; +} + /* Got a formular answer, validate and try to log in */ -if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ +if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htaccess_authenticated){ /* Reset error messages */ $message= ""; /* Destroy old sessions, they cause a successfull login to relog again ...*/ - if(isset($_SESSION['_LAST_PAGE_REQUEST'])){ - $_SESSION['_LAST_PAGE_REQUEST'] = time(); + if(session::is_set('_LAST_PAGE_REQUEST')){ + session::set('_LAST_PAGE_REQUEST',time()); } - $server= validate($_POST["server"]); + if (!$htaccess_authenticated){ + $server= validate($_POST["server"]); + } $config->set_current($server); /* Admin-logon and verify */ $ldap = $config->get_ldap_link(); if (is_null($ldap) || (is_int($ldap) && $ldap == 0)){ - print_red (_("Can't bind to LDAP. Please contact the system administrator.")); + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); displayLogin(); exit(); } @@ -230,7 +266,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ $tls = (isset($config->current['TLS']) && $config->current['TLS'] == "true"); if(!count($ldap->get_objectclasses())){ - print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible.")); + msg_dialog::display(_("LDAP error"), _("Cannot detect information about the installed LDAP schema!"), ERROR_DIALOG); displayLogin(); exit() ; }else{ @@ -243,13 +279,14 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ $checkarr = array(); foreach($str as $tr){ if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']){ - print_red($tr['MSG']."
"._("Your ldap setup contains old schema definitions. Please re-run the setup.")); + msg_dialog::display(_("LDAP error"), _("Your LDAP setup contains old schema definitions:")."

".$tr['MSG']."", ERROR_DIALOG); displayLogin(); exit(); } } } } + /* Check for locking area */ $ldap->cat($config->current['CONFIG'], array("dn")); $attrs= $ldap->fetch(); @@ -259,16 +296,31 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ } /* Check for valid input */ - $username= $_POST["username"]; - if (!ereg("^[@A-Za-z0-9_.-]+$", $username)){ - $message= _("Please specify a valid username!"); - } elseif (mb_strlen($_POST["password"], 'UTF-8') == 0){ - $message= _("Please specify your password!"); - $smarty->assign ('nextfield', 'password'); - } else { + $ok= true; + if (!$htaccess_authenticated){ + $username= $_POST["username"]; + if (!ereg("^[@A-Za-z0-9_.-]+$", $username)){ + $message= _("Please specify a valid username!"); + $ok= false; + } elseif (mb_strlen($_POST["password"], 'UTF-8') == 0){ + $message= _("Please specify your password!"); + $smarty->assign ('nextfield', 'password'); + $ok= false; + } + } + + if ($ok) { /* Login as user, initialize user ACL's */ - $ui= ldap_login_user($username, $_POST["password"]); + if ($htaccess_authenticated){ + $ui= ldap_login_user_htaccess($username); + if ($ui === NULL || !$ui){ + msg_dialog::display(_("Authentication error"), _("Cannot retrieve user information for htaccess authentication!"), FATAL_ERROR_DIALOG); + exit; + } + } else { + $ui= ldap_login_user($username, $_POST["password"]); + } if ($ui === NULL || !$ui){ $message= _("Please check the username/password combination."); $smarty->assign ('nextfield', 'password'); @@ -278,22 +330,16 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ del_user_locks($ui->dn); /* Save userinfo and plugin structure */ - $_SESSION['ui']= $ui; - $_SESSION['session_cnt']= 0; + session::set('ui',$ui); + session::set('session_cnt',0); /* Let GOsa trigger a new connection for each POST, save config to session. */ $config->get_departments(); $config->make_idepartments(); - $_SESSION['config']= $config; + session::set('config',$config); - /* Take care about zend.ze1_compatiblity_mode */ - if (ini_get("zend.ze1_compatibility_mode") != 0){ - $_SESSION['PHP4COMPATIBLE']= TRUE; - } - - /* Restore filter settings from cookie, if available - */ + /* Restore filter settings from cookie, if available */ if(isset($config->data['MAIN']['SAVE_FILTER']) && preg_match("/true/",$config->data['MAIN']['SAVE_FILTER'])){ if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){ @@ -308,7 +354,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ $cookie_vars= array("MultiDialogFilters","CurrentMainBase","plug"); foreach($cookie_vars as $var){ if(isset($cookie[$var])){ - $_SESSION[$var] = $cookie[$var]; + session::set($var,$cookie[$var]); } } if(isset($cookie['plug'])){ @@ -325,7 +371,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ $expired= ldap_expired_account($config, $ui->dn, $ui->username); if ($expired == 1){ - $message= _("Account locked. Please contact your system administrator."); + $message= _("Account locked. Please contact your system administrator!"); $smarty->assign ('nextfield', 'password'); new log("security","login","",array(),"Account for user \"$username\" has expired") ; } elseif ($expired == 3){ @@ -340,6 +386,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ } } } + /* Not account expired or password forced change go to main page */ new log("security","login","",array(),"User \"$username\" logged in successfully") ; $plist= new pluglist($config, $ui); @@ -356,7 +403,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ /* Fill template with required values */ $smarty->assign ('date', gmdate("D, d M Y H:i:s")); $smarty->assign ('username', $username); -$smarty->assign ('personal_img', get_template_path('images/personal.png')); +$smarty->assign ('personal_img', get_template_path('images/login-head.png')); $smarty->assign ('password_img', get_template_path('images/password.png')); $smarty->assign ('directory_img', get_template_path('images/ldapserver.png')); @@ -377,7 +424,6 @@ if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){ /* Translation of cookie-warning. Whether to display it, is determined by JavaScript */ $smarty->assign ("cookies", ""._("Warning").":<\/b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!")); - /* Generate server list */ $servers= array(); if (isset($_POST['server'])){ @@ -393,8 +439,8 @@ $smarty->assign ("server_id", $selected); /* show login screen */ $smarty->assign ("PHPSESSID", session_id()); -if (isset($_SESSION['errors'])){ - $smarty->assign("errors", $_SESSION['errors']); +if (session::is_set('errors')){ + $smarty->assign("errors", session::get('errors')); } if ($error_collector != ""){ $smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector).""); @@ -404,7 +450,7 @@ if ($error_collector != ""){ /* Set focus to the error button if we've an error message */ $focus= ""; -if (isset($_SESSION['errors']) && $_SESSION['errors'] != ""){ +if (session::is_set('errors') && session::get('errors') != ""){ $focus= '';