holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working on complete update of sessions class

Browse Source
This commit is contained in:
seek3r 2001-02-06 11:00:26 +00:00
parent 093aba9c5a
commit 99256dc16c
3 changed files with 143 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
login.php
View File

@ -34,8 +34,9 @@
} }
*/ */
$phpgw_info["server"]["template_dir"] = $phpgw_info["server"]["server_root"]."/phpgwapi/templates/default"; $phpgw_info["server"]["template_dir"] = PHPGW_SERVER_ROOT."/phpgwapi/templates/default";
$tmpl = new Template($phpgw_info["server"]["template_dir"]); // $tmpl = new Template($phpgw_info["server"]["template_dir"]);
$tmpl = CreateObject("phpgwapi.Template", $phpgw_info["server"]["template_dir"]);
if (! $deny_login && ! $phpgw_info["server"]["show_domain_selectbox"]) { if (! $deny_login && ! $phpgw_info["server"]["show_domain_selectbox"]) {
$tmpl->set_file(array("login_form" => "login.tpl")); $tmpl->set_file(array("login_form" => "login.tpl"));
@ -122,17 +123,18 @@
// If there is something wrong with this code TELL ME! // If there is something wrong with this code TELL ME!
// Commenting out the code will not fix it. (jengo) // Commenting out the code will not fix it. (jengo)
if (isset($last_loginid)) { if (isset($last_loginid)) {
//echo "check point 1 - $last_loginid<br>\n"; $prefs = CreateObject("phpgwapi.preferences", $last_loginid);
$prefs = CreateObject("phpgwapi.preferences", $last_loginid); if ($prefs->account_id == ""){
//echo "check point 2<br>\n"; $phpgw_info["user"]["preferences"]["common"]["lang"] = "en";
$phpgw_info["user"]["preferences"] = $prefs->read_repository(); }else{
//echo "check point 3<br>\n"; $phpgw_info["user"]["preferences"] = $prefs->read_repository();
#print "LANG:".$phpgw_info["user"]["preferences"]["common"]["lang"]."<br>"; }
$phpgw->translation->add_app("login"); #print "LANG:".$phpgw_info["user"]["preferences"]["common"]["lang"]."<br>";
$phpgw->translation->add_app("loginscreen"); $phpgw->translation->add_app("login");
if (lang("loginscreen_message") != "loginscreen_message*") { $phpgw->translation->add_app("loginscreen");
$tmpl->set_var("lang_message",stripslashes(lang("loginscreen_message"))); if (lang("loginscreen_message") != "loginscreen_message*") {
} $tmpl->set_var("lang_message",stripslashes(lang("loginscreen_message")));
}
} else { } else {
// If the lastloginid cookies isn't set, we will default to english. // If the lastloginid cookies isn't set, we will default to english.
// Change this if you need. // Change this if you need.

29
phpgwapi/inc/class.phpgw.inc.php
View File

@ -102,28 +102,19 @@
$this->acl = CreateObject("phpgwapi.acl"); $this->acl = CreateObject("phpgwapi.acl");
$this->accounts = CreateObject("phpgwapi.accounts"); $this->accounts = CreateObject("phpgwapi.accounts");
$this->session = CreateObject("phpgwapi.sessions"); $this->session = CreateObject("phpgwapi.sessions");
$this->preferences = CreateObject("phpgwapi.preferences");
if ($phpgw_info["flags"]["currentapp"] == "login") { if ($phpgw_info["flags"]["currentapp"] == "login") {
if ($login != ""){ if ($login != ""){
$log = explode("@",$login); $login_array = explode("@",$login);
$this->preferences = CreateObject("phpgwapi.preferences", $log[0]); $this->accounts->accounts($login_array[0]);
$this->preferences->preferences($login_array[0]);
} }
}else{ }elseif (! $this->session->verify()) {
if (! $this->session->verify()) { $this->db->query("select config_value from config where config_name='webserver_url'",__LINE__,__FILE__);
$this->db->query("select config_value from config where config_name='webserver_url'",__LINE__,__FILE__); $this->db->next_record();
$this->db->next_record(); Header("Location: " . $this->redirect($this->link($this->db->f("config_value")."/login.php","cd=10")));
Header("Location: " . $this->redirect($this->link($this->db->f("config_value")."/login.php","cd=10"))); exit;
exit;
}
$phpgw_info["user"]["account_id"] = $this->accounts->name2id($phpgw_info["user"]["userid"]);
$this->preferences = CreateObject("phpgwapi.preferences", intval($phpgw_info["user"]["account_id"]));
$this->applications = CreateObject("phpgwapi.applications", intval($phpgw_info["user"]["account_id"]));
$this->acl = CreateObject("phpgwapi.acl", intval($phpgw_info["user"]["account_id"]));
$phpgw_info["user"]["acl"] = $this->acl->read_repository();
$phpgw_info["user"]["preferences"] = $this->preferences->read_repository();
$phpgw_info["user"]["apps"] = $this->applications->read_repository();
@reset($phpgw_info["user"]["apps"]);
} }
$this->translation = CreateObject("phpgwapi.translation"); $this->translation = CreateObject("phpgwapi.translation");

186
phpgwapi/inc/class.sessions.inc.php
View File

@ -25,6 +25,26 @@
class sessions class sessions
{ {
var $login;
var $passwd;
var $account_id;
var $account_lid;
var $account_domain;
var $sessionid;
var $kp3;
var $data;
var $db;
var $db2;
function sessions()
{
global $phpgw, $phpgw_info, $sessionid, $kp3;
$this->db = $phpgw->db;
$this->db2 = $phpgw->db;
$this->sessionid = $sessionid;
$this->kp3 = $kp3;
}
function getuser_ip() function getuser_ip()
{ {
global $REMOTE_ADDR, $HTTP_X_FORWARDED_FOR; global $REMOTE_ADDR, $HTTP_X_FORWARDED_FOR;
@ -61,8 +81,9 @@
$phpgw_info["user"]["session_ip"] = $db->f("session_ip"); $phpgw_info["user"]["session_ip"] = $db->f("session_ip");
$t = explode("@",$db->f("session_lid")); $t = explode("@",$db->f("session_lid"));
$phpgw_info["user"]["userid"] = $t[0]; $phpgw_info["user"]["account_lid"] = $t[0];
// $this->read_repositories();
// $phpgw->accounts->account_id = $phpgw->accounts->name2id($phpgw_info["user"]["account_lid"]); // $phpgw->accounts->account_id = $phpgw->accounts->name2id($phpgw_info["user"]["account_lid"]);
// $phpgw_info["user"] = $phpgw->accounts->read_repository(); // $phpgw_info["user"] = $phpgw->accounts->read_repository();
@ -77,7 +98,7 @@
$phpgw_info = $phpgw->crypto->decrypt($db->f("session_info")); $phpgw_info = $phpgw->crypto->decrypt($db->f("session_info"));
$phpgw_info["flags"] = $phpgw_info_flags; $phpgw_info["flags"] = $phpgw_info_flags;
$userid_array = explode("@",$db->f("session_lid")); $userid_array = explode("@",$db->f("session_lid"));
$phpgw_info["user"]["userid"] = $userid_array[0]; $phpgw_info["user"]["account_lid"] = $userid_array[0];
if ($userid_array[1] != $phpgw_info["user"]["domain"]) { if ($userid_array[1] != $phpgw_info["user"]["domain"]) {
// return False; // return False;
@ -88,7 +109,7 @@
$this->update_dla(); $this->update_dla();
if (! $phpgw_info["user"]["userid"] ) { if (! $phpgw_info["user"]["account_lid"] ) {
return False; return False;
} else { } else {
// PHP 3 complains that these are not defined when the already are defined. // PHP 3 complains that these are not defined when the already are defined.
@ -109,84 +130,113 @@
} }
} }
function read_repositories($account_id)
{
global $phpgw_info, $phpgw;
if (gettype($account_id) == "string") { $account_id = $phpgw->accounts->name2id($account_id); }
$this->account_id = $account_id;
$phpgw->accounts->accounts($this->account_id);
$phpgw->preferences->preferences($this->account_id);
$phpgw->applications->applications($this->account_id);
$phpgw->acl->acl($this->account_id);
$phpgw_info["user"] = $phpgw->accounts->read_repository();
$phpgw_info["user"]["acl"] = $phpgw->acl->read_repository();
$phpgw_info["user"]["preferences"] = $phpgw->preferences->read_repository();
$phpgw_info["user"]["apps"] = $phpgw->applications->read_repository();
@reset($phpgw_info["user"]["apps"]);
$phpgw_info["user"]["domain"] = $this->account_domain;
$phpgw_info["user"]["sessionid"] = $this->sessionid;
$phpgw_info["user"]["kp3"] = $this->kp3;
$phpgw_info["user"]["session_ip"] = $this->getuser_ip();
$phpgw_info["user"]["session_lid"] = $this->account_lid."@".$this->account_domain;
$phpgw_info["user"]["account_id"] = $this->account_id;
$phpgw_info["user"]["account_lid"] = $this->account_lid;
$phpgw_info["user"]["userid"] = $this->account_lid;
$phpgw_info["user"]["passwd"] = $this->passwd;
$this->data["user"] = $phpgw_info["user"];
$this->data["apps"] = $phpgw_info["apps"];
$this->data["server"] = $phpgw_info["server"];
$this->data["hooks"] = $phpgw->hooks->read();
$this->data["user"]["preferences"] = $phpgw_info["user"]["preferences"];
$this->data["user"]["kp3"] = "";
}
function create($login,$passwd) function create($login,$passwd)
{ {
global $phpgw_info, $phpgw; global $phpgw_info, $phpgw;
$this->login = $login;
$this->passwd = $phpgw->common->encrypt($passwd);
$this->clean_sessions();
$login_array = explode("@", $login);
$this->account_lid = $login_array[0];
if ($login_array[1]!=""){
$this->account_domain = $login_array[1];
}else{
$this->account_domain = $phpgw_info["server"]["default_domain"];
}
$this->clean_sessions(); if ($phpgw_info["server"]["global_denied_users"][$this->account_lid]) { return False; }
$login_array = explode("@", $login);
$phpgw_info["user"]["userid"] = $login_array[0];
if ($phpgw_info["server"]["global_denied_users"][$phpgw_info["user"]["userid"]]) {
return False;
}
if (! $phpgw->auth->authenticate($phpgw_info["user"]["userid"], $passwd)) { if (! $phpgw->auth->authenticate($this->account_lid, $passwd)) {
return False; return False;
exit; exit;
} }
//$accts = CreateObject("phpgwapi.accounts");
//if (!$accts->exists($phpgw_info["user"]["userid"])) {
// $accts->auto_generate($phpgw_info["user"]["userid"], $passwd);
//}
$phpgw->accounts->account_id = $phpgw->accounts->name2id($phpgw_info["user"]["userid"]); if (!$phpgw->accounts->exists($this->account_lid) && $phpgw_info["server"]["auto_create_acct"] == True) {
$this->account_id = $accts->auto_add($this->account_lid, $passwd);
}else{
$this->account_id = $phpgw->accounts->name2id($this->account_lid);
}
$phpgw->accounts->account_id = $this->account_id;
$t_domain = $phpgw_info["user"]["domain"]; // We loose this info on the next line $phpgw_info["user"] = $phpgw->accounts->read_repository();
$phpgw_info["user"] = $phpgw->accounts->read_repository(); $this->sessionid = md5($phpgw->common->randomstring(10));
$phpgw_info["user"]["domain"] = $t_domain; $this->kp3 = md5($phpgw->common->randomstring(15));
$phpgw_info["user"]["sessionid"] = md5($phpgw->common->randomstring(10));
$phpgw_info["user"]["kp3"] = md5($phpgw->common->randomstring(15));
$phpgw->common->key = $phpgw_info["server"]["encryptkey"]; $phpgw->common->key = $phpgw_info["server"]["encryptkey"];
$phpgw->common->key .= $phpgw_info["user"]["sessionid"]; $phpgw->common->key .= $this->sessionid;
$phpgw->common->key .= $phpgw_info["user"]["kp3"]; $phpgw->common->key .= $this->kp3;
$phpgw->common->iv = $phpgw_info["server"]["mcrypt_iv"]; $phpgw->common->iv = $phpgw_info["server"]["mcrypt_iv"];
$cryptovars[0] = $phpgw->common->key; $cryptovars[0] = $phpgw->common->key;
$cryptovars[1] = $phpgw->common->iv; $cryptovars[1] = $phpgw->common->iv;
$phpgw->crypto = CreateObject("phpgwapi.crypto", $cryptovars); $phpgw->crypto = CreateObject("phpgwapi.crypto", $cryptovars);
$phpgw_info["user"]["passwd"] = $phpgw->common->encrypt($passwd);
if ($phpgw_info["server"]["usecookies"]) { if ($phpgw_info["server"]["usecookies"]) {
Setcookie("sessionid",$phpgw_info["user"]["sessionid"]); Setcookie("sessionid",$this->sessionid);
Setcookie("kp3",$phpgw_info["user"]["kp3"]); Setcookie("kp3",$this->kp3);
Setcookie("domain",$phpgw_info["user"]["domain"]); Setcookie("domain",$this->account_domain);
Setcookie("last_domain",$phpgw_info["user"]["domain"],time()+1209600); Setcookie("last_domain",$this->account_domain,time()+1209600);
if ($phpgw_info["user"]["domain"] ==$phpgw_info["server"]["default_domain"]) { if ($this->account_domain == $phpgw_info["server"]["default_domain"]) {
Setcookie("last_loginid",$phpgw_info["user"]["userid"],time()+1209600); // For 2 weeks Setcookie("last_loginid", $this->account_lid ,time()+1209600); // For 2 weeks
} else { } else {
Setcookie("last_loginid",$loginid,time()+1209600); // For 2 weeks Setcookie("last_loginid", $login ,time()+1209600); // For 2 weeks
} }
unset ($phpgw_info["server"]["default_domain"]); // we kill this for security reasons unset ($phpgw_info["server"]["default_domain"]); // we kill this for security reasons
} }
$phpgw_info["user"]["session_ip"] = $this->getuser_ip(); $this->read_repositories($this->account_id);
$phpgw_info["user"]["session_lid"] = $phpgw_info["user"]["account_lid"]."@".$phpgw_info["user"]["domain"];
$phpgw_info_temp["user"] = $phpgw_info["user"];
$phpgw_info_temp["apps"] = $phpgw_info["apps"];
$phpgw_info_temp["server"] = $phpgw_info["server"];
$phpgw_info_temp["hooks"] = $phpgw->hooks->read();
$phpgw_info_temp["user"]["preferences"] = $phpgw_info["user"]["preferences"];
$phpgw_info_temp["user"]["kp3"] = "";
if ($PHP_VERSION < "4.0.0") {
$info_string = addslashes($phpgw->crypto->encrypt($phpgw_info_temp));
} else {
$info_string = $phpgw->crypto->encrypt($phpgw_info_temp);
}
$phpgw->db->query("insert into phpgw_sessions values ('" . $phpgw_info["user"]["sessionid"]
. "','".$login."','" . $this->getuser_ip() . "','"
. time() . "','" . time() . "','".$info_string."')",__LINE__,__FILE__);
//$phpgw->accounts->save_repository(); if ($PHP_VERSION < "4.0.0") {
$info_string = addslashes($phpgw->crypto->encrypt($this->data));
} else {
$info_string = $phpgw->crypto->encrypt($this->data);
}
$phpgw->db->query("insert into phpgw_sessions values ('" . $this->sessionid
. "','".$login."','" . $this->getuser_ip() . "','"
. time() . "','" . time() . "','".$info_string."')",__LINE__,__FILE__);
$phpgw->db->query("insert into phpgw_access_log values ('" . $phpgw_info["user"]["sessionid"] . "','" $phpgw->db->query("insert into phpgw_access_log values ('" . $this->sessionid . "','"
. "$login','" . $this->getuser_ip() . "','" . time() . "$login','" . $this->getuser_ip() . "','" . time()
. "','') ",__LINE__,__FILE__); . "','') ",__LINE__,__FILE__);
$phpgw->auth->update_lastlogin($login,$this->getuser_ip()); $phpgw->auth->update_lastlogin($login,$this->getuser_ip());
return $phpgw_info["user"]["sessionid"]; return $this->sessionid;
} }
// This will update the DateLastActive column, so the login does not expire // This will update the DateLastActive column, so the login does not expire
@ -195,7 +245,7 @@
global $phpgw_info, $phpgw; global $phpgw_info, $phpgw;
$phpgw->db->query("update phpgw_sessions set session_dla='" . time() . "' where session_id='" $phpgw->db->query("update phpgw_sessions set session_dla='" . time() . "' where session_id='"
. $phpgw_info["user"]["sessionid"]."'",__LINE__,__FILE__); . $this->sessionid."'",__LINE__,__FILE__);
} }
function destroy() function destroy()