aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_user.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-10-16 00:38:26 +0000
committerrvelices <rv-github@modusoptimus.com>2008-10-16 00:38:26 +0000
commitebc3c2e2f7d9408db7e5335d63fdd2a003c3d79a (patch)
treed2b00fb200eab5f807b6eac33e8e692031227a1b /include/functions_user.inc.php
parenteb667c7711d61d0c757f2202af6c2e61cba7d1ac (diff)
merge 2755 and 2756 from branch 2.0 to trunk
- 2755 fix vulnerability http://www.milw0rm.com/exploits/6755 - 2756 security paranoia: protect session/remember me cookies from XSS attacks (works only if php>=5.2 and with IE/FF maybe others) git-svn-id: http://piwigo.org/svn/trunk@2757 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_user.inc.php34
1 files changed, 30 insertions, 4 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 02aa2a5d8..074a8aae9 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -1013,16 +1013,28 @@ function log_user($user_id, $remember_me)
if ($key!==false)
{
$cookie = $user_id.'-'.$now.'-'.$key;
- setcookie($conf['remember_me_name'],
+ if (version_compare(PHP_VERSION, '5.2', '>=') )
+ {
+ setcookie($conf['remember_me_name'],
+ $cookie,
+ time()+$conf['remember_me_length'],
+ cookie_path(),ini_get('session.cookie_domain'),ini_get('session.cookie_secure'),
+ ini_get('session.cookie_httponly')
+ );
+ }
+ else
+ {
+ setcookie($conf['remember_me_name'],
$cookie,
time()+$conf['remember_me_length'],
- cookie_path()
+ cookie_path(),ini_get('session.cookie_domain'),ini_get('session.cookie_secure')
);
+ }
}
}
else
{ // make sure we clean any remember me ...
- setcookie($conf['remember_me_name'], '', 0, cookie_path());
+ setcookie($conf['remember_me_name'], '', 0, cookie_path(),ini_get('session.cookie_domain'));
}
if ( session_id()!="" )
{ // we regenerate the session for security reasons
@@ -1062,7 +1074,7 @@ function auto_login() {
return true;
}
}
- setcookie($conf['remember_me_name'], '', 0, cookie_path());
+ setcookie($conf['remember_me_name'], '', 0, cookie_path(),ini_get('session.cookie_domain'));
}
return false;
}
@@ -1092,6 +1104,20 @@ SELECT '.$conf['user_fields']['id'].' AS id,
return false;
}
+/** Performs all the cleanup on user logout */
+function logout_user()
+{
+ global $conf;
+ $_SESSION = array();
+ session_unset();
+ session_destroy();
+ setcookie(session_name(),'',0,
+ ini_get('session.cookie_path'),
+ ini_get('session.cookie_domain')
+ );
+ setcookie($conf['remember_me_name'], '', 0, cookie_path(),ini_get('session.cookie_domain'));
+}
+
/*
* Return user status used in this library
* @return string